Merge branch 'master' of https://github.com/TTB-Network/python-openbmclapi

Author: tianxiu2b2t

VERSION

@@ -1 +1 @@
-v1.10.5-63b9e00
+v1.10.5-f5e974b

core/cluster.py

@@ -221,9 +221,10 @@ async def error(*responses: aiohttp.ClientResponse):
             history = list((ResponseRedirects(resp.status, str(resp.real_url)) for resp in responses))
             source = "主控" if len(history) == 1 else "节点"
             for history in history:
-                msg.append(f"  > {history.status} | {history.url}")
+                msg.append(f"> {history.status} | {history.url}")
             history = '\n'.join(msg)
-            logger.error(f"下载错误 {file.hash}({unit.format_bytes(file.size)}) 来自{source}地址 [{responses[-1].host}] 响应 [{responses[-1].status}] 历史地址：\n{history}")
+            logger.terror("cluster.error.download.failed", hash=file.hash, size=unit.format_bytes(file.size), 
+                          source=source, host=responses[-1].host, status=responses[-1].status, history=history)
         while not self.queues.empty() and storages.available:
             async with aiohttp.ClientSession(
                 BASE_URL,
@@ -269,7 +270,7 @@ async def error(*responses: aiohttp.ClientResponse):
                     continue
                 r = await self._mount_file(file, content)
                 if r[0] == -1:
-                    logger.error("放入存储时候错误")
+                    logger.terror("cluster.error.download.failed_to_upload")
                     await put(size, file)
                     continue
 

core/logger.py

@@ -57,9 +57,6 @@ def debug(self, *args, **kwargs):
     def warn(self, *args, **kwargs):
         self._log_with_args("WARNING", *args, **kwargs)
 
-    def exception(self, *args, **kwargs):
-        self._log_with_args("EXCEPTION", *args, **kwargs)
-
     def success(self, *args, **kwargs):
         self._log_with_args("SUCCESS", *args, **kwargs)
 
@@ -83,11 +80,6 @@ def twarn(self, key: str, failed_prompt=True, *args, **kwargs):
             "WARNING", locale.t(key=key, failed_prompt=failed_prompt, *args, **kwargs)
         )
 
-    def texception(self, key: str, failed_prompt=True, *args, **kwargs):
-        self._log_with_args(
-            "EXCEPTION", locale.t(key=key, failed_prompt=failed_prompt, *args, **kwargs)
-        )
-
     def tsuccess(self, key: str, failed_prompt=True, *args, **kwargs):
         self._log_with_args(
             "SUCCESS", locale.t(key=key, failed_prompt=failed_prompt, *args, **kwargs)

core/network.py

@@ -229,7 +229,7 @@ async def start():
                     "core.info.listening_ssl",
                     port=ssl_server.sockets[0].getsockname()[1],
                 )
-            logger.info(locale.t("core.info.listening", port=PORT))
+            logger.tinfo("core.info.listening", port=PORT)
             if cert:
                 async with server, ssl_server:
                     await asyncio.gather(server.serve_forever(), ssl_server.serve_forever())

i18n/zh_cn.json

@@ -22,6 +22,8 @@
   "cluster.tqdm.desc.download": "下载文件中",
   "cluster.debug.download_temp.downloading": "正在下载文件：$hash。",
   "cluster.debug.download_temp.downloaded": "成功下载文件：$hash。",
+  "cluster.error.download.failed": "无法下载文件 $hash（$size）（$source $host $status），历史地址：\n$history",
+  "cluster.error.download.failed_to_upload": "在尝试上传文件时发生错误。",
   "cluster.info.download.finished": "成功下载所有文件。",
   "cluster.info.check_files.check_type": "当前文件检查模式：$type。",
   "cluster.warn.check_files.skipped": "当前并无可用文件，已跳过文件检查。",
@@ -80,5 +82,5 @@
   "stats.error.broken_stats": "统计信息已损坏……",
   "system.info.loading": "正在初始化系统信息统计……",
   "timings.info.finished": "任务已完成，耗时：$time。",
-  "cluster.info.download.configuration": "下载配置策略：$type 下载源：$source 下载并发：$concurrency"
+  "cluster.info.download.configuration": "下载配置策略：$type，下载源：$source，下载并发：$concurrency。"
 }

plugins/__init__.py

@@ -55,7 +55,7 @@ def get_name(self):
 
 
 def load_plugins():
-    logger.info(locale.t("plugins.info.attempt_loading"))
+    logger.tinfo("plugins.info.attempt_loading")
     dirlist = os.listdir("./plugins")
     for file in dirlist:
         load = None
@@ -67,7 +67,7 @@ def load_plugins():
             if file[0] != "_" and file.endswith(".py"):
                 load = file[:-3]
         if load:
-            logger.debug(locale.t("plugins.debug.loading", name=load))
+            logger.debug("plugins.debug.loading", name=load)
             try:
                 plugin = Plugin(importlib.import_module("plugins." + load))
                 logger.info(