From c08beec2326d189322a0e3e0ef4db3cfcfe3a887 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Sat, 29 Mar 2025 22:02:59 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BC=98=E5=8C=96=E6=9C=AA?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/modules/filemanager/storages/alipan.py | 10 +++++++--- app/modules/filemanager/storages/u115.py | 8 ++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/modules/filemanager/storages/alipan.py b/app/modules/filemanager/storages/alipan.py index c9621912..1c3db540 100644 --- a/app/modules/filemanager/storages/alipan.py +++ b/app/modules/filemanager/storages/alipan.py @@ -20,6 +20,10 @@ from app.utils.string import StringUtils lock = threading.Lock() +class NoCheckInException(Exception): + pass + + class AliPan(StorageBase, metaclass=Singleton): """ 阿里云盘相关操作 @@ -64,7 +68,7 @@ class AliPan(StorageBase, metaclass=Singleton): 检查会话是否过期 """ if not self.access_token: - raise Exception("【阿里云盘】请先扫码登录!") + raise NoCheckInException("【阿里云盘】请先扫码登录!") @property def _default_drive_id(self) -> str: @@ -74,7 +78,7 @@ class AliPan(StorageBase, metaclass=Singleton): conf = self.get_conf() drive_id = conf.get("resource_drive_id") or conf.get("backup_drive_id") or conf.get("default_drive_id") if not drive_id: - raise Exception("【阿里云盘】请先扫码登录!") + raise NoCheckInException("【阿里云盘】请先扫码登录!") return drive_id @property @@ -951,5 +955,5 @@ class AliPan(StorageBase, metaclass=Singleton): total=total_size, available=total_size - used_size ) - except KeyError: + except NoCheckInException: return None diff --git a/app/modules/filemanager/storages/u115.py b/app/modules/filemanager/storages/u115.py index eda7edb0..edd5d48e 100644 --- a/app/modules/filemanager/storages/u115.py +++ b/app/modules/filemanager/storages/u115.py @@ -24,6 +24,10 @@ from app.utils.string import StringUtils lock = threading.Lock() +class NoCheckInException(Exception): + pass + + class U115Pan(StorageBase, metaclass=Singleton): """ 115相关操作 @@ -70,7 +74,7 @@ class U115Pan(StorageBase, metaclass=Singleton): 检查会话是否过期 """ if not self.access_token: - raise Exception("【115】请先扫码登录!") + raise NoCheckInException("【115】请先扫码登录!") @property def access_token(self) -> Optional[str]: @@ -850,5 +854,5 @@ class U115Pan(StorageBase, metaclass=Singleton): total=space["all_total"]["size"], available=space["all_remain"]["size"] ) - except KeyError: + except NoCheckInException: return None