diff --git a/CHANGELOG b/CHANGELOG index bcf014e..09739e4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,23 +1,11 @@ # Requirements Updated -- Updates ruamel.yaml to 0.17.31 -- Updates qbitorrent-api to 2023.5.48 -- Separate out dev requirements into requirements-dev.txt + # Breaking Changes -- `tag_nohardlinks` only updates/removes `noHL` tag. **It does not modify or cleanup share_limits anymore.** -- `tag_update` only adds tracker tags to torrent. **It does not modify or cleanup share_limits anymore.** -- Please remove any references to share_limits from your configuration in the tracker/nohardlinks section -- Migration guide can be followed here: [V4 Migration Guide](https://github.com/StuffAnThings/qbit_manage/wiki/v4-Migration-Guide) -- Webhook payloads changed (See [webhooks](https://github.com/StuffAnThings/qbit_manage/wiki/Config-Setup#webhooks) for updated payload) # New Features -- Adds new command `share_limits`, `--share-limits` , `QBT_SHARE_LIMITS=True` to update share limits based on tags/categories specified per group (Closes #88, Closes #306, Closes #259, Closes #308, Closes #137) -- See [Config Setup - share_limits](https://github.com/StuffAnThings/qbit_manage/wiki/Config-Setup#share_limits) for more details -- Adds new command `skip_qb_version_check`, `--skip-qb-version-check`, `QBT_SKIP_QB_VERSION_CHECK` to bypass qbitorrent compatibility check (unsupported - Thanks to @ftc2 #307) -- Updates to webhook notifications to group notifications when a function updates more than 10 Torrents. -- Adds new webhooks for `share_limits` -- Adds rate limit to webhook notifications (1 msg/sec) -# Bug Fixes -- Fixes #302 -- Fixes #317 +- cross-seed will move torrent to an error folder if it fails to inject torrent -**Full Changelog**: https://github.com/StuffAnThings/qbit_manage/compare/v3.6.4...v4.0.0 +# Bug Fixes + + +**Full Changelog**: https://github.com/StuffAnThings/qbit_manage/compare/v4.0.0...v4.0.1 diff --git a/VERSION b/VERSION index fcdb2e1..4db799f 100755 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.0 +4.0.1-develop1 diff --git a/modules/core/cross_seed.py b/modules/core/cross_seed.py index 7baef97..3f0d0e5 100644 --- a/modules/core/cross_seed.py +++ b/modules/core/cross_seed.py @@ -31,18 +31,21 @@ class CrossSeed: dir_cs = self.config.cross_seed_dir dir_cs_out = os.path.join(dir_cs, "qbit_manage_added") os.makedirs(dir_cs_out, exist_ok=True) + dir_cs_err = os.path.join(dir_cs, "qbit_manage_error") + os.makedirs(dir_cs_err, exist_ok=True) for file in cs_files: tr_name = file.split("]", 2)[2].split(".torrent")[0] t_tracker = file.split("]", 2)[1][1:] # Substring Key match in dictionary (used because t_name might not match exactly with self.qbt.torrentinfo key) # Returned the dictionary of filtered item torrentdict_file = dict(filter(lambda item: tr_name in item[0], self.qbt.torrentinfo.items())) + src = os.path.join(dir_cs, file) + dir_cs_out = os.path.join(dir_cs_out, file) + dir_cs_err = os.path.join(dir_cs_err, file) if torrentdict_file: # Get the exact torrent match name from self.qbt.torrentinfo t_name = next(iter(torrentdict_file)) dest = os.path.join(self.qbt.torrentinfo[t_name]["save_path"], "") - src = os.path.join(dir_cs, file) - dir_cs_out = os.path.join(dir_cs, "qbit_manage_added", file) category = self.qbt.torrentinfo[t_name].get("Category", self.qbt.get_category(dest)) # Only add cross-seed torrent if original torrent is complete if self.qbt.torrentinfo[t_name]["is_complete"]: @@ -98,6 +101,7 @@ class CrossSeed: logger.print_line(error, self.config.loglevel) else: logger.print_line(error, "WARNING") + util.move_files(src, dir_cs_err) self.config.notify(error, "cross-seed", False) self.config.webhooks_factory.notify(self.torrents_updated, self.notify_attr, group_by="category")