Merge branch 'develop' into pre-commit-ci-update-config

.github/workflows/dependabot-approve-and-auto-merge.yml

@@ -19,7 +19,7 @@ jobs:
       # will not occur.
       - name: Dependabot metadata
         id: dependabot-metadata
-        uses: dependabot/fetch-metadata@v1.5.1
+        uses: dependabot/fetch-metadata@v1.6.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       # Here the PR gets approved.

VERSION

@@ -1 +1 @@
-4.0.2
+4.0.3-develop3

modules/core/cross_seed.py

@@ -128,7 +128,7 @@ class CrossSeed:
                     "torrents": [t_name],
                     "torrent_category": t_cat,
                     "torrent_tag": "cross-seed",
-                    "torrent_tracker": tracker,
+                    "torrent_tracker": tracker["url"],
                 }
                 self.notify_attr.append(attr)
                 self.torrents_updated.append(t_name)

modules/core/recheck.py

@@ -46,7 +46,7 @@ class ReCheck:
                                 "title": "Resuming Torrent",
                                 "body": body,
                                 "torrents": [t_name],
-                                "torrent_tag": tracker["tag"],
+                                "torrent_tag": ", ".join(tracker["tag"]),
                                 "torrent_category": t_category,
                                 "torrent_tracker": tracker["url"],
                                 "notifiarr_indexer": tracker["notifiarr"],
@@ -93,7 +93,7 @@ class ReCheck:
                                     "title": "Resuming Torrent",
                                     "body": body,
                                     "torrents": [t_name],
-                                    "torrent_tag": tracker["tag"],
+                                    "torrent_tag": ", ".join(tracker["tag"]),
                                     "torrent_category": t_category,
                                     "torrent_tracker": tracker["url"],
                                     "notifiarr_indexer": tracker["notifiarr"],
@@ -118,7 +118,7 @@ class ReCheck:
                             "title": "Rechecking Torrent",
                             "body": body,
                             "torrents": [t_name],
-                            "torrent_tag": tracker["tag"],
+                            "torrent_tag": ", ".join(tracker["tag"]),
                             "torrent_category": t_category,
                             "torrent_tracker": tracker["url"],
                             "notifiarr_indexer": tracker["notifiarr"],

modules/qbittorrent.py

@@ -2,7 +2,6 @@
 import os
 import sys
 
-from qbittorrentapi import APIConnectionError
 from qbittorrentapi import Client
 from qbittorrentapi import LoginFailed
 from qbittorrentapi import NotFound404Error
@@ -74,15 +73,10 @@ class Qbt:
         except LoginFailed as exc:
             ex = "Qbittorrent Error: Failed to login. Invalid username/password."
             self.config.notify(ex, "Qbittorrent")
-            raise Failed(ex) from exc
-        except APIConnectionError as exc:
-            ex = "Qbittorrent Error: Unable to connect to the client."
-            self.config.notify(ex, "Qbittorrent")
-            raise Failed(ex) from exc
+            raise Failed(exc) from exc
         except Exception as exc:
-            ex = "Qbittorrent Error: Unable to connect to the client."
-            self.config.notify(ex, "Qbittorrent")
-            raise Failed(ex) from exc
+            self.config.notify(exc, "Qbittorrent")
+            raise Failed(exc) from exc
         logger.separator("Getting Torrent List", space=False, border=False)
         self.torrent_list = self.get_torrents({"sort": "added_on"})
 

requirements-dev.txt

@@ -1,2 +1,2 @@
-flake8==6.0.0
+flake8==6.1.0
 pre-commit==3.3.3

requirements.txt

@@ -1,6 +1,6 @@
 bencodepy==0.9.5
-GitPython==3.1.31
-qbittorrent-api==2023.6.50
+GitPython==3.1.32
+qbittorrent-api==2023.7.52
 requests==2.31.0
 retrying==1.3.4
 ruamel.yaml==0.17.32