From 853e8a1fb11df86fee14c29f57d819fa012fe7cf Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Fri, 28 Apr 2023 09:39:51 +0800 Subject: [PATCH 1/4] Fix #212 --- src/module/manager/renamer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/module/manager/renamer.py b/src/module/manager/renamer.py index fa50c63b..7bd97172 100644 --- a/src/module/manager/renamer.py +++ b/src/module/manager/renamer.py @@ -39,7 +39,7 @@ class Renamer: for f in info.files: file_name = f.name suffix = os.path.splitext(file_name)[-1] - if suffix in suffix_list: + if suffix.lower() in suffix_list: file_list.append(file_name) return file_list From bd6b7afa93e650341302ab237ef3c42681c40041 Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Fri, 28 Apr 2023 10:11:04 +0800 Subject: [PATCH 2/4] Fix #203 --- src/main.py | 2 +- src/module/core/download_client.py | 4 ++-- src/module/downloader/qb_downloader.py | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main.py b/src/main.py index b5e5d620..0b9cdf52 100644 --- a/src/main.py +++ b/src/main.py @@ -83,6 +83,6 @@ else: if __name__ == "__main__": log_config = uvicorn.config.LOGGING_CONFIG log_config["formatters"]["default"]["fmt"] = "[%(asctime)s] %(levelname)-8s %(message)s" - main_process.start() + # main_process.start() uvicorn.run(router, host="0.0.0.0", port=settings.program.webui_port, log_config=log_config) diff --git a/src/module/core/download_client.py b/src/module/core/download_client.py index 7f89bdf7..f1080a42 100644 --- a/src/module/core/download_client.py +++ b/src/module/core/download_client.py @@ -67,9 +67,9 @@ class DownloadClient: self.client.rss_set_rule(rule_name=f"{rule_name} S{season}", rule_def=rule) logger.info(f"Add {official_name} Season {season}") - def rss_feed(self, rss_link): + def rss_feed(self, rss_link, item_path="Mikan_RSS"): # TODO: 定时刷新 RSS - if self.client.get_rss_info() == rss_link: + if self.client.get_rss_info(item_path) == rss_link: logger.info("RSS Already exists.") else: logger.info("No feed exists, start adding feed.") diff --git a/src/module/downloader/qb_downloader.py b/src/module/downloader/qb_downloader.py index dc52ec18..a47d1aa9 100644 --- a/src/module/downloader/qb_downloader.py +++ b/src/module/downloader/qb_downloader.py @@ -66,8 +66,8 @@ class QbDownloader: def torrents_rename_file(self, torrent_hash, old_path, new_path): self._client.torrents_rename_file(torrent_hash=torrent_hash, old_path=old_path, new_path=new_path) - def get_rss_info(self): - item = self._client.rss_items().get("Mikan_RSS") + def get_rss_info(self, item_path: str = "Mikan_RSS"): + item = self._client.rss_items().get(item_path) if item is not None: return item.url else: @@ -75,7 +75,7 @@ class QbDownloader: def rss_add_feed(self, url, item_path): try: - if self.get_rss_info() is not None: + if self.get_rss_info(item_path) is not None: self.rss_remove_item(item_path) self._client.rss_add_feed(url, item_path) except Conflict409Error: From 92843d981344f7bc4f28aa5f68b6b6e687ffb5c4 Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Fri, 28 Apr 2023 10:13:07 +0800 Subject: [PATCH 3/4] Fix #214 --- src/module/api.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/module/api.py b/src/module/api.py index 864d7972..b0664dd5 100644 --- a/src/module/api.py +++ b/src/module/api.py @@ -58,9 +58,9 @@ def remove_rule(bangumi_id: str): @router.post("/api/v1/collection", tags=["download"]) async def collection(link: RssLink): - response = api_func.download_collection(link.rss_link).dict() + response = api_func.download_collection(link.rss_link) if response: - return response + return response.dict() else: return {"status": "Failed to parse link"} From 9866cc972dca0292d323821eee99269bbc519a29 Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Fri, 28 Apr 2023 10:31:39 +0800 Subject: [PATCH 4/4] Fix RSS Feed log bug --- src/main.py | 2 +- src/module/core/download_client.py | 2 +- src/module/downloader/qb_downloader.py | 17 +++++++++-------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main.py b/src/main.py index 0b9cdf52..b5e5d620 100644 --- a/src/main.py +++ b/src/main.py @@ -83,6 +83,6 @@ else: if __name__ == "__main__": log_config = uvicorn.config.LOGGING_CONFIG log_config["formatters"]["default"]["fmt"] = "[%(asctime)s] %(levelname)-8s %(message)s" - # main_process.start() + main_process.start() uvicorn.run(router, host="0.0.0.0", port=settings.program.webui_port, log_config=log_config) diff --git a/src/module/core/download_client.py b/src/module/core/download_client.py index f1080a42..eb4c376a 100644 --- a/src/module/core/download_client.py +++ b/src/module/core/download_client.py @@ -69,7 +69,7 @@ class DownloadClient: def rss_feed(self, rss_link, item_path="Mikan_RSS"): # TODO: 定时刷新 RSS - if self.client.get_rss_info(item_path) == rss_link: + if self.client.get_rss_info(rss_link): logger.info("RSS Already exists.") else: logger.info("No feed exists, start adding feed.") diff --git a/src/module/downloader/qb_downloader.py b/src/module/downloader/qb_downloader.py index a47d1aa9..d25ee2e6 100644 --- a/src/module/downloader/qb_downloader.py +++ b/src/module/downloader/qb_downloader.py @@ -66,17 +66,18 @@ class QbDownloader: def torrents_rename_file(self, torrent_hash, old_path, new_path): self._client.torrents_rename_file(torrent_hash=torrent_hash, old_path=old_path, new_path=new_path) - def get_rss_info(self, item_path: str = "Mikan_RSS"): - item = self._client.rss_items().get(item_path) - if item is not None: - return item.url - else: - return None + def get_rss_info(self, url) -> str | None: + items = self._client.rss_items() + for item in items.items(): + if item[1].url == url: + return item[0] + return None def rss_add_feed(self, url, item_path): try: - if self.get_rss_info(item_path) is not None: - self.rss_remove_item(item_path) + path = self.get_rss_info(url) + if path: + self.rss_remove_item(path) self._client.rss_add_feed(url, item_path) except Conflict409Error: logger.exception("RSS Exist.")