Merge pull request #553 from arabcoders/dev

Fix: sidecar loading for history items

Author: arabcoders

API.md

@@ -117,7 +117,6 @@ This document describes the available endpoints and their usage. All endpoints r
       - [Connection Events](#connection-events)
         - [`config_update`](#config_update)
         - [`connected`](#connected)
-        - [`active_queue`](#active_queue)
       - [Logging Events](#logging-events)
         - [`log_info`](#log_info)
         - [`log_success`](#log_success)
@@ -2742,29 +2741,6 @@ Emitted when a client successfully connects to the WebSocket.
 
 ---
 
-##### `active_queue`
-
-Emitted periodically with the current active queue status.
-
-**Event**:
-```json
-{
-  "event": "active_queue",
-  "data": {
-    "queue": [
-      {
-        "id": "abc123",
-        "status": "downloading",
-        "progress": 45.6,
-        ...
-      }
-    ]
-  }
-}
-```
-
----
-
 #### Logging Events
 
 ##### `log_info`

app/features/conditions/router.py

@@ -87,8 +87,8 @@ async def conditions_test(request: Request, encoder: Encoder, cache: Cache, conf
         preset: str = params.get("preset", config.default_preset)
         key: str = cache.hash(url + str(preset))
         if not cache.has(key):
-            from app.library.downloads.extractor import fetch_info
-            from app.library.YTDLPOpts import YTDLPOpts
+            from app.features.ytdlp.extractor import fetch_info
+            from app.features.ytdlp.ytdlp_opts import YTDLPOpts
 
             (data, _) = await fetch_info(
                 config=YTDLPOpts.get_instance().preset(name=preset).get_all(),
@@ -115,7 +115,7 @@ async def conditions_test(request: Request, encoder: Encoder, cache: Cache, conf
         )
 
     try:
-        from app.library.mini_filter import match_str
+        from app.features.ytdlp.mini_filter import match_str
 
         status: bool = match_str(cond, data)
     except Exception as e:

app/features/conditions/schemas.py

@@ -6,8 +6,7 @@
 
 from app.features.core.schemas import Pagination
 from app.features.core.utils import parse_int
-from app.library.mini_filter import match_str
-from app.library.Utils import arg_converter
+from app.features.ytdlp.mini_filter import match_str
 
 
 class Condition(BaseModel):
@@ -38,6 +37,8 @@ def _validate_cli(cls, value: str) -> str:
         if not value:
             return ""
         try:
+            from app.features.ytdlp.utils import arg_converter
+
             arg_converter(args=value)
         except ModuleNotFoundError:
             return value

app/features/conditions/service.py

@@ -4,8 +4,8 @@
 
 from app.features.conditions.models import ConditionModel
 from app.features.conditions.repository import ConditionsRepository
+from app.features.ytdlp.mini_filter import match_str
 from app.library.Events import EventBus, Events
-from app.library.mini_filter import match_str
 from app.library.Singleton import Singleton
 
 LOG: logging.Logger = logging.getLogger("feature.conditions")

app/features/core/utils.py

@@ -79,5 +79,20 @@ def format_validation_errors(exc: ValidationError) -> list[dict[str, Any]]:
 
 def gen_random(length: int = 16) -> str:
     import secrets
+    import string
 
-    return "".join(secrets.token_urlsafe(length)[:length])
+    if length < 1:
+        msg = "length must be >= 1"
+        raise ValueError(msg)
+
+    middle_alphabet = string.ascii_letters + string.digits + "-_"
+    edge_alphabet = string.ascii_letters + string.digits
+
+    if 1 == length:
+        return secrets.choice(edge_alphabet)
+
+    return (
+        secrets.choice(edge_alphabet)
+        + "".join(secrets.choice(middle_alphabet) for _ in range(length - 2))
+        + secrets.choice(edge_alphabet)
+    )

app/features/presets/migration.py

@@ -9,7 +9,6 @@
 from app.features.presets.schemas import Preset
 from app.features.presets.utils import preset_name
 from app.library.config import Config
-from app.library.Utils import arg_converter
 
 if TYPE_CHECKING:
     from app.features.presets.repository import PresetsRepository
@@ -87,6 +86,8 @@ def _normalize(self, item: Any, index: int, seen_names: dict[str, int]) -> dict[
 
         if cli:
             try:
+                from app.features.ytdlp.utils import arg_converter
+
                 arg_converter(args=cli, level=True)
             except Exception as exc:
                 LOG.warning("Skipping preset '%s' due to invalid CLI: %s", name, exc)

app/features/presets/schemas.py

@@ -9,7 +9,7 @@
 from app.features.core.utils import parse_int
 from app.features.presets.utils import preset_name
 from app.library.config import Config
-from app.library.Utils import arg_converter, create_cookies_file
+from app.library.Utils import create_cookies_file
 
 
 class Preset(BaseModel):
@@ -58,6 +58,8 @@ def _validate_cli(cls, value: Any) -> str:
             return ""
 
         try:
+            from app.features.ytdlp.utils import arg_converter
+
             arg_converter(args=value, level=True)
         except Exception as e:
             msg = f"Invalid command options for yt-dlp: {e!s}"

app/features/streaming/__init__.py

@@ -13,13 +13,10 @@
 
 import anyio
 
+from app.features.streaming.types import FFProbeError
 from app.library.Utils import timed_lru_cache
 
-LOG: logging.Logger = logging.getLogger(__name__)
-
-
-class FFProbeError(Exception):
-    pass
+LOG: logging.Logger = logging.getLogger("streaming.ffprobe")
 
 
 class FFStream:

app/library/ffprobe.py app/features/streaming/library/ffprobe.pyapp/library/ffprobe.py renamed to app/features/streaming/library/ffprobe.py

@@ -2,8 +2,8 @@
 from pathlib import Path
 from urllib.parse import quote
 
-from .ffprobe import ffprobe
-from .Utils import StreamingError
+from app.features.streaming.library.ffprobe import ffprobe
+from app.features.streaming.types import StreamingError
 
 
 class M3u8: