qBitrr2 5.8.6__tar.gz → 5.8.8__tar.gz

{qbitrr2-5.8.6/qBitrr2.egg-info → qbitrr2-5.8.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qBitrr2
-Version: 5.8.6
+Version: 5.8.8
 Summary: Intelligent automation for qBittorrent and *Arr apps (Radarr/Sonarr/Lidarr) - health monitoring, instant imports, quality upgrades, request integration
 Home-page: https://github.com/Feramance/qBitrr
 Author: Feramance
@@ -171,7 +171,7 @@ Access the WebUI at `http://<host>:6969/ui` after startup.
 
 ## ✨ Key Features
 
-- **🚀 Multi-qBittorrent Support (v3.0+)** – Manage torrents across multiple qBittorrent instances for load balancing, redundancy, and VPN isolation
+- **🚀 Multi-qBittorrent Support (v5.7.x+)** – Manage torrents across multiple qBittorrent instances for load balancing, redundancy, and VPN isolation
 - **🚑 Torrent Health Monitoring** – Detect stalled/failed downloads, auto-blacklist, trigger re-searches
 - **🔍 Automated Search** – Missing media, quality upgrades, custom format scoring
 - **🎯 Request Integration** – Pull requests from Overseerr/Ombi, prioritize user-requested media
@@ -206,7 +206,7 @@ Access the WebUI at `http://<host>:6969/ui` after startup.
    CompletedDownloadFolder = "/path/to/completed"
    ```
 
-### 🆕 Multi-qBittorrent (v3.0+)
+### 🆕 Multi-qBittorrent (v5.7.x+)
 
 Manage torrents across multiple qBittorrent instances:
 

{qbitrr2-5.8.6 → qbitrr2-5.8.8}/README.md

@@ -67,7 +67,7 @@ Access the WebUI at `http://<host>:6969/ui` after startup.
 
 ## ✨ Key Features
 
-- **🚀 Multi-qBittorrent Support (v3.0+)** – Manage torrents across multiple qBittorrent instances for load balancing, redundancy, and VPN isolation
+- **🚀 Multi-qBittorrent Support (v5.7.x+)** – Manage torrents across multiple qBittorrent instances for load balancing, redundancy, and VPN isolation
 - **🚑 Torrent Health Monitoring** – Detect stalled/failed downloads, auto-blacklist, trigger re-searches
 - **🔍 Automated Search** – Missing media, quality upgrades, custom format scoring
 - **🎯 Request Integration** – Pull requests from Overseerr/Ombi, prioritize user-requested media
@@ -102,7 +102,7 @@ Access the WebUI at `http://<host>:6969/ui` after startup.
    CompletedDownloadFolder = "/path/to/completed"
    ```
 
-### 🆕 Multi-qBittorrent (v3.0+)
+### 🆕 Multi-qBittorrent (v5.7.x+)
 
 Manage torrents across multiple qBittorrent instances:
 

{qbitrr2-5.8.6 → qbitrr2-5.8.8}/config.example.toml

@@ -129,7 +129,7 @@ Password = "CHANGE_ME"
 
 
 # ============================================================
-# MULTI-QBITTORRENT SUPPORT (v3.0+)
+# MULTI-QBITTORRENT SUPPORT (v5.7.x+)
 # ============================================================
 # You can configure multiple qBittorrent instances using the [qBit-NAME] syntax.
 # Each Arr instance will monitor ALL qBit instances for torrents in its category.

{qbitrr2-5.8.6 → qbitrr2-5.8.8}/pyproject.toml

@@ -28,7 +28,7 @@ target-version = ['py311']
 
 [tool.poetry]
 name = "pypi-public"
-version = "5.8.6"
+version = "5.8.8"
 description = "Intelligent automation for qBittorrent and *Arr apps (Radarr/Sonarr/Lidarr) - health monitoring, instant imports, quality upgrades, request integration"
 authors = ["Drapersniper", "Feramance"]
 readme = "README.md"

{qbitrr2-5.8.6 → qbitrr2-5.8.8}/qBitrr/arss.py

@@ -7649,6 +7649,7 @@ class ArrManager:
         self.uris: set[str] = set()
         self.special_categories: set[str] = {FAILED_CATEGORY, RECHECK_CATEGORY}
         self.arr_categories: set[str] = set()
+        self.qbit_managed_categories: set[str] = set()
         self.category_allowlist: set[str] = self.special_categories.copy()
         self.completed_folders: set[pathlib.Path] = set()
         self.managed_objects: dict[str, Arr] = {}
@@ -7663,6 +7664,62 @@ class ArrManager:
                 self.qbit_manager.ffprobe_downloader.probe_path,
             )
 
+    def _validate_category_assignments(self):
+        """
+        Validate that no category is managed by both Arr and qBit instances.
+
+        Collects all qBit-managed categories from all qBit instances and checks
+        for conflicts with Arr-managed categories. Allows same category on
+        multiple qBit instances (acceptable).
+
+        Raises:
+            ValueError: If any category is managed by both Arr and qBit
+        """
+        # Collect qBit-managed categories from all instances
+        for section in CONFIG.sections():
+            # Check default qBit section
+            if section == "qBit":
+                managed_cats = CONFIG.get("qBit.ManagedCategories", fallback=[])
+                if managed_cats:
+                    self.qbit_managed_categories.update(managed_cats)
+                    self.logger.debug(
+                        "qBit instance 'default' manages categories: %s",
+                        ", ".join(managed_cats),
+                    )
+            # Check additional qBit-XXX sections
+            elif section.startswith("qBit-"):
+                instance_name = section.replace("qBit-", "", 1)
+                managed_cats = CONFIG.get(f"{section}.ManagedCategories", fallback=[])
+                if managed_cats:
+                    self.qbit_managed_categories.update(managed_cats)
+                    self.logger.debug(
+                        "qBit instance '%s' manages categories: %s",
+                        instance_name,
+                        ", ".join(managed_cats),
+                    )
+
+        # Check for conflicts between Arr and qBit categories
+        conflicts = self.arr_categories & self.qbit_managed_categories
+        if conflicts:
+            conflict_list = ", ".join(sorted(conflicts))
+            error_msg = (
+                f"Category conflict detected: {conflict_list} "
+                f"cannot be managed by both Arr instances and qBit instances. "
+                f"Please assign each category to either Arr OR qBit management, not both."
+            )
+            self.logger.error(error_msg)
+            raise ValueError(error_msg)
+
+        # Update category allowlist to include qBit-managed categories
+        self.category_allowlist.update(self.qbit_managed_categories)
+
+        if self.qbit_managed_categories:
+            self.logger.info(
+                "qBit-managed categories registered: %s",
+                ", ".join(sorted(self.qbit_managed_categories)),
+            )
+        self.logger.debug("Category validation passed - no conflicts detected")
+
     def build_arr_instances(self):
         for key in CONFIG.sections():
             if search := re.match("(rad|son|anim|lid)arr.*", key, re.IGNORECASE):
@@ -7690,6 +7747,10 @@ class ArrManager:
                     continue
                 except (OSError, TypeError) as e:
                     self.logger.exception(e)
+
+        # Validate category assignments after all Arr instances are initialized
+        self._validate_category_assignments()
+
         if (
             FREE_SPACE != "-1"
             and AUTO_PAUSE_RESUME

{qbitrr2-5.8.6 → qbitrr2-5.8.8}/qBitrr/bundled_data.py

@@ -1,5 +1,5 @@
-version = "5.8.6"
-git_hash = "236b1bf2"
+version = "5.8.8"
+git_hash = "7569d1c7"
 license_text = (
     "Licence can be found on:\n\nhttps://github.com/Feramance/qBitrr/blob/master/LICENSE"
 )

{qbitrr2-5.8.6 → qbitrr2-5.8.8}/qBitrr/config_version.py

@@ -14,7 +14,7 @@ if TYPE_CHECKING:
     from qBitrr.gen_config import MyConfig
 
 # Current expected config version - increment when schema changes require migration
-EXPECTED_CONFIG_VERSION = 3
+EXPECTED_CONFIG_VERSION = 4
 
 logger = logging.getLogger(__name__)
 

{qbitrr2-5.8.6 → qbitrr2-5.8.8}/qBitrr/database.py

@@ -43,8 +43,10 @@ def get_database() -> SqliteDatabase:
                 "cache_size": -64_000,
                 "foreign_keys": 1,
                 "ignore_check_constraints": 0,
-                "synchronous": 0,
+                "synchronous": 2,  # FULL mode - maximum safety, prevents corruption on power loss
                 "read_uncommitted": 1,
+                "wal_autocheckpoint": 100,  # Checkpoint every 100 pages (more frequent = safer)
+                "journal_size_limit": 67108864,  # 64MB max WAL size
             },
             timeout=15,
         )
@@ -148,3 +150,29 @@ def _create_arrinstance_indexes(db: SqliteDatabase, models: list) -> None:
         db.commit()
     except Exception as e:
         logger.error("Error creating ArrInstance indexes: %s", e)
+
+
+def get_database_path() -> Path:
+    """Get the path to the database file."""
+    return Path(APPDATA_FOLDER) / "qbitrr.db"
+
+
+def checkpoint_database() -> bool:
+    """
+    Checkpoint the database WAL to prevent corruption on shutdown.
+
+    This is called automatically on graceful shutdown to ensure all
+    WAL entries are flushed to the main database file.
+
+    Returns:
+        True if checkpoint successful, False otherwise
+    """
+    from qBitrr.db_recovery import checkpoint_wal
+
+    db_path = get_database_path()
+    if not db_path.exists():
+        logger.debug("Database file does not exist, skipping checkpoint")
+        return True
+
+    logger.info("Checkpointing database WAL before shutdown...")
+    return checkpoint_wal(db_path, logger_override=logger)

{qbitrr2-5.8.6 → qbitrr2-5.8.8}/qBitrr/gen_config.py

@@ -61,6 +61,12 @@ def _add_web_settings_section(config: TOMLDocument):
         "Theme",
         "Dark",
     )
+    _gen_default_line(
+        web_settings,
+        "WebUI view density (Comfortable or Compact)",
+        "ViewDensity",
+        "Comfortable",
+    )
     config.add("WebUI", web_settings)
 
 
@@ -283,6 +289,58 @@ def _add_qbit_section(config: TOMLDocument):
         "Password",
         ENVIRO_CONFIG.qbit.password or "CHANGE_ME",
     )
+    _gen_default_line(
+        qbit,
+        [
+            "Categories managed directly by this qBit instance (not managed by Arr instances).",
+            "These categories will have seeding settings applied according to CategorySeeding configuration.",
+            "Example: ['downloads', 'private-tracker', 'long-term-seed']",
+        ],
+        "ManagedCategories",
+        [],
+    )
+
+    # Add CategorySeeding subsection
+    category_seeding = table()
+    _gen_default_line(
+        category_seeding,
+        "Download rate limit per torrent in KB/s (-1 = disabled)",
+        "DownloadRateLimitPerTorrent",
+        -1,
+    )
+    _gen_default_line(
+        category_seeding,
+        "Upload rate limit per torrent in KB/s (-1 = disabled)",
+        "UploadRateLimitPerTorrent",
+        -1,
+    )
+    _gen_default_line(
+        category_seeding,
+        "Maximum upload ratio (-1 = disabled, e.g. 2.0 for 200%)",
+        "MaxUploadRatio",
+        -1,
+    )
+    _gen_default_line(
+        category_seeding,
+        "Maximum seeding time in seconds (-1 = disabled, e.g. 604800 for 7 days)",
+        "MaxSeedingTime",
+        -1,
+    )
+    _gen_default_line(
+        category_seeding,
+        [
+            "When to remove torrents from qBittorrent:",
+            "  -1 = Never remove",
+            "   1 = Remove when MaxUploadRatio is reached",
+            "   2 = Remove when MaxSeedingTime is reached",
+            "   3 = Remove when either condition is met (OR)",
+            "   4 = Remove when both conditions are met (AND)",
+        ],
+        "RemoveTorrent",
+        -1,
+    )
+    qbit.add("CategorySeeding", category_seeding)
+
     config.add("qBit", qbit)
 
 
@@ -1152,6 +1210,79 @@ def _migrate_quality_profile_mappings(config: MyConfig) -> bool:
     return changes_made
 
 
+def _migrate_qbit_category_settings(config: MyConfig) -> bool:
+    """
+    Add qBit category management settings to existing configs.
+
+    Migration runs if:
+    - ConfigVersion < 4
+
+    Adds ManagedCategories and CategorySeeding configuration to all qBit sections.
+
+    After migration, ConfigVersion will be set to 4 by apply_config_migrations().
+
+    Returns:
+        True if changes were made, False otherwise
+    """
+    import logging
+
+    from qBitrr.config_version import get_config_version
+
+    logger = logging.getLogger(__name__)
+
+    # Check if migration already applied
+    current_version = get_config_version(config)
+    if current_version >= 4:
+        return False  # Already migrated
+
+    changes_made = False
+
+    # Migrate default qBit section
+    if "qBit" in config.config:
+        qbit_section = config.config["qBit"]
+        if "ManagedCategories" not in qbit_section:
+            qbit_section["ManagedCategories"] = []
+            changes_made = True
+            logger.info("Added ManagedCategories = [] to [qBit]")
+
+        # Add CategorySeeding subsection
+        if "CategorySeeding" not in qbit_section:
+            seeding = table()
+            seeding["DownloadRateLimitPerTorrent"] = -1
+            seeding["UploadRateLimitPerTorrent"] = -1
+            seeding["MaxUploadRatio"] = -1
+            seeding["MaxSeedingTime"] = -1
+            seeding["RemoveTorrent"] = -1
+            qbit_section["CategorySeeding"] = seeding
+            changes_made = True
+            logger.info("Added CategorySeeding configuration to [qBit]")
+
+    # Migrate additional qBit instances (qBit-XXX)
+    for section in config.config.keys():
+        if str(section).startswith("qBit-"):
+            qbit_section = config.config[str(section)]
+            if "ManagedCategories" not in qbit_section:
+                qbit_section["ManagedCategories"] = []
+                changes_made = True
+                logger.info(f"Added ManagedCategories = [] to [{section}]")
+
+            if "CategorySeeding" not in qbit_section:
+                seeding = table()
+                seeding["DownloadRateLimitPerTorrent"] = -1
+                seeding["UploadRateLimitPerTorrent"] = -1
+                seeding["MaxUploadRatio"] = -1
+                seeding["MaxSeedingTime"] = -1
+                seeding["RemoveTorrent"] = -1
+                qbit_section["CategorySeeding"] = seeding
+                changes_made = True
+                logger.info(f"Added CategorySeeding configuration to [{section}]")
+
+    if changes_made:
+        print("Migration v3→v4: Added qBit category management settings")
+
+    return changes_made
+
+
 def _normalize_theme_value(value: Any) -> str:
     """
     Normalize theme value to always be 'Light' or 'Dark' (case insensitive input).
@@ -1168,6 +1299,22 @@ def _normalize_theme_value(value: Any) -> str:
         return "Dark"
 
 
+def _normalize_view_density_value(value: Any) -> str:
+    """
+    Normalize view density value to always be 'Comfortable' or 'Compact' (case insensitive input).
+    """
+    if value is None:
+        return "Comfortable"
+    value_str = str(value).strip().lower()
+    if value_str == "comfortable":
+        return "Comfortable"
+    elif value_str == "compact":
+        return "Compact"
+    else:
+        # Default to Comfortable if invalid value
+        return "Comfortable"
+
+
 def _validate_and_fill_config(config: MyConfig) -> bool:
     """
     Validate configuration and fill in missing values with defaults.
@@ -1234,6 +1381,7 @@ def _validate_and_fill_config(config: MyConfig) -> bool:
         ("GroupSonarr", True),
         ("GroupLidarr", True),
         ("Theme", "Dark"),
+        ("ViewDensity", "Comfortable"),
     ]
 
     for key, default in webui_defaults:
@@ -1250,6 +1398,14 @@ def _validate_and_fill_config(config: MyConfig) -> bool:
             webui_section["Theme"] = normalized_theme
             changed = True
 
+    # Normalize ViewDensity value to always be capitalized (Comfortable or Compact)
+    if "ViewDensity" in webui_section:
+        current_density = webui_section["ViewDensity"]
+        normalized_density = _normalize_view_density_value(current_density)
+        if current_density != normalized_density:
+            webui_section["ViewDensity"] = normalized_density
+            changed = True
+
     # Validate qBit section
     qbit_defaults = [
         ("Disabled", False),
@@ -1343,6 +1499,10 @@ def apply_config_migrations(config: MyConfig) -> None:
     if _migrate_process_restart_settings(config):
         changes_made = True
 
+    # NEW: Add qBit category management settings (v3 → v4)
+    if _migrate_qbit_category_settings(config):
+        changes_made = True
+
     # Validate and fill config (this also ensures ConfigVersion field exists)
     if _validate_and_fill_config(config):
         changes_made = True