refactor(api): use Event.wait and a shared to_enum helper

Replace InputBridge's poll loop with Event.wait(timeout) and collapse the three download_manager enum maps into one to_enum() helper. No behaviour change.
This commit is contained in:
imSp4rky
2026-06-21 13:31:08 -06:00
parent fb90cd87b0
commit 9cb20693e0
2 changed files with 14 additions and 18 deletions
+11 -9
View File
@@ -155,6 +155,13 @@ class DownloadJob:
return result return result
def to_enum(values: List[str], enum_cls: type[Enum]) -> List[Enum]:
"""Map case-insensitive strings (by member name or value) to enum members, dropping unknowns."""
lookup = {m.name.upper(): m for m in enum_cls}
lookup.update({str(m.value).upper(): m for m in enum_cls})
return [lookup[v.upper()] for v in values if v.upper() in lookup]
def _perform_download( def _perform_download(
job_id: str, job_id: str,
service: str, service: str,
@@ -197,9 +204,7 @@ def _perform_download(
if isinstance(vcodec_raw, str): if isinstance(vcodec_raw, str):
vcodec_raw = [vcodec_raw] vcodec_raw = [vcodec_raw]
if isinstance(vcodec_raw, list) and vcodec_raw and not isinstance(vcodec_raw[0], Video.Codec): if isinstance(vcodec_raw, list) and vcodec_raw and not isinstance(vcodec_raw[0], Video.Codec):
codec_map = {c.name.upper(): c for c in Video.Codec} params["vcodec"] = to_enum(vcodec_raw, Video.Codec)
codec_map.update({c.value.upper(): c for c in Video.Codec})
params["vcodec"] = [codec_map[v.upper()] for v in vcodec_raw if v.upper() in codec_map]
else: else:
params["vcodec"] = [] params["vcodec"] = []
@@ -208,17 +213,14 @@ def _perform_download(
if isinstance(range_raw, str): if isinstance(range_raw, str):
range_raw = [range_raw] range_raw = [range_raw]
if isinstance(range_raw, list) and range_raw and not isinstance(range_raw[0], Video.Range): if isinstance(range_raw, list) and range_raw and not isinstance(range_raw[0], Video.Range):
range_map = {r.name.upper(): r for r in Video.Range} params["range"] = to_enum(range_raw, Video.Range)
range_map.update({r.value.upper(): r for r in Video.Range})
params["range"] = [range_map[r.upper()] for r in range_raw if r.upper() in range_map]
else: else:
params["range"] = [Video.Range.SDR] params["range"] = [Video.Range.SDR]
sub_format_raw = params.get("sub_format") sub_format_raw = params.get("sub_format")
if sub_format_raw and isinstance(sub_format_raw, str): if sub_format_raw and isinstance(sub_format_raw, str):
sub_map = {c.name.upper(): c for c in Subtitle.Codec} mapped = to_enum([sub_format_raw], Subtitle.Codec)
sub_map.update({c.value.upper(): c for c in Subtitle.Codec}) params["sub_format"] = mapped[0] if mapped else None
params["sub_format"] = sub_map.get(sub_format_raw.upper())
if params.get("export"): if params.get("export"):
params["export"] = bool(params["export"]) params["export"] = bool(params["export"])
+3 -9
View File
@@ -10,7 +10,6 @@ response value.
from __future__ import annotations from __future__ import annotations
import threading import threading
import time
from dataclasses import dataclass, field from dataclasses import dataclass, field
from enum import Enum from enum import Enum
from typing import Optional from typing import Optional
@@ -67,14 +66,9 @@ class InputBridge:
self._status = AuthStatus.PENDING_INPUT self._status = AuthStatus.PENDING_INPUT
self._response_ready.clear() self._response_ready.clear()
deadline = time.monotonic() + timeout # cancel() and submit_response() both .set() the event, so a single wait
while time.monotonic() < deadline: # returns on signal-or-cancel; no poll loop needed.
if self._response_ready.wait(timeout=0.5): if not self._response_ready.wait(timeout=timeout):
break
with self._lock:
if self._cancelled:
raise RuntimeError("Session was cancelled")
else:
with self._lock: with self._lock:
self._status = AuthStatus.FAILED self._status = AuthStatus.FAILED
raise TimeoutError(f"No client response for prompt within {timeout}s") raise TimeoutError(f"No client response for prompt within {timeout}s")