fix: some error

This commit is contained in:
Lan
2025-12-01 11:30:52 +08:00
parent 5f82650c36
commit bd6f646f5d
7 changed files with 39 additions and 25 deletions
+4 -9
View File
@@ -27,14 +27,6 @@ from fastapi.responses import FileResponse
class FileStorageInterface:
_instance: Optional["FileStorageInterface"] = None
def __new__(cls, *args, **kwargs):
if cls._instance is None:
cls._instance = super(FileStorageInterface, cls).__new__(
cls, *args, **kwargs
)
return cls._instance
async def save_file(self, file: UploadFile, save_path: str):
"""
@@ -191,7 +183,10 @@ class SystemFileStorage(FileStorageInterface):
"""
chunk_dir = (self.root_path / save_path).parent / 'chunks'
if chunk_dir.exists():
shutil.rmtree(chunk_dir)
try:
shutil.rmtree(chunk_dir)
except Exception as e:
logger.info(f"清理本地分片目录失败: {e}")
class S3FileStorage(FileStorageInterface):
+8 -2
View File
@@ -30,8 +30,14 @@ async def delete_expire_files():
Q(expired_at__lt=await get_now()) | Q(expired_count=0)
).all()
for exp in expire_data:
await file_storage.delete_file(exp)
await exp.delete()
try:
await file_storage.delete_file(exp)
except Exception as e:
logging.error(f"删除过期文件失败 code={exp.code}: {e}")
try:
await exp.delete()
except Exception as e:
logging.error(f"删除记录失败 code={exp.code}: {e}")
except Exception as e:
logging.error(e)
finally:
+1 -3
View File
@@ -46,9 +46,7 @@ async def get_select_token(code: str):
:return:
"""
token = settings.admin_token
return hashlib.sha256(
f"{code}{int(time.time() / 1000)}000{token}".encode()
).hexdigest()
return hashlib.sha256(f"{code}{int(time.time() / 1000)}000{token}".encode()).hexdigest()
async def get_file_url(code: str):