update refactoring and add new features

plugins/mpv/commands.py

@@ -1,5 +1,6 @@
 # pyright: reportUnusedFunction=false
 from typing import Any, Dict, Sequence, List, Optional
+import atexit
 import os
 import sys
 import json
@@ -21,6 +22,8 @@ from SYS.config import get_hydrus_access_key, get_hydrus_url, resolve_cookies_pa
 
 _NOTES_PREFETCH_INFLIGHT: set[str] = set()
 _NOTES_PREFETCH_LOCK = threading.Lock()
+_PREFETCH_THREADS: set[threading.Thread] = set()
+_PREFETCH_THREADS_LOCK = threading.Lock()
 _PLAYLIST_STORE_CACHE: Optional[Dict[str, Any]] = None
 _PLAYLIST_STORE_MTIME_NS: Optional[int] = None
 _SHA256_RE = re.compile(r"[0-9a-f]{64}")
@@ -347,21 +350,20 @@ def _get_latest_mpv_run_marker(log_db_path: str) -> Optional[tuple[str, str]]:
     try:
         import sqlite3
 
-        conn = sqlite3.connect(log_db_path, timeout=5.0)
-        cur = conn.cursor()
-        cur.execute(
-            (
-                "SELECT timestamp, message FROM logs "
-                "WHERE module = 'mpv' AND ("
-                "message LIKE '[helper] version=% started ipc=%' "
-                "OR message LIKE 'medeia lua loaded version=%'"
-                ") "
-                "ORDER BY timestamp DESC LIMIT 1"
+        with sqlite3.connect(log_db_path, timeout=5.0) as conn:
+            cur = conn.cursor()
+            cur.execute(
+                (
+                    "SELECT timestamp, message FROM logs "
+                    "WHERE module = 'mpv' AND ("
+                    "message LIKE '[helper] version=% started ipc=%' "
+                    "OR message LIKE 'medeia lua loaded version=%'"
+                    ") "
+                    "ORDER BY timestamp DESC LIMIT 1"
+                )
             )
-        )
-        row = cur.fetchone()
-        cur.close()
-        conn.close()
+            row = cur.fetchone()
+            cur.close()
         if row and row[0]:
             return str(row[0]), str(row[1] or "")
     except Exception:
@@ -381,26 +383,25 @@ def _get_mpv_logs_for_latest_run(
     try:
         import sqlite3
 
-        conn = sqlite3.connect(log_db_path, timeout=5.0)
-        cur = conn.cursor()
-        query = "SELECT timestamp, level, module, message FROM logs WHERE module = 'mpv'"
-        params: List[str] = []
-        if marker_ts:
-            query += " AND timestamp >= ?"
-            params.append(marker_ts)
-        else:
-            cutoff = (datetime.utcnow() - timedelta(hours=6)).strftime("%Y-%m-%d %H:%M:%S")
-            query += " AND timestamp >= ?"
-            params.append(cutoff)
-        if log_filter_text:
-            query += " AND LOWER(message) LIKE ?"
-            params.append(f"%{log_filter_text.lower()}%")
-        query += " ORDER BY timestamp DESC LIMIT ?"
-        params.append(str(max(1, int(limit))))
-        cur.execute(query, tuple(params))
-        rows = cur.fetchall()
-        cur.close()
-        conn.close()
+        with sqlite3.connect(log_db_path, timeout=5.0) as conn:
+            cur = conn.cursor()
+            query = "SELECT timestamp, level, module, message FROM logs WHERE module = 'mpv'"
+            params: List[str] = []
+            if marker_ts:
+                query += " AND timestamp >= ?"
+                params.append(marker_ts)
+            else:
+                cutoff = (datetime.utcnow() - timedelta(hours=6)).strftime("%Y-%m-%d %H:%M:%S")
+                query += " AND timestamp >= ?"
+                params.append(cutoff)
+            if log_filter_text:
+                query += " AND LOWER(message) LIKE ?"
+                params.append(f"%{log_filter_text.lower()}%")
+            query += " ORDER BY timestamp DESC LIMIT ?"
+            params.append(str(max(1, int(limit))))
+            cur.execute(query, tuple(params))
+            rows = cur.fetchall()
+            cur.close()
         rows.reverse()
         return marker_ts, marker_msg, rows
     except Exception:
@@ -849,11 +850,26 @@ def _prefetch_notes_async(
     thread = threading.Thread(
         target=_worker,
         name=f"mpv-notes-prefetch-{file_hash[:8]}",
-        daemon=True,
     )
+    with _PREFETCH_THREADS_LOCK:
+        _PREFETCH_THREADS.add(thread)
     thread.start()
 
 
+def _shutdown_prefetch_threads() -> None:
+    with _PREFETCH_THREADS_LOCK:
+        threads = list(_PREFETCH_THREADS)
+        _PREFETCH_THREADS.clear()
+    for t in threads:
+        try:
+            t.join(timeout=1.0)
+        except Exception:
+            pass
+
+
+atexit.register(_shutdown_prefetch_threads)
+
+
 def _schedule_notes_prefetch(items: Sequence[Any], config: Optional[Dict[str, Any]]) -> None:
     limit = _get_lyric_prefetch_limit(config)
     if limit <= 0: