fixed preme calculation bug and added exec time

This commit is contained in:
jblu 2022-08-01 13:01:00 -05:00
parent fca54f8952
commit 357591227e
3 changed files with 24 additions and 6 deletions

10
qbit-maid.py Executable file → Normal file
View File

@ -6,6 +6,7 @@ from qlist import *
from qlogging import *
from qprocess import *
import time
import datetime
import logging
from collections import Counter
@ -13,6 +14,7 @@ class Qbt:
def __init__(self):
"""Main object, should be calling functions from qlist.py, qlogging.py and qprocess.py"""
# Open the config. Needs a json file with the data in config.json.example
self.st = datetime.datetime.now()
c = open('./config.json')
self.config = load(c)
w = open('./category-whitelist.json')
@ -65,6 +67,7 @@ class Qbt:
# Pulling all torrent data
self.torrentlist = self.qbt_client.torrents_info()
#Main process block
#debugpremecal(self)
if self.use_log:
listqbitapiinfo(self)
listfirsttor(self)
@ -76,11 +79,12 @@ class Qbt:
torprocessor(self)
if self.use_log:
printprocessor(self)
if self.use_pushover:
tornotifysummary(self)
if self.config["delete_torrents"]:
tordelete(self)
self.et = datetime.datetime.now()
getscriptruntime(self)
if self.use_pushover:
tornotifysummary(self)
# Run
if __name__== "__main__":
Qbt()

View File

@ -9,7 +9,7 @@ def buildtorlist(self):
torrent = self.torrentlist.pop()
if self.use_log:
self.tl.debug(f'["{torrent["name"][0:20]}..."] {torrent["infohash_v1"]}')
if torrent['added_on'] + self.minimum_age <= self.t.time():
if torrent['added_on'] + self.minimum_age >= self.t.time():
self.preme_tor_counter += 1
continue
if torrent['category'] in self.cat_whitelist.values():

View File

@ -39,7 +39,8 @@ def tornotifysummary(self):
Protected: {self.c[self.tracker_protected_tag]}\n\
Non-protected: {self.c[self.tracker_non_protected_tag]}\n\
Orphaned: {self.up_tor_counter}\n\
Marked for deletion: {len(self.torrent_hash_delete_list)}", title="--- qbit-maid summary ---")
Marked for deletion: {len(self.torrent_hash_delete_list)}\n\
{self.extm}", title="--- qbit-maid summary ---")
def getunixtimestamp(self):
"""Used for debuging and development related to unixtimestamps, not used in main script but useful"""
@ -73,3 +74,16 @@ def torrentcount(self):
def torlisttags(self):
pass
def debugpremecal(self):
for torrent in self.torrentlist:
if torrent['infohash_v1'] == 'a89b484ea375094af53ce89ecbea14bf086d6284':
print(torrent["name"][0:20])
print(torrent['added_on'] + self.minimum_age >= self.t.time())
def getscriptruntime(self):
elapsed_time = self.et - self.st
if self.use_log:
self.tl.info(f'Execution time: [{elapsed_time}]')
if self.use_pushover:
self.extm = f"Execution time: [{elapsed_time}]"