library 3.2.3__tar.gz → 3.2.4__tar.gz

{library-3.2.3 → library-3.2.4}/.github/README.md

@@ -99,7 +99,7 @@ To stop playing press Ctrl+C in either the terminal or mpv
 <details><summary>List all subcommands</summary>
 
     $ library
-    library (v3.2.003; 102 subcommands)
+    library (v3.2.004; 102 subcommands)
 
     Create database subcommands:
     ╭─────────────────┬──────────────────────────────────────────╮

{library-3.2.3 → library-3.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: library
-Version: 3.2.3
+Version: 3.2.4
 Summary: xk media library
 Author-Email: Jacob Chapman <7908073+chapmanjacobd@users.noreply.github.com>
 License: BSD 3-Clause License
@@ -207,7 +207,7 @@ To stop playing press Ctrl+C in either the terminal or mpv
 <details><summary>List all subcommands</summary>
 
     $ library
-    library (v3.2.003; 102 subcommands)
+    library (v3.2.004; 102 subcommands)
 
     Create database subcommands:
     ╭─────────────────┬──────────────────────────────────────────╮

{library-3.2.3 → library-3.2.4}/library/__main__.py

@@ -5,7 +5,7 @@ from tabulate import tabulate
 from library.utils import argparse_utils, iterables
 from library.utils.log_utils import log
 
-__version__ = "3.2.003"
+__version__ = "3.2.004"
 
 progs = {
     "Create database subcommands": {

{library-3.2.3 → library-3.2.4}/library/mediafiles/torrents_start.py

@@ -1,5 +1,4 @@
-import getpass, logging, shutil, time
-from contextlib import suppress
+import getpass, shutil, time
 from pathlib import Path
 from time import sleep
 
@@ -65,9 +64,15 @@ def start_qBittorrent(args):
         HTTPADAPTER_ARGS={"pool_connections": 32, "pool_maxsize": 32},
     )
 
-    with suppress(Exception):
+    try:
         qbt_client.auth_log_in()
         return qbt_client
+    except qbittorrentapi.LoginFailed:
+        # qBittorrent may allow API access with WebUI authentication disabled.
+        if args.username is None and args.password is None:
+            return qbt_client
+    except (qbittorrentapi.APIConnectionError, ConnectionRefusedError):
+        pass
 
     if shutil.which("qbittorrent-nox"):
         username = getpass.getuser()
@@ -85,13 +90,13 @@ def start_qBittorrent(args):
             log.debug("qBittorrent web UI ready")
             break
         except qbittorrentapi.LoginFailed as excinfo:
-            logging.warning("Authentication failed. Check your qBit settings, --username, and --password: %s", excinfo)
+            log.warning("Authentication failed. Check your qBit settings, --username, and --password: %s", excinfo)
             break  # stop if authentication failing
         except (qbittorrentapi.APIConnectionError, ConnectionRefusedError):
             time.sleep(2)
             attempt += 1
     else:
-        logging.error("Failed to connect to qBittorrent web UI")
+        log.error("Failed to connect to qBittorrent web UI")
         raise ConnectionError("qBittorrent web UI not available")
 
     return qbt_client

{library-3.2.3 → library-3.2.4}/library/utils/web.py

@@ -262,7 +262,7 @@ def get_browser_profile_path(browser_name, profile=None):
     browser_name = browser_name.lower()
 
     if browser_name == "firefox":
-        profile_roots = list(_firefox_browser_dirs())
+        profile_roots = [root for root in _firefox_browser_dirs() if os.path.isfile(os.path.join(root, "profiles.ini"))]
         if not profile_roots:
             return None
         root = profile_roots[0]
@@ -270,6 +270,9 @@ def get_browser_profile_path(browser_name, profile=None):
             candidate = os.path.join(root, profile)
             if os.path.isdir(candidate):
                 return candidate
+        default_profile = _firefox_default_profile(root)
+        if default_profile and os.path.isdir(os.path.join(root, default_profile)):
+            return os.path.join(root, default_profile)
         return root
 
     if browser_name in {"chrome", "chromium", "brave", "edge", "opera", "vivaldi", "whale"}:
@@ -277,22 +280,53 @@ def get_browser_profile_path(browser_name, profile=None):
         browser_dir = settings["browser_dir"]
         if not os.path.isdir(browser_dir):
             return None
-        if profile:
-            candidate = os.path.join(browser_dir, profile)
-            if os.path.isdir(candidate):
-                return candidate
-        default_profile = os.path.join(browser_dir, "Default")
-        if os.path.isdir(default_profile):
-            return default_profile
+        # selenium passes this via --user-data-dir, which expects the data root;
+        # chrome selects its own last-used profile unless told otherwise
         return browser_dir
 
     return None
 
 
+def _firefox_default_profile(root):
+    import configparser
+
+    def read_ini(ini_name):
+        ini_path = os.path.join(root, ini_name)
+        if not os.path.isfile(ini_path):
+            return None
+        parser = configparser.RawConfigParser()
+        try:
+            with open(ini_path, encoding="utf8") as f:
+                parser.read_file(f)
+        except (configparser.Error, OSError):
+            return None
+        return parser
+
+    installs = read_ini("installs.ini")
+    if installs:
+        for section in installs.sections():
+            if section.lower().startswith("install"):
+                default = installs.get(section, "Default", fallback=None)
+                if default and os.path.isdir(os.path.join(root, default)):
+                    return default
+
+    profiles = read_ini("profiles.ini")
+    if not profiles:
+        return None
+    sections = [s for s in profiles.sections() if s.lower().startswith("profile")]
+    for section in sections:
+        if profiles.get(section, "Default", fallback="") == "1":
+            path = profiles.get(section, "Path", fallback=None)
+            if path and os.path.isdir(os.path.join(root, path)):
+                return path
+    return next((p for p in (profiles.get(s, "Path", fallback=None) for s in sections) if p), None)
+
+
 def load_selenium(args, wire=False):
     if getattr(args, "driver", False):
         return
 
+    _profile = None
     if not args.user_data_dir and getattr(args, "cookies_from_browser", None):
         from library.utils.web import parse_cookies_from_browser
 
@@ -300,6 +334,7 @@ def load_selenium(args, wire=False):
         resolved = get_browser_profile_path(browser_name, profile)
         if resolved:
             args.user_data_dir = resolved
+            _profile = profile
             log.info("Using browser profile: %s", resolved)
             if browser_name == "firefox" and not getattr(args, "chrome", False):
                 args.firefox = True
@@ -368,6 +403,8 @@ def load_selenium(args, wire=False):
         options = Options()
         if args.user_data_dir:
             options.add_argument(f"--user-data-dir={args.user_data_dir}")
+            if _profile:
+                options.add_argument(f"--profile-directory={_profile}")
 
         options.add_experimental_option(
             "prefs",

{library-3.2.3 → library-3.2.4}/pyproject.toml

@@ -35,7 +35,7 @@ dynamic = []
 name = "library"
 readme = ".github/README.md"
 requires-python = ">=3.12"
-version = "3.2.3"
+version = "3.2.4"
 
 [project.license]
 file = "LICENSE"