feat: 新增存储路径自定义，修复s3存储未删除文件#246

Author: Lan

apps/base/utils.py

@@ -13,12 +13,19 @@
 async def get_file_path_name(file: UploadFile) -> Tuple[str, str, str, str, str]:
     """获取文件路径和文件名"""
     today = datetime.datetime.now()
-    path = f"share/data/{today.strftime('%Y/%m/%d')}"
-    prefix, suffix = os.path.splitext(file.filename)
+    storage_path = settings.storage_path.strip('/')  # 移除开头和结尾的斜杠
     file_uuid = uuid.uuid4().hex
-    uuid_file_name = f"{file_uuid}{suffix}"
-    save_path = f"{path}/{uuid_file_name}"
-    return path, suffix, prefix, uuid_file_name, save_path
+    
+    # 使用 UUID 作为子目录名
+    base_path = f"share/data/{today.strftime('%Y/%m/%d')}/{file_uuid}"
+    
+    # 如果设置了存储路径，将其添加到基础路径中
+    path = f"{storage_path}/{base_path}" if storage_path else base_path
+    
+    prefix, suffix = os.path.splitext(file.filename)
+    # 保持原始文件名
+    save_path = f"{path}/{file.filename}"
+    return path, suffix, prefix, file.filename, save_path
 
 
 async def get_expire_info(expire_value: int, expire_style: str) -> Tuple[Optional[datetime.datetime], int, int, str]:

core/settings.py

@@ -12,6 +12,7 @@
 
 DEFAULT_CONFIG = {
     'file_storage': 'local',
+    'storage_path': '',
     'name': '文件快递柜 - FileCodeBox',
     'description': '开箱即用的文件快传系统',
     'notify_title': '系统通知',

core/tasks.py

@@ -16,6 +16,7 @@
 
 async def delete_expire_files():
     file_storage: FileStorageInterface = storages[settings.file_storage]()
+    print(settings.file_storage)
     while True:
         try:
             # 遍历 share目录下的所有文件夹，删除空的文件夹，并判断父目录是否为空，如果为空也删除

main.py

@@ -39,13 +39,13 @@ async def lifespan(app: FastAPI):
     # 初始化数据库
     await init_db()
 
-    # 启动后台任务
-    task = asyncio.create_task(delete_expire_files())
-
     # 加载配置
     await load_config()
     app.mount('/assets', StaticFiles(directory=f'./{settings.themesSelect}/assets'), name="assets")
 
+    # 启动后台任务
+    task = asyncio.create_task(delete_expire_files())
+
     try:
         yield
     finally: