From cfb15c1a78680bad8d67d70a9208d4f986e1478f Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 22 Nov 2023 10:49:04 +0700 Subject: [PATCH 1/5] handle version check comparison over any diff --- tubearchivist/home/src/ta/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tubearchivist/home/src/ta/config.py b/tubearchivist/home/src/ta/config.py index c6e9e68..f36dc69 100644 --- a/tubearchivist/home/src/ta/config.py +++ b/tubearchivist/home/src/ta/config.py @@ -323,7 +323,7 @@ class ReleaseVersion: if not message: return False - if self._parse_version(message.get("version")) == self.local_version: + if self.local_version >= self._parse_version(message.get("version")): RedisArchivist().del_message(self.NEW_KEY) return settings.TA_VERSION From 43708ee2a3f2dd002107efe4d848d36ba1cdced1 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 22 Nov 2023 12:46:09 +0700 Subject: [PATCH 2/5] refac _has_update parser, use tpl comparison --- tubearchivist/home/src/ta/config.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tubearchivist/home/src/ta/config.py b/tubearchivist/home/src/ta/config.py index f36dc69..9b3b035 100644 --- a/tubearchivist/home/src/ta/config.py +++ b/tubearchivist/home/src/ta/config.py @@ -277,12 +277,12 @@ class ReleaseVersion: """check version""" print(f"[{self.local_version}]: look for updates") self.get_remote_version() - new_version, is_breaking = self._has_update() + new_version = self._has_update() if new_version: message = { "status": True, "version": new_version, - "is_breaking": is_breaking, + "is_breaking": self.is_breaking, } RedisArchivist().set_message(self.NEW_KEY, message) print(f"[{self.local_version}]: found new version {new_version}") @@ -301,15 +301,13 @@ class ReleaseVersion: def _has_update(self): """check if there is an update""" - for idx, number in enumerate(self.local_version): - is_newer = self.remote_version[idx] > number - if is_newer: - return self.response["release_version"], self.is_breaking + if self.remote_version > self.local_version: + return self.remote_version if self.is_unstable and self.local_version == self.remote_version: - return self.response["release_version"], self.is_breaking + return self.remote_version - return False, False + return False @staticmethod def _parse_version(version): From 099c70a13b404114a6db7576c6c83556ebf231bc Mon Sep 17 00:00:00 2001 From: lamusmaser <1940060+lamusmaser@users.noreply.github.com> Date: Thu, 30 Nov 2023 19:23:58 -0700 Subject: [PATCH 3/5] Add check to determine if `sub_value` is `rand-d`, always. (#612) --- tubearchivist/home/src/ta/config.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tubearchivist/home/src/ta/config.py b/tubearchivist/home/src/ta/config.py index 9b3b035..365de3b 100644 --- a/tubearchivist/home/src/ta/config.py +++ b/tubearchivist/home/src/ta/config.py @@ -106,7 +106,10 @@ class AppConfig: # missing nested values for sub_key, sub_value in value.items(): - if sub_key not in redis_config[key].keys(): + if ( + sub_key not in redis_config[key].keys() + or sub_value == "rand-d" + ): if sub_value == "rand-d": sub_value = self._build_rand_daily() From 5aafc21bda43de75b9bdd9ca0ec19675f7bcc520 Mon Sep 17 00:00:00 2001 From: Simon Date: Sun, 3 Dec 2023 14:48:56 +0700 Subject: [PATCH 4/5] use featured path to extract channel metadata, #614 --- tubearchivist/home/src/index/channel.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tubearchivist/home/src/index/channel.py b/tubearchivist/home/src/index/channel.py index ada6105..5794ea9 100644 --- a/tubearchivist/home/src/index/channel.py +++ b/tubearchivist/home/src/index/channel.py @@ -30,6 +30,10 @@ class YoutubeChannel(YouTubeItem): self.all_playlists = False self.task = task + def build_yt_url(self): + """build youtube url""" + return f"{self.yt_base}{self.youtube_id}/featured" + def build_json(self, upload=False, fallback=False): """get from es or from youtube""" self.get_from_es() From b61b8635b84a82b682997fc1ed7854b90d6f58f3 Mon Sep 17 00:00:00 2001 From: Simon Date: Sun, 3 Dec 2023 14:49:59 +0700 Subject: [PATCH 5/5] bump celery --- tubearchivist/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tubearchivist/requirements.txt b/tubearchivist/requirements.txt index d5aee90..796573e 100644 --- a/tubearchivist/requirements.txt +++ b/tubearchivist/requirements.txt @@ -1,5 +1,5 @@ apprise==1.6.0 -celery==5.3.5 +celery==5.3.6 Django==4.2.7 django-auth-ldap==4.6.0 django-cors-headers==4.3.1