codfrm/MoviePilot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：优化文件管理api

Browse Source
This commit is contained in:
jxxghp 2024-06-20 11:38:57 +08:00
parent 0fb12c77eb
commit 185b72dc8d
3 changed files with 78 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
app/api/endpoints/aliyun.py
View File

@ -56,29 +56,27 @@ def userinfo(_: schemas.TokenPayload = Depends(verify_token)) -> Any:
return schemas.Response(success=False) return schemas.Response(success=False)
@router.get("/list", summary="所有目录和文件（阿里云盘）", response_model=List[schemas.FileItem]) @router.post("/list", summary="所有目录和文件（阿里云盘）", response_model=List[schemas.FileItem])
def list_aliyun(path: str, def list_aliyun(fileitem: schemas.FileItem,
fileid: str,
filetype: str = "dir",
sort: str = 'updated_at', sort: str = 'updated_at',
_: schemas.TokenPayload = Depends(verify_token)) -> Any: _: schemas.TokenPayload = Depends(verify_token)) -> Any:
""" """
查询当前目录下所有目录和文件 查询当前目录下所有目录和文件
:param path: 当前路径 :param fileitem: 文件夹信息
:param fileid: 文件ID
:param filetype: 文件类型
:param sort: 排序方式，name:按名称排序，time:按修改时间排序 :param sort: 排序方式，name:按名称排序，time:按修改时间排序
:param _: token :param _: token
:return: 所有目录和文件 :return: 所有目录和文件
""" """
if not fileid: if not fileitem.fileid:
return [] return []
if not path: if not fileitem.path:
path = "/" path = "/"
else:
path = fileitem.path
if sort == "time": if sort == "time":
sort = "updated_at" sort = "updated_at"
if filetype == "file": if fileitem.type == "file":
fileinfo = AliyunHelper().get_file_detail(fileid) fileinfo = AliyunHelper().get_file_detail(fileitem.fileid)
if fileinfo: if fileinfo:
return [schemas.FileItem( return [schemas.FileItem(
fileid=fileinfo.get("file_id"), fileid=fileinfo.get("file_id"),
@ -92,7 +90,7 @@ def list_aliyun(path: str,
thumbnail=fileinfo.get("thumbnail") thumbnail=fileinfo.get("thumbnail")
)] )]
return [] return []
items = AliyunHelper().list_files(parent_file_id=fileid, order_by=sort) items = AliyunHelper().list_files(parent_file_id=fileitem.fileid, order_by=sort)
if not items: if not items:
return [] return []
return [schemas.FileItem( return [schemas.FileItem(
@ -108,30 +106,30 @@ def list_aliyun(path: str,
) for item in items] ) for item in items]
@router.get("/mkdir", summary="创建目录（阿里云盘）", response_model=schemas.Response) @router.post("/mkdir", summary="创建目录（阿里云盘）", response_model=schemas.Response)
def mkdir_aliyun(fileid: str, def mkdir_aliyun(fileitem: schemas.FileItem,
name: str, name: str,
_: schemas.TokenPayload = Depends(verify_token)) -> Any: _: schemas.TokenPayload = Depends(verify_token)) -> Any:
""" """
创建目录 创建目录
""" """
if not fileid or not name: if not fileitem.fileid or not name:
return schemas.Response(success=False) return schemas.Response(success=False)
result = AliyunHelper().create_folder(parent_file_id=fileid, name=name) result = AliyunHelper().create_folder(parent_file_id=fileitem.fileid, name=name)
if result: if result:
return schemas.Response(success=True) return schemas.Response(success=True)
return schemas.Response(success=False) return schemas.Response(success=False)
@router.get("/delete", summary="删除文件或目录（阿里云盘）", response_model=schemas.Response) @router.post("/delete", summary="删除文件或目录（阿里云盘）", response_model=schemas.Response)
def delete_aliyun(fileid: str, def delete_aliyun(fileitem: schemas.FileItem,
_: schemas.TokenPayload = Depends(verify_token)) -> Any: _: schemas.TokenPayload = Depends(verify_token)) -> Any:
""" """
删除文件或目录 删除文件或目录
""" """
if not fileid: if not fileitem.fileid:
return schemas.Response(success=False) return schemas.Response(success=False)
result = AliyunHelper().delete_file(fileid) result = AliyunHelper().delete_file(fileitem.fileid)
if result: if result:
return schemas.Response(success=True) return schemas.Response(success=True)
return schemas.Response(success=False) return schemas.Response(success=False)
@ -152,22 +150,23 @@ def download_aliyun(fileid: str,
raise HTTPException(status_code=500, detail="下载文件出错") raise HTTPException(status_code=500, detail="下载文件出错")
@router.get("/rename", summary="重命名文件或目录（阿里云盘）", response_model=schemas.Response) @router.post("/rename", summary="重命名文件或目录（阿里云盘）", response_model=schemas.Response)
def rename_aliyun(fileid: str, new_name: str, path: str, def rename_aliyun(fileitem: schemas.FileItem,
new_name: str,
recursive: bool = False, recursive: bool = False,
_: schemas.TokenPayload = Depends(verify_token)) -> Any: _: schemas.TokenPayload = Depends(verify_token)) -> Any:
""" """
重命名文件或目录 重命名文件或目录
""" """
if not fileid or not new_name: if not fileitem.fileid or not new_name:
return schemas.Response(success=False) return schemas.Response(success=False)
result = AliyunHelper().rename_file(fileid, new_name) result = AliyunHelper().rename_file(fileitem.fileid, new_name)
if result: if result:
if recursive: if recursive:
transferchain = TransferChain() transferchain = TransferChain()
media_exts = settings.RMT_MEDIAEXT + settings.RMT_SUBEXT + settings.RMT_AUDIO_TRACK_EXT media_exts = settings.RMT_MEDIAEXT + settings.RMT_SUBEXT + settings.RMT_AUDIO_TRACK_EXT
# 递归修改目录内文件（智能识别命名） # 递归修改目录内文件（智能识别命名）
sub_files: List[schemas.FileItem] = list_aliyun(path=path, fileid=fileid) sub_files: List[schemas.FileItem] = list_aliyun(fileitem=fileitem)
if sub_files: if sub_files:
# 开始进度 # 开始进度
progress = ProgressHelper() progress = ProgressHelper()
@ -185,7 +184,7 @@ def rename_aliyun(fileid: str, new_name: str, path: str,
continue continue
if f".{sub_file.extension.lower()}" not in media_exts: if f".{sub_file.extension.lower()}" not in media_exts:
continue continue
sub_path = Path(f"{path}{sub_file.name}") sub_path = Path(f"{fileitem.path}{sub_file.name}")
meta = MetaInfoPath(sub_path) meta = MetaInfoPath(sub_path)
mediainfo = transferchain.recognize_media(meta) mediainfo = transferchain.recognize_media(meta)
if not mediainfo: if not mediainfo:
@ -195,8 +194,7 @@ def rename_aliyun(fileid: str, new_name: str, path: str,
if not new_path: if not new_path:
progress.end(ProgressKey.BatchRename) progress.end(ProgressKey.BatchRename)
return schemas.Response(success=False, message=f"{sub_path.name} 未识别到新名称") return schemas.Response(success=False, message=f"{sub_path.name} 未识别到新名称")
ret: schemas.Response = rename_aliyun(fileid=sub_file.fileid, ret: schemas.Response = rename_aliyun(fileitem=sub_file,
path=path,
new_name=Path(new_path).name, new_name=Path(new_path).name,
recursive=False) recursive=False)
if not ret.success: if not ret.success:

44
app/api/endpoints/local.py
View File

@ -20,20 +20,21 @@ router = APIRouter()
IMAGE_TYPES = [".jpg", ".png", ".gif", ".bmp", ".jpeg", ".webp"] IMAGE_TYPES = [".jpg", ".png", ".gif", ".bmp", ".jpeg", ".webp"]
@router.get("/list", summary="所有目录和文件（本地）", response_model=List[schemas.FileItem]) @router.post("/list", summary="所有目录和文件（本地）", response_model=List[schemas.FileItem])
def list_local(path: str, def list_local(fileitem: schemas.FileItem,
sort: str = 'time', sort: str = 'time',
_: schemas.TokenPayload = Depends(verify_token)) -> Any: _: schemas.TokenPayload = Depends(verify_token)) -> Any:
""" """
查询当前目录下所有目录和文件 查询当前目录下所有目录和文件
:param path: 目录路径 :param fileitem: 文件项
:param sort: 排序方式，name:按名称排序，time:按修改时间排序 :param sort: 排序方式，name:按名称排序，time:按修改时间排序
:param _: token :param _: token
:return: 所有目录和文件 :return: 所有目录和文件
""" """
# 返回结果 # 返回结果
ret_items = [] ret_items = []
if not path or path == "/": path = fileitem.path
if not fileitem.path or fileitem.path == "/":
if SystemUtils.is_windows(): if SystemUtils.is_windows():
partitions = SystemUtils.get_windows_drives() or ["C:/"] partitions = SystemUtils.get_windows_drives() or ["C:/"]
for partition in partitions: for partition in partitions:
@ -47,8 +48,8 @@ def list_local(path: str,
else: else:
path = "/" path = "/"
else: else:
if not SystemUtils.is_windows() and not path.startswith("/"): if not SystemUtils.is_windows() and not fileitem.path.startswith("/"):
path = "/" + path path = "/" + fileitem.path
# 遍历目录 # 遍历目录
path_obj = Path(path) path_obj = Path(path)
@ -143,28 +144,30 @@ def list_local_dir(path: str, _: schemas.TokenPayload = Depends(verify_token)) -
return ret_items return ret_items
@router.get("/mkdir", summary="创建目录（本地）", response_model=schemas.Response) @router.post("/mkdir", summary="创建目录（本地）", response_model=schemas.Response)
def mkdir_local(path: str, _: schemas.TokenPayload = Depends(verify_token)) -> Any: def mkdir_local(fileitem: schemas.FileItem,
name: str,
_: schemas.TokenPayload = Depends(verify_token)) -> Any:
""" """
创建目录 创建目录
""" """
if not path: if not fileitem.path:
return schemas.Response(success=False) return schemas.Response(success=False)
path_obj = Path(path) path_obj = Path(fileitem.path) / name
if path_obj.exists(): if path_obj.exists():
return schemas.Response(success=False) return schemas.Response(success=False)
path_obj.mkdir(parents=True, exist_ok=True) path_obj.mkdir(parents=True, exist_ok=True)
return schemas.Response(success=True) return schemas.Response(success=True)
@router.get("/delete", summary="删除文件或目录（本地）", response_model=schemas.Response) @router.post("/delete", summary="删除文件或目录（本地）", response_model=schemas.Response)
def delete_local(path: str, _: schemas.TokenPayload = Depends(verify_token)) -> Any: def delete_local(fileitem: schemas.FileItem, _: schemas.TokenPayload = Depends(verify_token)) -> Any:
""" """
删除文件或目录 删除文件或目录
""" """
if not path: if not fileitem.path:
return schemas.Response(success=False) return schemas.Response(success=False)
path_obj = Path(path) path_obj = Path(fileitem.path)
if not path_obj.exists(): if not path_obj.exists():
return schemas.Response(success=True) return schemas.Response(success=True)
if path_obj.is_file(): if path_obj.is_file():
@ -196,16 +199,17 @@ def download_local(path: str, _: schemas.TokenPayload = Depends(verify_uri_token
return reponse return reponse
@router.get("/rename", summary="重命名文件或目录（本地）", response_model=schemas.Response) @router.post("/rename", summary="重命名文件或目录（本地）", response_model=schemas.Response)
def rename_local(path: str, new_name: str, def rename_local(fileitem: schemas.FileItem,
new_name: str,
recursive: bool = False, recursive: bool = False,
_: schemas.TokenPayload = Depends(verify_token)) -> Any: _: schemas.TokenPayload = Depends(verify_token)) -> Any:
""" """
重命名文件或目录 重命名文件或目录
""" """
if not path or not new_name: if not fileitem.path or not new_name:
return schemas.Response(success=False) return schemas.Response(success=False)
path_obj = Path(path) path_obj = Path(fileitem.path)
if not path_obj.exists(): if not path_obj.exists():
return schemas.Response(success=False) return schemas.Response(success=False)
path_obj.rename(path_obj.parent / new_name) path_obj.rename(path_obj.parent / new_name)
@ -213,7 +217,7 @@ def rename_local(path: str, new_name: str,
transferchain = TransferChain() transferchain = TransferChain()
media_exts = settings.RMT_MEDIAEXT + settings.RMT_SUBEXT + settings.RMT_AUDIO_TRACK_EXT media_exts = settings.RMT_MEDIAEXT + settings.RMT_SUBEXT + settings.RMT_AUDIO_TRACK_EXT
# 递归修改目录内文件（智能识别命名） # 递归修改目录内文件（智能识别命名）
sub_files: List[schemas.FileItem] = list_local(path) sub_files: List[schemas.FileItem] = list_local(fileitem=fileitem)
if sub_files: if sub_files:
# 开始进度 # 开始进度
progress = ProgressHelper() progress = ProgressHelper()
@ -241,7 +245,7 @@ def rename_local(path: str, new_name: str,
if not new_path: if not new_path:
progress.end(ProgressKey.BatchRename) progress.end(ProgressKey.BatchRename)
return schemas.Response(success=False, message=f"{sub_path.name} 未识别到新名称") return schemas.Response(success=False, message=f"{sub_path.name} 未识别到新名称")
ret: schemas.Response = rename_local(new_path, new_name=Path(new_path).name, recursive=False) ret: schemas.Response = rename_local(fileitem, new_name=Path(new_path).name, recursive=False)
if not ret.success: if not ret.success:
progress.end(ProgressKey.BatchRename) progress.end(ProgressKey.BatchRename)
return schemas.Response(success=False, message=f"{sub_path.name} 重命名失败！") return schemas.Response(success=False, message=f"{sub_path.name} 重命名失败！")

59
app/api/endpoints/u115.py
View File

@ -1,4 +1,3 @@
import base64
from pathlib import Path from pathlib import Path
from typing import Any, List from typing import Any, List
@ -56,30 +55,28 @@ def storage(_: schemas.TokenPayload = Depends(verify_token)) -> Any:
return schemas.Response(success=False) return schemas.Response(success=False)
@router.get("/list", summary="所有目录和文件（115网盘）", response_model=List[schemas.FileItem]) @router.post("/list", summary="所有目录和文件（115网盘）", response_model=List[schemas.FileItem])
def list_115(path: str, def list_115(fileitem: schemas.FileItem,
fileid: str,
pickcode: str = None,
filetype: str = "dir",
sort: str = 'updated_at', sort: str = 'updated_at',
_: schemas.TokenPayload = Depends(verify_token)) -> Any: _: schemas.TokenPayload = Depends(verify_token)) -> Any:
""" """
查询当前目录下所有目录和文件 查询当前目录下所有目录和文件
:param path: 当前路径 :param fileitem: 文件项
:param fileid: 文件ID
:param pickcode: 115 pickcode
:param filetype: 文件类型
:param sort: 排序方式，name:按名称排序，time:按修改时间排序 :param sort: 排序方式，name:按名称排序，time:按修改时间排序
:param _: token :param _: token
:return: 所有目录和文件 :return: 所有目录和文件
""" """
if not fileid: if not fileitem.fileid:
return [] return []
if not path: if not fileitem.path:
path = "/" path = "/"
if fileid == "root": else:
path = fileitem.path
if fileitem.fileid == "root":
fileid = "0" fileid = "0"
if filetype == "file": else:
fileid = fileitem.fileid
if fileitem.type == "file":
name = Path(path).name name = Path(path).name
suffix = Path(name).suffix[1:] suffix = Path(name).suffix[1:]
return [schemas.FileItem( return [schemas.FileItem(
@ -88,7 +85,7 @@ def list_115(path: str,
path=path.rstrip('/'), path=path.rstrip('/'),
name=name, name=name,
extension=suffix, extension=suffix,
pickcode=pickcode pickcode=fileitem.pickcode
)] )]
items = U115Helper().list_files(parent_file_id=fileid) items = U115Helper().list_files(parent_file_id=fileid)
if not items: if not items:
@ -111,30 +108,30 @@ def list_115(path: str,
return file_list return file_list
@router.get("/mkdir", summary="创建目录（115网盘）", response_model=schemas.Response) @router.post("/mkdir", summary="创建目录（115网盘）", response_model=schemas.Response)
def mkdir_115(fileid: str, def mkdir_115(fileitem: schemas.FileItem,
name: str, name: str,
_: schemas.TokenPayload = Depends(verify_token)) -> Any: _: schemas.TokenPayload = Depends(verify_token)) -> Any:
""" """
创建目录 创建目录
""" """
if not fileid or not name: if not fileitem.fileid or not name:
return schemas.Response(success=False) return schemas.Response(success=False)
result = U115Helper().create_folder(parent_file_id=fileid, name=name) result = U115Helper().create_folder(parent_file_id=fileitem.fileid, name=name)
if result: if result:
return schemas.Response(success=True) return schemas.Response(success=True)
return schemas.Response(success=False) return schemas.Response(success=False)
@router.get("/delete", summary="删除文件或目录（115网盘）", response_model=schemas.Response) @router.post("/delete", summary="删除文件或目录（115网盘）", response_model=schemas.Response)
def delete_115(fileid: str, def delete_115(fileitem: schemas.FileItem,
_: schemas.TokenPayload = Depends(verify_token)) -> Any: _: schemas.TokenPayload = Depends(verify_token)) -> Any:
""" """
删除文件或目录 删除文件或目录
""" """
if not fileid: if not fileitem.fileid:
return schemas.Response(success=False) return schemas.Response(success=False)
result = U115Helper().delete_file(fileid) result = U115Helper().delete_file(fileitem.fileid)
if result: if result:
return schemas.Response(success=True) return schemas.Response(success=True)
return schemas.Response(success=False) return schemas.Response(success=False)
@ -157,22 +154,23 @@ def download_115(pickcode: str,
return schemas.Response(success=False) return schemas.Response(success=False)
@router.get("/rename", summary="重命名文件或目录（115网盘）", response_model=schemas.Response) @router.post("/rename", summary="重命名文件或目录（115网盘）", response_model=schemas.Response)
def rename_115(fileid: str, new_name: str, path: str, def rename_115(fileitem: schemas.FileItem,
new_name: str,
recursive: bool = False, recursive: bool = False,
_: schemas.TokenPayload = Depends(verify_token)) -> Any: _: schemas.TokenPayload = Depends(verify_token)) -> Any:
""" """
重命名文件或目录 重命名文件或目录
""" """
if not fileid or not new_name: if not fileitem.fileid or not new_name:
return schemas.Response(success=False) return schemas.Response(success=False)
result = U115Helper().rename_file(fileid, new_name) result = U115Helper().rename_file(fileitem.fileid, new_name)
if result: if result:
if recursive: if recursive:
transferchain = TransferChain() transferchain = TransferChain()
media_exts = settings.RMT_MEDIAEXT + settings.RMT_SUBEXT + settings.RMT_AUDIO_TRACK_EXT media_exts = settings.RMT_MEDIAEXT + settings.RMT_SUBEXT + settings.RMT_AUDIO_TRACK_EXT
# 递归修改目录内文件（智能识别命名） # 递归修改目录内文件（智能识别命名）
sub_files: List[schemas.FileItem] = list_115(path=path, fileid=fileid) sub_files: List[schemas.FileItem] = list_115(fileitem)
if sub_files: if sub_files:
# 开始进度 # 开始进度
progress = ProgressHelper() progress = ProgressHelper()
@ -190,7 +188,7 @@ def rename_115(fileid: str, new_name: str, path: str,
continue continue
if f".{sub_file.extension.lower()}" not in media_exts: if f".{sub_file.extension.lower()}" not in media_exts:
continue continue
sub_path = Path(f"{path}{sub_file.name}") sub_path = Path(f"{fileitem.path}{sub_file.name}")
meta = MetaInfoPath(sub_path) meta = MetaInfoPath(sub_path)
mediainfo = transferchain.recognize_media(meta) mediainfo = transferchain.recognize_media(meta)
if not mediainfo: if not mediainfo:
@ -200,8 +198,7 @@ def rename_115(fileid: str, new_name: str, path: str,
if not new_path: if not new_path:
progress.end(ProgressKey.BatchRename) progress.end(ProgressKey.BatchRename)
return schemas.Response(success=False, message=f"{sub_path.name} 未识别到新名称") return schemas.Response(success=False, message=f"{sub_path.name} 未识别到新名称")
ret: schemas.Response = rename_115(fileid=sub_file.fileid, ret: schemas.Response = rename_115(fileitem=sub_file,
path=path,
new_name=Path(new_path).name, new_name=Path(new_path).name,
recursive=False) recursive=False)
if not ret.success: if not ret.success: