From 47ca662b60d308a4541f2ed6707f4fb916f7615f Mon Sep 17 00:00:00 2001
From: Dariusz L <dl122@wp.pl>
Date: Sun, 2 Aug 2026 17:48:34 +0200
Subject: [PATCH] refactor: centralize shared download state

---
 core/download/state.py | 17 ++++++++++++++---
 core/downloader.py     | 21 ++++++++++-----------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/core/download/state.py b/core/download/state.py
index cb81cdc..8b2ddc2 100644
--- a/core/download/state.py
+++ b/core/download/state.py
@@ -1,8 +1,21 @@
 """Download progress and cancellation state operations."""
 
 import importlib
+import threading
 from typing import Any, Dict, Optional
 
+# Shared mutable download state.  The facade re-exports these same objects
+# during the migration, so there is only one owner and no duplicated state.
+download_progress: Dict[str, Dict[str, Any]] = {}
+download_lock = threading.Lock()
+cancelled_downloads: set = set()
+aria2_lock = threading.RLock()
+aria2_transfers: Dict[str, Dict[str, Any]] = {}
+aria2_action_locks: Dict[str, Any] = {}
+aria2_desired_states: Dict[str, Dict[str, Any]] = {}
+xet_transfers: Dict[str, Dict[str, Any]] = {}
+xet_transfers_lock = threading.Lock()
+
 
 def _downloader_module():
     """Return the facade so runtime patches remain effective."""
@@ -47,9 +60,7 @@ def cancel_download(download_id: str) -> bool:
         try:
             xet_cancel()
         except Exception as exc:
-            facade.log.warning(
-                f"Could not cancel Hugging Face Xet transfer {download_id}: {exc}"
-            )
+            facade.log.warning(f"Could not cancel Hugging Face Xet transfer {download_id}: {exc}")
     return True
 
 
diff --git a/core/downloader.py b/core/downloader.py
index 5ec2d52..9af9635 100644
--- a/core/downloader.py
+++ b/core/downloader.py
@@ -13,7 +13,7 @@ import threading
 import time  # noqa: F401
 from collections import deque  # noqa: F401
 from pathlib import Path
-from typing import Any, Dict, Optional
+from typing import Optional
 from urllib.parse import urlparse  # noqa: F401
 
 import requests  # noqa: F401
@@ -137,10 +137,19 @@ from .download.previews import (
     get_existing_model_preview_path,  # noqa: F401
 )
 from .download.state import (
+    aria2_action_locks,  # noqa: F401
+    aria2_desired_states,  # noqa: F401
+    aria2_lock,  # noqa: F401
+    aria2_transfers,  # noqa: F401
     cancel_download,
+    cancelled_downloads,  # noqa: F401
     clear_completed_downloads,
+    download_lock,  # noqa: F401
+    download_progress,  # noqa: F401
     get_all_progress,
     get_progress,
+    xet_transfers,  # noqa: F401
+    xet_transfers_lock,  # noqa: F401
 )
 from .network_utils import (
     host_matches_domain,  # noqa: F401
@@ -170,22 +179,12 @@ try:
 except ImportError:
     folder_paths = None
 
-# Download state tracking
-download_progress: Dict[str, Dict[str, Any]] = {}
-download_lock = threading.Lock()
-cancelled_downloads: set = set()
-aria2_lock = threading.RLock()
 aria2_process: Optional[subprocess.Popen] = None
 aria2_rpc_url = ""
 aria2_rpc_secret = ""
 aria2_rpc_lock = threading.Lock()
-aria2_transfers: Dict[str, Dict[str, Any]] = {}
-aria2_action_locks: Dict[str, threading.Lock] = {}
-aria2_desired_states: Dict[str, Dict[str, Any]] = {}
 aria2_idle_timer: Optional[threading.Timer] = None
 aria2_process_started_by_resolver = False
-xet_transfers: Dict[str, Dict[str, Any]] = {}
-xet_transfers_lock = threading.Lock()
 
 # Speed calculation settings
 SPEED_HISTORY_SIZE = 5  # Number of samples for smoothing