diff --git a/tubearchivist/home/src/download/queue.py b/tubearchivist/home/src/download/queue.py index 47225dd4..c115fbc1 100644 --- a/tubearchivist/home/src/download/queue.py +++ b/tubearchivist/home/src/download/queue.py @@ -269,9 +269,12 @@ class PendingList(PendingIndex): "vid_thumb_url": vid["thumbnail"], "title": vid["title"], "channel_id": vid["channel_id"], - "channel_indexed": vid["channel_id"] in self.all_channels, "duration": duration_str, "published": published, "timestamp": int(datetime.now().strftime("%s")), } + if self.all_channels: + youtube_details.update( + {"channel_indexed": vid["channel_id"] in self.all_channels} + ) return youtube_details diff --git a/tubearchivist/home/src/download/yt_dlp_base.py b/tubearchivist/home/src/download/yt_dlp_base.py index b32d536f..260b955b 100644 --- a/tubearchivist/home/src/download/yt_dlp_base.py +++ b/tubearchivist/home/src/download/yt_dlp_base.py @@ -30,7 +30,8 @@ class YtWrap: """build yt-dlp obs""" self.obs = self.OBS_BASE.copy() self.obs.update(self.obs_request) - self.add_cookie() + if self.config: + self.add_cookie() def add_cookie(self): """add cookie if enabled""" diff --git a/tubearchivist/home/src/index/reindex.py b/tubearchivist/home/src/index/reindex.py index 5fbdeee6..5e85f95c 100644 --- a/tubearchivist/home/src/index/reindex.py +++ b/tubearchivist/home/src/index/reindex.py @@ -153,6 +153,7 @@ class Reindex: date_downloaded = video.json_data["date_downloaded"] channel_dict = video.json_data["channel"] playlist = video.json_data.get("playlist") + subtitles = video.json_data.get("subtitles") # get new video.build_json() @@ -160,7 +161,7 @@ class Reindex: video.deactivate() return - video.delete_subtitles() + video.delete_subtitles(subtitles=subtitles) video.check_subtitles() # add back diff --git a/tubearchivist/home/src/index/video.py b/tubearchivist/home/src/index/video.py index fa2b0f96..86d44a04 100644 --- a/tubearchivist/home/src/index/video.py +++ b/tubearchivist/home/src/index/video.py @@ -67,7 +67,7 @@ class YoutubeSubtitle: return False video_media_url = self.video.json_data["media_url"] - media_url = video_media_url.replace(".mp4", f"-{lang}.vtt") + media_url = video_media_url.replace(".mp4", f".{lang}.vtt") all_formats = all_subtitles.get(lang) if not all_formats: return False @@ -103,7 +103,7 @@ class YoutubeSubtitle: return False video_media_url = self.video.json_data["media_url"] - media_url = video_media_url.replace(".mp4", f"-{lang}.vtt") + media_url = video_media_url.replace(".mp4", f".{lang}.vtt") all_formats = all_subtitles.get(lang) if not all_formats: # no user subtitles found @@ -152,15 +152,19 @@ class YoutubeSubtitle: """send subtitle to es for indexing""" _, _ = ElasticWrap("_bulk").post(data=query_str, ndjson=True) - def delete(self): + def delete(self, subtitles=False): """delete subtitles from index and filesystem""" youtube_id = self.video.youtube_id - # delete files videos_base = self.video.config["application"]["videos"] - if not self.video.json_data.get("subtitles"): - return + # delete files + if subtitles: + files = [i["media_url"] for i in subtitles] + else: + if not self.video.json_data.get("subtitles"): + return + + files = [i["media_url"] for i in self.video.json_data["subtitles"]] - files = [i["media_url"] for i in self.video.json_data["subtitles"]] for file_name in files: file_path = os.path.join(videos_base, file_name) try: @@ -594,10 +598,10 @@ class YoutubeVideo(YouTubeItem, YoutubeSubtitle): ) playlist.upload_to_es() - def delete_subtitles(self): + def delete_subtitles(self, subtitles=False): """delete indexed subtitles""" print(f"{self.youtube_id}: delete subtitles") - YoutubeSubtitle(self).delete() + YoutubeSubtitle(self).delete(subtitles=subtitles) def _get_ryd_stats(self): """get optional stats from returnyoutubedislikeapi.com""" diff --git a/tubearchivist/home/templates/home/channel_id.html b/tubearchivist/home/templates/home/channel_id.html index 04a43336..5aefcba8 100644 --- a/tubearchivist/home/templates/home/channel_id.html +++ b/tubearchivist/home/templates/home/channel_id.html @@ -145,9 +145,12 @@ sort-icon {% if view_style == "grid" %}
- {{ grid_items }} - grid plus row - grid minus row + {% if grid_items < 7 %} + grid plus row + {% endif %} + {% if grid_items > 3 %} + grid minus row + {% endif %}
{% endif %} grid view diff --git a/tubearchivist/home/templates/home/downloads.html b/tubearchivist/home/templates/home/downloads.html index 23dd98ac..3ca469ee 100644 --- a/tubearchivist/home/templates/home/downloads.html +++ b/tubearchivist/home/templates/home/downloads.html @@ -45,15 +45,6 @@ list view -
- {% if show_ignored_only %} -

Ignored from download

- - {% else %} -

Download queue

- - {% endif %} -

Total videos: {{ max_hits }}{% if max_hits == 10000 %}+{% endif %}

{% if results %} diff --git a/tubearchivist/home/templates/home/home.html b/tubearchivist/home/templates/home/home.html index fc4c76ae..cc497568 100644 --- a/tubearchivist/home/templates/home/home.html +++ b/tubearchivist/home/templates/home/home.html @@ -76,9 +76,12 @@ sort-icon {% if view_style == "grid" %}
- {{ grid_items }} - grid plus row - grid minus row + {% if grid_items < 7 %} + grid plus row + {% endif %} + {% if grid_items > 3 %} + grid minus row + {% endif %}
{% endif %} grid view diff --git a/tubearchivist/home/templates/home/playlist_id.html b/tubearchivist/home/templates/home/playlist_id.html index 60b55228..1f5569cb 100644 --- a/tubearchivist/home/templates/home/playlist_id.html +++ b/tubearchivist/home/templates/home/playlist_id.html @@ -80,9 +80,12 @@
{% if view_style == "grid" %}
- {{ grid_items }} - grid plus row - grid minus row + {% if grid_items < 7 %} + grid plus row + {% endif %} + {% if grid_items > 3 %} + grid minus row + {% endif %}
{% endif %} grid view diff --git a/tubearchivist/home/templates/home/search.html b/tubearchivist/home/templates/home/search.html index 8372c618..a4b26207 100644 --- a/tubearchivist/home/templates/home/search.html +++ b/tubearchivist/home/templates/home/search.html @@ -1,7 +1,7 @@ {% extends "home/base.html" %} {% block content %}
-
+

Search your Archive

@@ -10,7 +10,7 @@

Video Results

-
+

No videos found.

diff --git a/tubearchivist/home/templates/home/settings.html b/tubearchivist/home/templates/home/settings.html index d4cd7f58..a5bb82a0 100644 --- a/tubearchivist/home/templates/home/settings.html +++ b/tubearchivist/home/templates/home/settings.html @@ -269,6 +269,12 @@

Actions

+
+

Delete download queue

+

Delete your pending or previously ignored videos from your download queue.

+ + +

Manual media files import.

Add files to the cache/import folder. Make sure to follow the instructions in the Github Wiki.

diff --git a/tubearchivist/requirements.txt b/tubearchivist/requirements.txt index 322992fb..a1e49c97 100644 --- a/tubearchivist/requirements.txt +++ b/tubearchivist/requirements.txt @@ -1,5 +1,5 @@ beautifulsoup4==4.11.1 -celery==5.2.6 +celery==5.2.7 Django==4.0.4 django-cors-headers==3.12.0 djangorestframework==3.13.1 diff --git a/tubearchivist/static/css/style.css b/tubearchivist/static/css/style.css index 5ed455d6..f97e2f27 100644 --- a/tubearchivist/static/css/style.css +++ b/tubearchivist/static/css/style.css @@ -346,14 +346,20 @@ button:hover { justify-content: end; } -.view-icons img, -.grid-count img { +.view-icons img { width: 30px; margin: 5px 10px; cursor: pointer; filter: var(--img-filter); } +.grid-count img { + width: 15px; + margin: 5px; + cursor: pointer; + filter: var(--img-filter); +} + #hidden-form { display: none; } diff --git a/tubearchivist/static/script.js b/tubearchivist/static/script.js index 9c016be7..47ef7271 100644 --- a/tubearchivist/static/script.js +++ b/tubearchivist/static/script.js @@ -203,10 +203,10 @@ function deleteQueue(button) { var to_delete = button.getAttribute('data-id'); var payload = JSON.stringify({'deleteQueue': to_delete}); sendPost(payload); - setTimeout(function(){ - location.reload(); - return false; - }, 1000); + // clear button + var message = document.createElement('p'); + message.innerText = 'deleting download queue: ' + to_delete; + document.getElementById(button.id).replaceWith(message); } function stopQueue() { @@ -785,21 +785,25 @@ function setProgressBar(videoId, currentTime, duration) { } // multi search form +let searchTimeout = null; function searchMulti(query) { - if (query.length > 1) { - var payload = JSON.stringify({'multi_search': query}); - var http = new XMLHttpRequest(); - http.onreadystatechange = function() { - if (http.readyState === 4) { - allResults = JSON.parse(http.response).results; - populateMultiSearchResults(allResults); - } - }; - http.open("POST", "/process/", true); - http.setRequestHeader("X-CSRFToken", getCookie("csrftoken")); - http.setRequestHeader("Content-type", "application/json"); - http.send(payload); - } + clearTimeout(searchTimeout); + searchTimeout = setTimeout(function () { + if (query.length > 1) { + var payload = JSON.stringify({'multi_search': query}); + var http = new XMLHttpRequest(); + http.onreadystatechange = function() { + if (http.readyState === 4) { + allResults = JSON.parse(http.response).results; + populateMultiSearchResults(allResults); + } + }; + http.open("POST", "/process/", true); + http.setRequestHeader("X-CSRFToken", getCookie("csrftoken")); + http.setRequestHeader("Content-type", "application/json"); + http.send(payload); + } + }, 500); } function getViewDefaults(view) {