From 6e4be5345b3499abda4842242360bccea5655f95 Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Wed, 26 Apr 2023 22:34:09 +0800 Subject: [PATCH] Fix minor bug --- .dockerignore | 8 +++++++- src/main.py | 9 +++++---- src/module/core/download_client.py | 5 +++++ src/module/downloader/qb_downloader.py | 3 +++ 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.dockerignore b/.dockerignore index 6713638d..a1784928 100644 --- a/.dockerignore +++ b/.dockerignore @@ -30,4 +30,10 @@ config/bangumi.json/config/bangumi.json /LICENSE /README.md /setup.py -dist.zip \ No newline at end of file +dist.zip +data +config +.pytest_cache +test +.env +test.py \ No newline at end of file diff --git a/src/main.py b/src/main.py index 0515485a..b5e5d620 100644 --- a/src/main.py +++ b/src/main.py @@ -22,10 +22,11 @@ main_process = multiprocessing.Process(target=app.run) @router.get("/api/v1/restart", tags=["program"]) async def restart(): global main_process - if not main_process.is_alive(): - return {"status": "failed", "reason": "Already stopped"} - logger.info("Restarting...") - os.kill(main_process.pid, signal.SIGTERM) + if main_process.is_alive(): + os.kill(main_process.pid, signal.SIGTERM) + logger.info("Restarting...") + else: + logger.info("Starting...") main_process = multiprocessing.Process(target=app.run) main_process.start() logger.info("Restarted") diff --git a/src/module/core/download_client.py b/src/module/core/download_client.py index ef4d3ce1..7f89bdf7 100644 --- a/src/module/core/download_client.py +++ b/src/module/core/download_client.py @@ -31,6 +31,11 @@ class DownloadClient: "rss_refresh_interval": 30, } self.client.prefs_init(prefs=prefs) + try: + self.client.add_category("BangumiCollection") + except Exception as e: + logger.warning("Cannot add new category, maybe already exists.") + logger.debug(e) if settings.downloader.path == "": prefs = self.client.get_app_prefs() settings.downloader.path = os.path.join(prefs["save_path"], "Bangumi") diff --git a/src/module/downloader/qb_downloader.py b/src/module/downloader/qb_downloader.py index b2b57c1f..dc52ec18 100644 --- a/src/module/downloader/qb_downloader.py +++ b/src/module/downloader/qb_downloader.py @@ -42,6 +42,9 @@ class QbDownloader: def get_app_prefs(self): return self._client.app_preferences() + def add_category(self, category): + return self._client.torrents_createCategory(name=category) + @qb_connect_failed_wait def torrents_info(self, status_filter, category): return self._client.torrents_info(status_filter, category)