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

fix torrent

Browse Source
This commit is contained in:
jxxghp
2025-08-20 23:07:29 +08:00
parent dadc525d0b
commit 9b78deb802
2 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/chain/download.py
+13 -7
View File
@@ -8,6 +8,7 @@ from typing import List, Optional, Tuple, Set, Dict, Union
from app import schemas from app import schemas
from app.chain import ChainBase from app.chain import ChainBase
from app.core.cache import get_file_cache_backend
from app.core.config import settings, global_vars from app.core.config import settings, global_vars
from app.core.context import MediaInfo, TorrentInfo, Context from app.core.context import MediaInfo, TorrentInfo, Context
from app.core.event import eventmanager, Event from app.core.event import eventmanager, Event
@@ -217,15 +218,20 @@ class DownloadChain(ChainBase):
source=source, source=source,
userid=userid) userid=userid)
elif torrent_file: elif torrent_file:
torrent_content = torrent_file.read_bytes() if torrent_file.exists():
# 获取种子文件的文件夹名和文件清单 torrent_content = torrent_file.read_bytes()
_folder_name, _file_list = TorrentHelper().get_torrent_info(torrent_file) else:
else: # 缓存处理器
_folder_name, _file_list = TorrentHelper().get_fileinfo_from_torrent_content(torrent_content) cache_backend = get_file_cache_backend()
# 读取缓存的种子文件
torrent_content = cache_backend.get(torrent_file.as_posix(), region="torrents")
if not torrent_content: if not torrent_content:
return None return None
# 获取种子文件的文件夹名和文件清单
_folder_name, _file_list = TorrentHelper().get_fileinfo_from_torrent_content(torrent_content)
# 下载目录 # 下载目录
if save_path: if save_path:
# 下载目录使用自定义的 # 下载目录使用自定义的
@@ -566,7 +572,7 @@ class DownloadChain(ChainBase):
logger.info(f"开始下载 {torrent.title} ...") logger.info(f"开始下载 {torrent.title} ...")
download_id = self.download_single( download_id = self.download_single(
context=context, context=context,
torrent_file=content if isinstance(content, Path) else None, torrent_content=content,
save_path=save_path, save_path=save_path,
channel=channel, channel=channel,
source=source, source=source,
@@ -733,7 +739,7 @@ class DownloadChain(ChainBase):
logger.info(f"开始下载 {torrent.title} ...") logger.info(f"开始下载 {torrent.title} ...")
download_id = self.download_single( download_id = self.download_single(
context=context, context=context,
torrent_file=content if isinstance(content, Path) else None, torrent_content=content,
episodes=selected_episodes, episodes=selected_episodes,
save_path=save_path, save_path=save_path,
channel=channel, channel=channel,
app/helper/torrent.py
+18 -17
View File
@@ -36,16 +36,16 @@ class TorrentHelper(metaclass=WeakSingleton):
-> Tuple[Optional[Path], Optional[Union[str, bytes]], Optional[str], Optional[list], Optional[str]]: -> Tuple[Optional[Path], Optional[Union[str, bytes]], Optional[str], Optional[list], Optional[str]]:
""" """
把种子下载到本地 把种子下载到本地
:return: 种子临时文件相对路径【实际已无效】, 种子内容、种子主目录、种子文件清单、错误信息 :return: 种子缓存相对路径【用于索引缓存】, 种子内容、种子主目录、种子文件清单、错误信息
""" """
if url.startswith("magnet:"): if url.startswith("magnet:"):
return None, url, "", [], f"磁力链接" return None, url, "", [], f"磁力链接"
# 构建 torrent 种子文件的临时文件名 # 构建 torrent 种子文件的缓存路径
file_path = Path(StringUtils.md5_hash(url)).with_suffix(".torrent") cache_path = Path(StringUtils.md5_hash(url)).with_suffix(".torrent")
# 缓存处理器 # 缓存处理器
cache_backend = get_file_cache_backend() cache_backend = get_file_cache_backend()
# 读取缓存的种子文件 # 读取缓存的种子文件
torrent_content = cache_backend.get(file_path.as_posix(), region="torrents") torrent_content = cache_backend.get(cache_path.as_posix(), region="torrents")
if torrent_content: if torrent_content:
# 缓存已存在 # 缓存已存在
try: try:
@@ -55,9 +55,9 @@ class TorrentHelper(metaclass=WeakSingleton):
if not folder_name and not file_list: if not folder_name and not file_list:
raise ValueError("无效的缓存种子文件") raise ValueError("无效的缓存种子文件")
# 成功拿到种子数据 # 成功拿到种子数据
return file_path, torrent_content, folder_name, file_list, "" return cache_path, torrent_content, folder_name, file_list, ""
except Exception as err: except Exception as err:
logger.error(f"处理缓存的种子文件 {file_path} 时出错: {err}，将重新下载") logger.error(f"处理缓存的种子文件 {cache_path} 时出错: {err}，将重新下载")
# 下载种子文件 # 下载种子文件
req = RequestUtils( req = RequestUtils(
ua=ua, ua=ua,
@@ -77,11 +77,11 @@ class TorrentHelper(metaclass=WeakSingleton):
).get_res(url=url, allow_redirects=False) ).get_res(url=url, allow_redirects=False)
if req and req.status_code == 200: if req and req.status_code == 200:
if not req.content: if not req.content:
return file_path, None, "", [], "未下载到种子数据" return cache_path, None, "", [], "未下载到种子数据"
# 解析内容格式 # 解析内容格式
if req.content.startswith(b"magnet:"): if req.content.startswith(b"magnet:"):
# 磁力链接 # 磁力链接
return file_path, req.text, "", [], f"获取到磁力链接" return cache_path, req.text, "", [], f"获取到磁力链接"
if "下载种子文件".encode("utf-8") in req.content: if "下载种子文件".encode("utf-8") in req.content:
# 首次下载提示页面 # 首次下载提示页面
skip_flag = False skip_flag = False
@@ -119,31 +119,32 @@ class TorrentHelper(metaclass=WeakSingleton):
except Exception as err: except Exception as err:
logger.warn(f"触发了站点首次种子下载，尝试自动跳过时出现错误：{str(err)}，链接：{url}") logger.warn(f"触发了站点首次种子下载，尝试自动跳过时出现错误：{str(err)}，链接：{url}")
if not skip_flag: if not skip_flag:
return file_path, None, "", [], "种子数据有误，请确认链接是否正确，如为PT站点则需手工在站点下载一次种子" return cache_path, None, "", [], "种子数据有误，请确认链接是否正确，如为PT站点则需手工在站点下载一次种子"
# 种子内容 # 种子内容
if req.content: if req.content:
# 检查是不是种子文件，如果不是仍然抛出异常 # 检查是不是种子文件，如果不是仍然抛出异常
try: try:
# 保存到缓存
cache_backend.set(file_path.as_posix(), req.content, region="torrents")
# 获取种子目录和文件清单 # 获取种子目录和文件清单
folder_name, file_list = self.get_fileinfo_from_torrent_content(req.content) folder_name, file_list = self.get_fileinfo_from_torrent_content(req.content)
if file_list:
# 保存到缓存
cache_backend.set(cache_path.as_posix(), req.content, region="torrents")
# 成功拿到种子数据 # 成功拿到种子数据
return file_path, req.content, folder_name, file_list, "" return cache_path, req.content, folder_name, file_list, ""
except Exception as err: except Exception as err:
logger.error(f"种子文件解析失败：{str(err)}") logger.error(f"种子文件解析失败：{str(err)}")
# 种子数据仍然错误 # 种子数据仍然错误
return file_path, None, "", [], "种子数据有误，请确认链接是否正确" return cache_path, None, "", [], "种子数据有误，请确认链接是否正确"
# 返回失败 # 返回失败
return file_path, None, "", [], "" return cache_path, None, "", [], ""
elif req is None: elif req is None:
return file_path, None, "", [], "无法打开链接" return cache_path, None, "", [], "无法打开链接"
elif req.status_code == 429: elif req.status_code == 429:
return file_path, None, "", [], "触发站点流控，请稍后重试" return cache_path, None, "", [], "触发站点流控，请稍后重试"
else: else:
# 把错误的种子记下来，避免重复使用 # 把错误的种子记下来，避免重复使用
self.add_invalid(url) self.add_invalid(url)
return file_path, None, "", [], f"下载种子出错，状态码：{req.status_code}" return cache_path, None, "", [], f"下载种子出错，状态码：{req.status_code}"
def get_torrent_info(self, torrent_path: Path) -> Tuple[str, List[str]]: def get_torrent_info(self, torrent_path: Path) -> Tuple[str, List[str]]:
""" """