jblu/qbit-maid
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 5 Wiki Activity

Fixed #58
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
jblu 2023-09-12 13:04:38 -05:00
parent 8e70374ae7
commit 01a4c88cc4
6 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.toml.example
View File

@ -14,8 +14,8 @@ protected_tag = "ipt"
non_protected_tag = "public" non_protected_tag = "public"
[torrent] [torrent]
age = 2419200 max_age = 2419200
minimum_age = 432000 min_age = 432000
delete_torrents = false delete_torrents = false
[pushover] [pushover]

5
qbit-maid.py
View File

@ -55,8 +55,8 @@ class Qbt:
#torrent #torrent
self.delete_torrents = self.config["torrent"]["delete_torrents"] self.delete_torrents = self.config["torrent"]["delete_torrents"]
self.minimum_age = self.config["torrent"]["minimum_age"] self.min_age = self.config["torrent"]["min_age"]
self.age = self.config["torrent"]["age"] self.max_age = self.config["torrent"]["max_age"]
#pushover #pushover
self.use_pushover = self.config["pushover"]["use_pushover"] self.use_pushover = self.config["pushover"]["use_pushover"]
@ -112,6 +112,7 @@ class Qbt:
if self.use_log: if self.use_log:
list_qbit_api_info(self) list_qbit_api_info(self)
list_first_tor(self) list_first_tor(self)
debug_torrent_list(self)
build_tor_list(self) build_tor_list(self)
process_counts(self) process_counts(self)
if self.use_log: if self.use_log:

8
qlist.py
View File

@ -32,9 +32,9 @@ def build_tor_list(self):
self.qbt_client.torrents_add_tags(self.tracker_protected_tag,torrent['hash']) self.qbt_client.torrents_add_tags(self.tracker_protected_tag,torrent['hash'])
elif is_not_protected_tracker(torrent['tracker'], self.tracker_whitelist.values()): elif is_not_protected_tracker(torrent['tracker'], self.tracker_whitelist.values()):
self.qbt_client.torrents_add_tags(self.tracker_non_protected_tag,torrent['hash']) self.qbt_client.torrents_add_tags(self.tracker_non_protected_tag,torrent['hash'])
if is_preme(torrent['added_on'], self.minimum_age, self.t.time()): if is_preme(torrent['seeding_time'], self.minimum_age):
self.preme_tor_counter += 1 self.preme_tor_counter += 1
self.tl.debug(f'Premature torrent: ["{torrent["name"][0:20]}..."] hash: {torrent["hash"]}') self.tl.debug(f'Premature torrent: ["{torrent["name"][0:20]}..."] Seconds Seeded: [{torrent["seeding_time"]}] hash: {torrent["hash"]}')
continue continue
elif is_protected_tracker(torrent['tracker'], self.tracker_whitelist.values()): elif is_protected_tracker(torrent['tracker'], self.tracker_whitelist.values()):
if is_tag_blank(torrent['tags']): if is_tag_blank(torrent['tags']):
@ -50,8 +50,8 @@ def build_tor_list(self):
self.tracker_list.append(torrent) self.tracker_list.append(torrent)
def is_preme(added, minage, time): def is_preme(seeding_time, minage):
if added + minage >= time: if seeding_time >= minage:
return True return True
def is_cat_ignored(cat, catlist): def is_cat_ignored(cat, catlist):

5
qlogging.py
View File

@ -90,4 +90,7 @@ def send_ping(self, req_obj, healthcheck_url):
try: try:
req_obj.get(healthcheck_url, timeout=10) req_obj.get(healthcheck_url, timeout=10)
except req_obj.RequestException as e: except req_obj.RequestException as e:
self.tl.info(f"Ping failed: {e}") self.tl.info(f"Ping failed: {e}")
def debug_torrent_list(self):
self.tl.debug(self.torrent_list)

8
qprocess.py
View File

@ -12,9 +12,9 @@ def tor_processor(self):
elif is_protected_under_ratio(canidate['ratio'], 1.05, self.tracker_protected_tag, canidate["tags"]): elif is_protected_under_ratio(canidate['ratio'], 1.05, self.tracker_protected_tag, canidate["tags"]):
if self.use_log: if self.use_log:
self.tl.debug(f'["{canidate["name"][0:20]}..."] is below a 1.05 ratio({canidate["ratio"]})') self.tl.debug(f'["{canidate["name"][0:20]}..."] is below a 1.05 ratio({canidate["ratio"]})')
if is_old_tor(canidate['added_on'], self.age, self.t.time()): if is_old_tor(canidate['time_active'], self.max_age):
if self.use_log: if self.use_log:
self.tl.debug(f'["{canidate["name"][0:20]}..."] Seconds old: {self.t.time() - self.age - canidate["added_on"]}') self.tl.debug(f'["{canidate["name"][0:20]}..."] Seconds old: {canidate["time_active"]} Delta: {canidate["time_active"] - self.max_age}')
self.torrent_hash_delete_list.append(canidate['infohash_v1']) self.torrent_hash_delete_list.append(canidate['infohash_v1'])
if self.use_log: if self.use_log:
self.tl.info(f'Submitted ["{canidate["name"][0:20]}..."] for deletion from the protected list.') self.tl.info(f'Submitted ["{canidate["name"][0:20]}..."] for deletion from the protected list.')
@ -56,8 +56,8 @@ def is_protected_under_ratio(torratio, setratio, settag, tortag):
if torratio < float(setratio) and settag in tortag: if torratio < float(setratio) and settag in tortag:
return True return True
def is_old_tor(toradd, setage, currenttime): def is_old_tor(realage, maxage):
if toradd + setage <= currenttime: if realage >= maxage:
return True return True
def is_protected_over_ratio(torratio, setratio, settag, tortag): def is_protected_over_ratio(torratio, setratio, settag, tortag):

5
test_qbitmaid.py
View File

@ -4,8 +4,9 @@ from qprocess import is_downloading,is_protected_under_ratio,is_old_tor,is_prote
class TestQbitmaid(unittest.TestCase): class TestQbitmaid(unittest.TestCase):
def test_ispreme_sanity(self): def test_ispreme_sanity(self):
self.assertTrue(is_preme(1,1,1)) self.assertTrue(is_preme(1,1))
self.assertFalse(is_preme(1,1,3)) self.assertTrue(is_preme(2,1))
self.assertFalse(is_preme(1,2))
def test_ispreme(self): def test_ispreme(self):
pass pass