Merge pull request #86 from shinonomeow/shino_aio

fix download error

Author: shinonomeow

.github/workflows/build.yml

@@ -5,7 +5,7 @@ on:
     types:
       - closed
     branches:
-      - aio_test
+      - main
   push:
 
 jobs:
@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python 3.11
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v3
         with:
           python-version: "3.11"
       - name: Install dependencies
@@ -121,10 +121,12 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+
       - name: Install Node.js
         uses: actions/setup-node@v4
         with:
           node-version: 20
+
       - uses: pnpm/action-setup@v4
         name: Install pnpm
         with:
@@ -152,7 +154,7 @@ jobs:
           cd webui && pnpm build
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: dist
           path: webui/dist
@@ -183,7 +185,7 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            shinonomeow/auto_bangumi
+            estrellaxd/auto_bangumi
             ghcr.io/${{ github.repository }}
           tags: |
             type=raw,value=${{ needs.version-info.outputs.version }}
@@ -195,7 +197,7 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            shinonomeow/auto_bangumi
+            estrellaxd/auto_bangumi
             ghcr.io/${{ github.repository }}
           tags: |
             type=raw,value=${{ needs.version-info.outputs.version }}
@@ -217,7 +219,7 @@ jobs:
           password: ${{ secrets.ACCESS_TOKEN }}
 
       - name: Download artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: dist
           path: backend/src/dist
@@ -256,7 +258,7 @@ jobs:
           builder: ${{ steps.buildx.output.name }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: false
-          tags: shinonomeow/auto_bangumi:test
+          tags: estrellaxd/auto_bangumi:test
           cache-from: type=gha, scope=${{ github.workflow }}
           cache-to: type=gha, scope=${{ github.workflow }}
 
@@ -272,7 +274,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Download artifact webui
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: dist
           path: webui/dist
@@ -282,7 +284,7 @@ jobs:
           cd webui && ls -al && tree && zip -r dist.zip dist
 
       - name: Download artifact app
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: dist
           path: backend/src/dist
@@ -325,4 +327,17 @@ jobs:
             webui/dist.zip
             backend/app-v${{ needs.version-info.outputs.version }}.zip
         env:
-          GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
+
+  telegram:
+    runs-on: ubuntu-latest
+    needs: [release]
+    steps:
+      - name: send telegram message on push
+        uses: appleboy/telegram-action@master
+        with:
+          to: ${{ secrets.TELEGRAM_TO }}
+          token: ${{ secrets.TELEGRAM_TOKEN }}
+          message: |
+            New release: ${{ needs.release.outputs.version }}
+            Link: ${{ needs.release.outputs.url }}

backend/src/module/api/__init__.py

@@ -9,7 +9,7 @@
 from .rss import router as rss_router
 from .search import router as search_router
 
-__all__ = ["v1"]
+__all__ = ["v1","lifespan"]
 
 # API 1.0
 v1 = APIRouter(prefix="/v1")

backend/src/module/conf/log.py

@@ -19,16 +19,30 @@ def setup_logger(level: int = logging.INFO, reset: bool = False):
     logging.addLevelName(logging.WARNING, "WARNING:")
     LOGGING_FORMAT = "[%(asctime)s] %(levelname)-8s %(message)s"
     TIME_FORMAT = "%Y-%m-%d %H:%M:%S"
-    logging.basicConfig(
-        level=level,
-        format=LOGGING_FORMAT,
-        datefmt=TIME_FORMAT,
-        encoding="utf-8",
-        handlers=[
-            logging.FileHandler(LOG_PATH, encoding="utf-8"),
-            logging.StreamHandler(),
-        ],
-    )
+    
+    # 获取根日志器
+    root_logger = logging.getLogger()
+    
+    # 如果已经有处理器且不是重置模式，则更新现有配置
+    if root_logger.handlers and not reset:
+        # 更新根日志器的等级
+        root_logger.setLevel(level)
+        # 更新所有处理器的等级
+        for handler in root_logger.handlers:
+            handler.setLevel(level)
+    else:
+        # 首次配置或重置模式，使用 basicConfig
+        logging.basicConfig(
+            level=level,
+            format=LOGGING_FORMAT,
+            datefmt=TIME_FORMAT,
+            encoding="utf-8",
+            handlers=[
+                logging.FileHandler(LOG_PATH, encoding="utf-8"),
+                logging.StreamHandler(),
+            ],
+            force=reset,  # 强制重新配置如果是重置模式
+        )
     loggers_to_silence = [
         "httpx",
         "httpcore",

backend/src/module/core/program.py

@@ -1,6 +1,6 @@
 import logging
 
-from module.conf import VERSION, settings
+from module.conf import VERSION, settings, setup_logger
 
 from .aiocore import app_core
 from .status import ProgramStatus
@@ -56,6 +56,10 @@ async def start(self):
         logger.debug("[Program] loading settings...")
         settings.load()
         logger.debug("[Program] settings loaded.")
+        logger.debug("[Program] applying log configuration...")
+        # 重新应用日志配置以反映设置更改
+        setup_logger(level=logging.DEBUG if settings.log.debug_enable else logging.INFO)
+        logger.debug("[Program] log configuration applied.")
         logger.debug("[Program] starting application core...")
         await self.app_core.initialize()
         await self.app_core.start()

backend/src/module/downloader/client/qbittorrent/qbittorrent.py

@@ -150,24 +150,20 @@ async def torrent_info(self, hash: str) -> TorrentDownloadInfo | None:
                 params=data,
             )
             reps.raise_for_status()
-            if "404" in reps.text:
-                logger.warning(f"[qbittorrent] Cannot found {hash},{reps.text}")
-                return None
-            else:
-                logger.debug(f"[qbittorrent] Torrent info: {hash}")
-                reps = reps.json()
-                # print(reps)
-                logger.debug(
-                    f"[qbittorrent] Torrent info: {reps['eta']=}, {reps['save_path']=}, {reps['completion_date']=}"
-                )
-                if reps["completion_date"] == -1:
-                    reps["completion_date"] = 0
-                res = TorrentDownloadInfo(
-                    eta=reps["eta"],
-                    save_path=reps["save_path"],
-                    completed=reps["completion_date"],
-                )
-                return res
+            logger.debug(f"[qbittorrent] Torrent info: {hash}")
+            reps = reps.json()
+            # print(reps)
+            logger.debug(
+                f"[qbittorrent] Torrent info: {reps['eta']=}, {reps['save_path']=}, {reps['completion_date']=}"
+            )
+            if reps["completion_date"] == -1:
+                reps["completion_date"] = 0
+            res = TorrentDownloadInfo(
+                eta=reps["eta"],
+                save_path=reps["save_path"],
+                completed=reps["completion_date"],
+            )
+            return res
         except Exception as e:
             self.handle_exception(e, "torrent_info")
         return None

backend/src/module/downloader/download_client.py

@@ -6,10 +6,11 @@
 from typing import Any
 
 from module.conf import settings
-from module.downloader.client import AuthorizationError, BaseDownloader, Downloader
 from module.models import Torrent, TorrentDownloadInfo
 from module.utils import gen_save_path
 
+from .client import AuthorizationError, BaseDownloader
+
 logger = logging.getLogger(__name__)
 
 
@@ -106,7 +107,7 @@ class DownloadClient:
     """
 
     def __init__(self):
-        self.downloader: BaseDownloader | None = None
+        self.downloader: BaseDownloader = self.get_downloader()
         # 用于等待登陆完成
         self.login_success_event: asyncio.Event = asyncio.Event()
         self.login_timeout: int = 30  # 30秒超时
@@ -122,12 +123,7 @@ def __init__(self):
 
     def initialize(self):
         # 根据设置动态获取下载器
-        downloader_type = settings.downloader.type
-        package_path = f"module.downloader.client.{downloader_type}"
-        downloader_module = importlib.import_module(package_path)
-        DownloaderClass = downloader_module.Downloader
-        print(f"[Downloader Client] Using downloader: {downloader_type}")
-        self.downloader = DownloaderClass()
+        self.get_downloader()
 
         # 初始化下载器
         self.downloader.initialize()
@@ -138,8 +134,11 @@ def initialize(self):
     def get_downloader(self) -> BaseDownloader:
         """获取下载器实例"""
         downloader_type = settings.downloader.type
-
-        return self.downloader
+        package_path = f"module.downloader.client.{downloader_type}"
+        downloader_module = importlib.import_module(package_path)
+        DownloaderClass = downloader_module.Downloader
+        logger.debug(f"[Downloader Client] Using downloader: {downloader_type}")
+        return DownloaderClass()
 
     async def login(self):
         """一次性登录尝试，不重试"""