chore: 优化导入

Author: tianxiu2b2t

assets/js/common.js

@@ -143,6 +143,14 @@ class Element {
         this._render_i18n();
         return this;
     }
+    aria_label(text) {
+        if (Utils.isEmpty(text)) {
+            this._base.removeAttribute("title")
+        } else {
+            this._base.setAttribute("title", text)
+        }
+        return this
+    }
     _render_i18n() {
         if (this._i18n_key == null) {
             return;

assets/js/index.js

@@ -992,6 +992,17 @@ $style.addAll({
     }
 })
 class Tools {
+    static _NUMBER_UNITS = {
+        "": 1,
+        "K": 1e3,
+        "M": 1e3,
+        "B": 1e3,
+        "T": 1e3,
+        "P": 1e3,
+        "E": 1e3,
+        "Z": 1e3,
+        "Y": 1e3,
+    }
     static formatTime(seconds) {
         if (seconds < 0 || seconds == null) return $i18n.t("format.count_time.days", {
             day: "--",
@@ -1027,6 +1038,8 @@ class Tools {
         value_i18n: "",
         title_variable: () => { },
         value_variable: () => { },
+        aria_label_value: () => { },
+        aria_label_title: () => { },
         i18n: {}
     }) {
         var i18n = params.i18n || {};
@@ -1039,17 +1052,28 @@ class Tools {
                 "value"
             ]) {
                 label[key].i18n(params[key + "_i18n"])
+                var title = ref({}, {
+                    handler: (args) => {
+                        console.log(args)
+                        label[key].aria_label(args.object.value)
+                    }
+                })
                 var obj = ref({}, {
                     handler: (args) => {
                         label[key].t18n(args.object)
                     }
                 })
-                var handler = params[key + "_variable"]
-                if (!handler) continue;
-                try {
-                    handler(obj)
-                } catch (e) {
-                    console.error(e)
+                var handlers = [
+                    [params[key + "_variable"], obj],
+                    [params["aria_label_" + key], title],
+                ]
+                for (let [handler, o] of handlers) {
+                    if (!handler) continue;
+                    try {
+                        handler(o)
+                    } catch (e) {
+                        console.error(e)
+                    }
                 }
             }
         })
@@ -1100,6 +1124,18 @@ class Tools {
         // convert number to belike: 100,000, if 100000.0, we are 100,000.0
         return number.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ", ")
     }
+    static formatUnitNumber(number) {
+        var i = 0
+        for (const [u, un] of Object.entries(Tools._NUMBER_UNITS).slice(1)) {
+            if (number / un < 1) {
+                break
+            }
+            number /= un
+            i += 1
+        }
+        let unit = Object.keys(Tools._NUMBER_UNITS)[i]
+        return `${number.toFixed(unit.length != 0 ? (number % 1 == 0 ? 0 : 1) : 2)}${unit}`
+    }
     static _BYTES = {
         "iB": 1,
         "KiB": 1024,
@@ -1141,7 +1177,6 @@ class UserAuth {
         })
     }
 }
-
 const $userAuth = new UserAuth();
 
 async function load() {
@@ -1334,6 +1369,9 @@ async function load() {
                                 value_variable: (obj) => {
                                     $dashboard_locals.files_info_today_hits = obj;
                                 },
+                                aria_label_value: (obj) => {
+                                    $dashboard_locals.files_info_today_hits_label = obj;
+                                },
                                 i18n: {
                                     "zh_CN": {
                                         "dashboard.title.today.hits": "今日下载数",
@@ -1360,6 +1398,9 @@ async function load() {
                                 value_variable: (obj) => {
                                     $dashboard_locals.files_info_30days_hits = obj;
                                 },
+                                aria_label_value: (obj) => {
+                                    $dashboard_locals.files_info_30days_hits_label = obj;
+                                },
                                 i18n: {
                                     "zh_CN": {
                                         "dashboard.title.30days.hits": "30 天下载数",
@@ -1920,28 +1961,32 @@ async function load() {
                                     handler, obj, data
                                  } of [
                                     {
-                                         handler: Tools.formatSimpleNumber,
-                                         obj: $dashboard_locals.files_info_today_hits,
+                                         handler: Tools.formatUnitNumber,
+                                         obj: 'today_hits',
                                          data: rdata.hourly_hits
                                     },
                                     {
-                                         handler: Tools.formatSimpleNumber,
-                                         obj: $dashboard_locals.files_info_30days_hits,
+                                         handler: Tools.formatUnitNumber,
+                                         obj: '30days_hits',
                                          data: rdata.daily_hits
                                     },
                                     {
                                          handler: Tools.formatBytes,
-                                         obj: $dashboard_locals.files_info_today_bytes,
+                                         obj: 'today_bytes',
                                          data: rdata.hourly_bytes
                                     },
                                     {
                                         handler: Tools.formatBytes,
-                                        obj: $dashboard_locals.files_info_30days_bytes,
+                                        obj: '30days_bytes',
                                         data: rdata.daily_bytes
                                     }
                                 ]) {
                                     var formatted = handler(data)
-                                    obj.value = formatted
+                                    var o = $dashboard_locals[`files_info_${obj}`]
+                                    var label = $dashboard_locals[`files_info_${obj}_label`]
+                                    o.value = formatted
+                                    if (label == undefined) continue
+                                    label.value = data
                                 }
                             })();
                             for (const [statistics_type, data] of Object.entries(temp_response)) {

core/cache.py

@@ -1,6 +1,4 @@
-import abc
 import collections
-from dataclasses import dataclass
 import inspect
 import time
 from typing import Any, Iterator, MutableMapping, Optional, TypeVar

core/cluster.py

@@ -16,8 +16,7 @@
 import aiohttp
 from tqdm import tqdm
 
-from . import web
-from . import utils, logger, config, scheduler, units, storages, i18n, dashboard
+from . import web, utils, logger, config, scheduler, units, storages, i18n, dashboard
 from .storages import File as SFile, MeasureFile
 import socketio
 import urllib.parse as urlparse

core/dashboard.py

@@ -1,35 +1,30 @@
 import asyncio
 import base64
 from collections import defaultdict, deque
-from dataclasses import asdict, dataclass, field, fields, is_dataclass
+from dataclasses import asdict, dataclass, is_dataclass
 import datetime
 import enum
 import io
 import json
 import os
 from pathlib import Path
 import socket
-import sys
 import threading
 import time
 from typing import Any, Optional
 
 import aiohttp
 import psutil
 
-from core import cache, cluster, config, logger, units
+from . import cache, cluster, config, logger, units, utils, scheduler, database as db
 import ipdb
-from . import utils
 
-from . import scheduler
 from .web import (
     routes as route,
     time_qps
 )
 from aiohttp import web
 
-from . import database as db
-
 @dataclass
 class CollectionUsage:
     total: int

core/database.py

@@ -215,7 +215,6 @@ def decompress(data: bytes) -> defaultdict[str, int]:
         logger.ttraceback("database.error.unable.to.decompress", data=data)
         return defaultdict(lambda: 0)
 
-
 def commit():
     try:
         global FILE_CACHE
@@ -299,7 +298,6 @@ def init_storages_key(*storage: storages.iStorage):
                 q.update({"data": content})
         session.commit()
 
-
 async def init():
     Base.metadata.create_all(engine)
     scheduler.run_repeat_later(commit, 5, 10)

core/logger.py

@@ -1,6 +1,5 @@
 import sys
 import traceback
-from typing import Optional
 from loguru import logger as Logger
 from .config import const
 

core/units.py

@@ -42,7 +42,6 @@ def format_bytes(n: float) -> str:
         i += 1
     return f'{n:.2f}{BYTES_UNITS[i][0]}'
 
-
 def format_number(n: float) -> str:
     i = 0
     for u, un in NUMBER_UNITS[1:]:
@@ -52,7 +51,6 @@ def format_number(n: float) -> str:
         i += 1
     return f'{n:.2f}{NUMBER_UNITS[i][0]}'
 
-
 def format_count_time(n: float, round: int = 2) -> str:
     i = 0
     for u, un in TIME_UNITS[1:]:
@@ -75,7 +73,6 @@ def format_count_datetime(secs: float) -> str:
     else:
         return f'{m:02d}:{s:02d}'
 
-
 def format_datetime_from_timestamp(seconds: float):
     return datetime.fromtimestamp(seconds).strftime('%Y-%m-%d %H:%M:%S')
 

core/utils.py

@@ -407,24 +407,20 @@ def parse_time(time_str: str):
         setattr(obj, maps[unit], value)
     return obj
 
-
 async def run_sync(func, *args, **kwargs):
     loop = asyncio.get_running_loop()
     return await loop.run_in_executor(None, func, *args, **kwargs)
 
-
 @dataclass
 class ServiceError:
     code: str
     httpCode: int
     message: str
     name: str
 
-
 wrapper_tqdms: deque[WrapperTQDM] = deque()
 status_manager: StatusManager = StatusManager()
 
-
 def retry(max_retries: int = 3, delay: float = 1.0):
     def decorator(func):
         @functools.wraps(func)
@@ -463,9 +459,11 @@ def _raise_invalid_id(oid: str):
         "%r is not a valid ObjectId, it must be a 12-byte input"
         " or a 24-character hex string" % oid
     )
+
 def _random_bytes() -> bytes:
     """Get the 5-byte random field of an ObjectId."""
     return os.urandom(5)
+
 class ObjectId:
     _pid = os.getpid()
     _inc = SystemRandom().randint(0, _MAX_COUNTER_VALUE)
@@ -571,6 +569,7 @@ def __hash__(self) -> int:
         return hash(self.__id)
 
 ZERO: timedelta = timedelta(0)
+
 class FixedOffset(tzinfo):
     def __init__(self, offset: Union[float, timedelta], name: str) -> None:
         if isinstance(offset, timedelta):
@@ -588,4 +587,5 @@ def tzname(self, dt: Optional[datetime]) -> str:
         return self.__name
     def dst(self, dt: Optional[datetime]) -> timedelta:
         return ZERO
+
 utc: FixedOffset = FixedOffset(0, "UTC")

core/web.py

@@ -114,6 +114,7 @@ async def special_response():
         await asyncio.sleep(random.randint(30, 180))
     status = random.choice(DISALLOW_PUBLIC_DASHBOARD)
     return web.Response(status=status)
+
 REQUEST_BUFFER = 4096
 IO_BUFFER = 16384
 FINDING_FILTER = "127.0.0.1"
@@ -166,6 +167,7 @@ async def special_response():
     431,
     451,
 ]
+
 ip_tables: dict[tuple[str, int], tuple[str, int]] = {}
 ip_count: defaultdict[tuple[str, int], int] = defaultdict(int)
 app = web.Application(
@@ -174,12 +176,10 @@ async def special_response():
     ]
 )
 routes = web.RouteTableDef()
-
 runner: Optional[web.AppRunner] = None
 site: Optional[web.TCPSite] = None
 public_servers: deque[asyncio.Server] = deque()
 privates: dict[tuple[str, str], PrivateSSLServer] = {}
-
 time_qps: defaultdict[int, int] = defaultdict(int)
 xff: int = config.const.xff
 
@@ -368,7 +368,6 @@ def start():
         await start()
     logger.tsuccess("web.success.public_port", port=port, current=len(public_servers), total=count)
 
-
 def get_public_port():
     port = int(config.const.port)
     if port < 0: