From 27bb5ff2989e707ccf4cd45b0453f413211c1973 Mon Sep 17 00:00:00 2001
From: Simon <simobilleter@gmail.com>
Date: Fri, 11 Jul 2025 22:47:28 +0700
Subject: [PATCH] add to each item to pending queue in loop

---
 backend/download/src/queue.py          | 20 ++++++++++++++------
 backend/download/src/subscriptions.py  |  6 ++----
 backend/download/src/yt_dlp_handler.py |  4 +---
 backend/task/tasks.py                  |  3 +--
 backend/video/src/constants.py         |  3 +++
 5 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/backend/download/src/queue.py b/backend/download/src/queue.py
index 860ccaae..72a83bac 100644
--- a/backend/download/src/queue.py
+++ b/backend/download/src/queue.py
@@ -118,8 +118,9 @@ class PendingList(PendingIndex):
         self.flat = flat
         self.to_skip = False
         self.missing_videos: list[dict] = []
+        self.added = 0
 
-    def parse_url_list(self):
+    def parse_url_list(self, status="pending") -> int:
         """extract youtube ids from list"""
         self.get_download()
         self.get_indexed()
@@ -128,17 +129,24 @@ class PendingList(PendingIndex):
         for idx, entry in enumerate(self.youtube_ids, start=1):
             if self.task:
                 self.task.send_progress(
-                    message_lines=[f"Extracting items {idx}/{total}"],
-                    progress=(idx + 1) / total,
+                    message_lines=[f"Extracting URL {idx}/{total}"],
+                    progress=idx / total,
                 )
 
             self._process_entry(entry, idx, total)
+
+            if self.missing_videos:
+                self.added += self.add_to_pending(status)
+                self.missing_videos = []
+
             if self.task and self.task.is_stopped():
                 break
 
             rand_sleep(self.config)
 
-    def _process_entry(self, entry: dict, idx: int, total: int):
+        return self.added
+
+    def _process_entry(self, entry: ParsedURLType, idx: int, total: int):
         """process single entry from url list"""
         if entry["type"] == "video":
             to_add = self._add_video(entry["url"], entry["vid_type"])
@@ -373,7 +381,7 @@ class PendingList(PendingIndex):
     def __extract_vid_type(self, video_data) -> str:
         """build vid type"""
         if "vid_type" in video_data:
-            return video_data["vid_type"]
+            return str(video_data["vid_type"])
 
         if video_data.get("live_status") == "was_live":
             return VideoTypeEnum.STREAMS.value
@@ -445,7 +453,7 @@ class PendingList(PendingIndex):
 
         self.task.send_progress(
             message_lines=lines,
-            progress=(idx + 1) / total,
+            progress=idx / total,
         )
 
     def _notify_empty(self):
diff --git a/backend/download/src/subscriptions.py b/backend/download/src/subscriptions.py
index afdd0630..5d84ba03 100644
--- a/backend/download/src/subscriptions.py
+++ b/backend/download/src/subscriptions.py
@@ -60,8 +60,7 @@ class ChannelSubscription:
             auto_start=self.config["subscriptions"].get("auto_start", False),
             flat=self.config["subscriptions"].get("extract_flat", False),
         )
-        pending_handler.parse_url_list()
-        added = pending_handler.add_to_pending()
+        added = pending_handler.parse_url_list()
 
         return added
 
@@ -99,8 +98,7 @@ class PlaylistSubscription:
             auto_start=self.config["subscriptions"].get("auto_start", False),
             flat=self.config["subscriptions"].get("extract_flat", False),
         )
-        pending_handler.parse_url_list()
-        added = pending_handler.add_to_pending()
+        added = pending_handler.parse_url_list()
 
         return added
 
diff --git a/backend/download/src/yt_dlp_handler.py b/backend/download/src/yt_dlp_handler.py
index f74af4eb..0617bf38 100644
--- a/backend/download/src/yt_dlp_handler.py
+++ b/backend/download/src/yt_dlp_handler.py
@@ -360,9 +360,7 @@ class DownloadPostProcess(DownloaderBase):
 
         print("add deleted to ignore list")
         vids = [{"type": "video", "url": i["youtube_id"]} for i in to_delete]
-        pending = PendingList(youtube_ids=vids)
-        pending.parse_url_list()
-        _ = pending.add_to_pending(status="ignore")
+        PendingList(youtube_ids=vids).parse_url_list(status="ignore")
 
     def refresh_playlist(self) -> None:
         """match videos with playlists"""
diff --git a/backend/task/tasks.py b/backend/task/tasks.py
index 63a843f0..2cf49624 100644
--- a/backend/task/tasks.py
+++ b/backend/task/tasks.py
@@ -162,8 +162,7 @@ def extrac_dl(
     pending_handler = PendingList(
         youtube_ids=to_add, task=self, auto_start=auto_start, flat=flat
     )
-    pending_handler.parse_url_list()
-    videos_added = pending_handler.add_to_pending(status=status)
+    videos_added = pending_handler.parse_url_list(status=status)
 
     if auto_start:
         download_pending.delay(auto_only=True)
diff --git a/backend/video/src/constants.py b/backend/video/src/constants.py
index 11b7de74..382636d4 100644
--- a/backend/video/src/constants.py
+++ b/backend/video/src/constants.py
@@ -11,6 +11,9 @@ class VideoTypeEnum(enum.Enum):
     SHORTS = "shorts"
     UNKNOWN = "unknown"
 
+    def __str__(self):
+        return self.value
+
     @classmethod
     def values(cls) -> list[str]:
         """value list"""