GithubBackup/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-09-09 09:26:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
jxxghp
2025-05-08 09:56:43 +08:00
parent ea31072ae5
commit 570dddc120
2 changed files with 43 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/modules/filemanager/storages/alipan.py
+20 -24
View File
@@ -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]: