From 5025228ad5aebd704d49498077b32b533b81e17f Mon Sep 17 00:00:00 2001 From: Orion Date: Fri, 5 Jun 2026 16:04:05 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E6=96=87=E4=BB=B6=E5=BD=93=E5=89=8D=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/admin/views.py | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/apps/admin/views.py b/apps/admin/views.py index 83e3c9d..5f01b70 100644 --- a/apps/admin/views.py +++ b/apps/admin/views.py @@ -271,10 +271,12 @@ async def analytics(start: str = "", end: str = ""): "deleted": False, }, ) - bucket["name"] = bucket["name"] or current_name - bucket["size"] = bucket["size"] or int(file_item.size or 0) - bucket["uploaded_at"] = bucket["uploaded_at"] or file_item.created_at - bucket["expired_at"] = bucket["expired_at"] or file_item.expired_at + bucket["name"] = current_name + bucket["size"] = int(file_item.size or 0) + bucket["uploaded_at"] = file_item.created_at or bucket["uploaded_at"] + bucket["expired_at"] = file_item.expired_at + bucket["deleted"] = False + bucket["deleted_at"] = None created_key = ( file_item.created_at.strftime("%Y-%m-%d") if file_item.created_at else "" ) @@ -299,16 +301,20 @@ async def analytics(start: str = "", end: str = ""): def history_row(code: str, data: dict) -> dict: file_item = file_map.get(code) - uploaded_at = data.get("uploaded_at") or ( - file_item.created_at if file_item else None - ) - expired_at = data.get("expired_at") or ( - file_item.expired_at if file_item else None - ) + current_name = "" + if file_item: + current_name = ( + f"{file_item.prefix or ''}{file_item.suffix or ''}" + or file_item.uuid_file_name + or file_item.code + ) + uploaded_at = file_item.created_at if file_item else data.get("uploaded_at") + expired_at = file_item.expired_at if file_item else data.get("expired_at") + size = int(file_item.size or 0) if file_item else data.get("size") or 0 return { "code": code, - "name": data.get("name") or code, - "size": str(data.get("size") or 0), + "name": current_name or data.get("name") or code, + "size": str(size), "download_count": data.get("downloads") or 0, "download_traffic": str(data.get("downloadTraffic") or 0), "upload_count": data.get("uploads") or 0,