From 20aba7eb1727b38baf857e2cb9fff9ccf5dadf11 Mon Sep 17 00:00:00 2001 From: Attente <19653207+wikrin@users.noreply.github.com> Date: Wed, 7 May 2025 18:19:11 +0800 Subject: [PATCH 01/11] =?UTF-8?q?fix:=20#4228=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=AE=A2=E9=98=85=E4=BC=A0=E5=85=A5=20`MetaBase`,=20=E4=B8=8A?= =?UTF-8?q?=E4=B8=8B=E6=96=87=E5=A2=9E=E5=8A=A0=20`username`=20=E5=AD=97?= =?UTF-8?q?=E6=AE=B5,=20=E5=8E=9F=E5=A7=8B=E5=AF=B9=E8=B1=A1=E5=BC=95?= =?UTF-8?q?=E7=94=A8=E9=BB=98=E8=AE=A4=E5=BC=80=E5=90=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/chain/download.py | 3 ++- app/chain/subscribe.py | 4 +++- app/chain/transfer.py | 3 ++- app/helper/message.py | 5 ++++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/chain/download.py b/app/chain/download.py index 73a49f06..e917a424 100644 --- a/app/chain/download.py +++ b/app/chain/download.py @@ -339,7 +339,8 @@ class DownloadChain(ChainBase): meta=_meta, mediainfo=_media, torrentinfo=_torrent, - download_episodes=download_episodes + download_episodes=download_episodes, + username=username, ) # 下载成功后处理 self.download_added(context=context, download_dir=download_dir, torrent_path=torrent_file) diff --git a/app/chain/subscribe.py b/app/chain/subscribe.py index 218620c9..fb0f5176 100644 --- a/app/chain/subscribe.py +++ b/app/chain/subscribe.py @@ -241,6 +241,7 @@ class SubscribeChain(ChainBase, metaclass=Singleton): link=link, username=username ), + meta=metainfo, mediainfo=mediainfo, username=username ) @@ -1023,7 +1024,8 @@ class SubscribeChain(ChainBase, metaclass=Singleton): ), meta=meta, mediainfo=mediainfo, - msgstr=msgstr + msgstr=msgstr, + username=subscribe.username ) # 发送事件 EventManager().send_event(EventType.SubscribeComplete, { diff --git a/app/chain/transfer.py b/app/chain/transfer.py index e3b1b60c..ba14ee1e 100644 --- a/app/chain/transfer.py +++ b/app/chain/transfer.py @@ -1385,5 +1385,6 @@ class TransferChain(ChainBase, metaclass=Singleton): meta=meta, mediainfo=mediainfo, transferinfo=transferinfo, - season_episode=season_episode + season_episode=season_episode, + username=username ) diff --git a/app/helper/message.py b/app/helper/message.py index 51524751..533df1ba 100644 --- a/app/helper/message.py +++ b/app/helper/message.py @@ -42,7 +42,7 @@ class TemplateContextBuilder: transferinfo: Optional[TransferInfo] = None, file_extension: Optional[str] = None, episodes_info: Optional[List[TmdbEpisode]] = None, - include_raw_objects: bool = False, + include_raw_objects: bool = True, **kwargs ) -> Dict[str, Any]: """ @@ -80,8 +80,11 @@ class TemplateContextBuilder: "en_title": self.__convert_invalid_characters(mediainfo.en_title), # 原语种标题 "original_title": self.__convert_invalid_characters(mediainfo.original_title), + # 季号 + "season": self._context.get("season") or mediainfo.season, # 年份 "year": mediainfo.year or self._context.get("year"), + # 媒体标题 + 年份 "title_year": mediainfo.title_year or self._context.get("title_year"), } From f83787508f4a59cfaf269e4422b939e6da927284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=AF=E5=A4=A7=E4=BE=A0?= Date: Wed, 7 May 2025 18:36:24 +0800 Subject: [PATCH 02/11] fix #4236 --- app/modules/trimemedia/trimemedia.py | 1 + 1 file changed, 1 insertion(+) diff --git a/app/modules/trimemedia/trimemedia.py b/app/modules/trimemedia/trimemedia.py index 58603d6e..b7c858e1 100644 --- a/app/modules/trimemedia/trimemedia.py +++ b/app/modules/trimemedia/trimemedia.py @@ -44,6 +44,7 @@ class TrimeMedia: self._playhost = play_api.host elif play_host: logger.warning(f"请检查外网播放地址 {play_host}") + self._playhost = UrlUtils.standardize_base_url(play_host).rstrip("/") self.reconnect() From 5eca5a601190035d08b508770c944d60c1fac173 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Thu, 8 May 2025 09:47:43 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=BC=98=E5=8C=96U115Pan=E7=B1=BB?= =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E6=94=AF=E6=8C=81=E5=A4=9A=E7=BA=BF=E7=A8=8B=E5=B9=B6?= =?UTF-8?q?=E5=8F=91=E4=B8=8A=E4=BC=A0=E5=92=8C=E5=8A=A8=E6=80=81=E5=88=86?= =?UTF-8?q?=E7=89=87=E8=AE=A1=E7=AE=97=EF=BC=8C=E6=8F=90=E5=8D=87=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=95=88=E7=8E=87=E5=92=8C=E7=A8=B3=E5=AE=9A=E6=80=A7?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/modules/filemanager/storages/u115.py | 191 ++++++++++++++++------- 1 file changed, 132 insertions(+), 59 deletions(-) diff --git a/app/modules/filemanager/storages/u115.py b/app/modules/filemanager/storages/u115.py index 16bbc204..396024e1 100644 --- a/app/modules/filemanager/storages/u115.py +++ b/app/modules/filemanager/storages/u115.py @@ -4,8 +4,11 @@ import json import secrets import threading import time +from concurrent.futures import ThreadPoolExecutor, as_completed from pathlib import Path +from queue import Queue from typing import List, Dict, Optional, Tuple, Union +import io import oss2 import requests @@ -54,6 +57,11 @@ class U115Pan(StorageBase, metaclass=Singleton): # CID和路径缓存 _id_cache: Dict[str, str] = {} + # 最大线程数 + MAX_WORKERS = 10 + # 最大分片大小(1GB) + MAX_PART_SIZE = 1024 * 1024 * 1024 + def __init__(self): super().__init__() self.session = requests.Session() @@ -399,16 +407,63 @@ class U115Pan(StorageBase, metaclass=Singleton): modify_time=int(time.time()) ) + def _calc_parts(self, file_size: int) -> Tuple[int, int]: + """ + 计算最优分片大小和线程数 + """ + # 根据文件大小计算合适的分片数 + if file_size <= 100 * 1024 * 1024: # 小于100MB + return 10 * 1024 * 1024, min(3, self.MAX_WORKERS) # 10MB分片 + elif file_size <= 1024 * 1024 * 1024: # 小于1GB + return 100 * 1024 * 1024, min(5, self.MAX_WORKERS) # 100MB分片 + else: + # 文件较大,使用较大分片 + part_size = min(file_size // self.MAX_WORKERS, self.MAX_PART_SIZE) + return part_size, min(file_size // part_size + 1, self.MAX_WORKERS) + + def _upload_part(self, bucket: oss2.Bucket, object_name: str, upload_id: str, + part_number: int, part_data: bytes, progress_queue: Queue) -> PartInfo: + """ + 上传单个分片 + """ + try: + result = bucket.upload_part(object_name, upload_id, part_number, part_data) + part_info = PartInfo(part_number, result.etag) + # 将上传进度放入队列 + progress_queue.put(len(part_data)) + logger.info(f"【115】分片 {part_number} 上传完成") + return part_info + except Exception as e: + logger.error(f"【115】分片 {part_number} 上传失败: {str(e)}") + raise + + def _log_progress(self, desc: str, total: int) -> tqdm: + """ + 创建一个可以输出到日志的进度条 + """ + class TqdmToLogger(io.StringIO): + def write(s, buf): + buf = buf.strip('\r\n\t ') + if buf: + logger.info(buf) + + return tqdm( + total=total, + unit='B', + unit_scale=True, + desc=desc, + file=TqdmToLogger(), + mininterval=1.0, + maxinterval=5.0, + miniters=1 + ) + def upload(self, target_dir: schemas.FileItem, local_path: Path, new_name: Optional[str] = None) -> Optional[schemas.FileItem]: """ - 实现带秒传、断点续传和二次认证的文件上传 + 实现带秒传、断点续传和多线程并发上传 """ - def encode_callback(cb: dict): - """ - 回调参数Base64编码函数 - """ return oss2.utils.b64encode_as_string(json.dumps(cb).strip()) target_name = new_name or local_path.name @@ -440,6 +495,7 @@ class U115Pan(StorageBase, metaclass=Singleton): if not init_resp.get("state"): logger.warn(f"【115】初始化上传失败: {init_resp.get('error')}") return None + # 结果 init_result = init_resp.get("data") logger.debug(f"【115】上传 Step 1 初始化结果: {init_result}") @@ -457,15 +513,10 @@ class U115Pan(StorageBase, metaclass=Singleton): sign_checks = sign_check.split("-") start = int(sign_checks[0]) end = int(sign_checks[1]) - # 计算指定区间的SHA1 - # sign_check （用下划线隔开,截取上传文内容的sha1）(单位是byte): "2392148-2392298" with open(local_path, "rb") as f: - # 取2392148-2392298之间的内容(包含2392148、2392298)的sha1 f.seek(start) chunk = f.read(end - start + 1) sign_val = hashlib.sha1(chunk).hexdigest().upper() - # 重新初始化请求 - # sign_key，sign_val(根据sign_check计算的值大写的sha1值) init_data.update({ "pick_code": pick_code, "sign_key": sign_key, @@ -478,7 +529,6 @@ class U115Pan(StorageBase, metaclass=Singleton): ) if not init_resp: return None - # 二次认证结果 init_result = init_resp.get("data") logger.debug(f"【115】上传 Step 2 二次认证结果: {init_result}") if not pick_code: @@ -505,7 +555,7 @@ class U115Pan(StorageBase, metaclass=Singleton): logger.warn("【115】获取上传凭证失败") return None logger.debug(f"【115】上传 Step 4 获取上传凭证结果: {token_resp}") - # 上传凭证 + endpoint = token_resp.get("endpoint") AccessKeyId = token_resp.get("AccessKeyId") AccessKeySecret = token_resp.get("AccessKeySecret") @@ -528,69 +578,89 @@ class U115Pan(StorageBase, metaclass=Singleton): if resume_resp.get("callback"): callback = resume_resp["callback"] - # Step 6: 对象存储上传 + # Step 6: 多线程分片上传 auth = oss2.StsAuth( access_key_id=AccessKeyId, access_key_secret=AccessKeySecret, security_token=SecurityToken ) - bucket = oss2.Bucket(auth, endpoint, bucket_name) # noqa - # 处理oss请求回调 - callback_dict = json.loads(callback.get("callback")) - callback_var_dict = json.loads(callback.get("callback_var")) - # 补充参数 - logger.debug(f"【115】上传 Step 6 回调参数：{callback_dict} {callback_var_dict}") - # 填写不能包含Bucket名称在内的Object完整路径，例如exampledir/exampleobject.txt。 - # determine_part_size方法用于确定分片大小，设置分片大小为 100M - part_size = determine_part_size(file_size, preferred_size=100 * 1024 * 1024) + bucket = oss2.Bucket(auth, endpoint, bucket_name) + + # 计算分片大小和线程数 + part_size, workers = self._calc_parts(file_size) + logger.info(f"【115】开始上传: {local_path} -> {target_path}，" + f"分片大小：{StringUtils.str_filesize(part_size)}，线程数：{workers}") # 初始化进度条 - logger.info(f"【115】开始上传: {local_path} -> {target_path}，分片大小：{StringUtils.str_filesize(part_size)}") - progress_bar = tqdm( - total=file_size, - unit='B', - unit_scale=True, - desc="上传进度", - ascii=True - ) + progress_bar = self._log_progress(f"【115】{target_name} 上传进度", file_size) - # 初始化分片 + # 初始化分片上传 upload_id = bucket.init_multipart_upload(object_name, - params={ - "encoding-type": "url", - "sequential": "" - }).upload_id - parts = [] - # 逐个上传分片 - with open(local_path, 'rb') as fileobj: - part_number = 1 - offset = 0 - while offset < file_size: - num_to_upload = min(part_size, file_size - offset) - # 调用SizedFileAdapter(fileobj, size)方法会生成一个新的文件对象，重新计算起始追加位置。 - logger.info(f"【115】开始上传 {target_name} 分片 {part_number}: {offset} -> {offset + num_to_upload}") - result = bucket.upload_part(object_name, upload_id, part_number, - data=SizedFileAdapter(fileobj, num_to_upload)) - parts.append(PartInfo(part_number, result.etag)) - logger.info(f"【115】{target_name} 分片 {part_number} 上传完成") - offset += num_to_upload - part_number += 1 - # 更新进度 - progress_bar.update(num_to_upload) + params={ + "encoding-type": "url", + "sequential": "" + }).upload_id - # 关闭进度条 - if progress_bar: - progress_bar.close() + # 创建进度队列 + progress_queue = Queue() + + # 创建线程池 + with ThreadPoolExecutor(max_workers=workers) as pool: + futures = [] + parts = [] + + # 提交上传任务 + with open(local_path, 'rb') as fileobj: + part_number = 1 + offset = 0 + while offset < file_size: + size = min(part_size, file_size - offset) + fileobj.seek(offset) + part_data = fileobj.read(size) + future = pool.submit( + self._upload_part, + bucket, + object_name, + upload_id, + part_number, + part_data, + progress_queue + ) + futures.append(future) + offset += size + part_number += 1 - # 请求头 + # 更新进度条 + while len(parts) < len(futures): + try: + uploaded = progress_queue.get(timeout=1) + progress_bar.update(uploaded) + except: + pass + + # 等待所有任务完成 + for future in as_completed(futures): + try: + part_info = future.result() + parts.append(part_info) + except Exception as e: + logger.error(f"【115】分片上传失败: {str(e)}") + progress_bar.close() + return None + + # 按分片号排序 + parts.sort(key=lambda x: x.part_number) + + # 完成上传 headers = { - 'X-oss-callback': encode_callback(callback_dict), - 'x-oss-callback-var': encode_callback(callback_var_dict), + 'X-oss-callback': encode_callback(callback["callback"]), + 'x-oss-callback-var': encode_callback(callback["callback_var"]), 'x-oss-forbid-overwrite': 'false' } + try: result = bucket.complete_multipart_upload(object_name, upload_id, parts, - headers=headers) + headers=headers) if result.status == 200: logger.debug(f"【115】上传 Step 6 回调结果：{result.resp.response.json()}") logger.info(f"【115】{target_name} 上传成功") @@ -603,6 +673,9 @@ class U115Pan(StorageBase, metaclass=Singleton): else: logger.error(f"【115】{target_name} 上传失败: {e.status}, 错误码: {e.code}, 详情: {e.message}") return None + finally: + progress_bar.close() + # 返回结果 return self.get_item(target_path) From ea31072ae59fa01aaa93ac102d9b346a1601df4c Mon Sep 17 00:00:00 2001 From: jxxghp Date: Thu, 8 May 2025 09:52:32 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E4=BC=98=E5=8C=96AliPan=E7=B1=BB?= =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=A4=9A=E7=BA=BF=E7=A8=8B=E5=88=86?= =?UTF-8?q?=E7=89=87=E4=B8=8A=E4=BC=A0=E5=92=8C=E5=8A=A8=E6=80=81=E5=88=86?= =?UTF-8?q?=E7=89=87=E8=AE=A1=E7=AE=97=EF=BC=8C=E6=8F=90=E5=8D=87=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=95=88=E7=8E=87=E5=92=8C=E8=BF=9B=E5=BA=A6=E7=9B=91?= =?UTF-8?q?=E6=8E=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/modules/filemanager/storages/alipan.py | 201 +++++++++++++-------- 1 file changed, 130 insertions(+), 71 deletions(-) diff --git a/app/modules/filemanager/storages/alipan.py b/app/modules/filemanager/storages/alipan.py index 1c3db540..9b02f4e1 100644 --- a/app/modules/filemanager/storages/alipan.py +++ b/app/modules/filemanager/storages/alipan.py @@ -3,8 +3,11 @@ import hashlib import secrets import threading import time +from concurrent.futures import ThreadPoolExecutor, as_completed from pathlib import Path +from queue import Queue from typing import List, Dict, Optional, Tuple, Union +import io import requests from tqdm import tqdm @@ -50,6 +53,11 @@ class AliPan(StorageBase, metaclass=Singleton): # CID和路径缓存 _id_cache: Dict[str, Tuple[str, str]] = {} + # 最大线程数 + MAX_WORKERS = 10 + # 最大分片大小(1GB) + MAX_PART_SIZE = 1024 * 1024 * 1024 + def __init__(self): super().__init__() self.session = requests.Session() @@ -628,22 +636,77 @@ class AliPan(StorageBase, metaclass=Singleton): raise Exception(resp.get("message")) return resp + def _calc_parts(self, file_size: int) -> Tuple[int, int]: + """ + 计算最优分片大小和线程数 + """ + # 根据文件大小计算合适的分片数 + if file_size <= 100 * 1024 * 1024: # 小于100MB + return 10 * 1024 * 1024, min(3, self.MAX_WORKERS) # 10MB分片 + elif file_size <= 1024 * 1024 * 1024: # 小于1GB + return 100 * 1024 * 1024, min(5, self.MAX_WORKERS) # 100MB分片 + else: + # 文件较大,使用较大分片 + part_size = min(file_size // self.MAX_WORKERS, self.MAX_PART_SIZE) + return part_size, min(file_size // part_size + 1, self.MAX_WORKERS) + + def _log_progress(self, desc: str, total: int) -> tqdm: + """ + 创建一个可以输出到日志的进度条 + """ + class TqdmToLogger(io.StringIO): + def write(s, buf): + buf = buf.strip('\r\n\t ') + if buf: + logger.info(buf) + + return tqdm( + total=total, + unit='B', + unit_scale=True, + desc=desc, + file=TqdmToLogger(), + mininterval=1.0, + maxinterval=5.0, + miniters=1 + ) + + def _upload_part(self, upload_url: str, data: bytes, part_num: int, + progress_queue: Queue) -> Tuple[int, str]: + """ + 上传单个分片 + """ + try: + response = requests.put(upload_url, data=data) + if response and response.status_code == 200: + # 将上传进度放入队列 + progress_queue.put(len(data)) + logger.info(f"【阿里云盘】分片 {part_num} 上传完成") + return part_num, response.headers.get('ETag', '') + else: + raise Exception(f"上传失败: {response.status_code if response else 'No Response'}") + except Exception as e: + logger.error(f"【阿里云盘】分片 {part_num} 上传失败: {str(e)}") + raise + def upload(self, target_dir: schemas.FileItem, local_path: Path, new_name: Optional[str] = None) -> Optional[schemas.FileItem]: """ - 文件上传：分片、支持秒传 + 文件上传：多线程分片、支持秒传 """ target_name = new_name or local_path.name target_path = Path(target_dir.path) / target_name file_size = local_path.stat().st_size - # 1. 创建文件并检查秒传 - chunk_size = 100 * 1024 * 1024 # 分片大小 100M + # 1. 计算分片大小和线程数 + part_size, workers = self._calc_parts(file_size) + + # 2. 创建文件并检查秒传 create_res = self._create_file(drive_id=target_dir.drive_id, - parent_file_id=target_dir.fileid, - file_name=target_name, - file_path=local_path, - chunk_size=chunk_size) + parent_file_id=target_dir.fileid, + file_name=target_name, + file_path=local_path, + chunk_size=part_size) if create_res.get('rapid_upload', False): logger.info(f"【阿里云盘】{target_name} 秒传完成！") return self.get_item(target_path) @@ -652,93 +715,89 @@ class AliPan(StorageBase, metaclass=Singleton): logger.info(f"【阿里云盘】{target_name} 已存在") return self.get_item(target_path) - # 2. 准备分片上传参数 + # 3. 准备分片上传参数 file_id = create_res.get('file_id') if not file_id: logger.warn(f"【阿里云盘】创建 {target_name} 文件失败！") return None upload_id = create_res.get('upload_id') part_info_list = create_res.get('part_info_list') - uploaded_parts = set() + uploaded_parts = {} - # 3. 获取已上传分片 + # 4. 获取已上传分片 uploaded_info = self._list_uploaded_parts(drive_id=target_dir.drive_id, file_id=file_id, upload_id=upload_id) for part in uploaded_info.get('uploaded_parts', []): - uploaded_parts.add(part['part_number']) + uploaded_parts[part['part_number']] = part.get('etag', '') - # 4. 初始化进度条 - logger.info(f"【阿里云盘】开始上传: {local_path} -> {target_path}，分片数：{len(part_info_list)}") - progress_bar = tqdm( - total=file_size, - unit='B', - unit_scale=True, - desc="上传进度", - ascii=True - ) + # 5. 初始化进度条 + logger.info(f"【阿里云盘】开始上传: {local_path} -> {target_path}，" + f"分片大小：{StringUtils.str_filesize(part_size)}，线程数：{workers}") + progress_bar = self._log_progress(f"【阿里云盘】{target_name} 上传进度", file_size) - # 5. 分片上传循环 - with open(local_path, 'rb') as f: - for part_info in part_info_list: - part_num = part_info['part_number'] + # 6. 创建进度队列 + progress_queue = Queue() - # 计算分片参数 - start = (part_num - 1) * chunk_size - end = min(start + chunk_size, file_size) - current_chunk_size = end - start + # 7. 创建线程池 + with ThreadPoolExecutor(max_workers=workers) as pool: + futures = [] + + # 提交上传任务 + with open(local_path, 'rb') as f: + for part_info in part_info_list: + part_num = part_info['part_number'] + + # 跳过已上传的分片 + if part_num in uploaded_parts: + start = (part_num - 1) * part_size + end = min(start + part_size, file_size) + progress_bar.update(end - start) + continue - # 更新进度条（已存在的分片） - if part_num in uploaded_parts: - progress_bar.update(current_chunk_size) - continue + # 准备分片数据 + start = (part_num - 1) * part_size + end = min(start + part_size, file_size) + f.seek(start) + data = f.read(end - start) - # 准备分片数据 - f.seek(start) - data = f.read(current_chunk_size) + # 提交上传任务 + future = pool.submit( + self._upload_part, + part_info['upload_url'], + data, + part_num, + progress_queue + ) + futures.append((part_num, future)) - # 上传分片（带重试逻辑） - success = False - for attempt in range(3): # 最大重试次数 - try: - # 获取当前上传地址（可能刷新） - if attempt > 0: - new_urls = self._refresh_upload_urls(drive_id=target_dir.drive_id, file_id=file_id, - upload_id=upload_id, part_numbers=[part_num]) - upload_url = new_urls[0]['upload_url'] - else: - upload_url = part_info['upload_url'] + # 更新进度条 + while len(uploaded_parts) < len(part_info_list): + try: + uploaded = progress_queue.get(timeout=1) + progress_bar.update(uploaded) + except: + pass - # 执行上传 - logger.info( - f"【阿里云盘】开始 第{attempt + 1}次 上传 {target_name} 分片 {part_num} ...") - response = self._upload_part(upload_url=upload_url, data=data) - if response is None: - continue - if response.status_code == 200: - success = True - break - else: - logger.warn( - f"【阿里云盘】{target_name} 分片 {part_num} 第 {attempt + 1} 次上传失败：{response.text}！") - except Exception as e: - logger.warn(f"【阿里云盘】{target_name} 分片 {part_num} 上传异常: {str(e)}！") + # 等待所有任务完成 + for part_num, future in futures: + try: + num, etag = future.result() + uploaded_parts[num] = etag + except Exception as e: + logger.error(f"【阿里云盘】分片上传失败: {str(e)}") + progress_bar.close() + return None - # 处理上传结果 - if success: - uploaded_parts.add(part_num) - progress_bar.update(current_chunk_size) - else: - raise Exception(f"【阿里云盘】{target_name} 分片 {part_num} 上传失败！") + # 8. 关闭进度条 + progress_bar.close() - # 6. 关闭进度条 - if progress_bar: - progress_bar.close() - - # 7. 完成上传 + # 9. 完成上传 result = self._complete_upload(drive_id=target_dir.drive_id, file_id=file_id, upload_id=upload_id) if not result: raise Exception("【阿里云盘】完成上传失败！") if result.get("code"): logger.warn(f"【阿里云盘】{target_name} 上传失败：{result.get('message')}！") + return None + return self.__get_fileitem(result, parent=target_dir.path) def download(self, fileitem: schemas.FileItem, path: Path = None) -> Optional[Path]: From 570dddc1207ef8672027b3772ca902b478332385 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Thu, 8 May 2025 09:56:43 +0800 Subject: [PATCH 05/11] fix --- app/modules/filemanager/storages/alipan.py | 44 ++++++++++------------ app/modules/filemanager/storages/u115.py | 43 +++++++++++---------- 2 files changed, 43 insertions(+), 44 deletions(-) diff --git a/app/modules/filemanager/storages/alipan.py b/app/modules/filemanager/storages/alipan.py index 9b02f4e1..ead220f7 100644 --- a/app/modules/filemanager/storages/alipan.py +++ b/app/modules/filemanager/storages/alipan.py @@ -1,13 +1,13 @@ import base64 import hashlib +import io import secrets import threading import time -from concurrent.futures import ThreadPoolExecutor, as_completed +from concurrent.futures import ThreadPoolExecutor from pathlib import Path -from queue import Queue +from queue import Queue, Empty from typing import List, Dict, Optional, Tuple, Union -import io import requests from tqdm import tqdm @@ -591,13 +591,6 @@ class AliPan(StorageBase, metaclass=Singleton): raise Exception(resp.get("message")) return resp.get('part_info_list', []) - @staticmethod - def _upload_part(upload_url: str, data: bytes): - """ - 上传单个分片 - """ - return requests.put(upload_url, data=data) - def _list_uploaded_parts(self, drive_id: str, file_id: str, upload_id: str) -> dict: """ 获取已上传分片列表 @@ -650,12 +643,14 @@ class AliPan(StorageBase, metaclass=Singleton): part_size = min(file_size // self.MAX_WORKERS, self.MAX_PART_SIZE) return part_size, min(file_size // part_size + 1, self.MAX_WORKERS) - def _log_progress(self, desc: str, total: int) -> tqdm: + @staticmethod + def _log_progress(desc: str, total: int) -> tqdm: """ 创建一个可以输出到日志的进度条 """ + class TqdmToLogger(io.StringIO): - def write(s, buf): + def write(s, buf): # noqa buf = buf.strip('\r\n\t ') if buf: logger.info(buf) @@ -671,8 +666,9 @@ class AliPan(StorageBase, metaclass=Singleton): miniters=1 ) - def _upload_part(self, upload_url: str, data: bytes, part_num: int, - progress_queue: Queue) -> Tuple[int, str]: + @staticmethod + def _upload_part(upload_url: str, data: bytes, part_num: int, + progress_queue: Queue) -> Tuple[int, str]: """ 上传单个分片 """ @@ -700,13 +696,13 @@ class AliPan(StorageBase, metaclass=Singleton): # 1. 计算分片大小和线程数 part_size, workers = self._calc_parts(file_size) - + # 2. 创建文件并检查秒传 create_res = self._create_file(drive_id=target_dir.drive_id, - parent_file_id=target_dir.fileid, - file_name=target_name, - file_path=local_path, - chunk_size=part_size) + parent_file_id=target_dir.fileid, + file_name=target_name, + file_path=local_path, + chunk_size=part_size) if create_res.get('rapid_upload', False): logger.info(f"【阿里云盘】{target_name} 秒传完成！") return self.get_item(target_path) @@ -731,7 +727,7 @@ class AliPan(StorageBase, metaclass=Singleton): # 5. 初始化进度条 logger.info(f"【阿里云盘】开始上传: {local_path} -> {target_path}，" - f"分片大小：{StringUtils.str_filesize(part_size)}，线程数：{workers}") + f"分片大小：{StringUtils.str_filesize(part_size)}，线程数：{workers}") progress_bar = self._log_progress(f"【阿里云盘】{target_name} 上传进度", file_size) # 6. 创建进度队列 @@ -740,12 +736,12 @@ class AliPan(StorageBase, metaclass=Singleton): # 7. 创建线程池 with ThreadPoolExecutor(max_workers=workers) as pool: futures = [] - + # 提交上传任务 with open(local_path, 'rb') as f: for part_info in part_info_list: part_num = part_info['part_number'] - + # 跳过已上传的分片 if part_num in uploaded_parts: start = (part_num - 1) * part_size @@ -774,7 +770,7 @@ class AliPan(StorageBase, metaclass=Singleton): try: uploaded = progress_queue.get(timeout=1) progress_bar.update(uploaded) - except: + except Empty: pass # 等待所有任务完成 @@ -797,7 +793,7 @@ class AliPan(StorageBase, metaclass=Singleton): if result.get("code"): logger.warn(f"【阿里云盘】{target_name} 上传失败：{result.get('message')}！") return None - + return self.__get_fileitem(result, parent=target_dir.path) def download(self, fileitem: schemas.FileItem, path: Path = None) -> Optional[Path]: diff --git a/app/modules/filemanager/storages/u115.py b/app/modules/filemanager/storages/u115.py index 396024e1..584b2c7b 100644 --- a/app/modules/filemanager/storages/u115.py +++ b/app/modules/filemanager/storages/u115.py @@ -1,18 +1,17 @@ import base64 import hashlib +import io import json import secrets import threading import time from concurrent.futures import ThreadPoolExecutor, as_completed from pathlib import Path -from queue import Queue +from queue import Queue, Empty from typing import List, Dict, Optional, Tuple, Union -import io import oss2 import requests -from oss2 import SizedFileAdapter, determine_part_size from oss2.models import PartInfo from tqdm import tqdm @@ -421,8 +420,9 @@ class U115Pan(StorageBase, metaclass=Singleton): part_size = min(file_size // self.MAX_WORKERS, self.MAX_PART_SIZE) return part_size, min(file_size // part_size + 1, self.MAX_WORKERS) - def _upload_part(self, bucket: oss2.Bucket, object_name: str, upload_id: str, - part_number: int, part_data: bytes, progress_queue: Queue) -> PartInfo: + @staticmethod + def _upload_part(bucket: oss2.Bucket, object_name: str, upload_id: str, + part_number: int, part_data: bytes, progress_queue: Queue) -> PartInfo: """ 上传单个分片 """ @@ -437,12 +437,14 @@ class U115Pan(StorageBase, metaclass=Singleton): logger.error(f"【115】分片 {part_number} 上传失败: {str(e)}") raise - def _log_progress(self, desc: str, total: int) -> tqdm: + @staticmethod + def _log_progress(desc: str, total: int) -> tqdm: """ 创建一个可以输出到日志的进度条 """ + class TqdmToLogger(io.StringIO): - def write(s, buf): + def write(s, buf): # noqa buf = buf.strip('\r\n\t ') if buf: logger.info(buf) @@ -463,6 +465,7 @@ class U115Pan(StorageBase, metaclass=Singleton): """ 实现带秒传、断点续传和多线程并发上传 """ + def encode_callback(cb: dict): return oss2.utils.b64encode_as_string(json.dumps(cb).strip()) @@ -495,7 +498,7 @@ class U115Pan(StorageBase, metaclass=Singleton): if not init_resp.get("state"): logger.warn(f"【115】初始化上传失败: {init_resp.get('error')}") return None - + # 结果 init_result = init_resp.get("data") logger.debug(f"【115】上传 Step 1 初始化结果: {init_result}") @@ -555,7 +558,7 @@ class U115Pan(StorageBase, metaclass=Singleton): logger.warn("【115】获取上传凭证失败") return None logger.debug(f"【115】上传 Step 4 获取上传凭证结果: {token_resp}") - + endpoint = token_resp.get("endpoint") AccessKeyId = token_resp.get("AccessKeyId") AccessKeySecret = token_resp.get("AccessKeySecret") @@ -584,31 +587,31 @@ class U115Pan(StorageBase, metaclass=Singleton): access_key_secret=AccessKeySecret, security_token=SecurityToken ) - bucket = oss2.Bucket(auth, endpoint, bucket_name) + bucket = oss2.Bucket(auth, endpoint, bucket_name) # noqa # 计算分片大小和线程数 part_size, workers = self._calc_parts(file_size) logger.info(f"【115】开始上传: {local_path} -> {target_path}，" - f"分片大小：{StringUtils.str_filesize(part_size)}，线程数：{workers}") + f"分片大小：{StringUtils.str_filesize(part_size)}，线程数：{workers}") # 初始化进度条 progress_bar = self._log_progress(f"【115】{target_name} 上传进度", file_size) # 初始化分片上传 upload_id = bucket.init_multipart_upload(object_name, - params={ - "encoding-type": "url", - "sequential": "" - }).upload_id + params={ + "encoding-type": "url", + "sequential": "" + }).upload_id # 创建进度队列 progress_queue = Queue() - + # 创建线程池 with ThreadPoolExecutor(max_workers=workers) as pool: futures = [] parts = [] - + # 提交上传任务 with open(local_path, 'rb') as fileobj: part_number = 1 @@ -635,7 +638,7 @@ class U115Pan(StorageBase, metaclass=Singleton): try: uploaded = progress_queue.get(timeout=1) progress_bar.update(uploaded) - except: + except Empty: pass # 等待所有任务完成 @@ -657,10 +660,10 @@ class U115Pan(StorageBase, metaclass=Singleton): 'x-oss-callback-var': encode_callback(callback["callback_var"]), 'x-oss-forbid-overwrite': 'false' } - + try: result = bucket.complete_multipart_upload(object_name, upload_id, parts, - headers=headers) + headers=headers) if result.status == 200: logger.debug(f"【115】上传 Step 6 回调结果：{result.resp.response.json()}") logger.info(f"【115】{target_name} 上传成功") From 5788520401339c1a010b6897555c319d09e2225a Mon Sep 17 00:00:00 2001 From: jxxghp Date: Thu, 8 May 2025 10:09:24 +0800 Subject: [PATCH 06/11] =?UTF-8?q?fix=20=E9=98=BF=E9=87=8C=E4=BA=91?= =?UTF-8?q?=E7=9B=98=E4=BC=9A=E8=AF=9D=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/modules/filemanager/storages/alipan.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/modules/filemanager/storages/alipan.py b/app/modules/filemanager/storages/alipan.py index ead220f7..4190e943 100644 --- a/app/modules/filemanager/storages/alipan.py +++ b/app/modules/filemanager/storages/alipan.py @@ -27,6 +27,10 @@ class NoCheckInException(Exception): pass +class SessionInvalidException(Exception): + pass + + class AliPan(StorageBase, metaclass=Singleton): """ 阿里云盘相关操作 @@ -185,7 +189,7 @@ class AliPan(StorageBase, metaclass=Singleton): 确认登录后，获取相关token """ if not self._auth_state: - raise Exception("【阿里云盘】请先生成二维码") + raise SessionInvalidException("【阿里云盘】请先生成二维码") resp = self.session.post( f"{self.base_url}/oauth/access_token", json={ @@ -196,7 +200,7 @@ class AliPan(StorageBase, metaclass=Singleton): } ) if resp is None: - raise Exception("【阿里云盘】获取 access_token 失败") + raise SessionInvalidException("【阿里云盘】获取 access_token 失败") result = resp.json() if result.get("code"): raise Exception(f"【阿里云盘】{result.get('code')} - {result.get('message')}！") @@ -207,7 +211,7 @@ class AliPan(StorageBase, metaclass=Singleton): 刷新access_token """ if not refresh_token: - raise Exception("【阿里云盘】会话失效，请重新扫码登录！") + raise SessionInvalidException("【阿里云盘】会话失效，请重新扫码登录！") resp = self.session.post( f"{self.base_url}/oauth/access_token", json={ @@ -650,7 +654,7 @@ class AliPan(StorageBase, metaclass=Singleton): """ class TqdmToLogger(io.StringIO): - def write(s, buf): # noqa + def write(s, buf): # noqa buf = buf.strip('\r\n\t ') if buf: logger.info(buf) @@ -1012,3 +1016,5 @@ class AliPan(StorageBase, metaclass=Singleton): ) except NoCheckInException: return None + except SessionInvalidException: + return None From ff75db310f1575ecd30507dc1c93aa6c942751f2 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Thu, 8 May 2025 12:03:39 +0800 Subject: [PATCH 07/11] fix upload parts --- app/modules/filemanager/storages/alipan.py | 45 +++++++----------- app/modules/filemanager/storages/u115.py | 53 ++++++++-------------- 2 files changed, 36 insertions(+), 62 deletions(-) diff --git a/app/modules/filemanager/storages/alipan.py b/app/modules/filemanager/storages/alipan.py index 4190e943..efadc885 100644 --- a/app/modules/filemanager/storages/alipan.py +++ b/app/modules/filemanager/storages/alipan.py @@ -6,7 +6,6 @@ import threading import time from concurrent.futures import ThreadPoolExecutor from pathlib import Path -from queue import Queue, Empty from typing import List, Dict, Optional, Tuple, Union import requests @@ -61,6 +60,8 @@ class AliPan(StorageBase, metaclass=Singleton): MAX_WORKERS = 10 # 最大分片大小(1GB) MAX_PART_SIZE = 1024 * 1024 * 1024 + # 最小分片大小(100MB) + MIN_PART_SIZE = 100 * 1024 * 1024 def __init__(self): super().__init__() @@ -635,17 +636,17 @@ class AliPan(StorageBase, metaclass=Singleton): def _calc_parts(self, file_size: int) -> Tuple[int, int]: """ - 计算最优分片大小和线程数 + 计算最优分片大小和线程数，在最大分片大小和最小分片大小之间取最优值 + :param file_size: 文件大小 + :return: 分片大小，线程数 """ - # 根据文件大小计算合适的分片数 - if file_size <= 100 * 1024 * 1024: # 小于100MB - return 10 * 1024 * 1024, min(3, self.MAX_WORKERS) # 10MB分片 - elif file_size <= 1024 * 1024 * 1024: # 小于1GB - return 100 * 1024 * 1024, min(5, self.MAX_WORKERS) # 100MB分片 + if file_size <= self.MIN_PART_SIZE: + return file_size, 1 + if file_size >= self.MAX_PART_SIZE: + part_size = self.MAX_PART_SIZE else: - # 文件较大,使用较大分片 - part_size = min(file_size // self.MAX_WORKERS, self.MAX_PART_SIZE) - return part_size, min(file_size // part_size + 1, self.MAX_WORKERS) + part_size = max(self.MIN_PART_SIZE, file_size // self.MAX_WORKERS) + return part_size, (file_size + part_size - 1) // part_size @staticmethod def _log_progress(desc: str, total: int) -> tqdm: @@ -671,18 +672,15 @@ class AliPan(StorageBase, metaclass=Singleton): ) @staticmethod - def _upload_part(upload_url: str, data: bytes, part_num: int, - progress_queue: Queue) -> Tuple[int, str]: + def _upload_part(upload_url: str, data: bytes, part_num: int) -> Tuple[int, str, int]: """ 上传单个分片 """ try: response = requests.put(upload_url, data=data) if response and response.status_code == 200: - # 将上传进度放入队列 - progress_queue.put(len(data)) logger.info(f"【阿里云盘】分片 {part_num} 上传完成") - return part_num, response.headers.get('ETag', '') + return part_num, response.headers.get('ETag', ''), len(data) else: raise Exception(f"上传失败: {response.status_code if response else 'No Response'}") except Exception as e: @@ -734,9 +732,6 @@ class AliPan(StorageBase, metaclass=Singleton): f"分片大小：{StringUtils.str_filesize(part_size)}，线程数：{workers}") progress_bar = self._log_progress(f"【阿里云盘】{target_name} 上传进度", file_size) - # 6. 创建进度队列 - progress_queue = Queue() - # 7. 创建线程池 with ThreadPoolExecutor(max_workers=workers) as pool: futures = [] @@ -764,24 +759,16 @@ class AliPan(StorageBase, metaclass=Singleton): self._upload_part, part_info['upload_url'], data, - part_num, - progress_queue + part_num ) futures.append((part_num, future)) - # 更新进度条 - while len(uploaded_parts) < len(part_info_list): - try: - uploaded = progress_queue.get(timeout=1) - progress_bar.update(uploaded) - except Empty: - pass - # 等待所有任务完成 for part_num, future in futures: try: - num, etag = future.result() + num, etag, uploaded = future.result() uploaded_parts[num] = etag + progress_bar.update(uploaded) except Exception as e: logger.error(f"【阿里云盘】分片上传失败: {str(e)}") progress_bar.close() diff --git a/app/modules/filemanager/storages/u115.py b/app/modules/filemanager/storages/u115.py index 584b2c7b..e3aa8524 100644 --- a/app/modules/filemanager/storages/u115.py +++ b/app/modules/filemanager/storages/u115.py @@ -1,13 +1,11 @@ import base64 import hashlib import io -import json import secrets import threading import time from concurrent.futures import ThreadPoolExecutor, as_completed from pathlib import Path -from queue import Queue, Empty from typing import List, Dict, Optional, Tuple, Union import oss2 @@ -60,6 +58,8 @@ class U115Pan(StorageBase, metaclass=Singleton): MAX_WORKERS = 10 # 最大分片大小(1GB) MAX_PART_SIZE = 1024 * 1024 * 1024 + # 最小分片大小(100MB) + MIN_PART_SIZE = 100 * 1024 * 1024 def __init__(self): super().__init__() @@ -382,7 +382,7 @@ class U115Pan(StorageBase, metaclass=Singleton): "POST", "/open/folder/add", data={ - "pid": int(parent_item.fileid), + "pid": int(parent_item.fileid or "0"), "file_name": name } ) @@ -408,31 +408,29 @@ class U115Pan(StorageBase, metaclass=Singleton): def _calc_parts(self, file_size: int) -> Tuple[int, int]: """ - 计算最优分片大小和线程数 + 计算最优分片大小和线程数，在最大分片大小和最小分片大小之间取最优值 + :param file_size: 文件大小 + :return: 分片大小，线程数 """ - # 根据文件大小计算合适的分片数 - if file_size <= 100 * 1024 * 1024: # 小于100MB - return 10 * 1024 * 1024, min(3, self.MAX_WORKERS) # 10MB分片 - elif file_size <= 1024 * 1024 * 1024: # 小于1GB - return 100 * 1024 * 1024, min(5, self.MAX_WORKERS) # 100MB分片 + if file_size <= self.MIN_PART_SIZE: + return file_size, 1 + if file_size >= self.MAX_PART_SIZE: + part_size = self.MAX_PART_SIZE else: - # 文件较大,使用较大分片 - part_size = min(file_size // self.MAX_WORKERS, self.MAX_PART_SIZE) - return part_size, min(file_size // part_size + 1, self.MAX_WORKERS) + part_size = max(self.MIN_PART_SIZE, file_size // self.MAX_WORKERS) + return part_size, (file_size + part_size - 1) // part_size @staticmethod def _upload_part(bucket: oss2.Bucket, object_name: str, upload_id: str, - part_number: int, part_data: bytes, progress_queue: Queue) -> PartInfo: + part_number: int, part_data: bytes) -> Tuple[PartInfo, int]: """ 上传单个分片 """ try: result = bucket.upload_part(object_name, upload_id, part_number, part_data) part_info = PartInfo(part_number, result.etag) - # 将上传进度放入队列 - progress_queue.put(len(part_data)) logger.info(f"【115】分片 {part_number} 上传完成") - return part_info + return part_info, len(part_data) except Exception as e: logger.error(f"【115】分片 {part_number} 上传失败: {str(e)}") raise @@ -444,7 +442,7 @@ class U115Pan(StorageBase, metaclass=Singleton): """ class TqdmToLogger(io.StringIO): - def write(s, buf): # noqa + def write(s, buf): # noqa buf = buf.strip('\r\n\t ') if buf: logger.info(buf) @@ -466,8 +464,8 @@ class U115Pan(StorageBase, metaclass=Singleton): 实现带秒传、断点续传和多线程并发上传 """ - def encode_callback(cb: dict): - return oss2.utils.b64encode_as_string(json.dumps(cb).strip()) + def encode_callback(cb: str): + return oss2.utils.b64encode_as_string(cb) target_name = new_name or local_path.name target_path = Path(target_dir.path) / target_name @@ -604,9 +602,6 @@ class U115Pan(StorageBase, metaclass=Singleton): "sequential": "" }).upload_id - # 创建进度队列 - progress_queue = Queue() - # 创建线程池 with ThreadPoolExecutor(max_workers=workers) as pool: futures = [] @@ -626,26 +621,18 @@ class U115Pan(StorageBase, metaclass=Singleton): object_name, upload_id, part_number, - part_data, - progress_queue + part_data ) futures.append(future) offset += size part_number += 1 - # 更新进度条 - while len(parts) < len(futures): - try: - uploaded = progress_queue.get(timeout=1) - progress_bar.update(uploaded) - except Empty: - pass - # 等待所有任务完成 for future in as_completed(futures): try: - part_info = future.result() + part_info, uploaded = future.result() parts.append(part_info) + progress_bar.update(uploaded) except Exception as e: logger.error(f"【115】分片上传失败: {str(e)}") progress_bar.close() From 4ccae1dac754e826a52ca6649139561ce6628f26 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Thu, 8 May 2025 12:55:40 +0800 Subject: [PATCH 08/11] fix upload api --- app/modules/filemanager/__init__.py | 3 +-- app/modules/filemanager/storages/alipan.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/modules/filemanager/__init__.py b/app/modules/filemanager/__init__.py index c90c64a6..78df279f 100644 --- a/app/modules/filemanager/__init__.py +++ b/app/modules/filemanager/__init__.py @@ -895,8 +895,7 @@ class FileManagerModule(_ModuleBase): def __transfer_file(self, fileitem: FileItem, mediainfo: MediaInfo, source_oper: StorageBase, target_oper: StorageBase, target_storage: str, target_file: Path, - transfer_type: str, over_flag: Optional[bool] = False) -> Tuple[ - Optional[FileItem], str]: + transfer_type: str, over_flag: Optional[bool] = False) -> Tuple[Optional[FileItem], str]: """ 整理一个文件，同时处理其他相关文件 :param fileitem: 原文件 diff --git a/app/modules/filemanager/storages/alipan.py b/app/modules/filemanager/storages/alipan.py index efadc885..af9ed619 100644 --- a/app/modules/filemanager/storages/alipan.py +++ b/app/modules/filemanager/storages/alipan.py @@ -450,7 +450,7 @@ class AliPan(StorageBase, metaclass=Singleton): "/adrive/v1.0/openFile/create", json={ "drive_id": parent_item.drive_id, - "parent_file_id": parent_item.fileid, + "parent_file_id": parent_item.fileid or "root", "name": name, "type": "folder" } @@ -900,7 +900,7 @@ class AliPan(StorageBase, metaclass=Singleton): if folder: return folder # 逐级查找和创建目录 - fileitem = schemas.FileItem(storage=self.schema.value, path="/") + fileitem = schemas.FileItem(storage=self.schema.value, path="/", drive_id=self._default_drive_id) for part in path.parts[1:]: dir_file = __find_dir(fileitem, part) if dir_file: From 18836071185cb5522a8dcaaa153fab0662e1f1f5 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Thu, 8 May 2025 13:12:20 +0800 Subject: [PATCH 09/11] fix upload api --- app/modules/filemanager/storages/alipan.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/modules/filemanager/storages/alipan.py b/app/modules/filemanager/storages/alipan.py index af9ed619..2d76c73e 100644 --- a/app/modules/filemanager/storages/alipan.py +++ b/app/modules/filemanager/storages/alipan.py @@ -348,6 +348,8 @@ class AliPan(StorageBase, metaclass=Singleton): """ if not fileinfo: return schemas.FileItem() + if not parent.endswith("/"): + parent += "/" if fileinfo.get("type") == "folder": return schemas.FileItem( storage=self.schema.value, @@ -874,7 +876,7 @@ class AliPan(StorageBase, metaclass=Singleton): if resp.get("code"): logger.debug(f"【阿里云盘】获取文件信息失败: {resp.get('message')}") return None - return self.__get_fileitem(resp, parent=f"{str(path.parent)}/") + return self.__get_fileitem(resp, parent=str(path.parent)) except Exception as e: logger.debug(f"【阿里云盘】获取文件信息失败: {str(e)}") return None From 645de137f2d8371a8c513350a4fcbecea4662e96 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Thu, 8 May 2025 14:26:47 +0800 Subject: [PATCH 10/11] =?UTF-8?q?fix=20=E6=8F=92=E4=BB=B6=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=88=A4=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/core/plugin.py | 14 +++++++++----- app/utils/object.py | 15 +++++++++++---- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/app/core/plugin.py b/app/core/plugin.py index 6d39fe21..d0bd95eb 100644 --- a/app/core/plugin.py +++ b/app/core/plugin.py @@ -465,13 +465,15 @@ class PluginManager(metaclass=Singleton): }] """ ret_apis = [] - for plugin_id, plugin in self._running_plugins.items(): + if pid: + plugins = {pid: self._running_plugins.get(pid)} + else: + plugins = self._running_plugins + for plugin_id, plugin in plugins.items(): if pid and pid != plugin_id: continue if hasattr(plugin, "get_api") and ObjectUtils.check_method(plugin.get_api): try: - if not plugin.get_state(): - continue apis = plugin.get_api() or [] for api in apis: api["path"] = f"/{plugin_id}{api['path']}" @@ -831,7 +833,8 @@ class PluginManager(metaclass=Singleton): logger.debug(f"获取插件是否在本地包中存在失败，{e}") return False - def get_plugins_from_market(self, market: str, package_version: Optional[str] = None) -> Optional[List[schemas.Plugin]]: + def get_plugins_from_market(self, market: str, package_version: Optional[str] = None) -> Optional[ + List[schemas.Plugin]]: """ 从指定的市场获取插件信息 :param market: 市场的 URL 或标识 @@ -845,7 +848,8 @@ class PluginManager(metaclass=Singleton): # 获取在线插件 online_plugins = self.pluginhelper.get_plugins(market, package_version) if online_plugins is None: - logger.warning(f"获取{package_version if package_version else ''}插件库失败：{market}，请检查 GitHub 网络连接") + logger.warning( + f"获取{package_version if package_version else ''}插件库失败：{market}，请检查 GitHub 网络连接") return [] ret_plugins = [] add_time = len(online_plugins) diff --git a/app/utils/object.py b/app/utils/object.py index 08bcc07f..559e31ff 100644 --- a/app/utils/object.py +++ b/app/utils/object.py @@ -52,21 +52,28 @@ class ObjectUtils: # 跳过空行 if not line: continue - # 处理多行注释 + # 处理"""单行注释 + if line.startswith(('"""', "'''")) and line.endswith(('"""', "'''")): + continue + # 处理"""多行注释 if line.startswith(('"""', "'''")): in_comment = not in_comment continue # 在注释中则跳过 if in_comment: continue - # 跳过注释、pass语句、装饰器、函数定义行 - if line.startswith('#') or line == "pass" or line.startswith('@') or line.startswith('def '): + # 跳过#注释、pass语句、装饰器、函数定义行 + if (line.startswith('#') + or line == "pass" + or line.startswith('@') + or line.startswith('def ')): continue # 发现有效代码行 return True # 没有有效代码行 return False - except Exception: + except Exception as err: + print(err) # 源代码分析失败时，进行字节码分析 code_obj = func.__code__ instructions = list(dis.get_instructions(code_obj)) From 0040b266a545b11bf690a0884f5701c4fe488344 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Thu, 8 May 2025 17:26:56 +0800 Subject: [PATCH 11/11] v2.4.5 --- version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.py b/version.py index 368b5a84..73c66df3 100644 --- a/version.py +++ b/version.py @@ -1,2 +1,2 @@ -APP_VERSION = 'v2.4.4-1' -FRONTEND_VERSION = 'v2.4.4-1' +APP_VERSION = 'v2.4.5' +FRONTEND_VERSION = 'v2.4.5'