🌐 更新 i18n

SilianZ · SilianZ · commit d0c9637c9228 · 2024-04-06T13:10:20.000+08:00
diff --git a/README.md b/README.md
@@ -23,11 +23,9 @@
 
 ✨ **Docker** 支持。通过 Docker 更加**快捷地**部署 python-openbmclapi ~~（更支持一键跑路）~~
 
-🌈 __*新增功能！*__ **插件拓展**支持。你可以更方便地为 python-openbmclapi 编写自己的插件。
+🎉 __*新增功能！*__ WebDav 支持（实验性）。
 
-🎉 __*新增功能！*__ 基于 Echart 的 OpenBMCLAPI 仪表盘（Dashboard）。
-
-🎉 __*新增功能！*__ 基于 loguru 的**日志器**。
+🎉 __*新增功能！*__ 多语言支持（实验性）。
 
 </div>
 
diff --git a/config/config.yml.example b/config/config.yml.example
@@ -1,22 +1,43 @@
 advanced:
+  debug: false
   header_bytes: 4096
   io_buffer: 16777216
+  language: zh_cn
   min_rate: 500
   min_rate_timestamp: 1000
   request_buffer: 8192
   timeout: 30
+cache:
+  buffer: 536870912
+  check: 360
+  time: 1800
 cluster:
   byoc: false
+  enable: true
+  file_check_mode: size
   id: ''
   public_host: ''
   public_port: 8800
+  reconnect:
+    delay: 5
+    retry: -1
   secret: ''
-download:
-  threads: 64
+  skip_sign: false
+  timeout:
+    enable: 60
+    keepalive: 300
+  url: https://openbmclapi.bangbang93.com/
 dashboard:
-  password: ''
+  password: '123456'
   username: admin
+download:
+  threads: 64
+storages:
+  bmclapi:
+    path: ./bmclapi
+    type: file
 web:
+  force_ssl: false
   port: 8080
   server_name: TTB-Network
   ssl_port: 8800
diff --git a/core/__init__.py b/core/__init__.py
@@ -196,9 +196,7 @@ async def check_ports():
                 await client.writer.drain()
                 key = await client.read(len(check_port_key), 5)
             except:
-                logger.warn(
-                    f"Port {port[0].sockets[0].getsockname()[1]} has been closed! Reopening..."
-                )
+                logger.warn(locale.t("core.warn.port_closed", port=port[0].sockets[0].getsockname()[1]))
                 logger.error(traceback.format_exc())
                 closed = True
         if closed:
@@ -222,10 +220,8 @@ async def main():
                 port=0 if SSL_PORT == PORT else SSL_PORT,
                 ssl=server_side_ssl if get_loaded() else None,
             )
-            logger.info(f"Listening server on port {PORT}.")
-            logger.info(
-                f"Listening SSL server on {ssl_server.sockets[0].getsockname()[1]}."
-            )
+            logger.info(locale.t("core.info.listening", port=PORT))
+            logger.info(locale.t("core.info.listening_ssl", port=ssl_server.sockets[0].getsockname()[1]))
             async with server, ssl_server:
                 await asyncio.gather(server.serve_forever(), ssl_server.serve_forever())
         except asyncio.CancelledError:
@@ -240,7 +236,7 @@ async def main():
             logger.error(traceback.format_exc())
             await asyncio.sleep(2)
     await close()
-    logger.info("Shutting down web service...")
+    logger.info(locale.t("core.info.shutting_down_web_service"))
     os.environ["ASYNCIO_STARTUP"] = str(0)
     os.kill(os.getpid(), signal.SIGINT)
 
diff --git a/core/cluster.py b/core/cluster.py
@@ -96,9 +96,9 @@ async def __call__(self, data) -> list[BMCLAPIFile]:
         self.files = []
         with tqdm(
             total=self.read_long(),
-            desc="Parsing Filelist",
+            desc=locale.t("cluster.tqdm.desc.parsing_file_list"),
             unit_scale=True,
-            unit=" file(s)",
+            unit=locale.t("cluster.tqdm.unit.file"),
         ) as pbar:
             for _ in range(pbar.total):
                 self.files.append(
@@ -813,12 +813,12 @@ def __init__(self) -> None:
         self._retry = 0
 
     def _message(self, message):
-        logger.info(locale.t("cluster.info.remote_message", message=message))
+        logger.info(locale.t("cluster.info.cluster.remote_message", message=message))
         if "信任度过低" in message:
             self.trusted = False
 
     def _exception(self, message):
-        logger.error(locale.t("cluster.error.remote_message", message=message))
+        logger.error(locale.t("cluster.error.cluster.remote_message", message=message))
 
     async def emit(self, channel, data=None):
         await self.sio.emit(
@@ -834,27 +834,28 @@ async def init(self):
                     transports=["websocket"],
                 )
             except:
-                logger.warn(locale.t("cluster.warn.failed_to_connect"))
+                logger.warn(locale.t("cluster.warn.cluster.failed_to_connect"))
                 Timer.delay(self.init, delay=5)
                 return
         await self.start()
 
     async def start(self):
         await self.cert()
         if len(storages.get_storages()) == 0:
-            logger.warn("There is currently no Storage, the enabled nodes are blocked.")
+            logger.warn(locale.t("cluster.warn.cluster.no_storage"))
             return
         await self.start_storage()
 
     async def start_storage(self):
         if len(storages.get_storages()) == 0:
             if self.connected:
                 self.disable()
-            logger.warn("There is currently no Storage, the enabled nodes are blocked.")
+            logger.warn(locale.t("cluster.warn.cluster.no_storage"))
             return
         start = time.time()
         await self.file_check()
-        logger.success(f"File check completed, time: {time.time() - start:.2f}s")
+        t = "%.2f" % start
+        logger.success(locale.t("cluster.success.cluster.finished_file_check", time=t))
         if not self.connected:
             await self.enable()
 
@@ -863,12 +864,10 @@ async def cert(self):
 
     async def enable(self):
         if self.connected:
-            logger.debug(
-                "Still trying to enable cluster? You has been blocked. (\nFrom bangbang93:\n 谁他妈\n 一秒钟发了好几百个enable请求\n ban了解一下等我回杭州再看\n ban了先\n\n > Timestamp at 2024/3/30 14:07 GMT+8\n)"
-            )
+            logger.debug(locale.t("cluster.debug.cluster.blocked"))
             return
         if not ENABLE:
-            logger.warn("Disabled cluster.")
+            logger.warn(locale.t("cluster.warn.cluster.disabled"))
             return
         self.connected = True
         if self._enable_timer is not None:
@@ -878,23 +877,19 @@ async def enable(self):
 
     async def retry(self):
         if RECONNECT_RETRY != -1 and self._retry >= RECONNECT_RETRY:
-            logger.error(
-                f"The number of retries has reached {RECONNECT_RETRY} and the enabled node has been disabled"
-            )
+            logger.error(locale.t("cluster.error.cluster.reached_maximum_retry_count", count=RECONNECT_RETRY))
             return
         if self.connected:
             await self.disable()
             self.connected = False
         self._retry += 1
-        logger.info(f"Retrying after {RECONNECT_DELAY}s.")
+        logger.info(locale.t("cluster.info.cluster.retry", t=RECONNECT_DELAY))
         await asyncio.sleep(RECONNECT_DELAY)
         await self.enable()
 
     async def _enable(self):
         if not ENABLE:
-            logger.warn(
-                "Disabled cluster."
-            )
+            logger.warn(locale.t("cluster.warn.cluster.disabled"))
             return
         storage_str = {"file": 0, "webdav": 0}
         self.trusted = True
@@ -903,9 +898,7 @@ async def _enable(self):
                 storage_str["file"] += 1
             elif isinstance(storage, WebDav):
                 storage_str["webdav"] += 1
-        logger.info(
-            f"Total {len(storages.get_storages())} storage ({storage_str['file']} Local Storage, {storage_str['webdav']} Webdav Storage)."
-        )
+        logger.info(locale.t("cluster.info.cluster.storage_count", total=len(storages.get_storages()), local=storage_str['file'], webdav=storage_str['webdav']))
         await self.emit(
             "enable",
             {
@@ -941,27 +934,25 @@ async def message(self, type, data: list[Any]):
                 self._enable_timer.block()
                 self._enable_timer = None
             if err:
-                logger.error(f"Unable to start service: {err['message']}.")
+                logger.error(locale.t("cluster.error.cluster.failed_to_start_service", e=err['message']))
                 await self.retry()
                 return
             self._retry = 0
             self.connected = True
-            logger.success(f"Connected to the main server! Starting service...")
-            logger.info(
-                f"Hosting on {CLUSTER_ID}.openbmclapi.933.moe:{PUBLIC_PORT or PORT}."
-            )
+            logger.success(locale.t("cluster.success.cluster.connected_to_center_server"))
+            logger.info(locale.t("cluster.info.cluster.hosting", id=CLUSTER_ID, port=PUBLIC_PORT or PORT))
             await self.start_keepalive()
             await dashboard.set_status(
                 "正常工作" + ("" if self.trusted else "（节点信任度过低）")
             )
         elif type == "keep-alive":
             if err:
-                logger.error(f"Unable to keep alive! Reconnecting...")
+                logger.error(locale.t("cluster.error.cluster.keepalive_failed"))
                 await self.retry()
                 return
             if not ack:
                 await self.emit("disable")
-                logger.warn("The cluster is kicked by server.")
+                logger.warn(locale.t("cluster.warn.cluster.kicked"))
                 return
             storage_data = {"hits": 0, "bytes": 0}
             for storage in self._cur_storages:
@@ -997,7 +988,7 @@ async def _keepalive_timeout(self):
         if self.keepaliveTimeoutTimer is not None:
             self.keepaliveTimeoutTimer.block()
         self.keepaliving = False
-        logger.warn("Failed to keepalive! Reconnecting the main server...")
+        logger.warn(locale.t("cluster.error.cluster.keepalive_failed"))
         await self.retry()
 
     async def _keepalive(self):
@@ -1011,13 +1002,13 @@ async def _keepalive(self):
             {"time": int(time.time() * 1000), **data},
         )
         self.keepaliving = False
-        logger.debug("Next keep alive")
+        logger.debug(locale.t("cluster.info.cluster.next_keepalive"))
         await self.start_keepalive(60)
 
     async def disable(self):
         if self.sio.connected:
             await self.emit("disable")
-            logger.info("Disconnected from the main server...")
+            logger.info(locale.t("cluster.info.cluster.disconnecting"))
         await dashboard.set_status("已下线")
 
     async def get_cache_stats(self) -> StatsCache:
@@ -1041,7 +1032,7 @@ async def check_update():
     global fetched_version
     fetched_version = "Unknown"
     async with aiohttp.ClientSession(base_url=github_api) as session:
-        logger.info("Checking update...")
+        logger.info(locale.t("cluster.info.check_update.checking"))
         try:
             async with session.get(
                 "/repos/TTB-Network/python-openbmclapi/releases/latest"
@@ -1050,12 +1041,12 @@ async def check_update():
                 data = await req.json()
                 fetched_version = data["tag_name"]
             if fetched_version != VERSION:
-                logger.success(f"New version found: {fetched_version}!")
+                logger.success(locale.t("cluster.success.check_update.new_version", latest=fetched_version))
                 await dashboard.trigger("version")
             else:
-                logger.info(f"Already up to date.")
+                logger.info(locale.t("cluster.info.check_update.already_up_to_date"))
         except aiohttp.ClientError as e:
-            logger.error(f"An error occured whilst checking update: {e}.")
+            logger.error(locale.t("cluster.error.check_update.failed", e=e))
     Timer.delay(check_update, delay=3600)
 
 
diff --git a/core/const.py b/core/const.py
@@ -96,7 +96,7 @@
     505: "HTTP Version not supported",
 }
 REQUEST_TIME_UNITS = ["ns", "ms", "s", "m", "h"]
-FILECHECK = Config.get("file.check")
+FILECHECK = Config.get("clueset.file_check_mode")
 STORAGES: list['StorageParse'] = []
 
 @dataclass
diff --git a/core/dashboard.py b/core/dashboard.py
@@ -11,7 +11,6 @@
 from core import stats, system, unit, utils, web
 from core import cluster
 from core.api import StatsCache
-from core.config import Config
 from core import timer as Timer
 from core.timer import Task
 
diff --git a/core/timer.py b/core/timer.py
@@ -3,9 +3,10 @@
 import os
 import time
 import traceback
-from typing import Any, Callable, Optional, Coroutine
+from typing import Any, Callable, Optional
 from core.logger import logger as log
 from core.const import *
+from core.i18n import locale
 
 logger = log.depth(2)
 
@@ -34,9 +35,9 @@ def _get_function_name(self):
         return self._frame_name
     def block(self):
         if self._blocked:
-            logger.debug(f"The task <{self._get_function_name()}> is blocked.")
+            logger.debug(locale.t("timer.info.task.freezed", task=self._get_function_name()))
         else:
-            logger.debug(f"The task <{self._get_function_name()}> is blocking.")
+            logger.debug(locale.t("timer.info.task.freezing", task=self._get_function_name()))
         self._blocked = True
         if self._cur_task is not None:
             self._cur_task.cancel()
diff --git a/i18n/zh_cn.json b/i18n/zh_cn.json
@@ -5,7 +5,7 @@
     "web.info.loading": "加载中……",
     "cluster.success.keepalive": "成功保活，服务了 $hits 个文件 ($bytes，$count 个储存)，Ping：$ping 毫秒。",
     "cluster.info.token.fetching": "正在获取 token……",
-    "cluster.success.token.fetched": "成功获取 token。TTL：$tll",
+    "cluster.success.token.fetched": "成功获取 token。TTL：$tll。",
     "cluster.error.token.failed": "在尝试获取 token 时发生错误，将在 $delay 秒后重试：$e。",
     "cluster.error.cert.failed": "无法获取证书。$ack。",
     "cluster.success.cert.requested": "成功获取证书！",
@@ -27,9 +27,38 @@
     "cluster.success.check_files.finished": "已检查所有文件：$count ($size)！",
     "cluster.info.check_files.missing": "文件缺失：$count。",
     "cluster.tqdm.desc.cleaning_cache": "清除缓存中",
+    "cluster.tqdm.desc.parsing_file_list": "解析文件列表中",
     "cluster.tqdm.desc.fetching_webdav_files": "获取 WebDav <endpoint: '$endpoint'> 文件列表中",
     "i18n.prompt.failed": "（错误：无法找到该 i18n 字符串）",
-    "cluster.info.remote_message": "[总控]: $message",
-    "cluster.error.remote_message": "[总控]: $message",
-    "cluster.warn.failed_to_connect": "无法连接到总控，将在 5 秒后重试。"
+    "cluster.info.cluster.remote_message": "[总控]: $message",
+    "cluster.error.cluster.remote_message": "[总控]: $message",
+    "cluster.warn.cluster.failed_to_connect": "无法连接到总控，将在 5 秒后重试。",
+    "cluster.warn.cluster.no_storage": "因为当前没有任何存储，已关闭节点。",
+    "cluster.success.cluster.finished_file_check": "文件检查已完成，耗时：$time 秒",
+    "cluster.debug.cluster.blocked": "还在尝试启用节点？你已经被 ban 了。 (\nFrom bangbang93:\n 谁他妈\n 一秒钟发了好几百个enable请求\n ban了解一下等我回杭州再看\n ban了先\n\n > 2024/3/30 14:07 GMT+8\n)",
+    "cluster.warn.cluster.disabled": "已关闭节点。",
+    "cluster.error.cluster.reached_maximum_retry_count": "重试次数已到达 $count 次，已关闭节点。",
+    "cluster.info.cluster.retry": "将在 $t 秒后重试。",
+    "cluster.info.cluster.storage_count": "当前总计有 $total 个储存，$local 个本地储存，$webdab 个 WebDav 储存。",
+    "cluster.error.cluster.failed_to_start_service": "无法启动服务：$e",
+    "cluster.success.cluster.connected_to_center_server": "成功连接至主控，启动服务中……",
+    "cluster.info.cluster.hosting": "服务器已在 $id.openbmclapi.933.moe:$port 开放。",
+    "cluster.error.cluster.keepalive_failed": "保活失败，正在重连……",
+    "cluster.warn.cluster.kicked": "节点已被强制断开连接。",
+    "cluster.info.cluster.disconnecting": "正在与主控断开连接……",
+    "cluster.info.cluster.next_keepalive": "正在进行下一次保活。",
+    "cluster.info.check_update.checking": "检查更新中……",
+    "cluster.success.check_update.new_version": "发现新版本：$latest！",
+    "cluster.info.check_update.already_up_to_date": "当前已是最新版本。",
+    "cluster.error.check_update.failed": "在尝试获取最新版本是遇到了错误：$e。",
+    "timer.info.task.freezing": "正在冻结任务 <$task>。",
+    "timer.info.task.freezed": "已冻结任务 <$task>。",
+    "plugins.info.attempt_loading": "准备加载插件中……",
+    "plugins.debug.loading": "正在加载插件 plugins.$name。",
+    "plugins.success.loaded": "成功加载插件 [$name]！版本：[$version]，作者：[$author]",
+    "core.warn.port_closed": "端口 $port 已被关闭，正在重新开启……",
+    "core.info.listening": "正在端口 $port 上监听服务器。",
+    "core.info.listening_ssl": "正在端口 $port 上监听 SSL 服务器。",
+    "core.info.shutting_down_web_service": "正在关闭 Web 服务……"
+
 }
diff --git a/plugins/__init__.py b/plugins/__init__.py

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@`
`96`	`96`	`505: "HTTP Version not supported",`
`97`	`97`	`}`
`98`	`98`	`REQUEST_TIME_UNITS = ["ns", "ms", "s", "m", "h"]`
`99`		`-FILECHECK = Config.get("file.check")`
	`99`	`+FILECHECK = Config.get("clueset.file_check_mode")`
`100`	`100`	`STORAGES: list['StorageParse'] = []`
`101`	`101`
`102`	`102`	`@dataclass`