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

VERSION

@@ -1 +1 @@
-4.0.1
+4.0.2-develop3

modules/core/remove_orphaned.py

@@ -31,7 +31,7 @@ class RemoveOrphaned:
         orphaned_files = []
         excluded_orphan_files = []
 
-        root_files = self.executor.submit(util.get_root_files, self.remote_dir, self.root_dir, self.orphaned_dir)
+        root_files = self.executor.submit(util.get_root_files, self.root_dir, self.remote_dir, self.orphaned_dir)
 
         # Get an updated list of torrents
         logger.print_line("Locating orphan files", self.config.loglevel)

modules/core/remove_unregistered.py

@@ -108,12 +108,6 @@ class RemoveUnregistered:
                         msg_up = trk.msg.upper()
                         msg = trk.msg
                         if TrackerStatus(trk.status) == TrackerStatus.NOT_WORKING:
-                            # Tag any error torrents
-                            if self.cfg_tag_error and self.tag_error not in check_tags:
-                                if not list_in_text(msg_up, TorrentMessages.IGNORE_MSGS) and not list_in_text(
-                                    msg_up, TorrentMessages.UNREGISTERED_MSGS
-                                ):
-                                    self.tag_tracker_error(msg, tracker, torrent)
                             # Check for unregistered torrents
                             if self.cfg_rem_unregistered:
                                 if list_in_text(msg_up, TorrentMessages.UNREGISTERED_MSGS) and not list_in_text(
@@ -125,6 +119,9 @@ class RemoveUnregistered:
                                     if self.check_for_unregistered_torrents_using_bhd_api(tracker, msg_up, torrent.hash):
                                         self.del_unregistered(msg, tracker, torrent)
                                         break
+                            # Tag any error torrents
+                            if self.cfg_tag_error and self.tag_error not in check_tags:
+                                self.tag_tracker_error(msg, tracker, torrent)
 
             except NotFound404Error:
                 continue

qbit_manage.py

@@ -370,6 +370,8 @@ with open(os.path.join(os.path.dirname(os.path.abspath(__file__)), "VERSION")) a
             version = util.parse_version(line)
             break
 branch = util.guess_branch(version, env_version, git_branch)
+if branch is None:
+    branch = "Unknown"
 version = (version[0].replace("develop", branch), version[1].replace("develop", branch), version[2])
 
 

requirements.txt

@@ -1,7 +1,7 @@
 bencodepy==0.9.5
 GitPython==3.1.31
-qbittorrent-api==2023.6.49
+qbittorrent-api==2023.6.50
 requests==2.31.0
 retrying==1.3.4
-ruamel.yaml==0.17.31
+ruamel.yaml==0.17.32
 schedule==1.2.0