fix: 支持 report API 升级部份依赖并初步支持 AList 储存

Author: SilianZ

core/cluster.py

@@ -1,8 +1,7 @@
 """
 todo:
-1. 支持 report API
-2. 缺失文件时临时下载文件处理
-3. 断连时重新发送 disable 包
+1. 缺失文件时临时下载文件处理
+2. 断连时重新发送 disable 包
 """
 
 from core.config import Config
@@ -15,7 +14,8 @@
 from core.orm import writeHits
 from core.i18n import locale
 from typing import List, Any
-from aiohttp import web
+from aiohttp import web, ClientResponseError
+from urllib.parse import urljoin
 from tqdm import tqdm
 from pathlib import Path
 import toml
@@ -245,18 +245,38 @@ async def downloadFile(
                         if all(results):
                             pbar.update(len(content))
                             return
+
+                except ClientResponseError as e:
+                    logger.terror(
+                        "cluster.error.download_file.retry",
+                        file=file.hash,
+                        e=e.message,
+                        retry=delay,
+                    )
+                    self.report(e, session)
+
                 except Exception as e:
                     logger.terror(
                         "cluster.error.download_file.retry",
                         file=file.hash,
                         e=e,
                         retry=delay,
                     )
+
                 await asyncio.sleep(delay)
 
             logger.terror("cluster.error.download_file.failed", file=file.hash)
             self.failed_filelist.files.append(file)
 
+    async def report(self, error: ClientResponseError, session: aiohttp.ClientSession) -> None:
+        history_urls = [urljoin(self.base_url), *error.history]
+        try:
+            async with session.post("/openbmclapi/report", data={"url": history_urls, "error": error.message}) as response:
+                response.raise_for_status()
+                logger.tdebug("cluster.debug.report", url=history_urls)
+        except Exception:
+            pass
+
     async def setupRouter(self) -> None:
         logger.tinfo("cluster.info.router.creating")
         try:

core/storages/__init__.py

@@ -1,5 +1,6 @@
 from core.classes import Storage
 from core.storages.local import LocalStorage
+from core.storages.alist import AListStorage
 from core.config import Config
 from typing import List
 
@@ -10,4 +11,6 @@ def getStorages() -> List[Storage]:
     for storage in config:
         if storage["type"] == "local":
             storages.append(LocalStorage(path=storage["path"]))
+        if storage["type"] == "alist":
+            storages.append(AListStorage())
     return storages

core/storages/alist.py

@@ -0,0 +1,6 @@
+from dataclasses import dataclass
+
+
+class AListStorage(): 
+    def __init__(self) -> None:
+        pass

core/storages/local.py

@@ -128,7 +128,7 @@ async def recycleFiles(self, files: FileList) -> None:
         ) as pbar:
             size = 0
             for file in delete_files:
-                total_size += file.stat().st_size
+                size += file.stat().st_size
                 pbar.update(1)
                 try:
                     file.unlink()

i18n/zh_cn.json

@@ -25,6 +25,7 @@
     "cluster.success.filelist.parsed": "成功解析文件列表！文件数量：${count}，总大小：${size}。",
     "cluster.error.download_file.retry": "在尝试下载文件 ${file} 时遇到错误：${e}，将在 ${retry}s 后重试。",
     "cluster.error.download_file.failed": "无法下载文件 ${file}，已达到最高重试次数。",
+    "cluster.debug.report": "成功汇报错误 URL！URL：${url}。",
     "cluster.info.sync_files.skipped": "因为当前没有文件缺失，已跳过文件同步。",
     "cluster.success.sync_files.downloaded": "成功下载所有文件！",
     "cluster.error.sync_files.retry": "无法下载所有文件，将在 ${retry}s 后重试。",