trex Bot
d8034278d8
- read [ignored_tags] instead of [ignored_domains], so tag-based ignoring
actually works
- match ignored tags as whole tags, not substrings ('ipt' no longer matches
'iptorrents')
- send the login-error notification through the Pushover client instead of
the non-existent module-level send_message()
- handle an empty torrent list instead of raising IndexError before any
summary is sent
- tag a new torrent once instead of once per code path
- honour toml_path without DOCKER in AppriseClient
- close replaced log handlers so the file descriptor is released
Also add the missing [telemetry] section to config.toml.example, which
qbit-maid.py requires at startup.
The tests that pinned each bug now assert the fixed behaviour, and the
suite still reports 100% coverage.
90 lines
4.0 KiB
Python
Executable File
90 lines
4.0 KiB
Python
Executable File
def build_tor_list(self):
|
|
"""Builds multiple lists of torrents to be sorted. Also adds tags to the torents.
|
|
There are more effecient ways of doing things but I did this rather quickly.
|
|
V2 will certainly be more performant. The reason two lists were used was so that torrents
|
|
that are in public trackers woudln't be around as long as torrents from a private tracker.
|
|
"""
|
|
self.total_torrents = len(self.torrent_list)
|
|
while self.torrent_list:
|
|
torrent = self.torrent_list.pop()
|
|
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']):
|
|
self.tl.warning(f'Torrent doesn\'t have a tracker ["{torrent["name"][0:20]}..."] hash: {torrent["hash"]}')
|
|
self.ignored_counter += 1
|
|
continue
|
|
elif 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
|
|
elif is_ignored_tag(self.ignored_tags.values(),torrent['tags']):
|
|
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']):
|
|
tag = torrent_tag_for(
|
|
torrent['tracker'],
|
|
self.tracker_protected_tag,
|
|
self.tracker_non_protected_tag,
|
|
self.tracker_whitelist.values(),
|
|
)
|
|
if tag:
|
|
self.tl.debug(f'Tagging new torrent: ["{torrent["name"][0:20]}..."] {torrent["tracker"]}hash: {torrent["hash"]}')
|
|
self.qbt_client.torrents_add_tags(tag, torrent['hash'])
|
|
if is_preme(torrent['seeding_time'], self.min_age):
|
|
self.preme_tor_counter += 1
|
|
self.tl.debug(f'Premature torrent: ["{torrent["name"][0:20]}..."] Seconds Seeded: [{torrent["seeding_time"]}] hash: {torrent["hash"]}')
|
|
continue
|
|
elif is_protected_tracker(torrent['tracker'], self.tracker_whitelist.values()):
|
|
self.tracker_list.append(torrent)
|
|
elif is_not_protected_tracker(torrent['tracker'], self.tracker_whitelist.values()):
|
|
self.tracker_list.append(torrent)
|
|
|
|
|
|
def is_preme(seeding_time, minage):
|
|
if seeding_time <= minage:
|
|
return True
|
|
|
|
def is_cat_ignored(cat, catlist):
|
|
if cat in catlist:
|
|
return True
|
|
|
|
def is_tracker_blank(tracker):
|
|
if tracker == '':
|
|
return True
|
|
|
|
def is_protected_tracker(tracker, trackerlist):
|
|
if tracker == '':
|
|
return False
|
|
if tracker.split('/')[2] in trackerlist:
|
|
return True
|
|
|
|
def is_not_protected_tracker(tracker, trackerlist):
|
|
if tracker == '':
|
|
return False
|
|
if tracker.split('/')[2] not in trackerlist:
|
|
return True
|
|
|
|
def torrent_tag_for(tracker, protected_tag, non_protected_tag, trackerlist):
|
|
"""Return the tag a torrent should carry, or None for an unknown tracker."""
|
|
if is_protected_tracker(tracker, trackerlist):
|
|
return protected_tag
|
|
if is_not_protected_tracker(tracker, trackerlist):
|
|
return non_protected_tag
|
|
return None
|
|
|
|
def is_tag_blank(tag):
|
|
if tag == '':
|
|
return True
|
|
|
|
def is_ignored_tag(igtags, tortags):
|
|
"""True when the torrent carries one of the configured ignored tags.
|
|
|
|
qBittorrent returns tags as a comma-separated string, so the comparison is
|
|
per tag: a configured ``ipt`` must not match a torrent tagged
|
|
``iptorrents``.
|
|
"""
|
|
if not tortags:
|
|
return False
|
|
torrent_tags = {tag.strip() for tag in str(tortags).split(',') if tag.strip()}
|
|
return any(igt in torrent_tags for igt in igtags) |