tubearchivist/tubearchivist-frontend
1
0
Fork 0
mirror of https://github.com/tubearchivist/tubearchivist-frontend.git synced 2024-11-04 19:30:13 +00:00
Code Issues Projects Releases Wiki Activity

use original sort order for playlist_id list

Browse Source
This commit is contained in:
simon 2021-11-13 18:36:48 +07:00
parent b9ddf6a299
commit e3f0075132
No known key found for this signature in database
GPG Key ID: 2C15AA5E89985DD4
1 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
tubearchivist/home/views.py
View File

@ -594,18 +594,22 @@ class PlaylistIdView(View):
page_get = int(request.GET.get("page", 0)) page_get = int(request.GET.get("page", 0))
pagination_handler = Pagination(page_get, request.user.id) pagination_handler = Pagination(page_get, request.user.id)
# get data # get data
playlist_info = self.get_playlist_info(
playlist_id_detail, view_config["es_url"]
)
sort = {
i["youtube_id"]: i["idx"]
for i in playlist_info["playlist_entries"]
}
playlist_name = playlist_info["playlist_name"]
url = view_config["es_url"] + "/ta_video/_search" url = view_config["es_url"] + "/ta_video/_search"
data = self.build_data( data = self.build_data(
pagination_handler, playlist_id_detail, view_config pagination_handler, playlist_id_detail, view_config, sort
) )
search = SearchHandler(url, data) search = SearchHandler(url, data)
videos_hits = search.get_data() videos_hits = search.get_data()
max_hits = search.max_hits max_hits = search.max_hits
playlist_info = self.get_playlist_info(
playlist_id_detail, view_config["es_url"]
)
playlist_name = playlist_info["playlist_name"]
if max_hits: if max_hits:
source = videos_hits[0]["source"] source = videos_hits[0]["source"]
@ -632,10 +636,9 @@ class PlaylistIdView(View):
return context return context
@staticmethod @staticmethod
def build_data(pagination_handler, playlist_id_detail, view_config): def build_data(pagination_handler, playlist_id_detail, view_config, sort):
"""build data query for es""" """build data query for es"""
sort_by = view_config["sort_by"] sort_by = view_config["sort_by"]
sort_order = view_config["sort_order"]
# overwrite sort_by to match key # overwrite sort_by to match key
if sort_by == "views": if sort_by == "views":
@ -645,6 +648,12 @@ class PlaylistIdView(View):
elif sort_by == "downloaded": elif sort_by == "downloaded":
sort_by = "date_downloaded" sort_by = "date_downloaded"
script = (
"if(params.scores.containsKey(doc['youtube_id'].value)) "
+ "{return params.scores[doc['youtube_id'].value];} "
+ "return 100000;"
)
data = { data = {
"size": pagination_handler.pagination["page_size"], "size": pagination_handler.pagination["page_size"],
"from": pagination_handler.pagination["page_from"], "from": pagination_handler.pagination["page_from"],
@ -655,7 +664,19 @@ class PlaylistIdView(View):
] ]
} }
}, },
"sort": [{sort_by: {"order": sort_order}}], "sort": [
{
"_script": {
"type": "number",
"script": {
"lang": "painless",
"source": script,
"params": {"scores": sort},
},
"order": "asc",
}
}
],
} }
if view_config["hide_watched"]: if view_config["hide_watched"]:
to_append = {"term": {"player.watched": {"value": False}}} to_append = {"term": {"player.watched": {"value": False}}}