From a72be27982ba0adde7614bfa070a84d9951d39d9 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 15 Mar 2024 12:01:09 +0100 Subject: [PATCH 1/8] more robust channel title building --- tubearchivist/home/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tubearchivist/home/views.py b/tubearchivist/home/views.py index e87cc27..69c16ad 100644 --- a/tubearchivist/home/views.py +++ b/tubearchivist/home/views.py @@ -524,7 +524,7 @@ class ChannelIdView(ChannelIdBaseView): self.context.update( { - "title": "Channel: " + channel_name, + "title": f"Channel: {channel_name}", "channel_info": channel_info, } ) From 8bf7f71351e72136b3ea1af2b66091b69bc7566c Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 3 Apr 2024 16:31:36 +0200 Subject: [PATCH 2/8] ensure 100 download progress is sent --- tubearchivist/home/src/download/yt_dlp_handler.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tubearchivist/home/src/download/yt_dlp_handler.py b/tubearchivist/home/src/download/yt_dlp_handler.py index 6bf2c95..cb76ac3 100644 --- a/tubearchivist/home/src/download/yt_dlp_handler.py +++ b/tubearchivist/home/src/download/yt_dlp_handler.py @@ -177,7 +177,7 @@ class VideoDownloader: if not success: continue - self._notify(video_data, "Add video metadata to index") + self._notify(video_data, "Add video metadata to index", progress=1) vid_dict = index_new_video( youtube_id, @@ -197,14 +197,16 @@ class VideoDownloader: return self.videos - def _notify(self, video_data, message): + def _notify(self, video_data, message, progress=False): """send progress notification to task""" if not self.task: return typ = VideoTypeEnum(video_data["vid_type"]).value.rstrip("s").title() title = video_data.get("title") - self.task.send_progress([f"Processing {typ}: {title}", message]) + self.task.send_progress( + [f"Processing {typ}: {title}", message], progress=progress + ) def _get_next(self, auto_only): """get next item in queue""" From e26b039899cb6ca57ae305db6656cc28d3bbe6d2 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 3 Apr 2024 16:39:24 +0200 Subject: [PATCH 3/8] bump requirements --- tubearchivist/requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tubearchivist/requirements.txt b/tubearchivist/requirements.txt index c4b1b24..6e5d118 100644 --- a/tubearchivist/requirements.txt +++ b/tubearchivist/requirements.txt @@ -1,10 +1,10 @@ -apprise==1.7.4 +apprise==1.7.5 celery==5.3.6 Django==5.0.3 -django-auth-ldap==4.6.0 +django-auth-ldap==4.7.0 django-cors-headers==4.3.1 -djangorestframework==3.14.0 -Pillow==10.2.0 +djangorestframework==3.15.1 +Pillow==10.3.0 redis==5.0.0 requests==2.31.0 ryd-client==0.0.6 From e51232959986342e6d34271be69fb8e9a76aeda3 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 3 Apr 2024 16:40:16 +0200 Subject: [PATCH 4/8] remove migpath call at startup, #687 --- docker_assets/run.sh | 1 - tubearchivist/config/management/commands/ta_migpath.py | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docker_assets/run.sh b/docker_assets/run.sh index b06d5b7..4b60e58 100644 --- a/docker_assets/run.sh +++ b/docker_assets/run.sh @@ -14,7 +14,6 @@ fi python manage.py ta_envcheck python manage.py ta_connection python manage.py ta_startup -python manage.py ta_migpath # start all tasks nginx & diff --git a/tubearchivist/config/management/commands/ta_migpath.py b/tubearchivist/config/management/commands/ta_migpath.py index 05f0b76..28c9546 100644 --- a/tubearchivist/config/management/commands/ta_migpath.py +++ b/tubearchivist/config/management/commands/ta_migpath.py @@ -1,4 +1,8 @@ -"""filepath migration from v0.3.6 to v0.3.7""" +""" +filepath migration from v0.3.6 to v0.3.7 +not getting called at startup any more, to run manually if needed: +python manage.py ta_migpath +""" import json import os From 8c38a2eb695e180036e88d76ddf01e2606b0cc93 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 3 Apr 2024 21:02:33 +0200 Subject: [PATCH 5/8] clarify feature requests and contributing details --- CONTRIBUTING.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9b10c2c..4efc49a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -37,12 +37,12 @@ Please keep in mind: - A bug that can't be reproduced, is difficult or sometimes even impossible to fix. Provide very clear steps *how to reproduce*. ### Feature Request -This project needs your help to grow further. There is no shortage of ideas, see the open [issues on GH](https://github.com/tubearchivist/tubearchivist/issues?q=is%3Aopen+is%3Aissue+label%3Aenhancement) and the [roadmap](https://github.com/tubearchivist/tubearchivist#roadmap), what this project lacks is contributors to implement these ideas. +This project needs your help to grow further. There is no shortage of ideas, see the open [issues on GH](https://github.com/tubearchivist/tubearchivist/issues?q=is%3Aopen+is%3Aissue+label%3Aenhancement) and the [roadmap](https://github.com/tubearchivist/tubearchivist#roadmap), what this project lacks is contributors interested in helping with overall improvements of the application. Focus is *not* on adding new features, but improving existing ones. -Existing ideas are easily *multiple years* worth of development effort, at least at current speed. Best and fastest way to implement your feature is to do it yourself, that's why this project is open source after all. This project is *very* selective with accepting new feature requests at this point. +Existing ideas are easily *multiple years* worth of development effort, at least at current speed. This project is *very* selective with accepting new feature requests at this point. Good feature requests usually fall into one or more of these categories: -- You want to work on your own idea within the next few days or weeks. +- You want to work on your own small scoped idea within the next few days or weeks. - Your idea is beneficial for a wide range of users, not just for you. - Your idea extends the current project by building on and improving existing functionality. - Your idea is quick and easy to implement, for an experienced as well as for a first time contributor. @@ -66,7 +66,9 @@ IMPORTANT: When receiving help, contribute back to the community by improving th ## How to make a Pull Request -Thank you for contributing and helping improve this project. This is a quick checklist to help streamline the process: +Thank you for contributing and helping improve this project. Focus for the forseeable future is on improving and building on existing functionality, *not* on adding and expanding the application. + +This is a quick checklist to help streamline the process: - For **code changes**, make your PR against the [testing branch](https://github.com/tubearchivist/tubearchivist/tree/testing). That's where all active development happens. This simplifies the later merging into *master*, minimizes any conflicts and usually allows for easy and convenient *fast-forward* merging. - For **documentation changes**, make your PR directly against the *master* branch. From 9c34bb01d9bb7806b26913b21f46732caade9fb3 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 3 Apr 2024 21:04:26 +0200 Subject: [PATCH 6/8] fix spelling --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4efc49a..9758498 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -66,7 +66,7 @@ IMPORTANT: When receiving help, contribute back to the community by improving th ## How to make a Pull Request -Thank you for contributing and helping improve this project. Focus for the forseeable future is on improving and building on existing functionality, *not* on adding and expanding the application. +Thank you for contributing and helping improve this project. Focus for the foreseeable future is on improving and building on existing functionality, *not* on adding and expanding the application. This is a quick checklist to help streamline the process: From a4d062fa52ed14776ca6fa61e3e9a61f1c35b60a Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 5 Apr 2024 14:40:22 +0200 Subject: [PATCH 7/8] fix comment extraction player_client for redirect workaround --- tubearchivist/home/src/index/comments.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tubearchivist/home/src/index/comments.py b/tubearchivist/home/src/index/comments.py index 91b18ff..5dced73 100644 --- a/tubearchivist/home/src/index/comments.py +++ b/tubearchivist/home/src/index/comments.py @@ -68,6 +68,7 @@ class Comments: "youtube": { "max_comments": max_comments_list, "comment_sort": [comment_sort], + "player_client": ["ios", "web"], # workaround yt-dlp #9554 } }, } From 5c84a2cbf8fa3a3f19e860fb7b057313668f5562 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 5 Apr 2024 15:03:44 +0200 Subject: [PATCH 8/8] fix getMessages getting called multiple times in parallel --- tubearchivist/static/progress.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tubearchivist/static/progress.js b/tubearchivist/static/progress.js index a73654a..3127214 100644 --- a/tubearchivist/static/progress.js +++ b/tubearchivist/static/progress.js @@ -12,7 +12,7 @@ checkMessages(); // start to look for messages function checkMessages() { let notifications = document.getElementById('notifications'); - if (notifications) { + if (notifications && notifications.childNodes.length === 0 ) { let dataOrigin = notifications.getAttribute('data'); getMessages(dataOrigin); }