StuffAnThings/qbit_manage
1
1
Fork 0
mirror of https://github.com/StuffAnThings/qbit_manage.git synced 2025-11-11 00:41:34 +08:00
Code Issues Projects Releases Packages Wiki Activity

refactor(web_api): simplify default directory initialization

Browse source 
- Remove conditional logic for config_dir handling
- Ensure default_dir is always properly initialized
This commit is contained in:
bobokun 2025-09-05 16:47:15 -04:00
parent 310d39b90a
commit 330d9a172a
No known key found for this signature in database
GPG key ID: B73932169607D927
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
4.6.1-develop6 4.6.1-develop7

25
modules/web_api.py
View file

@ -172,7 +172,7 @@ async def process_queue_periodically(web_api: WebAPI) -> None:
class WebAPI: class WebAPI:
"""Web API handler for qBittorrent-Manage.""" """Web API handler for qBittorrent-Manage."""
default_dir: str = field(default_factory=lambda: util.ensure_config_dir_initialized(util.get_default_config_dir())) default_dir: str
args: dict = field(default_factory=dict) args: dict = field(default_factory=dict)
app: FastAPI = field(default=None) app: FastAPI = field(default=None)
is_running: Synchronized[bool] = field(default=None) is_running: Synchronized[bool] = field(default=None)
@ -209,17 +209,11 @@ class WebAPI:
app = FastAPI(lifespan=lifespan) app = FastAPI(lifespan=lifespan)
object.__setattr__(self, "app", app) object.__setattr__(self, "app", app)
# If caller provided a config_dir (e.g., computed in qbit_manage), prefer it # Ensure default dir is initialized
try: try:
provided_dir = self.args.get("config_dir") object.__setattr__(self, "default_dir", util.ensure_config_dir_initialized(self.default_dir))
if provided_dir:
resolved_dir = util.ensure_config_dir_initialized(provided_dir)
object.__setattr__(self, "default_dir", resolved_dir)
else:
# Ensure default dir is initialized
object.__setattr__(self, "default_dir", util.ensure_config_dir_initialized(self.default_dir))
except Exception as e: except Exception as e:
logger.error(f"Failed to apply provided config_dir '{self.args.get('config_dir')}': {e}") logger.error(f"Failed to initialize default_dir '{self.default_dir}': {e}")
# Initialize paths during startup # Initialize paths during startup
object.__setattr__(self, "config_path", Path(self.default_dir)) object.__setattr__(self, "config_path", Path(self.default_dir))
@ -1542,7 +1536,18 @@ def create_app(
scheduler: object = None, scheduler: object = None,
) -> FastAPI: ) -> FastAPI:
"""Create and return the FastAPI application.""" """Create and return the FastAPI application."""
# Get default_dir from args, which should be set by qbit_manage.py
default_dir = args.get("config_dir")
if not default_dir:
# Fallback if not provided
default_dir = util.ensure_config_dir_initialized(
util.get_default_config_dir(
args.config_files,
)
)
return WebAPI( return WebAPI(
default_dir=default_dir,
args=args, args=args,
is_running=is_running, is_running=is_running,
is_running_lock=is_running_lock, is_running_lock=is_running_lock,