From 4b98f17ce755b7384182441fd5b4fef45c960c64 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 Apr 2023 01:00:31 +0000 Subject: [PATCH 1/9] Bump requests from 2.28.2 to 2.29.0 Bumps [requests](https://github.com/psf/requests) from 2.28.2 to 2.29.0. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](https://github.com/psf/requests/compare/v2.28.2...v2.29.0) --- updated-dependencies: - dependency-name: requests dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7e5d5dc..7c1a61c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ flake8==6.0.0 pre-commit==3.2.2 qbittorrent-api==2023.4.47 -requests==2.28.2 +requests==2.29.0 retrying==1.3.4 ruamel.yaml==0.17.21 schedule==1.2.0 From b693b97fb0394b45f8fe35afe53a58f5bcb2141c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 May 2023 00:59:58 +0000 Subject: [PATCH 2/9] Bump pre-commit from 3.2.2 to 3.3.0 Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 3.2.2 to 3.3.0. - [Release notes](https://github.com/pre-commit/pre-commit/releases) - [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md) - [Commits](https://github.com/pre-commit/pre-commit/compare/v3.2.2...v3.3.0) --- updated-dependencies: - dependency-name: pre-commit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7c1a61c..b9c9bc5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ flake8==6.0.0 -pre-commit==3.2.2 +pre-commit==3.3.0 qbittorrent-api==2023.4.47 requests==2.29.0 retrying==1.3.4 From 02c84078ee9db87c347959d16101fdb1f995bc0f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 May 2023 00:59:37 +0000 Subject: [PATCH 3/9] Bump pre-commit from 3.3.0 to 3.3.1 Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/pre-commit/pre-commit/releases) - [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md) - [Commits](https://github.com/pre-commit/pre-commit/compare/v3.3.0...v3.3.1) --- updated-dependencies: - dependency-name: pre-commit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b9c9bc5..4af1151 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ flake8==6.0.0 -pre-commit==3.3.0 +pre-commit==3.3.1 qbittorrent-api==2023.4.47 requests==2.29.0 retrying==1.3.4 From 963b0109b37f29206458c12dc1e63716e516b64a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 May 2023 00:59:50 +0000 Subject: [PATCH 4/9] Bump ruamel-yaml from 0.17.21 to 0.17.22 Bumps [ruamel-yaml](https://sourceforge.net/p/ruamel-yaml/code/ci/default/tree) from 0.17.21 to 0.17.22. --- updated-dependencies: - dependency-name: ruamel-yaml dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b9c9bc5..3335c38 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,5 +3,5 @@ pre-commit==3.3.0 qbittorrent-api==2023.4.47 requests==2.29.0 retrying==1.3.4 -ruamel.yaml==0.17.21 +ruamel.yaml==0.17.22 schedule==1.2.0 From 007986ba5bb681312bbe90a7b54388562578ca84 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 May 2023 01:01:36 +0000 Subject: [PATCH 5/9] Bump requests from 2.29.0 to 2.30.0 Bumps [requests](https://github.com/psf/requests) from 2.29.0 to 2.30.0. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](https://github.com/psf/requests/compare/v2.29.0...v2.30.0) --- updated-dependencies: - dependency-name: requests dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index af56735..653cd2a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ flake8==6.0.0 pre-commit==3.3.1 qbittorrent-api==2023.4.47 -requests==2.29.0 +requests==2.30.0 retrying==1.3.4 ruamel.yaml==0.17.22 schedule==1.2.0 From 3a8bdf526ff4be55b49e798bdc9696688c6ef4b5 Mon Sep 17 00:00:00 2001 From: bobokun Date: Sat, 6 May 2023 09:37:11 -0400 Subject: [PATCH 6/9] Additional error checking to fix #282 --- modules/config.py | 39 ++++++++++++++++++++------------------- qbit_manage.py | 14 +++++--------- 2 files changed, 25 insertions(+), 28 deletions(-) diff --git a/modules/config.py b/modules/config.py index f884dc6..b09a070 100755 --- a/modules/config.py +++ b/modules/config.py @@ -110,27 +110,28 @@ class Config: self.data["notifiarr"] = self.data.pop("notifiarr") if "webhooks" in self.data: temp = self.data.pop("webhooks") - if "function" not in temp or ("function" in temp and temp["function"] is None): - temp["function"] = {} + if temp is not None: + if "function" not in temp or ("function" in temp and temp["function"] is None): + temp["function"] = {} - def hooks(attr): - if attr in temp: - items = temp.pop(attr) - if items: - temp["function"][attr] = items - if attr not in temp["function"]: - temp["function"][attr] = {} - temp["function"][attr] = None + def hooks(attr): + if attr in temp: + items = temp.pop(attr) + if items: + temp["function"][attr] = items + if attr not in temp["function"]: + temp["function"][attr] = {} + temp["function"][attr] = None - hooks("cross_seed") - hooks("recheck") - hooks("cat_update") - hooks("tag_update") - hooks("rem_unregistered") - hooks("rem_orphaned") - hooks("tag_nohardlinks") - hooks("cleanup_dirs") - self.data["webhooks"] = temp + hooks("cross_seed") + hooks("recheck") + hooks("cat_update") + hooks("tag_update") + hooks("rem_unregistered") + hooks("rem_orphaned") + hooks("tag_nohardlinks") + hooks("cleanup_dirs") + self.data["webhooks"] = temp if "bhd" in self.data: self.data["bhd"] = self.data.pop("bhd") self.dry_run = self.commands["dry_run"] diff --git a/qbit_manage.py b/qbit_manage.py index 0ca6f61..0250a75 100755 --- a/qbit_manage.py +++ b/qbit_manage.py @@ -377,16 +377,12 @@ def start(): try: cfg = Config(default_dir, args) qbit_manager = cfg.qbt - except Exception as ex: - if "Qbittorrent Error" in ex.args[0]: - logger.print_line(ex, "CRITICAL") - logger.print_line("Exiting scheduled Run.", "CRITICAL") - finished_run() - return None - else: - logger.stacktrace() - logger.print_line(ex, "CRITICAL") + logger.stacktrace() + logger.print_line(ex, "CRITICAL") + logger.print_line("Exiting scheduled Run.", "CRITICAL") + finished_run() + return None if qbit_manager: # Set Category From 4bca6f142af284a1e56f67dfb5ad9b8de569a899 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 May 2023 01:06:58 +0000 Subject: [PATCH 7/9] Bump ruamel-yaml from 0.17.22 to 0.17.24 Bumps [ruamel-yaml](https://sourceforge.net/p/ruamel-yaml/code/ci/default/tree) from 0.17.22 to 0.17.24. --- updated-dependencies: - dependency-name: ruamel-yaml dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 653cd2a..119172b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,5 +3,5 @@ pre-commit==3.3.1 qbittorrent-api==2023.4.47 requests==2.30.0 retrying==1.3.4 -ruamel.yaml==0.17.22 +ruamel.yaml==0.17.24 schedule==1.2.0 From 50a88759c6cf15f24dc5a67657bf1cc8022d39ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 May 2023 01:12:29 +0000 Subject: [PATCH 8/9] Bump ruamel-yaml from 0.17.24 to 0.17.26 Bumps [ruamel-yaml](https://sourceforge.net/p/ruamel-yaml/code/ci/default/tree) from 0.17.24 to 0.17.26. --- updated-dependencies: - dependency-name: ruamel-yaml dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 119172b..b34add4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,5 +3,5 @@ pre-commit==3.3.1 qbittorrent-api==2023.4.47 requests==2.30.0 retrying==1.3.4 -ruamel.yaml==0.17.24 +ruamel.yaml==0.17.26 schedule==1.2.0 From eeb87f09486800bee3b13e9842749c19148a9e56 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 May 2023 01:00:24 +0000 Subject: [PATCH 9/9] Bump pre-commit from 3.3.1 to 3.3.2 Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 3.3.1 to 3.3.2. - [Release notes](https://github.com/pre-commit/pre-commit/releases) - [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md) - [Commits](https://github.com/pre-commit/pre-commit/compare/v3.3.1...v3.3.2) --- updated-dependencies: - dependency-name: pre-commit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b34add4..3df979a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ flake8==6.0.0 -pre-commit==3.3.1 +pre-commit==3.3.2 qbittorrent-api==2023.4.47 requests==2.30.0 retrying==1.3.4