From 4d2c4b80a7b263bb73f6a127d6043990ab9e33dd Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Sun, 6 Aug 2023 17:01:46 +0800 Subject: [PATCH] fix: fix bugs. Remove unnecessary code. --- backend/src/module/api/program.py | 1 - backend/src/module/core/program.py | 2 -- backend/src/module/core/rss_feed.py | 7 ------- backend/src/module/manager/torrent.py | 12 ++++-------- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/backend/src/module/api/program.py b/backend/src/module/api/program.py index d75bd4ea..83720a0e 100644 --- a/backend/src/module/api/program.py +++ b/backend/src/module/api/program.py @@ -21,7 +21,6 @@ async def startup(): @router.on_event("shutdown") async def shutdown(): program.stop() - sys.exit(0) @router.get("/restart") diff --git a/backend/src/module/core/program.py b/backend/src/module/core/program.py index 855e52ff..22a2915f 100644 --- a/backend/src/module/core/program.py +++ b/backend/src/module/core/program.py @@ -3,7 +3,6 @@ import logging from module.conf import VERSION, settings from module.update import data_migration -from .rss_feed import add_rss_feed from .sub_thread import RenameThread, RSSThread logger = logging.getLogger(__name__) @@ -52,7 +51,6 @@ class Program(RenameThread, RSSThread): if self.enable_renamer: self.rename_start() if self.enable_rss: - add_rss_feed() self.rss_start() logger.info("Program running.") return {"status": "Program started."} diff --git a/backend/src/module/core/rss_feed.py b/backend/src/module/core/rss_feed.py index 82006602..2dae9d8c 100644 --- a/backend/src/module/core/rss_feed.py +++ b/backend/src/module/core/rss_feed.py @@ -25,10 +25,3 @@ def add_rss_feed(): if add: client.add_rss_feed(settings.rss_link) logger.info(f"Add RSS Feed: {settings.rss_link}") - - -if __name__ == "__main__": - from module.conf import setup_logger - - setup_logger() - add_rss_feed() diff --git a/backend/src/module/manager/torrent.py b/backend/src/module/manager/torrent.py index facd8273..72022d70 100644 --- a/backend/src/module/manager/torrent.py +++ b/backend/src/module/manager/torrent.py @@ -31,8 +31,9 @@ class TorrentManager(Database): data = self.bangumi.search_id(int(_id)) if isinstance(data, Bangumi): with DownloadClient() as client: - client.remove_rule(data.rule_name) - client.remove_rss_feed(data.official_title) + # client.remove_rule(data.rule_name) + # client.remove_rss_feed(data.official_title) + self.rss.delete(data.official_title) self.bangumi.delete_one(int(_id)) if file: torrent_message = self.delete_torrents(data, client) @@ -56,7 +57,7 @@ class TorrentManager(Database): data = self.bangumi.search_id(int(_id)) if isinstance(data, Bangumi): with DownloadClient() as client: - client.remove_rule(data.rule_name) + # client.remove_rule(data.rule_name) data.deleted = True self.bangumi.update(data) if file: @@ -84,8 +85,6 @@ class TorrentManager(Database): if isinstance(data, Bangumi): data.deleted = False self.bangumi.update(data) - with DownloadClient() as client: - client.set_rule(data) logger.info(f"[Manager] Enable rule for {data.official_title}") return JSONResponse( status_code=200, @@ -112,9 +111,6 @@ class TorrentManager(Database): path = client._gen_save_path(data) if match_list: client.move_torrent(match_list, path) - # Set new download rule - client.remove_rule(data.rule_name) - client.set_rule(data) self.bangumi.update(data) return JSONResponse( status_code=200,