qlist.py

@@ -9,6 +9,29 @@ def build_tor_list(self):
             torrent = self.torrent_list.pop()
             if self.use_log:
                 self.tl.debug(f'---Analyzing ["{torrent["name"][0:20]}..."] {torrent["infohash_v1"]}---')
+            # Need a way to tag when the tracker is blank
+            if is_tracker_blank(torrent['tracker']):
+                if self.use_log:
+                    self.tl.warning(f'Torrent doesn\'t have a tracker ["{torrent["name"][0:20]}..."] [{torrent["tracker"]}]hash: {torrent["hash"]}')
+                self.ignored_counter += 1
+                continue
+            if is_cat_ignored(torrent['category'], self.cat_whitelist.values()):
+                if self.use_log:
+                    self.tl.info(f'Ignored category: ["{torrent["name"][0:20]}..."] category:[{torrent["category"]}] hash: {torrent["hash"]}')
+                self.ignored_counter += 1
+                continue
+            if is_ignored_tag(self.ignored_tags.values(),torrent['tags']):
+                if self.use_log:
+                    self.tl.info(f'Ignored tag: ["{torrent["name"][0:20]}..."] tags: {torrent["tags"]} hash: {torrent["hash"]}')
+                self.ignored_counter += 1
+                continue
+            if is_tag_blank(torrent['tags']):
+                if self.use_log:
+                    self.tl.debug(f'Tagging new torrent: ["{torrent["name"][0:20]}..."] {torrent["tracker"]}hash: {torrent["hash"]}')
+                if is_protected_tracker(torrent['tracker'], self.tracker_whitelist.values()):
+                    self.qbt_client.torrents_add_tags(self.tracker_protected_tag,torrent['hash'])
+                if is_not_protected_tracker(torrent['tracker'], self.tracker_whitelist.values()):
+                    self.qbt_client.torrents_add_tags(self.tracker_non_protected_tag,torrent['hash'])
             if is_protected_tracker(torrent['tracker'], self.tracker_whitelist.values()):
                 if is_tag_blank(torrent['tags']):
                     self.qbt_client.torrents_add_tags(self.tracker_protected_tag,torrent['hash'])
@@ -21,23 +44,10 @@ def build_tor_list(self):
                     if self.use_log:
                         self.tl.debug(f'Tagging Non-protected torrent: ["{torrent["name"][0:20]}..."] {torrent["tracker"]}hash: {torrent["hash"]}')
                 self.tracker_list.append(torrent)
-            if is_ignored_tag(self.ignored_tags.values(),torrent['tags']):
-                self.ignored_counter += 1
-                self.tl.info(f'Ignored tag: ["{torrent["name"][0:20]}..."] tags: {torrent["tags"]} hash: {torrent["hash"]}')
-                continue
             if is_preme(torrent['added_on'], self.minimum_age, self.t.time()):
                 self.preme_tor_counter += 1
                 self.tl.debug(f'Premature torrent: ["{torrent["name"][0:20]}..."] hash: {torrent["hash"]}')
                 continue
-            if is_cat_ignored(torrent['category'], self.cat_whitelist.values()):
-                self.tl.info(f'Ignored category: ["{torrent["name"][0:20]}..."] category:[{torrent["category"]}] hash: {torrent["hash"]}')
-                self.ignored_counter += 1
-                continue
-            if is_tracker_blank(torrent['tracker']):
-                if self.use_log:
-                    self.tl.warning(f'Torrent doesn\'t have a tracker ["{torrent["name"][0:20]}..."] [{torrent["tracker"]}]hash: {torrent["hash"]}')
-                self.ignored_counter += 1
-                continue
 
 
 def is_preme(added, minage, time):

test_qbitmaid.py

@@ -90,10 +90,8 @@ class TestQbitmaid(unittest.TestCase):
     def test_isignoredtag_sanity(self):
         self.assertTrue(is_ignored_tag(['a','b','c'], 'first,second,third,a'))
     
-    def test_isignoredtag_sanity(self):
+    def test_isignoredtag(self):
-        self.assertTrue(is_ignored_tag(['a','b','c'], 'first,second,third,a'))
+        self.assertTrue(is_ignored_tag(['save'], 'save,public,ipt'))
-
-
 
     # def test__sanity(self):
     #     pass