update:删除过期文件夹的方式

Author: vastsa

main.py

@@ -98,7 +98,7 @@ async def admin_delete(code: str, s: AsyncSession = Depends(get_session)):
 async def config(s: AsyncSession = Depends(get_session)):
     # 从数据库获取系统配置
     data = (await s.execute(select(Values).filter(Values.key == 'config'))).scalar_one_or_none()
-    return {'detail': '获取成功', 'data': data.value}
+    return {'detail': '获取成功', 'data': data.value if data else {}}
 
 
 @app.get('/')

storage.py

@@ -57,14 +57,14 @@ async def delete_files(self, texts):
         tasks = [self.delete_file(text) for text in texts]
         await asyncio.gather(*tasks)
 
-    async def judge_delete_folder(self, filepath):
-        currpath = os.path.dirname(filepath)
-        if os.listdir(currpath):
-            return
-        while str(currpath) != (str(os.path.join(self.DATA_ROOT, 'upload'))):
-            if not os.listdir(currpath):
-                os.rmdir(os.path.abspath(currpath))
-            currpath = os.path.dirname(currpath)
+    def judge_delete_folder(self, filepath):
+        current = filepath.parent
+        while current != self.DATA_ROOT:
+            if not list(current.iterdir()):
+                os.rmdir(current)
+                current = current.parent
+            else:
+                break
 
 
 STORAGE_ENGINE = {