adjusted log function to not be called if disabled

This commit is contained in:
jblu 2022-07-20 11:06:11 -05:00
parent 1889901f93
commit 1375bc36ce
3 changed files with 41 additions and 21 deletions

View File

@ -41,7 +41,8 @@ class Qbt:
self.tracker_protected_tag = 'ipt' self.tracker_protected_tag = 'ipt'
self.tracker_non_protected_tag = 'public' self.tracker_non_protected_tag = 'public'
self.torrent_hash_delete_list = [] self.torrent_hash_delete_list = []
self.tl.debug(self.tracker_whitelist) if self.use_log:
self.tl.debug(self.tracker_whitelist)
try: try:
self.tl.info('Connecting to host.') self.tl.info('Connecting to host.')
self.qbt_client.auth_log_in() self.qbt_client.auth_log_in()
@ -51,12 +52,15 @@ class Qbt:
self.poc.send_message(e, title="qbit-maid API ERROR") self.poc.send_message(e, title="qbit-maid API ERROR")
self.torrentlist = {} self.torrentlist = {}
self.torrentlist = self.qbt_client.torrents_info() self.torrentlist = self.qbt_client.torrents_info()
listqbitapiinfo(self) if self.use_log:
#listfirsttor(self) listqbitapiinfo(self)
listfirsttor(self)
buildtorlist(self) buildtorlist(self)
torrentcount(self) if self.use_log:
torrentcount(self)
torprocessor(self) torprocessor(self)
printprocessor(self) if self.use_log:
printprocessor(self)
if self.use_pushover: if self.use_pushover:
tornotifysummary(self) tornotifysummary(self)
tordelete(self) tordelete(self)

View File

@ -5,27 +5,33 @@ def buildtorlist(self):
self.nonprotected_count = 0 self.nonprotected_count = 0
while self.torrentlist: while self.torrentlist:
torrent = self.torrentlist.pop() torrent = self.torrentlist.pop()
self.tl.debug(f'{torrent["name"]} {torrent["infohash_v1"]}') if self.use_log:
self.tl.debug(f'{torrent["name"]} {torrent["infohash_v1"]}')
if torrent['tracker'] == '': if torrent['tracker'] == '':
self.tl.warning(f"Torrent doesn't have a tracker{torrent['name']} [{torrent['tracker']}]hash: {torrent['hash']}") if self.use_log:
self.tl.warning(f"Torrent doesn't have a tracker{torrent['name']} [{torrent['tracker']}]hash: {torrent['hash']}")
break break
if self.tracker_whitelist['iptorrents-empirehost'] in torrent['tracker']: if self.tracker_whitelist['iptorrents-empirehost'] in torrent['tracker']:
self.tl.debug(f'Protected torrent: {torrent["tracker"]}hash: {torrent["hash"]}') if self.use_log:
self.tl.debug(f'Protected torrent: {torrent["tracker"]}hash: {torrent["hash"]}')
self.protected_count += 1 self.protected_count += 1
self.qbt_client.torrents_add_tags(self.tracker_protected_tag,torrent['hash']) self.qbt_client.torrents_add_tags(self.tracker_protected_tag,torrent['hash'])
self.tracker_protected_list.append(torrent) self.tracker_protected_list.append(torrent)
elif self.tracker_whitelist["iptorrents-stackoverflow"] in torrent['tracker']: elif self.tracker_whitelist["iptorrents-stackoverflow"] in torrent['tracker']:
self.tl.debug(f'Protected torrent: {torrent["tracker"]}hash: {torrent["hash"]}') if self.use_log:
self.tl.debug(f'Protected torrent: {torrent["tracker"]}hash: {torrent["hash"]}')
self.protected_count += 1 self.protected_count += 1
self.qbt_client.torrents_add_tags(self.tracker_protected_tag,torrent['hash']) self.qbt_client.torrents_add_tags(self.tracker_protected_tag,torrent['hash'])
self.tracker_protected_list.append(torrent) self.tracker_protected_list.append(torrent)
elif self.tracker_whitelist["iptorrents-bgp"] in torrent['tracker']: elif self.tracker_whitelist["iptorrents-bgp"] in torrent['tracker']:
self.tl.debug(f'Protected torrent: {torrent["tracker"]}hash: {torrent["hash"]}') if self.use_log:
self.tl.debug(f'Protected torrent: {torrent["tracker"]}hash: {torrent["hash"]}')
self.protected_count += 1 self.protected_count += 1
self.qbt_client.torrents_add_tags(self.tracker_protected_tag,torrent['hash']) self.qbt_client.torrents_add_tags(self.tracker_protected_tag,torrent['hash'])
self.tracker_protected_list.append(torrent) self.tracker_protected_list.append(torrent)
else: else:
self.tl.debug(f'Non-protected torrent: {torrent["tracker"]}hash: {torrent["hash"]}') if self.use_log:
self.tl.debug(f'Non-protected torrent: {torrent["tracker"]}hash: {torrent["hash"]}')
self.nonprotected_count += 1 self.nonprotected_count += 1
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'])
self.tracker_nonprotected_list.append(torrent) self.tracker_nonprotected_list.append(torrent)

View File

@ -2,28 +2,37 @@
def torprocessor(self): def torprocessor(self):
for canidate in self.tracker_nonprotected_list: for canidate in self.tracker_nonprotected_list:
if 'ipt' in canidate['tags']: if 'ipt' in canidate['tags']:
self.tl.warning(f'{canidate["name"]} was in non-protected list.') if self.use_log:
self.tl.warning(f'{canidate["name"]} was in non-protected list.')
break break
if canidate['state'] == 'downloading': if canidate['state'] == 'downloading':
self.tl.info(f'{canidate["name"]} is still downloading and will be skipped.') if self.use_log:
self.tl.info(f'{canidate["name"]} is still downloading and will be skipped.')
break break
else: else:
self.torrent_hash_delete_list.append(canidate['infohash_v1']) self.torrent_hash_delete_list.append(canidate['infohash_v1'])
self.tl.info(f'Submitted {canidate["name"]} for deletion.') if self.use_log:
self.tl.info(f'Submitted {canidate["name"]} for deletion.')
for canidate in self.tracker_protected_list: for canidate in self.tracker_protected_list:
if canidate['state'] == 'downloading': if canidate['state'] == 'downloading':
self.tl.warning(f'{canidate["name"]} is still downloading and will be skipped.') if self.use_log:
self.tl.warning(f'{canidate["name"]} is still downloading and will be skipped.')
break break
if canidate['ratio'] < float(1.05): if canidate['ratio'] < float(1.05):
self.tl.debug(f'{canidate["name"]} is below a 1.05 ratio({canidate["ratio"]})') if self.use_log:
self.tl.debug(f'{canidate["name"]} is below a 1.05 ratio({canidate["ratio"]})')
if canidate['added_on'] + self.config["age"] <= self.t.time(): if canidate['added_on'] + self.config["age"] <= self.t.time():
self.tl.debug(f'{canidate["name"]} Seconds old: {self.t.time() - self.config["age"] - canidate["added_on"]}') if self.use_log:
self.tl.debug(f'{canidate["name"]} Seconds old: {self.t.time() - self.config["age"] - canidate["added_on"]}')
self.torrent_hash_delete_list.append(canidate['infohash_v1']) self.torrent_hash_delete_list.append(canidate['infohash_v1'])
self.tl.info(f'Submitted {canidate["name"]} for deletion from the protected list.') if self.use_log:
self.tl.info(f'Submitted {canidate["name"]} for deletion from the protected list.')
if canidate['ratio'] >= float(1.05): if canidate['ratio'] >= float(1.05):
self.tl.debug(f'{canidate["name"]} is above a 1.05 ratio({canidate["ratio"]}).') if self.use_log:
self.tl.debug(f'{canidate["name"]} is above a 1.05 ratio({canidate["ratio"]}).')
self.torrent_hash_delete_list.append(canidate['infohash_v1']) self.torrent_hash_delete_list.append(canidate['infohash_v1'])
self.tl.info(f'Submitted {canidate["name"]} for deletion from the protected list.') if self.use_log:
self.tl.info(f'Submitted {canidate["name"]} for deletion from the protected list.')
else: else:
pass pass
@ -33,6 +42,7 @@ def printprocessor(self):
self.tl.info(f'Total torrents set for deletion: {len(self.torrent_hash_delete_list)}') self.tl.info(f'Total torrents set for deletion: {len(self.torrent_hash_delete_list)}')
def tordelete(self): def tordelete(self):
self.tl.debug('Hash list submitted for deletion:') if self.use_log:
self.tl.debug('Hash list submitted for deletion:')
self.tl.debug(self.torrent_hash_delete_list) self.tl.debug(self.torrent_hash_delete_list)
self.qbt_client.torrents_delete(True, self.torrent_hash_delete_list) self.qbt_client.torrents_delete(True, self.torrent_hash_delete_list)