From 29d7f070686c66adc6f90033ebab2a5607d4fa19 Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期三, 25 十二月 2024 14:55:18 +0800
Subject: [PATCH] 新增合并Excel下载后删除相关文件
---
app/api/excel.py | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/app/api/excel.py b/app/api/excel.py
index 5f35b5a..f581508 100644
--- a/app/api/excel.py
+++ b/app/api/excel.py
@@ -1,4 +1,4 @@
-from fastapi import APIRouter, File, UploadFile, Form
+from fastapi import APIRouter, File, UploadFile, Form, BackgroundTasks
from fastapi.responses import JSONResponse, FileResponse
from starlette.websockets import WebSocket
from app.utils.excelmerge.conformity import run_conformity
@@ -131,12 +131,29 @@
@router.get("/download/{filename}")
-async def download_file(filename: str, user_id: str):
+async def download_file(filename: str, user_id: str, background_tasks: BackgroundTasks):
user_excel = user_file_path(user_id, EXCEL_FILES_PATH)
+ user_source = user_file_path(user_id, SOURCE_FILES_PATH)
file_path = os.path.join(user_excel, filename)
if not os.path.exists(file_path):
return JSONResponse(status_code=404, content={"error": "鏂囦欢涓嶅瓨鍦�"})
+ def delete_files_in_directory(directory):
+ for root, dirs, files in os.walk(directory, topdown=False):
+ for name in files:
+ os.remove(os.path.join(root, name))
+ for name in dirs:
+ os.rmdir(os.path.join(root, name))
+
+ def delete_file():
+ try:
+ delete_files_in_directory(user_excel)
+ delete_files_in_directory(user_source)
+ except OSError as e:
+ print(f"Error deleting file {file_path}: {e}")
+
+ background_tasks.add_task(delete_file)
+
return FileResponse(file_path, filename=filename,
media_type='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
--
Gitblit v1.8.0