Merge pull request #265 from arabcoders/dev

Switched newDownload form to use HttpAPI for easier state management

app/library/DownloadQueue.py

@@ -410,6 +410,7 @@ class DownloadQueue(metaclass=Singleton):
                 "callback": {
                     "func": lambda _, msg: logs.append(msg),
                     "level": logging.WARNING,
+                    "name": "callback-logger",
                 },
                 **YTDLPOpts.get_instance()
                 .preset(name=item.preset, with_cookies=not item.cookies)
@@ -462,9 +463,8 @@ class DownloadQueue(metaclass=Singleton):
             if not entry:
                 return {"status": "error", "msg": "Unable to extract info." + "\n".join(logs)}
 
-            LOG.debug(
-                f"extract_info: for 'URL: {item.url}' is done in '{time.perf_counter() - started}'. Length: '{len(entry)}/keys'."
-            )
+            end_time = time.perf_counter() - started
+            LOG.debug(f"extract_info: for 'URL: {item.url}' is done in '{end_time:.3f}'. Length: '{len(entry)}/keys'.")
         except yt_dlp.utils.ExistingVideoReached as exc:
             LOG.error(f"Video has been downloaded already and recorded in archive.log file. '{exc!s}'.")
             return {"status": "error", "msg": "Video has been downloaded already and recorded in archive.log file."}
@@ -761,7 +761,7 @@ class DownloadQueue(metaclass=Singleton):
         """
         Monitor the queue and pool for stale downloads and cancel them if needed.
         """
-        if self.is_paused() or self.queue.empty():
+        if self.is_paused():
             return
 
         if not self.queue.empty():

app/library/HttpAPI.py

@@ -722,14 +722,15 @@ class HttpAPI(Common):
             except ValueError as e:
                 return web.json_response(data={"error": str(e), "data": item}, status=web.HTTPBadRequest.status_code)
 
-        return web.json_response(
-            data=await asyncio.wait_for(
-                fut=asyncio.gather(*[self.add(item=item) for item in items]),
-                timeout=None,
-            ),
-            status=web.HTTPOk.status_code,
-            dumps=self.encoder.encode,
+        status = await asyncio.wait_for(
+            fut=asyncio.gather(*[self.add(item=item) for item in items]),
+            timeout=None,
         )
+        response = []
+        for i, item in enumerate(items):
+            response.append({"item": item, "status": status[i].get("status") == "ok", "msg": status[i].get("msg")})
+
+        return web.json_response(data=response, status=web.HTTPOk.status_code, dumps=self.encoder.encode)
 
     @route("GET", "api/logs")
     async def logs(self, request: Request) -> Response:

app/library/LogWrapper.py

@@ -1,6 +1,9 @@
 import logging
+from collections.abc import Callable
 from dataclasses import dataclass
 
+LOG = logging.getLogger(__name__)
+
 
 @dataclass(kw_only=True)
 class LogTarget:
@@ -8,6 +11,7 @@ class LogTarget:
     A data class that represents a logging target with its level and type.
 
     Attributes:
+        name (str): The name of the logging target.
         target: The logging target, which can be a logging.Logger instance or a callable.
         level (int): The logging level for the target.
         logger (bool): True if the target is a logging.Logger instance, False otherwise.
@@ -15,7 +19,8 @@ class LogTarget:
 
     """
 
-    target: "logging.Logger|callable"
+    name: str | None = None
+    target: logging.Logger | Callable
     level: int
     logger: bool
 
@@ -55,17 +60,36 @@ class LogWrapper:
     """
 
     targets: list[LogTarget] = []
+    """A list of dictionaries where each dictionary represents a logging target with its level and type."""
 
-    def add_target(self, target: "logging.Logger|callable", level: int = logging.DEBUG):
+    def __init__(self):
+        self.targets: list[LogTarget] = []
+
+    def add_target(self, target: logging.Logger | Callable, level: int = logging.DEBUG, name: str | None = None):
         """
         Adds a new logging target with the specified logging level.
 
         Args:
-            target (logging.Logger|callable): The logging target, which can be a logging.Logger instance or a callable.
+            target (logging.Logger|Callable): The logging target, which can be a logging.Logger instance or a Callable.
             level (int): The logging level for the target. Defaults to logging.DEBUG.
+            name (str|None): The name of the logging target. Defaults to None.
 
         """
-        self.targets.append(LogTarget(target=target, level=level, logger=isinstance(target, logging.Logger)))
+        if not isinstance(target, logging.Logger | Callable):
+            msg = "Target must be a logging.Logger instance or a callable."
+            raise TypeError(msg)
+
+        if name is None:
+            name = target.name if isinstance(target, logging.Logger) else target.__name__
+
+        self.targets.append(
+            LogTarget(
+                name=name,
+                target=target,
+                level=level,
+                logger=isinstance(target, logging.Logger),
+            )
+        )
 
     def has_targets(self):
         """

app/library/Utils.py

@@ -109,6 +109,7 @@ def extract_info(
     no_archive: bool = False,
     follow_redirect: bool = False,
     sanitize_info: bool = False,
+    **kwargs,  # noqa: ARG001
 ) -> dict:
     """
     Extracts video information from the given URL.
@@ -120,13 +121,12 @@ def extract_info(
         no_archive (bool): Disable download archive.
         follow_redirect (bool): Follow URL redirects.
         sanitize_info (bool): Sanitize the extracted information
+        **kwargs: Additional arguments.
 
     Returns:
         dict: Video information.
 
     """
-    log_wrapper = LogWrapper()
-
     params: dict = {
         **config,
         "color": "no_color",
@@ -141,26 +141,31 @@ def extract_info(
     for key in keys_to_remove:
         params.pop(key, None)
 
-    id = None
-    idDict = get_archive_id(url=url)
-    if idDict.get("id"):
-        id = f".{idDict['id']}"
-
-    log_wrapper.add_target(target=logging.getLogger(f"yt-dlp{id}"), level=logging.DEBUG if debug else logging.WARNING)
-
     if debug:
         params["verbose"] = True
     else:
         params["quiet"] = True
 
+    log_wrapper = LogWrapper()
+    idDict = get_archive_id(url=url)
+    archive_id = f".{idDict['id']}" if idDict.get("id") else None
+
+    log_wrapper.add_target(
+        target=logging.getLogger(f"yt-dlp{archive_id}"),
+        level=logging.DEBUG if debug else logging.WARNING,
+    )
+
     if "callback" in params:
         if isinstance(params["callback"], dict):
             log_wrapper.add_target(
                 target=params["callback"]["func"],
                 level=params["callback"]["level"] or logging.ERROR,
+                name=params["callback"]["name"] or "callback",
             )
         else:
-            log_wrapper.add_target(target=params["callback"], level=logging.ERROR)
+            log_wrapper.add_target(target=params["callback"], level=logging.ERROR, name="callback")
+
+    if "callback" in params:
         del params["callback"]
 
     if log_wrapper.has_targets():

ui/components/NewDownload.vue

@@ -206,12 +206,13 @@ const addDownload = async () => {
     }
   }
 
-  addInProgress.value = true
+  const request_data = []
 
-  form.value.url.split(',').forEach(url => {
+  form.value.url.split(',').forEach(async (url) => {
     if (!url.trim()) {
       return
     }
+
     const data = {
       url: url,
       preset: config.app.basic_mode ? config.app.default_preset : form.value.preset,
@@ -225,8 +226,31 @@ const addDownload = async () => {
       data.extras = form.value.extras
     }
 
-    socket.emit('add_url', data)
+    request_data.push(data)
   })
+
+  try {
+    addInProgress.value = true
+    const response = await request('/api/history', {
+      credentials: 'include',
+      method: 'POST',
+      body: JSON.stringify(request_data),
+    })
+
+    if (!response.ok) {
+      const data = await response.json()
+      throw new Error(data.error)
+    }
+
+    form.value.url = ''
+    emitter('clear_form')
+  }
+  catch (e) {
+    console.error(e)
+    toast.error(`Error: ${e.message}`)
+  } finally {
+    addInProgress.value = false
+  }
 }
 
 const resetConfig = () => {
@@ -250,29 +274,6 @@ const resetConfig = () => {
   toast.success('Local configuration has been reset.')
 }
 
-const statusHandler = async stream => {
-  const { status, msg } = JSON.parse(stream)
-
-  addInProgress.value = false
-
-  if ('error' === status) {
-    toast.error(msg)
-    return
-  }
-
-  form.value.url = ''
-}
-
-const unlockDownload = async stream => {
-  const json = JSON.parse(stream)
-  if (!json?.data) {
-    return
-  }
-  if ("unlock" in json.data && true === json.data.unlock) {
-    addInProgress.value = false
-  }
-}
-
 const convertOptions = async args => {
   try {
     const response = await convertCliOptions(args)
@@ -294,9 +295,6 @@ const convertOptions = async args => {
 }
 
 onMounted(async () => {
-  socket.on('status', statusHandler)
-  socket.on('error', unlockDownload)
-
   await nextTick()
 
   if ('' === form.value?.preset) {
@@ -317,11 +315,6 @@ onMounted(async () => {
   }
 })
 
-onUnmounted(() => {
-  socket.off('status', statusHandler)
-  socket.off('error', unlockDownload)
-})
-
 const hasFormatInConfig = computed(() => {
   if (!form?.value?.value) {
     return false