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

Author: tianxiu2b2t

README.md

@@ -1,10 +1,6 @@
 <div align="center">
 
-<picture>
-  <source media="(prefers-color-scheme: dark)" srcset="https://d.kstore.space/download/7507/logo_dark.svg">
-  <source media="(prefers-color-scheme: light)" srcset="https://d.kstore.space/download/7507/logo_light.svg">
-  <img alt="logo" src="https://d.kstore.space/download/7507/logo_light.svg" height=400>
-</picture>
+![](https://7507.kstore.space/logo-full.svg?password=44d43eb4b2becd5f936b1c8a3c97df9d-1714584375234)
 
 # OpenBMCLAPI for Python
 

config/config.yml.example

@@ -1,5 +1,6 @@
 advanced:
   auto_update: false
+  copy_from_other_storage: true
   debug: false
   download_threads: 64
   file_check_mode: size

core/cluster.py

@@ -24,7 +24,6 @@
 from core import certificate, dashboard, unit
 from core import scheduler
 import pyzstd as zstd
-from core.timings import logTqdm, logTqdmType
 import core.utils as utils
 import core.stats as stats
 import core.web as web
@@ -280,7 +279,7 @@ async def download(self, miss: list[BMCLAPIFile]):
             unit_divisor=1024,
             total=sum((file.size for file in miss)),
             unit_scale=True,
-        ) as pbar, logTqdm(pbar, logTqdmType.BYTES):
+        ) as pbar:
             await dashboard.set_status_by_tqdm("files.downloading", pbar)
             for file in miss:
                 await self.queues.put(file)
@@ -344,7 +343,7 @@ async def __call__(
             total=len(files) * len(storages.get_storages()),
             unit=locale.t("cluster.tqdm.unit.file"),
             unit_scale=True,
-        ) as pbar, logTqdm(pbar):
+        ) as pbar:
             self.pbar = pbar
             self.files = files
             await dashboard.set_status_by_tqdm("files.checking", pbar)
@@ -379,7 +378,7 @@ async def __call__(
                     ):
                         missing_files_by_storage[storage].add((file, index_storage))
                         total_missing_bytes += file.size
-        if total_missing_bytes != 0 and len(g_storage) >= 2 and FROM_OTHER_STORAGE_COPY:
+        if total_missing_bytes != 0 and len(g_storage) >= 2 and COPY_FROM_OTHER_STORAGE:
             with tqdm(
                 total=total_missing_bytes,
                 desc=locale.t(
@@ -388,7 +387,7 @@ async def __call__(
                 unit="B",
                 unit_divisor=1024,
                 unit_scale=True,
-            ) as pbar, logTqdm(pbar, logTqdmType.BYTES):
+            ) as pbar:
                 await dashboard.set_status_by_tqdm("files.copying", pbar)
                 removes: defaultdict[Storage, set[tuple[BMCLAPIFile, int]]] = (
                     defaultdict(set)
@@ -452,7 +451,7 @@ async def __call__(
                     desc=locale.t("cluster.tqdm.desc.delete_old_files"),
                     unit=locale.t("cluster.tqdm.unit.file"),
                     unit_scale=True,
-                ) as pbar, logTqdm(pbar):
+                ) as pbar:
                     await dashboard.set_status_by_tqdm("files.delete_old", pbar)
                     for storage, filelist in more_files.items():
                         removed = await storage.removes(filelist)
@@ -789,7 +788,7 @@ def stop(tqdm: Optional[tqdm] = None):
             with tqdm(
                 total=len(dirs),
                 desc=f"[WebDav List Files <endpoint: '{self._download_endpoint()}'>]",
-            ) as pbar, logTqdm(pbar):
+            ) as pbar:
                 await dashboard.set_status_by_tqdm("storage.webdav", pbar)
                 r = await self._execute(self.session.list(self._download_endpoint()))
                 if r is asyncio.CancelledError:

core/config.py

@@ -38,7 +38,7 @@
     "advanced.debug": False,
     "advanced.language": "zh_cn",
     "advanced.auto_update": False,
-    "advanced.from_other_storage_copy": True,
+    "advanced.copy_from_other_storage": True,
     "dashboard.username": "admin",
     "dashboard.websocket": True,
     "dashboard.password": "".join(

core/const.py

@@ -122,7 +122,7 @@
 MAX_INSTANCES: int = 9999
 AUTO_DOWNLOAD_RELEASE: bool = Config.get("update.auto_download")
 CERTIFICATE: 'Certificate' = None
-FROM_OTHER_STORAGE_COPY: bool = Config.get("advanced.from_other_storage_copy")
+COPY_FROM_OTHER_STORAGE: bool = Config.get("advanced.copy_from_another_storage")
 
 @dataclass
 class StorageParse:

core/stats.py

@@ -8,7 +8,6 @@
 import pyzstd as zstd
 from tqdm import tqdm
 
-from core.timings import timing
 from core.utils import (
     DataInputStream,
     DataOutputStream,

core/timings.py

@@ -5,7 +5,6 @@
 
 from core import dashboard, logger, scheduler
 from core.const import AUTO_DOWNLOAD_RELEASE, IO_BUFFER, VERSION
-from core.timings import logTqdm, logTqdmType
 
 
 github_api = "https://api.github.com"
@@ -55,7 +54,7 @@ async def download():
         async with session.get(download_url) as resp:
             length = int(resp.headers.get("Content-Length") or 0)
             filename = f"{fetched_version}.zip"
-            with tqdm(total=length, desc="Download Release", unit="b", unit_divisor=1024, unit_scale=True) as pbar, logTqdm(pbar, logTqdmType.BYTES), open(f"./releases/{filename}", "wb") as w:
+            with tqdm(total=length, desc="Download Release", unit="b", unit_divisor=1024, unit_scale=True) as pbar, open(f"./releases/{filename}", "wb") as w:
                 while (data := await resp.content.read(IO_BUFFER)):
                     pbar.update(len(data))
                     w.write(data)

core/update.py

@@ -78,5 +78,5 @@
   "core.info.shutting_down_web_service": "正在关闭 Web 服务……",
   "stats.error.broken_stats": "统计信息已损坏……",
   "system.info.loading": "正在初始化系统信息统计……",
-  "timings.info.finished": "任务 $desc 已完成，耗时 $time（$count / $total）。"
+  "timings.info.finished": "任务已完成，耗时：$time。"
 }

i18n/zh_cn.json

@@ -5,7 +5,7 @@ if [ "$(id -u)" -ne 0 ]; then
 	echo -e "\e[31mERROR: Not root user\e[0m"
 	exit 1
 fi
-MIRROR_PREFIX="https://mirror.ghproxy.com/"
+MIRROR_PREFIX="https://ghproxy.bugungu.top/"
 echo "MIRROR_PREFIX=${MIRROR_PREFIX}"
 
 REPO='TTB-Network/python-openbmclapi'