From 469bd8391ed1d039b0a72188a3dcd110632ddb98 Mon Sep 17 00:00:00 2001 From: bakerboy448 <55419169+bakerboy448@users.noreply.github.com> Date: Fri, 3 Jan 2025 16:07:32 -0600 Subject: [PATCH] v4.1.15 (#723) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 4.1.15-develop1 * Update SUPPORTED_VERSIONS.json for master (#706) * 4.1.14-develop1 * Update SUPPORTED_VERSIONS.json for master (#692) * 4.1.13-develop * Bump croniter from 3.0.3 to 3.0.4 (#680) Bumps [croniter](https://github.com/kiorky/croniter) from 3.0.3 to 3.0.4. - [Changelog](https://github.com/kiorky/croniter/blob/master/CHANGELOG.rst) - [Commits](https://github.com/kiorky/croniter/compare/3.0.3...3.0.4) --- updated-dependencies: - dependency-name: croniter dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump qbittorrent-api from 2024.9.67 to 2024.10.68 (#684) Bumps [qbittorrent-api](https://github.com/rmartin16/qbittorrent-api) from 2024.9.67 to 2024.10.68. - [Release notes](https://github.com/rmartin16/qbittorrent-api/releases) - [Changelog](https://github.com/rmartin16/qbittorrent-api/blob/main/CHANGELOG.md) - [Commits](https://github.com/rmartin16/qbittorrent-api/compare/v2024.9.67...v2024.10.68) --- updated-dependencies: - dependency-name: qbittorrent-api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update SUPPORTED_VERSIONS.json * bump develop * (ci): add ci for version bump on develop (#688) * Fixes bug in torrent exporting for qbit versions under 4.5.0 * Bump actions/checkout from 3 to 4 (#690) * Bump actions/setup-python from 3 to 5 (#689) * Bump croniter from 3.0.4 to 5.0.1 (#685) * [pre-commit.ci] pre-commit autoupdate (#682) * 4.1.13 * Update SUPPORTED_VERSIONS.json --------- Signed-off-by: dependabot[bot] Co-authored-by: bobokun Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: bakerboy448 <55419169+bakerboy448@users.noreply.github.com> Co-authored-by: bobokun <12660469+bobokun@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * chore(docs): Sync wiki to docs [skip-cd] * Bump qbittorrent-api from 2024.10.68 to 2024.11.69 (#693) * Bump qbittorrent-api from 2024.10.68 to 2024.11.69 Bumps [qbittorrent-api](https://github.com/rmartin16/qbittorrent-api) from 2024.10.68 to 2024.11.69. - [Release notes](https://github.com/rmartin16/qbittorrent-api/releases) - [Changelog](https://github.com/rmartin16/qbittorrent-api/blob/main/CHANGELOG.md) - [Commits](https://github.com/rmartin16/qbittorrent-api/compare/v2024.10.68...v2024.11.69) --- updated-dependencies: - dependency-name: qbittorrent-api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * bump develop (#694) * chore: bump qbittorrent-api (#697) * chore: bump qbittorrent-api * Update VERSION * Update SUPPORTED_VERSIONS.json * chore(docs): Sync wiki to docs [skip-cd] * 4.1.14 * Update SUPPORTED_VERSIONS.json * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Signed-off-by: dependabot[bot] Co-authored-by: bobokun Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: bakerboy448 <55419169+bakerboy448@users.noreply.github.com> Co-authored-by: bobokun <12660469+bobokun@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Actionbot * (fix): BHD add additional unregistered messages for season packs (#707) * (fix): BHD add additional unregistered messages for season packs * Update VERSION * docs: update README.md (#708) * Update README.md Fixed small typo * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * (bhd): handle additional season pack unregistered (#709) * (bhd): handle additional season pack unregistered "COMPLETE SEASON UPLOADED" did not match Complete Season Uploaded: https://beyond-hd.me/torrents/[link] * fixup! * Bump qbittorrent-api from 2024.11.70 to 2024.12.71 (#712) Bumps [qbittorrent-api](https://github.com/rmartin16/qbittorrent-api) from 2024.11.70 to 2024.12.71. - [Release notes](https://github.com/rmartin16/qbittorrent-api/releases) - [Changelog](https://github.com/rmartin16/qbittorrent-api/blob/main/CHANGELOG.md) - [Commits](https://github.com/rmartin16/qbittorrent-api/compare/v2024.11.70...v2024.12.71) --- updated-dependencies: - dependency-name: qbittorrent-api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * bump 4.1.15-develop4 * Update SUPPORTED_VERSIONS.json * Bump croniter from 5.0.1 to 6.0.0 (#711) * Fix help description for --rem-orphaned argument (#716) * Bump ruamel-yaml from 0.18.6 to 0.18.7 (#720) Bumps ruamel-yaml from 0.18.6 to 0.18.7. --- updated-dependencies: - dependency-name: ruamel-yaml dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump ruamel-yaml from 0.18.7 to 0.18.8 (#721) Bumps ruamel-yaml from 0.18.7 to 0.18.8. --- updated-dependencies: - dependency-name: ruamel-yaml dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump gitpython from 3.1.43 to 3.1.44 (#722) Bumps [gitpython](https://github.com/gitpython-developers/GitPython) from 3.1.43 to 3.1.44. - [Release notes](https://github.com/gitpython-developers/GitPython/releases) - [Changelog](https://github.com/gitpython-developers/GitPython/blob/main/CHANGES) - [Commits](https://github.com/gitpython-developers/GitPython/compare/3.1.43...3.1.44) --- updated-dependencies: - dependency-name: gitpython dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * [pre-commit.ci] pre-commit autoupdate (#715) * [pre-commit.ci] pre-commit autoupdate updates: - [github.com/asottile/pyupgrade: v3.19.0 → v3.19.1](https://github.com/asottile/pyupgrade/compare/v3.19.0...v3.19.1) * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: bobokun <12660469+bobokun@users.noreply.github.com> * Fixes #719 * 4.1.15 --------- Signed-off-by: dependabot[bot] Co-authored-by: bobokun Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: bobokun <12660469+bobokun@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Actionbot Co-authored-by: tanka8 Co-authored-by: Michael Brünen <34708235+OddMagnet@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- CHANGELOG | 7 +++++-- README.md | 2 +- SUPPORTED_VERSIONS.json | 8 ++++---- VERSION | 2 +- docs/Config-Setup.md | 2 +- modules/util.py | 7 +++++++ qbit_manage.py | 2 +- requirements.txt | 8 ++++---- 9 files changed, 25 insertions(+), 15 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 59690a1..4c4fa43 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -38,7 +38,7 @@ repos: name: isort (python) args: [--force-single-line-imports, --profile, black] - repo: https://github.com/asottile/pyupgrade - rev: v3.19.0 + rev: v3.19.1 hooks: - id: pyupgrade args: [--py3-plus] diff --git a/CHANGELOG b/CHANGELOG index 2760f42..6eddef3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,7 @@ # Requirements Updated -qbittorrent-api==2024.11.70 +qbittorrent-api==2024.12.71 -**Full Changelog**: https://github.com/StuffAnThings/qbit_manage/compare/v4.1.13...v4.1.14 +# Bug Fixes +- Additional unregistered messages added (Fixes #719) + +**Full Changelog**: https://github.com/StuffAnThings/qbit_manage/compare/v4.1.14...v4.1.15 diff --git a/README.md b/README.md index d1cf719..127b68a 100755 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ This is a program used to manage your qBittorrent instance such as: We rely on [qbittorrent-api](https://pypi.org/project/qbittorrent-api/) to interact with Qbittorrent. -Generally expect new releases of Qbittorrent to not immediately be supported. Support CANNOT be added until qbittorrent-api adds support gor the version. Any material changed and impact must then be assessed prior to Qbit Manage supporting it. +Generally expect new releases of Qbittorrent to not immediately be supported. Support CANNOT be added until qbittorrent-api adds support for the version. Any material changed and impact must then be assessed prior to Qbit Manage supporting it. ### Master diff --git a/SUPPORTED_VERSIONS.json b/SUPPORTED_VERSIONS.json index a772c11..d73f7f3 100644 --- a/SUPPORTED_VERSIONS.json +++ b/SUPPORTED_VERSIONS.json @@ -1,10 +1,10 @@ { "master": { - "qbit": "v5.0.1", - "qbitapi": "2024.10.68" - }, - "develop": { "qbit": "v5.0.2", "qbitapi": "2024.11.70" + }, + "develop": { + "qbit": "v5.0.3", + "qbitapi": "2024.12.71" } } diff --git a/VERSION b/VERSION index 5888f1a..796262d 100755 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.1.14 +4.1.15 diff --git a/docs/Config-Setup.md b/docs/Config-Setup.md index daf09ea..ba94c9e 100644 --- a/docs/Config-Setup.md +++ b/docs/Config-Setup.md @@ -135,7 +135,7 @@ If you're needing information regarding hardlinks here are some excellent resour * [Wikipedia: Hardlinks](https://en.wikipedia.org/wiki/Hard_link) Mandatory to fill out [directory parameter](#directory) above to use this function (root_dir/remote_dir) -Beyond this you'll need to use one of the [categories](#cat) above as the key. +Beyond this you'll need to use one of the [categories](#cat) above as the key. | Configuration | Definition | Required | | :------------ | :-------------------------------------------------------- | :----------------- | diff --git a/modules/util.py b/modules/util.py index b32b084..8680b33 100755 --- a/modules/util.py +++ b/modules/util.py @@ -77,12 +77,16 @@ class TorrentMessages: "TORRENT IS NOT AUTHORIZED FOR USE ON THIS TRACKER", "INFOHASH NOT FOUND.", # blutopia "TORRENT HAS BEEN DELETED.", # blutopia + "TRACKER NICHT REGISTRIERT.", + "TORRENT EXISTIERT NICHT", + "TORRENT NICHT GEFUNDEN", ] UNREGISTERED_MSGS_BHD = [ "DEAD", "DUPE", "COMPLETE SEASON UPLOADED", + "COMPLETE SEASON UPLOADED:", "PROBLEM WITH DESCRIPTION", "PROBLEM WITH FILE", "PROBLEM WITH PACK", @@ -91,6 +95,9 @@ class TorrentMessages: "OTHER", "TORRENT HAS BEEN DELETED", "NUKED", + "SEASON PACK:", + "SEASON PACK OUT", + "SEASON PACK UPLOADED", ] IGNORE_MSGS = [ diff --git a/qbit_manage.py b/qbit_manage.py index de0e201..b9345b8 100755 --- a/qbit_manage.py +++ b/qbit_manage.py @@ -140,7 +140,7 @@ parser.add_argument( dest="rem_orphaned", action="store_true", default=False, - help="Use this if you would like to remove unregistered torrents.", + help="Use this if you would like to remove orphaned files.", ) parser.add_argument( "-tnhl", diff --git a/requirements.txt b/requirements.txt index 0595415..f433ba6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ bencodepy==0.9.5 -croniter==5.0.1 -GitPython==3.1.43 +croniter==6.0.0 +GitPython==3.1.44 humanize==4.11.0 pytimeparse2==1.7.1 -qbittorrent-api==2024.11.70 +qbittorrent-api==2024.12.71 requests==2.32.3 retrying==1.3.4 -ruamel.yaml==0.18.6 +ruamel.yaml==0.18.8 schedule==1.2.2