mirror of
https://github.com/jxxghp/MoviePilot.git
synced 2026-09-06 16:07:01 +08:00
fix alipan upload
This commit is contained in:
@@ -506,7 +506,7 @@ class AliPan(StorageBase, metaclass=Singleton):
|
|||||||
return sha1.hexdigest()
|
return sha1.hexdigest()
|
||||||
|
|
||||||
def _create_file(self, drive_id: str, parent_file_id: str,
|
def _create_file(self, drive_id: str, parent_file_id: str,
|
||||||
file_name: str, file_path: Path, check_name_mode="ignore",
|
file_name: str, file_path: Path, check_name_mode="refuse",
|
||||||
chunk_size: int = 1 * 1024 * 1024 * 1024):
|
chunk_size: int = 1 * 1024 * 1024 * 1024):
|
||||||
"""
|
"""
|
||||||
创建文件请求,尝试秒传
|
创建文件请求,尝试秒传
|
||||||
@@ -586,11 +586,7 @@ class AliPan(StorageBase, metaclass=Singleton):
|
|||||||
"""
|
"""
|
||||||
上传单个分片
|
上传单个分片
|
||||||
"""
|
"""
|
||||||
headers = {
|
return requests.put(upload_url, data=data)
|
||||||
'Content-Length': str(len(data)),
|
|
||||||
'Content-Type': 'application/octet-stream'
|
|
||||||
}
|
|
||||||
return requests.put(upload_url, data=data, headers=headers)
|
|
||||||
|
|
||||||
def _list_uploaded_parts(self, drive_id: str, file_id: str, upload_id: str) -> dict:
|
def _list_uploaded_parts(self, drive_id: str, file_id: str, upload_id: str) -> dict:
|
||||||
"""
|
"""
|
||||||
@@ -650,6 +646,10 @@ class AliPan(StorageBase, metaclass=Singleton):
|
|||||||
logger.info(f"【阿里云盘】{target_name} 秒传完成!")
|
logger.info(f"【阿里云盘】{target_name} 秒传完成!")
|
||||||
return self.get_item(target_path)
|
return self.get_item(target_path)
|
||||||
|
|
||||||
|
if create_res.get("exist", False):
|
||||||
|
logger.info(f"【阿里云盘】{target_name} 已存在")
|
||||||
|
return self.get_item(target_path)
|
||||||
|
|
||||||
# 2. 准备分片上传参数
|
# 2. 准备分片上传参数
|
||||||
file_id = create_res.get('file_id')
|
file_id = create_res.get('file_id')
|
||||||
if not file_id:
|
if not file_id:
|
||||||
@@ -755,7 +755,7 @@ class AliPan(StorageBase, metaclass=Singleton):
|
|||||||
return None
|
return None
|
||||||
download_url = download_info.get("url")
|
download_url = download_info.get("url")
|
||||||
local_path = path or settings.TEMP_PATH / fileitem.name
|
local_path = path or settings.TEMP_PATH / fileitem.name
|
||||||
with self.session.get(download_url, stream=True) as r:
|
with requests.get(download_url, stream=True) as r:
|
||||||
r.raise_for_status()
|
r.raise_for_status()
|
||||||
with open(local_path, "wb") as f:
|
with open(local_path, "wb") as f:
|
||||||
for chunk in r.iter_content(chunk_size=8192):
|
for chunk in r.iter_content(chunk_size=8192):
|
||||||
|
|||||||
Reference in New Issue
Block a user