diff --git a/docs/wiki b/docs/wiki index 519e381e..4311a8de 160000 --- a/docs/wiki +++ b/docs/wiki @@ -1 +1 @@ -Subproject commit 519e381e8a1add62e76a39181ee61bad02816035 +Subproject commit 4311a8def4ffe78d1eb8a5d326482df1a1170f74 diff --git a/src/module/manager/collector.py b/src/module/manager/collector.py index db62c4c7..1b341e3e 100644 --- a/src/module/manager/collector.py +++ b/src/module/manager/collector.py @@ -38,7 +38,6 @@ class SeasonCollector(DownloadClient): self.add_rss_feed(data.rss_link[0], item_path=data.official_title) - def eps_complete(): with BangumiDatabase() as bd: datas = bd.not_complete() diff --git a/src/module/manager/torrent.py b/src/module/manager/torrent.py index 8e05194b..6d43be6f 100644 --- a/src/module/manager/torrent.py +++ b/src/module/manager/torrent.py @@ -21,9 +21,9 @@ class TorrentManager(BangumiDatabase): if hash_list: client.delete_torrent(hash_list) logger.info(f"Delete rule and torrents for {data.official_title}") - return f"Delete torrents for {data.official_title}" + return f"Delete {data.official_title} torrents." else: - return f"Can't find torrents for {data.official_title}" + return f"Can't find {data.official_title} torrents." def delete_rule(self, _id: int | str, file: bool = False): data = self.search_id(int(_id)) @@ -35,8 +35,7 @@ class TorrentManager(BangumiDatabase): if file: torrent_message = self.delete_torrents(data, client) return JSONResponse(status_code=200, content={ - "msg": f"Delete rule and torrents for {data.official_title}, " - f"{torrent_message}", + "msg": f"Delete {data.official_title} rule. {torrent_message}" }) logger.info(f"[Manager] Delete rule for {data.official_title}") return JSONResponse(status_code=200, content={ @@ -57,12 +56,11 @@ class TorrentManager(BangumiDatabase): if file: torrent_message = self.delete_torrents(data, client) return JSONResponse(status_code=200, content={ - "msg": f"Disable rule and delete torrents for {data.official_title}" - f"{torrent_message}", + "msg": f"Disable {data.official_title} rule. {torrent_message}" }) logger.info(f"[Manager] Disable rule for {data.official_title}") return JSONResponse(status_code=200, content={ - "msg": f"Disable rule for {data.official_title}", + "msg": f"Disable {data.official_title} rule.", }) else: return JSONResponse(status_code=406, content={ @@ -78,7 +76,7 @@ class TorrentManager(BangumiDatabase): client.set_rule(data) logger.info(f"[Manager] Enable rule for {data.official_title}") return JSONResponse(status_code=200, content={ - "msg": f"Enable rule for {data.official_title}", + "msg": f"Enable {data.official_title} rule.", }) else: return JSONResponse(status_code=406, content={ @@ -88,9 +86,9 @@ class TorrentManager(BangumiDatabase): def update_rule(self, data: BangumiData): old_data = self.search_id(data.id) if not old_data: - logger.error(f"[Manager] Can't find data with id {data.id}") + logger.error(f"[Manager] Can't find data with {data.id}") return JSONResponse(status_code=406, content={ - "msg": f"Can't find data with id {data.id}" + "msg": f"Can't find data with {data.id}" }) else: # Move torrent @@ -116,7 +114,7 @@ class TorrentManager(BangumiDatabase): def search_one(self, _id: int | str): data = self.search_id(int(_id)) if not data: - logger.error(f"[Manager] Can't find data with id {_id}") - return {"status": "error", "msg": f"Can't find data with id {_id}"} + logger.error(f"[Manager] Can't find data with {_id}") + return {"status": "error", "msg": f"Can't find data with {_id}"} else: return data