From 89f2f2b0d3f57b7a343840c162051358e9d9ab0d Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Tue, 11 Mar 2025 17:39:33 -0400
Subject: [PATCH 01/22] Show progress on tasks page

---
 tubesync/sync/tasks.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tubesync/sync/tasks.py b/tubesync/sync/tasks.py
index 4a1884d8..a75c269a 100644
--- a/tubesync/sync/tasks.py
+++ b/tubesync/sync/tasks.py
@@ -203,9 +203,12 @@ def index_source_task(source_id):
     # Got some media, update the last crawl timestamp
     source.last_crawl = timezone.now()
     source.save()
-    log.info(f'Found {len(videos)} media items for source: {source}')
+    num_videos = len(videos)
+    log.info(f'Found {num_videos} media items for source: {source}')
     fields = lambda f, m: m.get_metadata_field(f)
-    for video in videos:
+    tvn_format = '[{}' + f'/{num_videos}] {task.verbose_name}'
+    for vn, video in enumerate(videos, start=1):
+        task.verbose_name = tvn_format.format(vn)
         # Create or update each video as a Media object
         key = video.get(source.key_field, None)
         if not key:

From 3ad0fad72e27ee38171f0cf809b40fb5fd4fcc03 Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Wed, 12 Mar 2025 15:38:52 -0400
Subject: [PATCH 02/22] Get task functions

---
 tubesync/sync/tasks.py | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/tubesync/sync/tasks.py b/tubesync/sync/tasks.py
index a75c269a..1f7ec3ab 100644
--- a/tubesync/sync/tasks.py
+++ b/tubesync/sync/tasks.py
@@ -114,27 +114,26 @@ def get_source_completed_tasks(source_id, only_errors=False):
         q['failed_at__isnull'] = False
     return CompletedTask.objects.filter(**q).order_by('-failed_at')
 
+def get_tasks(task_name, id=None, /, instance=None):
+    assert not (id is None and instance is None)
+    arg = str(id or instance.pk)
+    return Task.objects.get_task(str(task_name), args=(arg,),)
+
+def get_first_task(task_name, id=None, /, *, instance=None):
+    tqs = get_tasks(task_name, id, instance).order_by('run_at')
+    return tqs[0] if tqs.count() else False
 
 def get_media_download_task(media_id):
-    try:
-        return Task.objects.get_task('sync.tasks.download_media',
-                                     args=(str(media_id),))[0]
-    except IndexError:
-        return False
+    return get_first_task('sync.tasks.download_media', media_id)
 
 def get_media_metadata_task(media_id):
-    try:
-        return Task.objects.get_task('sync.tasks.download_media_metadata',
-                                     args=(str(media_id),))[0]
-    except IndexError:
-        return False
+    return get_first_task('sync.tasks.download_media_metadata', media_id)
 
 def get_media_premiere_task(media_id):
-    try:
-        return Task.objects.get_task('sync.tasks.wait_for_media_premiere',
-                                     args=(str(media_id),))[0]
-    except IndexError:
-        return False
+    return get_first_task('sync.tasks.wait_for_media_premiere', media_id)
+
+def get_source_index_task(source_id):
+    return get_first_task('sync.tasks.index_source_task', source_id)
 
 def delete_task_by_source(task_name, source_id):
     now = timezone.now()
@@ -206,6 +205,7 @@ def index_source_task(source_id):
     num_videos = len(videos)
     log.info(f'Found {num_videos} media items for source: {source}')
     fields = lambda f, m: m.get_metadata_field(f)
+    task = get_source_index_task(source_id)
     tvn_format = '[{}' + f'/{num_videos}] {task.verbose_name}'
     for vn, video in enumerate(videos, start=1):
         task.verbose_name = tvn_format.format(vn)

From c0355e8f696973b72f1710d353c52a395c0ece9d Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Wed, 12 Mar 2025 15:46:55 -0400
Subject: [PATCH 03/22] Reset task verbose name after the loop ends

---
 tubesync/sync/tasks.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tubesync/sync/tasks.py b/tubesync/sync/tasks.py
index 1f7ec3ab..c99d83aa 100644
--- a/tubesync/sync/tasks.py
+++ b/tubesync/sync/tasks.py
@@ -206,9 +206,12 @@ def index_source_task(source_id):
     log.info(f'Found {num_videos} media items for source: {source}')
     fields = lambda f, m: m.get_metadata_field(f)
     task = get_source_index_task(source_id)
-    tvn_format = '[{}' + f'/{num_videos}] {task.verbose_name}'
+    if task:
+        verbose_name = task.verbose_name
+        tvn_format = '[{}' + f'/{num_videos}] {verbose_name}'
     for vn, video in enumerate(videos, start=1):
-        task.verbose_name = tvn_format.format(vn)
+        if task:
+            task.verbose_name = tvn_format.format(vn)
         # Create or update each video as a Media object
         key = video.get(source.key_field, None)
         if not key:
@@ -239,6 +242,8 @@ def index_source_task(source_id):
                 log.info(f'Indexed new media: {source} / {media}')
         except IntegrityError as e:
             log.error(f'Index media failed: {source} / {media} with "{e}"')
+    if task:
+            task.verbose_name = verbose_name
     # Tack on a cleanup of old completed tasks
     cleanup_completed_tasks()
     # Tack on a cleanup of old media

From 408a3e1c952560324d086d719606365f922b555a Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Wed, 12 Mar 2025 17:32:19 -0400
Subject: [PATCH 04/22] Save the updated `verbose_name` of the task

---
 tubesync/sync/tasks.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tubesync/sync/tasks.py b/tubesync/sync/tasks.py
index c99d83aa..3b3dce45 100644
--- a/tubesync/sync/tasks.py
+++ b/tubesync/sync/tasks.py
@@ -212,6 +212,7 @@ def index_source_task(source_id):
     for vn, video in enumerate(videos, start=1):
         if task:
             task.verbose_name = tvn_format.format(vn)
+            task.save(update_fields=('verbose_name'))
         # Create or update each video as a Media object
         key = video.get(source.key_field, None)
         if not key:
@@ -243,7 +244,8 @@ def index_source_task(source_id):
         except IntegrityError as e:
             log.error(f'Index media failed: {source} / {media} with "{e}"')
     if task:
-            task.verbose_name = verbose_name
+        task.verbose_name = verbose_name
+        task.save(update_fields=('verbose_name'))
     # Tack on a cleanup of old completed tasks
     cleanup_completed_tasks()
     # Tack on a cleanup of old media

From f99c8fc5963d3235f1346c6de164baf5ef806640 Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Thu, 13 Mar 2025 06:16:01 -0400
Subject: [PATCH 05/22] Use set since tuple is dangerous for strings

Even in explicit form tuple used a collection of characters instead of a single string.

I hate that Python has these little traps.
---
 tubesync/sync/tasks.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tubesync/sync/tasks.py b/tubesync/sync/tasks.py
index 3b3dce45..3bb6a329 100644
--- a/tubesync/sync/tasks.py
+++ b/tubesync/sync/tasks.py
@@ -212,7 +212,7 @@ def index_source_task(source_id):
     for vn, video in enumerate(videos, start=1):
         if task:
             task.verbose_name = tvn_format.format(vn)
-            task.save(update_fields=('verbose_name'))
+            task.save(update_fields={'verbose_name'})
         # Create or update each video as a Media object
         key = video.get(source.key_field, None)
         if not key:
@@ -245,7 +245,7 @@ def index_source_task(source_id):
             log.error(f'Index media failed: {source} / {media} with "{e}"')
     if task:
         task.verbose_name = verbose_name
-        task.save(update_fields=('verbose_name'))
+        task.save(update_fields={'verbose_name'})
     # Tack on a cleanup of old completed tasks
     cleanup_completed_tasks()
     # Tack on a cleanup of old media

From ec45f29e1d30bd147954e966a6fafa5b46ddc909 Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Sat, 15 Mar 2025 21:05:39 -0400
Subject: [PATCH 06/22] Use smaller transactions

---
 tubesync/sync/tasks.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tubesync/sync/tasks.py b/tubesync/sync/tasks.py
index 3bb6a329..702086fe 100644
--- a/tubesync/sync/tasks.py
+++ b/tubesync/sync/tasks.py
@@ -179,7 +179,6 @@ def cleanup_removed_media(source, videos):
 
 
 @background(schedule=300, remove_existing_tasks=True)
-@atomic(durable=True)
 def index_source_task(source_id):
     '''
         Indexes media available from a Source object.
@@ -210,9 +209,6 @@ def index_source_task(source_id):
         verbose_name = task.verbose_name
         tvn_format = '[{}' + f'/{num_videos}] {verbose_name}'
     for vn, video in enumerate(videos, start=1):
-        if task:
-            task.verbose_name = tvn_format.format(vn)
-            task.save(update_fields={'verbose_name'})
         # Create or update each video as a Media object
         key = video.get(source.key_field, None)
         if not key:
@@ -229,8 +225,12 @@ def index_source_task(source_id):
         published_dt = media.metadata_published(timestamp)
         if published_dt is not None:
             media.published = published_dt
+        if task:
+            task.verbose_name = tvn_format.format(vn)
         try:
             with atomic():
+                if task:
+                    task.save(update_fields={'verbose_name'})
                 media.save()
             log.debug(f'Indexed media: {source} / {media}')
             # log the new media instances

From 4bc510bdad1a694c960d1e0e39fb13c06db86af1 Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Tue, 18 Mar 2025 09:31:43 -0400
Subject: [PATCH 07/22] The workflow should work for forks also

---
 .github/workflows/ci.yaml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 6068cab1..d59fb9f5 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -34,7 +34,10 @@ jobs:
       - name: Run Django tests
         run: cd tubesync && python3 manage.py test --verbosity=2
   containerise:
+    if: ${{ always() }}
+    needs: test
     runs-on: ubuntu-latest
+    timeout-minutes: 120
     steps:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -42,13 +45,18 @@ jobs:
         id: buildx
         uses: docker/setup-buildx-action@v3
       - name: Log into GitHub Container Registry
-        run: echo "${{ secrets.REGISTRY_ACCESS_TOKEN }}" | docker login https://ghcr.io -u ${{ github.actor }} --password-stdin
+        env:
+          DOCKER_REGISTRY: https://ghcr.io
+          DOCKER_USERNAME: ${{ github.actor }}
+          DOCKER_TOKEN: ${{ 'meeb' == github.repository_owner && secrets.REGISTRY_ACCESS_TOKEN || secrets.GITHUB_TOKEN }}
+        run: echo '${{ env.DOCKER_TOKEN }}' | docker login --password-stdin --username '${{ env.DOCKER_USERNAME }}' '${{ env.DOCKER_REGISTRY }}'
       - name: Lowercase github username for ghcr
         id: string
         uses: ASzc/change-string-case-action@v6
         with:
           string: ${{ github.actor }}
       - name: Build and push
+        timeout-minutes: 60
         uses: docker/build-push-action@v6
         with:
           platforms: linux/amd64,linux/arm64

From c1cc71691af9cc20879b5edb7312583e3c67ec5e Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Tue, 18 Mar 2025 11:23:53 -0400
Subject: [PATCH 08/22] Use shell variables

---
 .github/workflows/ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d59fb9f5..eb31f519 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -49,7 +49,7 @@ jobs:
           DOCKER_REGISTRY: https://ghcr.io
           DOCKER_USERNAME: ${{ github.actor }}
           DOCKER_TOKEN: ${{ 'meeb' == github.repository_owner && secrets.REGISTRY_ACCESS_TOKEN || secrets.GITHUB_TOKEN }}
-        run: echo '${{ env.DOCKER_TOKEN }}' | docker login --password-stdin --username '${{ env.DOCKER_USERNAME }}' '${{ env.DOCKER_REGISTRY }}'
+        run: echo "${DOCKER_TOKEN}" | docker login --password-stdin --username "${DOCKER_USERNAME}" "${DOCKER_REGISTRY}"
       - name: Lowercase github username for ghcr
         id: string
         uses: ASzc/change-string-case-action@v6

From 021f4b172ae0971712ca6661445813f32ab5254f Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Tue, 18 Mar 2025 20:05:14 -0400
Subject: [PATCH 09/22] Display progress for checking task

---
 tubesync/sync/tasks.py | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/tubesync/sync/tasks.py b/tubesync/sync/tasks.py
index 702086fe..d89d3f66 100644
--- a/tubesync/sync/tasks.py
+++ b/tubesync/sync/tasks.py
@@ -132,6 +132,9 @@ def get_media_metadata_task(media_id):
 def get_media_premiere_task(media_id):
     return get_first_task('sync.tasks.wait_for_media_premiere', media_id)
 
+def get_source_check_task(source_id):
+    return get_first_task('sync.tasks.save_all_media_for_source', source_id)
+
 def get_source_index_task(source_id):
     return get_first_task('sync.tasks.index_source_task', source_id)
 
@@ -605,6 +608,7 @@ def save_all_media_for_source(source_id):
 
     already_saved = set()
     mqs = Media.objects.filter(source=source)
+    task = get_source_check_task(source_id)
     refresh_qs = mqs.filter(
         can_download=False,
         skip=False,
@@ -612,22 +616,40 @@ def save_all_media_for_source(source_id):
         downloaded=False,
         metadata__isnull=False,
     )
-    for media in refresh_qs:
+    if task:
+        verbose_name = task.verbose_name
+        tvn_format = '[{}' + f'/{refresh_qs.count()}] {verbose_name}'
+    for mn, media in enumerate(refresh_qs, start=1):
+        if task:
+            task.verbose_name = tvn_format.format(mn)
+            with atomic():
+                task.save(update_fields={'verbose_name'})
         try:
             media.refresh_formats
         except YouTubeError as e:
             log.debug(f'Failed to refresh formats for: {source} / {media.key}: {e!s}')
             pass
         else:
-            media.save()
+            with atomic():
+                media.save()
             already_saved.add(media.uuid)
 
     # Trigger the post_save signal for each media item linked to this source as various
     # flags may need to be recalculated
-    with atomic():
-        for media in mqs:
+    if task:
+        tvn_format = '[{}' + f'/{mqs.count()}] {verbose_name}'
+    for mn, media in enumerate(mqs, start=1):
+        if task:
+            task.verbose_name = tvn_format.format(mn)
+            with atomic():
+                task.save(update_fields={'verbose_name'})
             if media.uuid not in already_saved:
-                media.save()
+                with atomic():
+                    media.save()
+    if task:
+        task.verbose_name = verbose_name
+        with atomic():
+            task.save(update_fields={'verbose_name'})
 
 
 @background(schedule=60, remove_existing_tasks=True)

From d2458a297965428729cd876db3803953bec0dbce Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Tue, 18 Mar 2025 20:12:54 -0400
Subject: [PATCH 10/22] Keep transactions specific to task

---
 tubesync/sync/tasks.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tubesync/sync/tasks.py b/tubesync/sync/tasks.py
index d89d3f66..fd5d1800 100644
--- a/tubesync/sync/tasks.py
+++ b/tubesync/sync/tasks.py
@@ -230,11 +230,10 @@ def index_source_task(source_id):
             media.published = published_dt
         if task:
             task.verbose_name = tvn_format.format(vn)
-        try:
             with atomic():
-                if task:
                     task.save(update_fields={'verbose_name'})
-                media.save()
+        try:
+            media.save()
             log.debug(f'Indexed media: {source} / {media}')
             # log the new media instances
             new_media_instance = (
@@ -248,7 +247,8 @@ def index_source_task(source_id):
             log.error(f'Index media failed: {source} / {media} with "{e}"')
     if task:
         task.verbose_name = verbose_name
-        task.save(update_fields={'verbose_name'})
+        with atomic():
+            task.save(update_fields={'verbose_name'})
     # Tack on a cleanup of old completed tasks
     cleanup_completed_tasks()
     # Tack on a cleanup of old media

From 1f72718f317b6f7c66301b316f2f8db611589709 Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Tue, 18 Mar 2025 20:15:17 -0400
Subject: [PATCH 11/22] fixup: indentation

---
 tubesync/sync/tasks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tubesync/sync/tasks.py b/tubesync/sync/tasks.py
index fd5d1800..cf0d99d4 100644
--- a/tubesync/sync/tasks.py
+++ b/tubesync/sync/tasks.py
@@ -231,7 +231,7 @@ def index_source_task(source_id):
         if task:
             task.verbose_name = tvn_format.format(vn)
             with atomic():
-                    task.save(update_fields={'verbose_name'})
+                task.save(update_fields={'verbose_name'})
         try:
             media.save()
             log.debug(f'Indexed media: {source} / {media}')

From abae403a8fbed7fb5520a551f91174c2aba47916 Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Tue, 18 Mar 2025 21:12:18 -0400
Subject: [PATCH 12/22] Remove extra blank lines

---
 tubesync/sync/tasks.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tubesync/sync/tasks.py b/tubesync/sync/tasks.py
index c510b8fd..4fcf8455 100644
--- a/tubesync/sync/tasks.py
+++ b/tubesync/sync/tasks.py
@@ -254,12 +254,10 @@ def index_source_task(source_id):
                         priority=20,
                         verbose_name=verbose_name.format(media.pk),
                     )
-
     if task:
         task.verbose_name = verbose_name
         with atomic():
             task.save(update_fields={'verbose_name'})
-
     # Tack on a cleanup of old completed tasks
     cleanup_completed_tasks()
     with atomic(durable=True):

From 281268772aa62d79f5f6e9c8b277ece54435cd23 Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Wed, 19 Mar 2025 00:02:26 -0400
Subject: [PATCH 13/22] Add a default thumbnail URL before metadata is
 available

---
 tubesync/sync/models.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tubesync/sync/models.py b/tubesync/sync/models.py
index 5d36191e..b2656129 100644
--- a/tubesync/sync/models.py
+++ b/tubesync/sync/models.py
@@ -1202,6 +1202,8 @@ class Media(models.Model):
 
     @property
     def thumbnail(self):
+        if not self.has_metadata:
+            return f'https://i.ytimg.com/vi/{self.key}/maxresdefault.jpg'
         return self.get_metadata_first_value('thumbnail', '')
 
     @property

From 65f86b116151bb03afa2eed54986e268cce3f98f Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Wed, 19 Mar 2025 00:13:23 -0400
Subject: [PATCH 14/22] Use the default argument

---
 tubesync/sync/models.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tubesync/sync/models.py b/tubesync/sync/models.py
index b2656129..168f4d8e 100644
--- a/tubesync/sync/models.py
+++ b/tubesync/sync/models.py
@@ -1202,9 +1202,8 @@ class Media(models.Model):
 
     @property
     def thumbnail(self):
-        if not self.has_metadata:
-            return f'https://i.ytimg.com/vi/{self.key}/maxresdefault.jpg'
-        return self.get_metadata_first_value('thumbnail', '')
+        default = f'https://i.ytimg.com/vi/{self.key}/maxresdefault.jpg'
+        return self.get_metadata_first_value('thumbnail', default)
 
     @property
     def name(self):

From 3d6a217f20c0b3f7f9cce51da4284073fc229d92 Mon Sep 17 00:00:00 2001
From: meeb <meeb@meeb.org>
Date: Wed, 19 Mar 2025 15:36:36 +1100
Subject: [PATCH 15/22] bump ffmpeg and yt-dlp

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 99e2b102..cb8094f3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
 # syntax=docker/dockerfile:1
 # check=error=true
 
-ARG FFMPEG_DATE="2025-03-04-15-43"
-ARG FFMPEG_VERSION="N-118645-gf76195ff65"
+ARG FFMPEG_DATE="2025-03-18-14-20"
+ARG FFMPEG_VERSION="N-118860-g81c50c33b6"
 
 ARG S6_VERSION="3.2.0.2"
 

From 20959fb4c2a400f42c6a6ca366e3f649af5b00ae Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Wed, 19 Mar 2025 00:46:49 -0400
Subject: [PATCH 16/22] Thumbnail download can proceed without metadata

---
 tubesync/sync/tasks.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tubesync/sync/tasks.py b/tubesync/sync/tasks.py
index 12c2afcb..183ee351 100644
--- a/tubesync/sync/tasks.py
+++ b/tubesync/sync/tasks.py
@@ -457,8 +457,6 @@ def download_media_thumbnail(media_id, url):
     except Media.DoesNotExist:
         # Task triggered but the media no longer exists, do nothing
         return
-    if not media.has_metadata:
-        raise NoMetadataException('Metadata is not yet available.')
     if media.skip:
         # Media was toggled to be skipped after the task was scheduled
         log.warn(f'Download task triggered for media: {media} (UUID: {media.pk}) but '

From e1f2cd0d85576346d90ac1e471ba64db5b4c9c01 Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Wed, 19 Mar 2025 01:00:06 -0400
Subject: [PATCH 17/22] fixup: indentation

---
 tubesync/sync/tasks.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tubesync/sync/tasks.py b/tubesync/sync/tasks.py
index 12c2afcb..9ec22447 100644
--- a/tubesync/sync/tasks.py
+++ b/tubesync/sync/tasks.py
@@ -276,12 +276,12 @@ def index_source_task(source_id):
             if new_media_instance:
                 log.info(f'Indexed new media: {source} / {media}')
                 log.info(f'Scheduling task to download metadata for: {media.url}')
-                    verbose_name = _('Downloading metadata for "{}"')
-                    download_media_metadata(
-                        str(media.pk),
-                        priority=20,
-                        verbose_name=verbose_name.format(media.pk),
-                    )
+                verbose_name = _('Downloading metadata for "{}"')
+                download_media_metadata(
+                    str(media.pk),
+                    priority=20,
+                    verbose_name=verbose_name.format(media.pk),
+                )
     if task:
         task.verbose_name = verbose_name
         with atomic():

From f5a30c218b27cddc3f30b13c0c62af91dba9b9c9 Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Wed, 19 Mar 2025 01:23:02 -0400
Subject: [PATCH 18/22] Follow `yt-dlp/FFmpeg-Builds/releases` automatically

---
 .github/workflows/ci.yaml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index eb31f519..53ac1d37 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -39,6 +39,20 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 120
     steps:
+      - name: Set environment variables with GitHub CLI
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          {
+            # Fetch the latest+1 release from yt-dlp/FFmpeg-Builds
+            var='FFMPEG_DATE' ;
+            delim='"'"${var}"'_EOF"' ;
+            jq_arg='.[1].tag_name[10:]' ;
+            printf -- '%s<<%s\n' "${var}" "${delim}" ;
+            gh api repos/yt-dlp/FFmpeg-Builds/releases --cache 12h --jq "${jq_arg}" ;
+            printf -- '%s\n' "${delim}" ;
+            unset -v delim jq_arg var ;
+          } >> "${GITHUB_ENV}"
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
@@ -66,3 +80,5 @@ jobs:
           cache-to: type=inline
           build-args: |
             IMAGE_NAME=${{ env.IMAGE_NAME }}
+            FFMPEG_DATE=${{ env.FFMPEG_DATE }}
+            FFMPEG_VERSION=N

From 35f0dcff555ad4f9887c6a1637acee28442a8285 Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Wed, 19 Mar 2025 01:35:19 -0400
Subject: [PATCH 19/22] Remove `FFMPEG_DATE` value from Dockerfile

---
 Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 99e2b102..4cfab87d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,7 @@
 # syntax=docker/dockerfile:1
 # check=error=true
 
-ARG FFMPEG_DATE="2025-03-04-15-43"
-ARG FFMPEG_VERSION="N-118645-gf76195ff65"
-
+ARG FFMPEG_VERSION="N"
 ARG S6_VERSION="3.2.0.2"
 
 ARG SHA256_S6_AMD64="59289456ab1761e277bd456a95e737c06b03ede99158beb24f12b165a904f478"

From d6785660b8d8def5bffd73566886a142b3d091d6 Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Wed, 19 Mar 2025 01:36:49 -0400
Subject: [PATCH 20/22] Don't override `FFMPEG_VERSION` yet

---
 .github/workflows/ci.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 53ac1d37..f68ab9db 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -81,4 +81,3 @@ jobs:
           build-args: |
             IMAGE_NAME=${{ env.IMAGE_NAME }}
             FFMPEG_DATE=${{ env.FFMPEG_DATE }}
-            FFMPEG_VERSION=N

From ba8ad209104adee1c7873dcbefd2c9054d30438a Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Wed, 19 Mar 2025 01:59:07 -0400
Subject: [PATCH 21/22] Don't push for forks

---
 .github/workflows/ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f68ab9db..325b902c 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -74,7 +74,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           platforms: linux/amd64,linux/arm64
-          push: true
+          push: ${{ 'success' == needs.test.result && 'meeb' == github.repository_owner && 'true' || 'false' }}
           tags: ghcr.io/${{ steps.string.outputs.lowercase }}/${{ env.IMAGE_NAME }}:latest
           cache-from: type=registry,ref=ghcr.io/${{ steps.string.outputs.lowercase }}/${{ env.IMAGE_NAME }}:latest
           cache-to: type=inline

From 84e7a23fc95bdfb082148aa8e5a3facf34282d09 Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Wed, 19 Mar 2025 02:05:33 -0400
Subject: [PATCH 22/22] Avoid using `always()`

---
 .github/workflows/ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 325b902c..6aa8e0e7 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -34,7 +34,7 @@ jobs:
       - name: Run Django tests
         run: cd tubesync && python3 manage.py test --verbosity=2
   containerise:
-    if: ${{ always() }}
+    if: ${{ !cancelled() }}
     needs: test
     runs-on: ubuntu-latest
     timeout-minutes: 120