From cc85d8287e9fc45ca3553e58767f5c8bc195f777 Mon Sep 17 00:00:00 2001 From: Simon Date: Sat, 7 Dec 2024 22:06:18 +0700 Subject: [PATCH 1/8] pin dev requirements --- tubearchivist/requirements-dev.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tubearchivist/requirements-dev.txt b/tubearchivist/requirements-dev.txt index 0e0dea78..b7f4258e 100644 --- a/tubearchivist/requirements-dev.txt +++ b/tubearchivist/requirements-dev.txt @@ -1,11 +1,11 @@ -r requirements.txt -black -codespell -flake8 -isort -pylint -pylint-django -pytest -pytest-django -requirementscheck -types-requests +black==24.10.0 +codespell==2.3.0 +flake8==7.1.1 +isort==5.13.2 +pylint-django==2.6.1 +pylint==3.3.2 +pytest-django==4.9.0 +pytest==8.3.4 +requirementscheck==0.0.3 +types-requests==2.32.0.20241016 From a3910a79299bfd1e71e9111b575ee12765c0ac8c Mon Sep 17 00:00:00 2001 From: Simon Date: Sat, 7 Dec 2024 22:07:01 +0700 Subject: [PATCH 2/8] fix none channel playlist entry extraction --- tubearchivist/home/src/index/playlist.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tubearchivist/home/src/index/playlist.py b/tubearchivist/home/src/index/playlist.py index a7cef0f0..bee54231 100644 --- a/tubearchivist/home/src/index/playlist.py +++ b/tubearchivist/home/src/index/playlist.py @@ -93,13 +93,10 @@ class YoutubePlaylist(YouTubeItem): """get all videos in playlist, match downloaded with ids_found""" all_members = [] for idx, entry in enumerate(self.youtube_meta["entries"]): - if not entry["channel"]: - continue - to_append = { "youtube_id": entry["id"], "title": entry["title"], - "uploader": entry["channel"], + "uploader": entry.get("channel"), "idx": idx, "downloaded": entry["id"] in ids_found, } From d051f8cb150fade5a7a3a18a1d2a2013f4471e8a Mon Sep 17 00:00:00 2001 From: Simon Date: Sat, 7 Dec 2024 22:07:59 +0700 Subject: [PATCH 3/8] bump requirements --- tubearchivist/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tubearchivist/requirements.txt b/tubearchivist/requirements.txt index 41cfea40..d41207db 100644 --- a/tubearchivist/requirements.txt +++ b/tubearchivist/requirements.txt @@ -3,12 +3,12 @@ celery==5.4.0 django-auth-ldap==5.1.0 django-celery-beat==2.7.0 django-cors-headers==4.6.0 -Django==5.1.3 +Django==5.1.4 djangorestframework==3.15.2 Pillow==11.0.0 -redis==5.2.0 +redis==5.2.1 requests==2.32.3 ryd-client==0.0.6 uWSGI==2.0.28 whitenoise==6.8.2 -yt-dlp[default]==2024.11.4 +yt-dlp[default]==2024.12.6 From 9288f197ef0552c8d1d6581d955cac6b9370b291 Mon Sep 17 00:00:00 2001 From: Simon Date: Sat, 7 Dec 2024 22:08:09 +0700 Subject: [PATCH 4/8] add unstable tag --- tubearchivist/config/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tubearchivist/config/settings.py b/tubearchivist/config/settings.py index ad046850..fce0d9eb 100644 --- a/tubearchivist/config/settings.py +++ b/tubearchivist/config/settings.py @@ -276,4 +276,4 @@ CORS_ALLOW_HEADERS = list(default_headers) + [ # TA application settings TA_UPSTREAM = "https://github.com/tubearchivist/tubearchivist" -TA_VERSION = "v0.4.11" +TA_VERSION = "v0.4.12-unstable" From 9fd2c01966f6e234c6484afb13a4ef3713dae980 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 18 Dec 2024 09:23:09 +0700 Subject: [PATCH 5/8] bump yt-dlp fix AI dub prio --- tubearchivist/requirements-dev.txt | 2 +- tubearchivist/requirements.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tubearchivist/requirements-dev.txt b/tubearchivist/requirements-dev.txt index b7f4258e..3aac969a 100644 --- a/tubearchivist/requirements-dev.txt +++ b/tubearchivist/requirements-dev.txt @@ -7,5 +7,5 @@ pylint-django==2.6.1 pylint==3.3.2 pytest-django==4.9.0 pytest==8.3.4 -requirementscheck==0.0.3 +requirementscheck==0.0.4 types-requests==2.32.0.20241016 diff --git a/tubearchivist/requirements.txt b/tubearchivist/requirements.txt index d41207db..b2a3f921 100644 --- a/tubearchivist/requirements.txt +++ b/tubearchivist/requirements.txt @@ -1,4 +1,4 @@ -apprise==1.9.0 +apprise==1.9.1 celery==5.4.0 django-auth-ldap==5.1.0 django-celery-beat==2.7.0 @@ -11,4 +11,4 @@ requests==2.32.3 ryd-client==0.0.6 uWSGI==2.0.28 whitenoise==6.8.2 -yt-dlp[default]==2024.12.6 +yt-dlp[default]==2024.12.13 From 4057e8000458b025b40c638d8d3e33ac38411b9f Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 20 Dec 2024 11:10:13 +0700 Subject: [PATCH 6/8] bump TA_VERSION --- tubearchivist/config/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tubearchivist/config/settings.py b/tubearchivist/config/settings.py index fce0d9eb..da90ffff 100644 --- a/tubearchivist/config/settings.py +++ b/tubearchivist/config/settings.py @@ -276,4 +276,4 @@ CORS_ALLOW_HEADERS = list(default_headers) + [ # TA application settings TA_UPSTREAM = "https://github.com/tubearchivist/tubearchivist" -TA_VERSION = "v0.4.12-unstable" +TA_VERSION = "v0.4.12" From 1d7833cd2458ba7b4ae18eb444c54c49c03ff04f Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 20 Dec 2024 11:11:58 +0700 Subject: [PATCH 7/8] bump es --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index f7e4dd9b..bbd11302 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -40,7 +40,7 @@ services: depends_on: - archivist-es archivist-es: - image: bbilly1/tubearchivist-es # only for amd64, or use official es 8.14.3 + image: bbilly1/tubearchivist-es # only for amd64, or use official es 8.16.0 container_name: archivist-es restart: unless-stopped environment: From b1112f5e6dcce6047d4471602ef66943987aab80 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 20 Dec 2024 11:20:02 +0700 Subject: [PATCH 8/8] fix numeric sort --- deploy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy.sh b/deploy.sh index 6087b03f..0213d9f4 100755 --- a/deploy.sh +++ b/deploy.sh @@ -157,7 +157,7 @@ function sync_docker { fi echo "latest tags:" - git tag | tail -n 5 | sort -r + git tag | sort -rV | head -n 5 printf "\ncreate new version:\n" read -r VERSION @@ -189,7 +189,7 @@ function sync_docker_old { fi echo "latest tags:" - git tag | tail -n 5 | sort -r + git tag | sort -rV | head -n 5 printf "\ncreate new version:\n" read -r VERSION