fix：优化下载

app/modules/filemanager/storages/__init__.py

@@ -15,7 +15,7 @@ def transfer_process(path: str) -> Callable[[int | float], None]:
     """
     传输进度回调
     """
-    pbar = tqdm(total=100, desc="整理进度", unit="%")
+    pbar = tqdm(total=100, desc="进度", unit="%")
     progress = ProgressHelper(HashUtils.md5(path))
     progress.start()
 

app/modules/filemanager/storages/alipan.py

@@ -14,6 +14,7 @@ from app.log import logger
 from app.modules.filemanager import StorageBase
 from app.modules.filemanager.storages import transfer_process
 from app.schemas.types import StorageSchema
+from app.utils.http import RequestUtils
 from app.utils.singleton import WeakSingleton
 from app.utils.string import StringUtils
 
@@ -729,7 +730,25 @@ class AliPan(StorageBase, metaclass=WeakSingleton):
         progress_callback = transfer_process(Path(fileitem.path).as_posix())
 
         try:
-            with requests.get(download_url, stream=True) as r:
+            # 构建请求头，包含必要的认证信息
+            headers = {
+                "User-Agent": settings.NORMAL_USER_AGENT,
+                "Referer": "https://www.aliyundrive.com/",
+                "Accept": "*/*",
+                "Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8",
+                "Accept-Encoding": "gzip, deflate, br",
+                "Connection": "keep-alive",
+                "Sec-Fetch-Dest": "empty",
+                "Sec-Fetch-Mode": "cors",
+                "Sec-Fetch-Site": "cross-site"
+            }
+
+            # 如果有access_token，添加到请求头
+            if self.access_token:
+                headers["Authorization"] = f"Bearer {self.access_token}"
+
+            request_utils = RequestUtils(headers=headers)
+            with request_utils.get_stream(download_url, raise_exception=True) as r:
                 r.raise_for_status()
                 downloaded_size = 0
                 with open(local_path, "wb") as f:
@@ -748,22 +767,13 @@ class AliPan(StorageBase, metaclass=WeakSingleton):
                 # 完成下载
                 progress_callback(100)
                 logger.info(f"【阿里云盘】下载完成: {fileitem.name}")
-
-        except requests.exceptions.RequestException as e:
-            logger.error(f"【阿里云盘】下载网络错误: {fileitem.name} - {str(e)}")
-            # 删除可能部分下载的文件
-            if local_path.exists():
-                local_path.unlink()
-            return None
+                return local_path
         except Exception as e:
             logger.error(f"【阿里云盘】下载失败: {fileitem.name} - {str(e)}")
-            # 删除可能部分下载的文件
             if local_path.exists():
                 local_path.unlink()
             return None
 
-        return local_path
-
     def check(self) -> bool:
         return self.access_token is not None
 

app/modules/filemanager/storages/alist.py

@@ -4,8 +4,6 @@ from datetime import datetime
 from pathlib import Path
 from typing import Optional, List
 
-import requests
-
 from app import schemas
 from app.core.cache import cached
 from app.core.config import settings, global_vars
@@ -569,18 +567,22 @@ class Alist(StorageBase, metaclass=WeakSingleton):
         else:
             local_path = path / fileitem.name
 
-        with requests.get(download_url, headers=self.__get_header_with_token(), stream=True) as r:
-            r.raise_for_status()
-            with open(local_path, "wb") as f:
-                for chunk in r.iter_content(chunk_size=8192):
-                    if global_vars.is_transfer_stopped(fileitem.path):
-                        logger.info(f"【OpenList】{fileitem.path} 下载已取消！")
-                        return None
-                    f.write(chunk)
+        request_utils = RequestUtils(headers=self.__get_header_with_token())
+        try:
+            with request_utils.get_stream(download_url, raise_exception=True) as r:
+                r.raise_for_status()
+                with open(local_path, "wb") as f:
+                    for chunk in r.iter_content(chunk_size=8192):
+                        if global_vars.is_transfer_stopped(fileitem.path):
+                            logger.info(f"【OpenList】{fileitem.path} 下载已取消！")
+                            return None
+                        f.write(chunk)
+        except Exception as e:
+            logger.error(f"【OpenList】下载文件 {fileitem.path} 失败：{e}")
+            if local_path.exists():
+                return local_path
 
-        if local_path.exists():
-            return local_path
-        return None
+        return local_path
 
     def upload(
             self, fileitem: schemas.FileItem, path: Path, new_name: Optional[str] = None, task: bool = False