diff --git a/docs/Settings.md b/docs/Settings.md index e73498e1..2ec38c4d 100644 --- a/docs/Settings.md +++ b/docs/Settings.md @@ -10,7 +10,7 @@ Switch between the easy on the eyes dark theme and the burning bright theme. - **Page Size**: Defines how many results get displayed on a given page. Same value goes for all archive views. ## Subscriptions -Settings related to the channel management. +Settings related to the channel management. Disable shorts or streams by setting their page size to 0 (zero). - **Channel Page Size**: Defines how many pages will get analyzed by **Tube Archivist** each time you click on *Rescan Subscriptions*. The default page size used by yt-dlp is **50**, that's also the recommended value to set here. Any value higher will slow down the rescan process, for example if you set the value to 51, that means yt-dlp will have to go through 2 pages of results instead of 1 and by that doubling the time that process takes. - **Live Page Size**: Same as above, but for channel live streams. - **Shorts page Size**: Same as above, but for shorts videos. diff --git a/tubearchivist/config/settings.py b/tubearchivist/config/settings.py index 78933eea..8c5edc2a 100644 --- a/tubearchivist/config/settings.py +++ b/tubearchivist/config/settings.py @@ -262,4 +262,4 @@ CORS_ALLOW_HEADERS = list(default_headers) + [ # TA application settings TA_UPSTREAM = "https://github.com/tubearchivist/tubearchivist" -TA_VERSION = "v0.3.1" +TA_VERSION = "v0.3.2-unstable" diff --git a/tubearchivist/home/src/download/subscriptions.py b/tubearchivist/home/src/download/subscriptions.py index f154b490..67818b84 100644 --- a/tubearchivist/home/src/download/subscriptions.py +++ b/tubearchivist/home/src/download/subscriptions.py @@ -85,6 +85,10 @@ class ChannelSubscription: return queries for query_item, default_limit in limit_map.items(): + if not default_limit: + # is deactivated in config + continue + if limit: query_limit = default_limit else: diff --git a/tubearchivist/home/src/ta/config.py b/tubearchivist/home/src/ta/config.py index 3b9a77b0..16625d7e 100644 --- a/tubearchivist/home/src/ta/config.py +++ b/tubearchivist/home/src/ta/config.py @@ -135,6 +135,7 @@ class AppConfig: # check for customizations if not redis_config: config = self.get_config() + config["scheduler"]["version_check"] = self._build_rand_daily() RedisArchivist().set_message("config", config) return diff --git a/tubearchivist/home/tasks.py b/tubearchivist/home/tasks.py index d5138368..c41a7aa5 100644 --- a/tubearchivist/home/tasks.py +++ b/tubearchivist/home/tasks.py @@ -301,7 +301,7 @@ def index_channel_playlists(channel_id): "status": key, "level": "info", "title": "Looking for playlists", - "message": f'Scanning channel "{channel.youtube_id}" in progress', + "message": f"{channel_id}: Channel scan in progress", } RedisArchivist().set_message(key, mess_dict, expire=True) channel.index_channel_playlists() @@ -313,9 +313,6 @@ def version_check(): ReleaseVersion().check() -try: - app.conf.beat_schedule = ScheduleBuilder().build_schedule() -except KeyError: - # update path to load new defaults - StartupCheck().sync_redis_state() - app.conf.beat_schedule = ScheduleBuilder().build_schedule() +# load new defaults then start the schedule here +StartupCheck().sync_redis_state() +app.conf.beat_schedule = ScheduleBuilder().build_schedule() diff --git a/tubearchivist/home/templates/home/settings.html b/tubearchivist/home/templates/home/settings.html index 02607493..ec3d4c97 100644 --- a/tubearchivist/home/templates/home/settings.html +++ b/tubearchivist/home/templates/home/settings.html @@ -33,6 +33,7 @@ {% csrf_token %}

Subscriptions

+

Disable shorts or streams by setting their page size to 0 (zero).

YouTube page size: {{ config.subscriptions.channel_size }}

Videos to scan to find new items for the Rescan subscriptions task, max recommended 50.
@@ -40,12 +41,12 @@

YouTube Live page size: {{ config.subscriptions.live_channel_size }}

- Live Videos to scan to find new items for the Rescan subscriptions task, max recommended 50, 0 to disable.
+ Live Videos to scan to find new items for the Rescan subscriptions task, max recommended 50.
{{ app_form.subscriptions_live_channel_size }}

YouTube Shorts page size: {{ config.subscriptions.shorts_channel_size }}

- Shorts Videos to scan to find new items for the Rescan subscriptions task, max recommended 50, 0 to disable.
+ Shorts Videos to scan to find new items for the Rescan subscriptions task, max recommended 50.
{{ app_form.subscriptions_shorts_channel_size }}