🐛 修复历史文件当前信息同步
This commit is contained in:
+17
-11
@@ -271,10 +271,12 @@ async def analytics(start: str = "", end: str = ""):
|
|||||||
"deleted": False,
|
"deleted": False,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
bucket["name"] = bucket["name"] or current_name
|
bucket["name"] = current_name
|
||||||
bucket["size"] = bucket["size"] or int(file_item.size or 0)
|
bucket["size"] = int(file_item.size or 0)
|
||||||
bucket["uploaded_at"] = bucket["uploaded_at"] or file_item.created_at
|
bucket["uploaded_at"] = file_item.created_at or bucket["uploaded_at"]
|
||||||
bucket["expired_at"] = bucket["expired_at"] or file_item.expired_at
|
bucket["expired_at"] = file_item.expired_at
|
||||||
|
bucket["deleted"] = False
|
||||||
|
bucket["deleted_at"] = None
|
||||||
created_key = (
|
created_key = (
|
||||||
file_item.created_at.strftime("%Y-%m-%d") if file_item.created_at else ""
|
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:
|
def history_row(code: str, data: dict) -> dict:
|
||||||
file_item = file_map.get(code)
|
file_item = file_map.get(code)
|
||||||
uploaded_at = data.get("uploaded_at") or (
|
current_name = ""
|
||||||
file_item.created_at if file_item else None
|
if file_item:
|
||||||
)
|
current_name = (
|
||||||
expired_at = data.get("expired_at") or (
|
f"{file_item.prefix or ''}{file_item.suffix or ''}"
|
||||||
file_item.expired_at if file_item else None
|
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 {
|
return {
|
||||||
"code": code,
|
"code": code,
|
||||||
"name": data.get("name") or code,
|
"name": current_name or data.get("name") or code,
|
||||||
"size": str(data.get("size") or 0),
|
"size": str(size),
|
||||||
"download_count": data.get("downloads") or 0,
|
"download_count": data.get("downloads") or 0,
|
||||||
"download_traffic": str(data.get("downloadTraffic") or 0),
|
"download_traffic": str(data.get("downloadTraffic") or 0),
|
||||||
"upload_count": data.get("uploads") or 0,
|
"upload_count": data.get("uploads") or 0,
|
||||||
|
|||||||
Reference in New Issue
Block a user