fix directories

app/api/endpoints/dashboard.py

@@ -43,23 +43,23 @@ def statistic2(_: str = Depends(verify_apitoken)) -> Any:
     return statistic()
 
 
-@router.get("/storage", summary="存储空间", response_model=schemas.Storage)
+@router.get("/storage", summary="本地存储空间", response_model=schemas.Storage)
 def storage(_: schemas.TokenPayload = Depends(verify_token)) -> Any:
     """
-    查询存储空间信息
+    查询本地存储空间信息
     """
-    library_dirs = DirectoryHelper().get_library_dirs()
-    total_storage, free_storage = SystemUtils.space_usage([Path(d.path) for d in library_dirs if d.path])
+    library_dirs = DirectoryHelper().get_local_library_dirs()
+    total_storage, free_storage = SystemUtils.space_usage([Path(d.library_path) for d in library_dirs])
     return schemas.Storage(
         total_storage=total_storage,
         used_storage=total_storage - free_storage
     )
 
 
-@router.get("/storage2", summary="存储空间（API_TOKEN）", response_model=schemas.Storage)
+@router.get("/storage2", summary="本地存储空间（API_TOKEN）", response_model=schemas.Storage)
 def storage2(_: str = Depends(verify_apitoken)) -> Any:
     """
-    查询存储空间信息 API_TOKEN认证（?token=xxx）
+    查询本地存储空间信息 API_TOKEN认证（?token=xxx）
     """
     return storage()
 
@@ -78,8 +78,8 @@ def downloader(_: schemas.TokenPayload = Depends(verify_token)) -> Any:
     查询下载器信息
     """
     # 下载目录空间
-    download_dirs = DirectoryHelper().get_download_dirs()
-    _, free_space = SystemUtils.space_usage([Path(d.path) for d in download_dirs if d.path])
+    download_dirs = DirectoryHelper().get_local_download_dirs()
+    _, free_space = SystemUtils.space_usage([Path(d.download_path) for d in download_dirs])
     # 下载器信息
     downloader_info = schemas.DownloaderInfo()
     transfer_infos = DashboardChain().downloader_info()

app/api/endpoints/douban.py

@@ -176,7 +176,6 @@ def tv_hot(page: int = 1,
 @router.get("/credits/{doubanid}/{type_name}", summary="豆瓣演员阵容", response_model=List[schemas.MediaPerson])
 def douban_credits(doubanid: str,
                    type_name: str,
-                   page: int = 1,
                    _: schemas.TokenPayload = Depends(verify_token)) -> Any:
     """
     根据豆瓣ID查询演员阵容，type_name: 电影/电视剧

app/api/endpoints/history.py

@@ -1,4 +1,4 @@
-from pathlib import Path
+import json
 from typing import List, Any
 
 from fastapi import APIRouter, Depends
@@ -81,17 +81,19 @@ def delete_transfer_history(history_in: schemas.TransferHistory,
     """
     删除转移历史记录
     """
-    history = TransferHistory.get(db, history_in.id)
+    history: TransferHistory = TransferHistory.get(db, history_in.id)
     if not history:
         return schemas.Response(success=False, msg="记录不存在")
     # 册除媒体库文件
-    if deletedest and history.dest:
-        state, msg = TransferChain().delete_files(Path(history.dest))
+    if deletedest and history.dest_fileitem:
+        dest_fileitem = schemas.FileItem(**json.loads(history.dest_fileitem))
+        state, msg = TransferChain().delete_files(dest_fileitem)
         if not state:
             return schemas.Response(success=False, msg=msg)
     # 删除源文件
-    if deletesrc and history.src:
-        state, msg = TransferChain().delete_files(Path(history.src))
+    if deletesrc and history.dest_fileitem:
+        dest_fileitem = schemas.FileItem(**json.loads(history.dest_fileitem))
+        state, msg = TransferChain().delete_files(dest_fileitem)
         if not state:
             return schemas.Response(success=False, msg=msg)
         # 发送事件

app/api/endpoints/media.py

@@ -120,7 +120,7 @@ def scrape(fileitem: schemas.FileItem,
         if not fileitem.fileid:
             return schemas.Response(success=False, message="刮削文件ID无效")
     # 手动刮削
-    chain.scrape_metadata(storage=storage, fileitem=fileitem, meta=meta, mediainfo=mediainfo)
+    chain.scrape_metadata(fileitem=fileitem, meta=meta, mediainfo=mediainfo)
     return schemas.Response(success=True, message=f"{fileitem.path} 刮削完成")
 
 

app/api/endpoints/mediaserver.py

@@ -119,26 +119,26 @@ def not_exists(media_in: schemas.MediaInfo,
 
 
 @router.get("/latest", summary="最新入库条目", response_model=List[schemas.MediaServerPlayItem])
-def latest(count: int = 18,
+def latest(server: str, count: int = 18,
            userinfo: schemas.TokenPayload = Depends(verify_token)) -> Any:
     """
     获取媒体服务器最新入库条目
     """
-    return MediaServerChain().latest(count=count, username=userinfo.username) or []
+    return MediaServerChain().latest(server=server, count=count, username=userinfo.username) or []
 
 
 @router.get("/playing", summary="正在播放条目", response_model=List[schemas.MediaServerPlayItem])
-def playing(count: int = 12,
+def playing(server: str, count: int = 12,
             userinfo: schemas.TokenPayload = Depends(verify_token)) -> Any:
     """
     获取媒体服务器正在播放条目
     """
-    return MediaServerChain().playing(count=count, username=userinfo.username) or []
+    return MediaServerChain().playing(server=server, count=count, username=userinfo.username) or []
 
 
 @router.get("/library", summary="媒体库列表", response_model=List[schemas.MediaServerLibrary])
-def library(userinfo: schemas.TokenPayload = Depends(verify_token)) -> Any:
+def library(server: str, userinfo: schemas.TokenPayload = Depends(verify_token)) -> Any:
     """
     获取媒体服务器媒体库列表
     """
-    return MediaServerChain().librarys(username=userinfo.username) or []
+    return MediaServerChain().librarys(server=server, username=userinfo.username) or []

app/api/endpoints/plugin.py

@@ -164,7 +164,7 @@ def plugin_dashboard(plugin_id: str, user_agent: Annotated[str | None, Header()]
     """
     根据插件ID获取插件仪表板
     """
-    return PluginManager().get_plugin_dashboard(plugin_id, key=None, user_agent=user_agent)
+    return PluginManager().get_plugin_dashboard(plugin_id, user_agent=user_agent)
 
 
 @router.get("/dashboard/{plugin_id}/{key}", summary="获取插件仪表板配置")

app/api/endpoints/transfer.py

@@ -96,14 +96,14 @@ def manual_transfer(fileitem: FileItem = None,
         force = True
         if history.status and ("move" in history.mode):
             # 重新整理成功的转移，则使用成功的 dest 做 in_path
-            src_fileitem = json.loads(history.dest_fileitem)
+            src_fileitem = FileItem(**json.loads(history.dest_fileitem))
         else:
             # 源路径
-            src_fileitem = json.loads(history.src_fileitem)
+            src_fileitem = FileItem(**json.loads(history.src_fileitem))
             # 目的路径
             if history.dest_fileitem:
                 # 删除旧的已整理文件
-                dest_fileitem = json.loads(history.dest_fileitem)
+                dest_fileitem = FileItem(**json.loads(history.dest_fileitem))
                 transfer.delete_files(dest_fileitem)
     elif fileitem:
         src_fileitem = fileitem