qBitrr2 5.5.3__tar.gz → 5.5.5__tar.gz

{qbitrr2-5.5.3/qBitrr2.egg-info → qbitrr2-5.5.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qBitrr2
-Version: 5.5.3
+Version: 5.5.5
 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
@@ -83,7 +83,7 @@ Requires-Dist: upgrade-pip==0.1.4; extra == "all"
 Requires-Dist: ujson==5.10.0; extra == "all"
 Dynamic: license-file
 
-# qBitrr
+# <img src="assets/logov2-clean.png" alt="qBitrr Logo" width="40" style="vertical-align: middle;"/> qBitrr
 
 [![PyPI](https://img.shields.io/pypi/v/qBitrr2?label=PyPI)](https://pypi.org/project/qBitrr2/)
 [![Downloads](https://img.shields.io/pypi/dm/qBitrr2)](https://pypi.org/project/qBitrr2/)

{qbitrr2-5.5.3 → qbitrr2-5.5.5}/README.md

@@ -1,4 +1,4 @@
-# qBitrr
+# <img src="assets/logov2-clean.png" alt="qBitrr Logo" width="40" style="vertical-align: middle;"/> qBitrr
 
 [![PyPI](https://img.shields.io/pypi/v/qBitrr2?label=PyPI)](https://pypi.org/project/qBitrr2/)
 [![Downloads](https://img.shields.io/pypi/dm/qBitrr2)](https://pypi.org/project/qBitrr2/)

{qbitrr2-5.5.3 → qbitrr2-5.5.5}/pyproject.toml

@@ -28,7 +28,7 @@ target-version = ['py311']
 
 [tool.poetry]
 name = "pypi-public"
-version = "5.5.3"
+version = "5.5.5"
 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.5.3 → qbitrr2-5.5.5}/qBitrr/bundled_data.py

@@ -1,5 +1,5 @@
-version = "5.5.3"
-git_hash = "0af67a21"
+version = "5.5.5"
+git_hash = "b4485490"
 license_text = (
     "Licence can be found on:\n\nhttps://github.com/Feramance/qBitrr/blob/master/LICENSE"
 )

{qbitrr2-5.5.3 → qbitrr2-5.5.5}/qBitrr/db_lock.py

@@ -6,6 +6,7 @@ from contextlib import contextmanager
 from pathlib import Path
 from typing import Iterator
 
+from qBitrr.db_recovery import checkpoint_wal, repair_database
 from qBitrr.home_path import APPDATA_FOLDER
 
 if os.name == "nt":  # pragma: no cover - platform specific
@@ -99,6 +100,8 @@ def with_database_retry(
     - sqlite3.IntegrityError (data constraint violations)
     - sqlite3.ProgrammingError (SQL syntax errors)
 
+    On detecting database corruption, attempts automatic recovery before retrying.
+
     Args:
         func: Callable to execute (should take no arguments)
         retries: Maximum number of retry attempts (default: 5)
@@ -118,6 +121,8 @@ def with_database_retry(
     import time
 
     attempt = 0
+    corruption_recovery_attempted = False
+
     while True:
         try:
             return func()
@@ -128,6 +133,61 @@ def with_database_retry(
             if "syntax" in error_msg or "constraint" in error_msg:
                 raise
 
+            # Detect corruption and attempt recovery (only once)
+            if not corruption_recovery_attempted and (
+                "disk image is malformed" in error_msg
+                or "database disk image is malformed" in error_msg
+                or "database corruption" in error_msg
+            ):
+                corruption_recovery_attempted = True
+                if logger:
+                    logger.error(
+                        "Database corruption detected: %s. Attempting automatic recovery...",
+                        e,
+                    )
+
+                recovery_succeeded = False
+                try:
+                    db_path = APPDATA_FOLDER / "qbitrr.db"
+
+                    # Step 1: Try WAL checkpoint (least invasive)
+                    if logger:
+                        logger.info("Attempting WAL checkpoint...")
+                    if checkpoint_wal(db_path, logger):
+                        if logger:
+                            logger.info("WAL checkpoint successful - retrying operation")
+                        recovery_succeeded = True
+                    else:
+                        # Step 2: Try full repair (more invasive)
+                        if logger:
+                            logger.warning(
+                                "WAL checkpoint failed - attempting full database repair..."
+                            )
+                        if repair_database(db_path, backup=True, logger_override=logger):
+                            if logger:
+                                logger.info("Database repair successful - retrying operation")
+                            recovery_succeeded = True
+
+                except Exception as recovery_error:
+                    if logger:
+                        logger.error(
+                            "Database recovery error: %s",
+                            recovery_error,
+                        )
+
+                if recovery_succeeded:
+                    # Reset attempt counter after successful recovery
+                    attempt = 0
+                    time.sleep(1)  # Brief pause before retry
+                    continue
+
+                # If we reach here, recovery failed - log and continue with normal retry
+                if logger:
+                    logger.critical(
+                        "Automatic database recovery failed. "
+                        "Manual intervention may be required. Attempting normal retry..."
+                    )
+
             attempt += 1
             if attempt >= retries:
                 if logger:
@@ -161,16 +221,18 @@ class ResilientSqliteDatabase:
     (specifically when setting PRAGMAs), before query-level retry logic can help.
     """
 
-    def __init__(self, database, max_retries=5, backoff=0.5):
+    def __init__(self, database, max_retries=5, backoff=0.5, logger=None):
         """
         Args:
             database: Peewee SqliteDatabase instance to wrap
             max_retries: Maximum connection retry attempts
             backoff: Initial backoff delay in seconds
+            logger: Optional logger instance for logging recovery attempts
         """
         self._db = database
         self._max_retries = max_retries
         self._backoff = backoff
+        self._logger = logger
 
     def __getattr__(self, name):
         """Delegate all attribute access to the wrapped database."""
@@ -194,6 +256,7 @@ class ResilientSqliteDatabase:
 
         last_error = None
         delay = self._backoff
+        corruption_recovery_attempted = False
 
         for attempt in range(1, self._max_retries + 1):
             try:
@@ -201,8 +264,77 @@ class ResilientSqliteDatabase:
             except (OperationalError, DatabaseError, sqlite3.OperationalError) as e:
                 error_msg = str(e).lower()
 
-                # Only retry on transient I/O errors
-                if "disk i/o error" in error_msg or "database is locked" in error_msg:
+                # Detect corruption and attempt recovery (only once)
+                if not corruption_recovery_attempted and (
+                    "disk image is malformed" in error_msg
+                    or "database disk image is malformed" in error_msg
+                    or "database corruption" in error_msg
+                ):
+                    corruption_recovery_attempted = True
+                    if self._logger:
+                        self._logger.error(
+                            "Database corruption detected during connection: %s. "
+                            "Attempting automatic recovery...",
+                            e,
+                        )
+
+                    recovery_succeeded = False
+                    try:
+                        db_path = APPDATA_FOLDER / "qbitrr.db"
+
+                        # Close current connection if any
+                        try:
+                            if not self._db.is_closed():
+                                self._db.close()
+                        except Exception:
+                            pass  # Ignore errors closing corrupted connection
+
+                        # Step 1: Try WAL checkpoint
+                        if self._logger:
+                            self._logger.info("Attempting WAL checkpoint...")
+                        if checkpoint_wal(db_path, self._logger):
+                            if self._logger:
+                                self._logger.info(
+                                    "WAL checkpoint successful - retrying connection"
+                                )
+                            recovery_succeeded = True
+                        else:
+                            # Step 2: Try full repair
+                            if self._logger:
+                                self._logger.warning(
+                                    "WAL checkpoint failed - attempting full database repair..."
+                                )
+                            if repair_database(db_path, backup=True, logger_override=self._logger):
+                                if self._logger:
+                                    self._logger.info(
+                                        "Database repair successful - retrying connection"
+                                    )
+                                recovery_succeeded = True
+
+                    except Exception as recovery_error:
+                        if self._logger:
+                            self._logger.error(
+                                "Database recovery error: %s",
+                                recovery_error,
+                            )
+
+                    if recovery_succeeded:
+                        time.sleep(1)
+                        continue
+
+                    # Recovery failed - log and continue with normal retry
+                    if self._logger:
+                        self._logger.critical(
+                            "Automatic database recovery failed. "
+                            "Manual intervention may be required."
+                        )
+
+                # Retry on transient I/O errors
+                if (
+                    "disk i/o error" in error_msg
+                    or "database is locked" in error_msg
+                    or "disk image is malformed" in error_msg
+                ):
                     last_error = e
 
                     if attempt < self._max_retries: