diff --git a/.github/workflows/dependabot-approve-and-auto-merge.yml b/.github/workflows/dependabot-approve-and-auto-merge.yml index 139312a..2f17b93 100644 --- a/.github/workflows/dependabot-approve-and-auto-merge.yml +++ b/.github/workflows/dependabot-approve-and-auto-merge.yml @@ -19,7 +19,7 @@ jobs: # will not occur. - name: Dependabot metadata id: dependabot-metadata - uses: dependabot/fetch-metadata@v2.2.0 + uses: dependabot/fetch-metadata@v2.3.0 with: github-token: "${{ secrets.GITHUB_TOKEN }}" # Here the PR gets approved. diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4c4fa43..b6c4a06 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,7 +17,7 @@ repos: - id: pretty-format-json args: [--autofix, --indent, '4', --no-sort-keys] - repo: https://github.com/hhatto/autopep8 - rev: v2.3.1 + rev: v2.3.2 hooks: - id: autopep8 - repo: https://github.com/adrienverge/yamllint.git diff --git a/CHANGELOG b/CHANGELOG index 6eddef3..56dd283 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,7 @@ # Requirements Updated -qbittorrent-api==2024.12.71 +ruamel.yaml==0.18.10 -# Bug Fixes -- Additional unregistered messages added (Fixes #719) +# New Updates +- Adds support for wlidcard matching in category (Adds #695) -**Full Changelog**: https://github.com/StuffAnThings/qbit_manage/compare/v4.1.14...v4.1.15 +**Full Changelog**: https://github.com/StuffAnThings/qbit_manage/compare/v4.1.15...v4.1.16 diff --git a/SUPPORTED_VERSIONS.json b/SUPPORTED_VERSIONS.json index d73f7f3..8d665a8 100644 --- a/SUPPORTED_VERSIONS.json +++ b/SUPPORTED_VERSIONS.json @@ -1,7 +1,7 @@ { "master": { - "qbit": "v5.0.2", - "qbitapi": "2024.11.70" + "qbit": "v5.0.3", + "qbitapi": "2024.12.71" }, "develop": { "qbit": "v5.0.3", diff --git a/VERSION b/VERSION index 796262d..1b94a07 100755 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.1.15 +4.1.16 diff --git a/config/config.yml.sample b/config/config.yml.sample index ce32caf..cfb89e4 100755 --- a/config/config.yml.sample +++ b/config/config.yml.sample @@ -63,6 +63,7 @@ cat: # Category & Path Parameters # All save paths in qbittorent must be populated below. # If you want to leave a save_path as uncategorized you can use the key 'Uncategorized' as the name of the category. + # You can use Unix filename pattern matching as well when specifying the save_path # : # Path of your save directory. movies: "/data/torrents/Movies" tv: "/data/torrents/TV" diff --git a/modules/core/remove_orphaned.py b/modules/core/remove_orphaned.py index b4fe7fb..c2de4bb 100644 --- a/modules/core/remove_orphaned.py +++ b/modules/core/remove_orphaned.py @@ -72,7 +72,7 @@ class RemoveOrphaned: "Aborting deletion to avoid accidental data loss." ) self.config.notify(e, "Remove Orphaned", False) - logger.debug(f"Orphaned files detected: {orphaned_files}") + logger.info(f"Orphaned files detected: {orphaned_files}") logger.warning(e) return elif orphaned_files: diff --git a/modules/qbittorrent.py b/modules/qbittorrent.py index ffab1ae..4aeefc1 100755 --- a/modules/qbittorrent.py +++ b/modules/qbittorrent.py @@ -2,6 +2,7 @@ import os import sys +from fnmatch import fnmatch from functools import cache from qbittorrentapi import Client @@ -397,7 +398,7 @@ class Qbt: if "cat" in self.config.data and self.config.data["cat"] is not None: cat_path = self.config.data["cat"] for cat, save_path in cat_path.items(): - if os.path.join(save_path, "") == path: + if os.path.join(save_path, "") == path or fnmatch(path, save_path): category.append(cat) if not category: diff --git a/requirements-dev.txt b/requirements-dev.txt index 6072bcb..f947093 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,2 +1,2 @@ flake8==7.1.1 -pre-commit==4.0.1 +pre-commit==4.1.0 diff --git a/requirements.txt b/requirements.txt index f433ba6..cec6d6c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,5 +6,5 @@ pytimeparse2==1.7.1 qbittorrent-api==2024.12.71 requests==2.32.3 retrying==1.3.4 -ruamel.yaml==0.18.8 +ruamel.yaml==0.18.10 schedule==1.2.2