From 7fc349c14a78c884ecee1a6b7ec56e7cd15210eb Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Fri, 2 Jun 2023 14:31:38 +0800 Subject: [PATCH] fix: fix #281 --- src/module/downloader/client/qb_downloader.py | 11 ++++++----- src/module/manager/torrent.py | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/module/downloader/client/qb_downloader.py b/src/module/downloader/client/qb_downloader.py index b10c2386..8920bc4c 100644 --- a/src/module/downloader/client/qb_downloader.py +++ b/src/module/downloader/client/qb_downloader.py @@ -93,15 +93,16 @@ class QbDownloader: return False def rss_add_feed(self, url, item_path): - self._client.rss_add_feed(url, item_path) + try: + self._client.rss_add_feed(url, item_path) + except Conflict409Error: + logger.warning(f"[Downloader] RSS feed {url} already exists") def rss_remove_item(self, item_path): try: self._client.rss_remove_item(item_path) - except Conflict409Error as e: - logger.debug(e) - logger.info("Add new RSS") - raise ConflictError() + except Conflict409Error: + logger.warning(f"[Downloader] RSS item {item_path} does not exist") def rss_get_feeds(self): return self._client.rss_items() diff --git a/src/module/manager/torrent.py b/src/module/manager/torrent.py index 5a6ce957..8bd77a7c 100644 --- a/src/module/manager/torrent.py +++ b/src/module/manager/torrent.py @@ -36,6 +36,7 @@ class TorrentManager(BangumiDatabase): if isinstance(data, BangumiData): with DownloadClient() as client: client.remove_rule(data.rule_name) + client.remove_rss_feed(data.official_title) self.delete_one(int(_id)) if file: self.delete_torrents(data, client)