4.0.7 (#462)

# Requirements Updated
- qbittorrent-api==2023.11.57
- ruamel.yaml==0.18.5

# Bug Fixes
- Fixes #388
- Fixes #452
- Fixes #437

.github/workflows/develop.yml

@@ -18,13 +18,6 @@ jobs:
         with:
           ref: develop
 
-      - name: Trigger Hotio Webhook
-        uses: joelwmale/webhook-action@master
-        with:
-          url: ${{ secrets.HOTIO_WEBHOOK_URL }}
-          headers: '{"Authorization": "Bearer ${{ secrets.HOTIO_WEBHOOK_SECRET }}"}'
-          body: '{ "application": "qbitmanage", "branch":  "nightly" }'
-
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
@@ -51,3 +44,10 @@ jobs:
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
           tags: ${{ secrets.DOCKER_HUB_USERNAME }}/qbit_manage:develop
+
+      - name: Trigger Hotio Webhook
+        uses: joelwmale/webhook-action@master
+        with:
+          url: ${{ secrets.HOTIO_WEBHOOK_URL }}
+          headers: '{"Authorization": "Bearer ${{ secrets.HOTIO_WEBHOOK_SECRET }}"}'
+          body: '{ "application": "qbitmanage", "branch":  "nightly" }'

CHANGELOG

@@ -1,14 +1,10 @@
 # Requirements Updated
-- GitPython==3.1.40
-- qbittorrent-api==2023.10.54
-- ruamel.yaml==0.18.2
+- qbittorrent-api==2023.11.57
+- ruamel.yaml==0.18.5
 
 # Bug Fixes
-- Fixes #419
-- Remove duplicates when cleaning up directories (#422)
-- Fixes #426
-- Fixes #429
+- Fixes #388
+- Fixes #452
+- Fixes #437
 
-**Full Changelog**: https://github.com/StuffAnThings/qbit_manage/compare/v4.0.5...v4.0.6
-
-Special thanks to @garypiner for their contributions!
+**Full Changelog**: https://github.com/StuffAnThings/qbit_manage/compare/v4.0.6...v4.0.7

VERSION

@@ -1 +1 @@
-4.0.6
+4.0.7

modules/config.py

@@ -213,7 +213,7 @@ def hooks(attr):
 
         self.apprise_factory = None
         if "apprise" in self.data:
-            if self.data["apprise"] is not None:
+            if self.data["apprise"] is not None and self.data["apprise"].get("api_url") is not None:
                 logger.info("Connecting to Apprise...")
                 try:
                     self.apprise_factory = Apprise(
@@ -233,7 +233,7 @@ def hooks(attr):
 
         self.notifiarr_factory = None
         if "notifiarr" in self.data:
-            if self.data["notifiarr"] is not None:
+            if self.data["notifiarr"] is not None and self.data["notifiarr"].get("apikey") is not None:
                 logger.info("Connecting to Notifiarr...")
                 try:
                     self.notifiarr_factory = Notifiarr(
@@ -260,7 +260,7 @@ def hooks(attr):
 
         self.beyond_hd = None
         if "bhd" in self.data:
-            if self.data["bhd"] is not None:
+            if self.data["bhd"] is not None and self.data["bhd"].get("apikey") is not None:
                 logger.info("Connecting to BHD API...")
                 try:
                     self.beyond_hd = BeyondHD(

modules/qbittorrent.py

@@ -201,7 +201,7 @@ def get_torrents(self, params):
 
     def get_tags(self, trackers):
         """Get tags from config file based on keyword"""
-        urls = [x.url for x in trackers if x.url.startswith("http")]
+        urls = [x.url for x in trackers if x.url.startswith(("http", "udp", "ws"))]
         tracker = {}
         tracker["tag"] = None
         tracker["cat"] = None

modules/util.py

@@ -73,6 +73,7 @@ class TorrentMessages:
         "STREAM TRUNCATED",
         "GATEWAY TIMEOUT",  # BHD Gateway Timeout
         "ANNOUNCE IS CURRENTLY UNAVAILABLE",  # BHD Announce unavailable
+        "TORRENT HAS BEEN POSTPONED",  # BHD Status
     ]
 
     EXCEPTIONS_MSGS = [

requirements-dev.txt

@@ -1,2 +1,2 @@
 flake8==6.1.0
-pre-commit==3.5.0
+pre-commit==3.6.0

requirements.txt

@@ -1,7 +1,7 @@
 bencodepy==0.9.5
 GitPython==3.1.40
-qbittorrent-api==2023.10.54
+qbittorrent-api==2023.11.57
 requests==2.31.0
 retrying==1.3.4
-ruamel.yaml==0.18.2
+ruamel.yaml==0.18.5
 schedule==1.2.1