From e20578685ac326e57a1c242e5e546cc1dd7d8c14 Mon Sep 17 00:00:00 2001 From: Attente <19653207+wikrin@users.noreply.github.com> Date: Sat, 9 Nov 2024 23:59:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=87=8D=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/endpoints/storage.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/api/endpoints/storage.py b/app/api/endpoints/storage.py index 07a19c16..40cfbff5 100644 --- a/app/api/endpoints/storage.py +++ b/app/api/endpoints/storage.py @@ -149,8 +149,11 @@ def rename(fileitem: schemas.FileItem, :param recursive: 是否递归修改 :param _: token """ - if not fileitem.fileid or not new_name: - return schemas.Response(success=False) + if fileitem.storage != 'local': + if not fileitem.fileid or not new_name: + return schemas.Response(success=False, message="ID或新名称为空") + elif not new_name: + return schemas.Response(success=False, message="新名称为空") result = StorageChain().rename_file(fileitem, new_name) if result: if recursive: From 7fc5b7678e48a9babd3fdbbf189ab0ec71758462 Mon Sep 17 00:00:00 2001 From: Attente <19653207+wikrin@users.noreply.github.com> Date: Sun, 10 Nov 2024 07:47:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/endpoints/storage.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/api/endpoints/storage.py b/app/api/endpoints/storage.py index 40cfbff5..3bf1db5b 100644 --- a/app/api/endpoints/storage.py +++ b/app/api/endpoints/storage.py @@ -149,11 +149,10 @@ def rename(fileitem: schemas.FileItem, :param recursive: 是否递归修改 :param _: token """ - if fileitem.storage != 'local': - if not fileitem.fileid or not new_name: - return schemas.Response(success=False, message="ID或新名称为空") - elif not new_name: + if not new_name: return schemas.Response(success=False, message="新名称为空") + if fileitem.storage != 'local' and not fileitem.fileid: + return schemas.Response(success=False, message="资源ID获取失败") result = StorageChain().rename_file(fileitem, new_name) if result: if recursive: