Merge remote-tracking branch 'origin/master'

apps/admin/dependencies.py

@@ -18,16 +18,15 @@ def create_token(data: dict, expires_in: int = 3600 * 24) -> str:
     :param data: 数据负载
     :param expires_in: 过期时间(秒)
     """
-    header = base64.b64encode(json.dumps({"alg": "HS256", "typ": "JWT"}).encode()).decode()
-    payload = base64.b64encode(json.dumps({
-        **data,
-        "exp": int(time.time()) + expires_in
-    }).encode()).decode()
+    header = base64.b64encode(
+        json.dumps({"alg": "HS256", "typ": "JWT"}).encode()
+    ).decode()
+    payload = base64.b64encode(
+        json.dumps({**data, "exp": int(time.time()) + expires_in}).encode()
+    ).decode()
 
     signature = hmac.new(
-        settings.admin_token.encode(),
-        f"{header}.{payload}".encode(),
-        'sha256'
+        settings.admin_token.encode(), f"{header}.{payload}".encode(), "sha256"
     ).digest()
     signature = base64.b64encode(signature).decode()
 
@@ -41,13 +40,13 @@ def verify_token(token: str) -> dict:
     :return: 解码后的数据
     """
     try:
-        header_b64, payload_b64, signature_b64 = token.split('.')
+        header_b64, payload_b64, signature_b64 = token.split(".")
 
         # 验证签名
         expected_signature = hmac.new(
             settings.admin_token.encode(),
             f"{header_b64}.{payload_b64}".encode(),
-            'sha256'
+            "sha256",
         ).digest()
         expected_signature_b64 = base64.b64encode(expected_signature).decode()
 
@@ -66,7 +65,9 @@ def verify_token(token: str) -> dict:
         raise ValueError(f"token验证失败: {str(e)}")
 
 
-async def admin_required(authorization: str = Header(default=None), request: Request = None):
+async def admin_required(
+    authorization: str = Header(default=None), request: Request = None
+):
     """
     验证管理员权限
     """
@@ -81,12 +82,14 @@ async def admin_required(authorization: str = Header(default=None), request: Req
             except ValueError as e:
                 is_admin = False
 
-        if request.url.path.startswith('/share/'):
+        if request.url.path.startswith("/share/"):
             if not settings.openUpload and not is_admin:
-                raise HTTPException(status_code=403, detail='本站未开启游客上传，如需上传请先登录后台')
+                raise HTTPException(
+                    status_code=403, detail="本站未开启游客上传，如需上传请先登录后台"
+                )
         else:
             if not is_admin:
-                raise HTTPException(status_code=401, detail='未授权或授权校验失败')
+                raise HTTPException(status_code=401, detail="未授权或授权校验失败")
         return is_admin
     except ValueError as e:
         raise HTTPException(status_code=401, detail=str(e))

apps/admin/schemas.py

@@ -7,7 +7,7 @@ class IDData(BaseModel):
 
 class ShareItem(BaseModel):
     expire_value: int
-    expire_style: str = 'day'
+    expire_style: str = "day"
     filename: str
 
 

apps/admin/services.py

@@ -19,16 +19,18 @@ async def delete_file(self, file_id: int):
         await self.file_storage.delete_file(file_code)
         await file_code.delete()
 
-    async def list_files(self, page: int, size: int, keyword: str = ''):
+    async def list_files(self, page: int, size: int, keyword: str = ""):
         offset = (page - 1) * size
-        files = await FileCodes.filter(prefix__icontains=keyword).limit(size).offset(offset)
+        files = (
+            await FileCodes.filter(prefix__icontains=keyword).limit(size).offset(offset)
+        )
         total = await FileCodes.filter(prefix__icontains=keyword).count()
         return files, total
 
     async def download_file(self, file_id: int):
         file_code = await FileCodes.filter(id=file_id).first()
         if not file_code:
-            raise HTTPException(status_code=404, detail='文件不存在')
+            raise HTTPException(status_code=404, detail="文件不存在")
         if file_code.text:
             return APIResponse(detail=file_code.text)
         else:
@@ -37,10 +39,12 @@ async def download_file(self, file_id: int):
     async def share_local_file(self, item):
         local_file = LocalFileClass(item.filename)
         if not await local_file.exists():
-            raise HTTPException(status_code=404, detail='文件不存在')
+            raise HTTPException(status_code=404, detail="文件不存在")
 
         text = await local_file.read()
-        expired_at, expired_count, used_count, code = await get_expire_info(item.expire_value, item.expire_style)
+        expired_at, expired_count, used_count, code = await get_expire_info(
+            item.expire_value, item.expire_style
+        )
         path, suffix, prefix, uuid_file_name, save_path = await get_file_path_name(item)
 
         await self.file_storage.save_file(text, save_path)
@@ -58,8 +62,8 @@ async def share_local_file(self, item):
         )
 
         return {
-            'code': code,
-            'name': local_file.file,
+            "code": code,
+            "name": local_file.file,
         }
 
 
@@ -68,54 +72,67 @@ def get_config(self):
         return settings.items()
 
     async def update_config(self, data: dict):
-        admin_token = data.get('admin_token')
-        if admin_token is None or admin_token == '':
-            raise HTTPException(status_code=400, detail='管理员密码不能为空')
+        admin_token = data.get("admin_token")
+        if admin_token is None or admin_token == "":
+            raise HTTPException(status_code=400, detail="管理员密码不能为空")
 
         for key, value in data.items():
             if key not in settings.default_config:
                 continue
-            if key in ['errorCount', 'errorMinute', 'max_save_seconds', 'onedrive_proxy', 'openUpload', 'port', 's3_proxy', 'uploadCount', 'uploadMinute', 'uploadSize']:
+            if key in [
+                "errorCount",
+                "errorMinute",
+                "max_save_seconds",
+                "onedrive_proxy",
+                "openUpload",
+                "port",
+                "s3_proxy",
+                "uploadCount",
+                "uploadMinute",
+                "uploadSize",
+            ]:
                 data[key] = int(value)
-            elif key in ['opacity']:
+            elif key in ["opacity"]:
                 data[key] = float(value)
             else:
                 data[key] = value
 
-        await KeyValue.filter(key='settings').update(value=data)
+        await KeyValue.filter(key="settings").update(value=data)
         for k, v in data.items():
             settings.__setattr__(k, v)
 
 
 class LocalFileService:
     async def list_files(self):
         files = []
-        if not os.path.exists(data_root / 'local'):
-            os.makedirs(data_root / 'local')
-        for file in os.listdir(data_root / 'local'):
+        if not os.path.exists(data_root / "local"):
+            os.makedirs(data_root / "local")
+        for file in os.listdir(data_root / "local"):
             files.append(LocalFileClass(file))
         return files
 
     async def delete_file(self, filename: str):
         file = LocalFileClass(filename)
         if await file.exists():
             await file.delete()
-            return '删除成功'
-        raise HTTPException(status_code=404, detail='文件不存在')
+            return "删除成功"
+        raise HTTPException(status_code=404, detail="文件不存在")
 
 
 class LocalFileClass:
     def __init__(self, file):
         self.file = file
-        self.path = data_root / 'local' / file
-        self.ctime = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(os.path.getctime(self.path)))
+        self.path = data_root / "local" / file
+        self.ctime = time.strftime(
+            "%Y-%m-%d %H:%M:%S", time.localtime(os.path.getctime(self.path))
+        )
         self.size = os.path.getsize(self.path)
 
     async def read(self):
-        return open(self.path, 'rb')
+        return open(self.path, "rb")
 
     async def write(self, data):
-        with open(self.path, 'w') as f:
+        with open(self.path, "w") as f:
             f.write(data)
 
     async def delete(self):