mirror of
https://github.com/StuffAnThings/qbit_manage.git
synced 2025-11-10 16:30:54 +08:00
Merge branch 'develop' into patch-1
This commit is contained in:
commit
8448939b3c
3 changed files with 28 additions and 31 deletions
|
|
@ -110,6 +110,7 @@ class Config:
|
||||||
self.data["notifiarr"] = self.data.pop("notifiarr")
|
self.data["notifiarr"] = self.data.pop("notifiarr")
|
||||||
if "webhooks" in self.data:
|
if "webhooks" in self.data:
|
||||||
temp = self.data.pop("webhooks")
|
temp = self.data.pop("webhooks")
|
||||||
|
if temp is not None:
|
||||||
if "function" not in temp or ("function" in temp and temp["function"] is None):
|
if "function" not in temp or ("function" in temp and temp["function"] is None):
|
||||||
temp["function"] = {}
|
temp["function"] = {}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -377,16 +377,12 @@ def start():
|
||||||
try:
|
try:
|
||||||
cfg = Config(default_dir, args)
|
cfg = Config(default_dir, args)
|
||||||
qbit_manager = cfg.qbt
|
qbit_manager = cfg.qbt
|
||||||
|
|
||||||
except Exception as ex:
|
except Exception as ex:
|
||||||
if "Qbittorrent Error" in ex.args[0]:
|
logger.stacktrace()
|
||||||
logger.print_line(ex, "CRITICAL")
|
logger.print_line(ex, "CRITICAL")
|
||||||
logger.print_line("Exiting scheduled Run.", "CRITICAL")
|
logger.print_line("Exiting scheduled Run.", "CRITICAL")
|
||||||
finished_run()
|
finished_run()
|
||||||
return None
|
return None
|
||||||
else:
|
|
||||||
logger.stacktrace()
|
|
||||||
logger.print_line(ex, "CRITICAL")
|
|
||||||
|
|
||||||
if qbit_manager:
|
if qbit_manager:
|
||||||
# Set Category
|
# Set Category
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
flake8==6.0.0
|
flake8==6.0.0
|
||||||
pre-commit==3.2.2
|
pre-commit==3.3.2
|
||||||
qbittorrent-api==2023.4.47
|
qbittorrent-api==2023.4.47
|
||||||
requests==2.28.2
|
requests==2.30.0
|
||||||
retrying==1.3.4
|
retrying==1.3.4
|
||||||
ruamel.yaml==0.17.21
|
ruamel.yaml==0.17.26
|
||||||
schedule==1.2.0
|
schedule==1.2.0
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue