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

chore(rtorrent): formatting code

Browse Source
This commit is contained in:
DDSRem
2026-02-22 13:42:27 +08:00
parent def652c768
commit 69a1207102
2 changed files with 280 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/modules/rtorrent/__init__.py
+187 -89
View File
@@ -16,13 +16,13 @@ from app.utils.string import StringUtils
class RtorrentModule(_ModuleBase, _DownloaderBase[Rtorrent]):
def init_module(self) -> None:
"""
初始化模块
"""
super().init_service(service_name=Rtorrent.__name__.lower(),
service_type=Rtorrent)
super().init_service(
service_name=Rtorrent.__name__.lower(), service_type=Rtorrent
)
@staticmethod
def get_name() -> str:
@@ -77,9 +77,16 @@ class RtorrentModule(_ModuleBase, _DownloaderBase[Rtorrent]):
logger.info(f"rTorrent下载器 {name} 连接断开，尝试重连 ...")
server.reconnect()
def download(self, content: Union[Path, str, bytes], download_dir: Path, cookie: str,
episodes: Set[int] = None, category: Optional[str] = None, label: Optional[str] = None,
downloader: Optional[str] = None) -> Optional[Tuple[Optional[str], Optional[str], Optional[str], str]]:
def download(
self,
content: Union[Path, str, bytes],
download_dir: Path,
cookie: str,
episodes: Set[int] = None,
category: Optional[str] = None,
label: Optional[str] = None,
downloader: Optional[str] = None,
) -> Optional[Tuple[Optional[str], Optional[str], Optional[str], str]]:
"""
根据种子文件，选择并添加下载任务
:param content: 种子文件地址或者磁力链接或种子内容
@@ -102,7 +109,9 @@ class RtorrentModule(_ModuleBase, _DownloaderBase[Rtorrent]):
if content.exists():
torrent_content = content.read_bytes()
else:
torrent_content = FileCache().get(content.as_posix(), region="torrents")
torrent_content = FileCache().get(
content.as_posix(), region="torrents"
)
else:
torrent_content = content
@@ -123,9 +132,12 @@ class RtorrentModule(_ModuleBase, _DownloaderBase[Rtorrent]):
# 读取种子的名称
torrent_from_file, content = __get_torrent_info()
# 检查是否为磁力链接
is_magnet = isinstance(content, str) and content.startswith("magnet:") or isinstance(content,
bytes) and content.startswith(
b"magnet:")
is_magnet = (
isinstance(content, str)
and content.startswith("magnet:")
or isinstance(content, bytes)
and content.startswith(b"magnet:")
)
if not torrent_from_file and not is_magnet:
return None, None, None, f"添加种子任务失败：无法读取种子文件"
@@ -137,7 +149,7 @@ class RtorrentModule(_ModuleBase, _DownloaderBase[Rtorrent]):
# 生成随机Tag
tag = StringUtils.generate_random_str(10)
if label:
tags = label.split(',') + [tag]
tags = label.split(",") + [tag]
elif settings.TORRENT_TAG:
tags = [tag, settings.TORRENT_TAG]
else:
@@ -165,18 +177,41 @@ class RtorrentModule(_ModuleBase, _DownloaderBase[Rtorrent]):
try:
for torrent in torrents:
# 名称与大小相等则认为是同一个种子
if torrent.get("name") == getattr(torrent_from_file, 'name', '') \
and torrent.get("total_size") == getattr(torrent_from_file, 'total_size', 0):
if torrent.get("name") == getattr(
torrent_from_file, "name", ""
) and torrent.get("total_size") == getattr(
torrent_from_file, "total_size", 0
):
torrent_hash = torrent.get("hash")
torrent_tags = [str(t).strip() for t in torrent.get("tags", "").split(',') if t.strip()]
logger.warn(f"下载器中已存在该种子任务：{torrent_hash} - {torrent.get('name')}")
torrent_tags = [
str(t).strip()
for t in torrent.get("tags", "").split(",")
if t.strip()
]
logger.warn(
f"下载器中已存在该种子任务：{torrent_hash} - {torrent.get('name')}"
)
# 给种子打上标签
if "已整理" in torrent_tags:
server.remove_torrents_tag(ids=torrent_hash, tag=['已整理'])
if settings.TORRENT_TAG and settings.TORRENT_TAG not in torrent_tags:
logger.info(f"给种子 {torrent_hash} 打上标签：{settings.TORRENT_TAG}")
server.set_torrents_tag(ids=torrent_hash, tags=[settings.TORRENT_TAG])
return downloader or self.get_default_config_name(), torrent_hash, torrent_layout, f"下载任务已存在"
server.remove_torrents_tag(
ids=torrent_hash, tag=["已整理"]
)
if (
settings.TORRENT_TAG
and settings.TORRENT_TAG not in torrent_tags
):
logger.info(
f"给种子 {torrent_hash} 打上标签：{settings.TORRENT_TAG}"
)
server.set_torrents_tag(
ids=torrent_hash, tags=[settings.TORRENT_TAG]
)
return (
downloader or self.get_default_config_name(),
torrent_hash,
torrent_layout,
f"下载任务已存在",
)
finally:
torrents.clear()
del torrents
@@ -185,13 +220,23 @@ class RtorrentModule(_ModuleBase, _DownloaderBase[Rtorrent]):
# 获取种子Hash
torrent_hash = server.get_torrent_id_by_tag(tags=tag)
if not torrent_hash:
return None, None, None, f"下载任务添加成功，但获取rTorrent任务信息失败：{content}"
return (
None,
None,
None,
f"下载任务添加成功，但获取rTorrent任务信息失败：{content}",
)
else:
if is_paused:
# 种子文件
torrent_files = server.get_files(torrent_hash)
if not torrent_files:
return downloader or self.get_default_config_name(), torrent_hash, torrent_layout, "获取种子文件失败，下载任务可能在暂停状态"
return (
downloader or self.get_default_config_name(),
torrent_hash,
torrent_layout,
"获取种子文件失败，下载任务可能在暂停状态",
)
# 不需要的文件ID
file_ids = []
@@ -202,8 +247,9 @@ class RtorrentModule(_ModuleBase, _DownloaderBase[Rtorrent]):
file_id = torrent_file.get("id")
file_name = torrent_file.get("name")
meta_info = MetaInfo(file_name)
if not meta_info.episode_list \
or not set(meta_info.episode_list).issubset(episodes):
if not meta_info.episode_list or not set(
meta_info.episode_list
).issubset(episodes):
file_ids.append(file_id)
else:
sucess_epidised.update(meta_info.episode_list)
@@ -213,17 +259,31 @@ class RtorrentModule(_ModuleBase, _DownloaderBase[Rtorrent]):
sucess_epidised = list(sucess_epidised)
if sucess_epidised and file_ids:
# 设置不需要的文件优先级为0（不下载）
server.set_files(torrent_hash=torrent_hash, file_ids=file_ids, priority=0)
server.set_files(
torrent_hash=torrent_hash, file_ids=file_ids, priority=0
)
# 开始任务
server.start_torrents(torrent_hash)
return downloader or self.get_default_config_name(), torrent_hash, torrent_layout, f"添加下载成功，已选择集数：{sucess_epidised}"
return (
downloader or self.get_default_config_name(),
torrent_hash,
torrent_layout,
f"添加下载成功，已选择集数：{sucess_epidised}",
)
else:
return downloader or self.get_default_config_name(), torrent_hash, torrent_layout, "添加下载成功"
return (
downloader or self.get_default_config_name(),
torrent_hash,
torrent_layout,
"添加下载成功",
)
def list_torrents(self, status: TorrentStatus = None,
hashs: Union[list, str] = None,
downloader: Optional[str] = None
) -> Optional[List[Union[TransferTorrent, DownloadingTorrent]]]:
def list_torrents(
self,
status: TorrentStatus = None,
hashs: Union[list, str] = None,
downloader: Optional[str] = None,
) -> Optional[List[Union[TransferTorrent, DownloadingTorrent]]]:
"""
获取下载器种子列表
:param status: 种子状态
@@ -243,31 +303,41 @@ class RtorrentModule(_ModuleBase, _DownloaderBase[Rtorrent]):
if hashs:
# 按Hash获取
for name, server in servers.items():
torrents, _ = server.get_torrents(ids=hashs, tags=settings.TORRENT_TAG) or []
torrents, _ = (
server.get_torrents(ids=hashs, tags=settings.TORRENT_TAG) or []
)
try:
for torrent in torrents:
content_path = torrent.get("content_path")
if content_path:
torrent_path = Path(content_path)
else:
torrent_path = Path(torrent.get('save_path')) / torrent.get('name')
ret_torrents.append(TransferTorrent(
downloader=name,
title=torrent.get('name'),
path=torrent_path,
hash=torrent.get('hash'),
size=torrent.get('total_size'),
tags=torrent.get('tags'),
progress=torrent.get('progress', 0),
state="paused" if torrent.get('state') == 0 else "downloading",
))
torrent_path = Path(torrent.get("save_path")) / torrent.get(
"name"
)
ret_torrents.append(
TransferTorrent(
downloader=name,
title=torrent.get("name"),
path=torrent_path,
hash=torrent.get("hash"),
size=torrent.get("total_size"),
tags=torrent.get("tags"),
progress=torrent.get("progress", 0),
state="paused"
if torrent.get("state") == 0
else "downloading",
)
)
finally:
torrents.clear()
del torrents
elif status == TorrentStatus.TRANSFER:
# 获取已完成且未整理的
for name, server in servers.items():
torrents = server.get_completed_torrents(tags=settings.TORRENT_TAG) or []
torrents = (
server.get_completed_torrents(tags=settings.TORRENT_TAG) or []
)
try:
for torrent in torrents:
tags = torrent.get("tags") or ""
@@ -278,43 +348,56 @@ class RtorrentModule(_ModuleBase, _DownloaderBase[Rtorrent]):
if content_path:
torrent_path = Path(content_path)
else:
torrent_path = Path(torrent.get('save_path')) / torrent.get('name')
ret_torrents.append(TransferTorrent(
downloader=name,
title=torrent.get('name'),
path=torrent_path,
hash=torrent.get('hash'),
tags=torrent.get('tags')
))
torrent_path = Path(torrent.get("save_path")) / torrent.get(
"name"
)
ret_torrents.append(
TransferTorrent(
downloader=name,
title=torrent.get("name"),
path=torrent_path,
hash=torrent.get("hash"),
tags=torrent.get("tags"),
)
)
finally:
torrents.clear()
del torrents
elif status == TorrentStatus.DOWNLOADING:
# 获取正在下载的任务
for name, server in servers.items():
torrents = server.get_downloading_torrents(tags=settings.TORRENT_TAG) or []
torrents = (
server.get_downloading_torrents(tags=settings.TORRENT_TAG) or []
)
try:
for torrent in torrents:
meta = MetaInfo(torrent.get('name'))
dlspeed = torrent.get('dlspeed', 0)
upspeed = torrent.get('upspeed', 0)
total_size = torrent.get('total_size', 0)
completed = torrent.get('completed', 0)
ret_torrents.append(DownloadingTorrent(
downloader=name,
hash=torrent.get('hash'),
title=torrent.get('name'),
name=meta.name,
year=meta.year,
season_episode=meta.season_episode,
progress=torrent.get('progress', 0),
size=total_size,
state="paused" if torrent.get('state') == 0 else "downloading",
dlspeed=StringUtils.str_filesize(dlspeed),
upspeed=StringUtils.str_filesize(upspeed),
left_time=StringUtils.str_secends(
(total_size - completed) / dlspeed) if dlspeed > 0 else ''
))
meta = MetaInfo(torrent.get("name"))
dlspeed = torrent.get("dlspeed", 0)
upspeed = torrent.get("upspeed", 0)
total_size = torrent.get("total_size", 0)
completed = torrent.get("completed", 0)
ret_torrents.append(
DownloadingTorrent(
downloader=name,
hash=torrent.get("hash"),
title=torrent.get("name"),
name=meta.name,
year=meta.year,
season_episode=meta.season_episode,
progress=torrent.get("progress", 0),
size=total_size,
state="paused"
if torrent.get("state") == 0
else "downloading",
dlspeed=StringUtils.str_filesize(dlspeed),
upspeed=StringUtils.str_filesize(upspeed),
left_time=StringUtils.str_secends(
(total_size - completed) / dlspeed
)
if dlspeed > 0
else "",
)
)
finally:
torrents.clear()
del torrents
@@ -322,7 +405,9 @@ class RtorrentModule(_ModuleBase, _DownloaderBase[Rtorrent]):
return None
return ret_torrents # noqa
def transfer_completed(self, hashs: Union[str, list], downloader: Optional[str] = None) -> None:
def transfer_completed(
self, hashs: Union[str, list], downloader: Optional[str] = None
) -> None:
"""
转移完成后的处理
:param hashs: 种子Hash
@@ -335,15 +420,19 @@ class RtorrentModule(_ModuleBase, _DownloaderBase[Rtorrent]):
org_tags = server.get_torrent_tags(ids=hashs)
# 种子打上已整理标签
if org_tags:
tags = org_tags + ['已整理']
tags = org_tags + ["已整理"]
else:
tags = ['已整理']
tags = ["已整理"]
# 直接设置完整标签（覆盖）
server.set_torrents_tag(ids=hashs, tags=tags, overwrite=True)
return None
def remove_torrents(self, hashs: Union[str, list], delete_file: Optional[bool] = True,
downloader: Optional[str] = None) -> Optional[bool]:
def remove_torrents(
self,
hashs: Union[str, list],
delete_file: Optional[bool] = True,
downloader: Optional[str] = None,
) -> Optional[bool]:
"""
删除下载器种子
:param hashs: 种子Hash
@@ -356,8 +445,9 @@ class RtorrentModule(_ModuleBase, _DownloaderBase[Rtorrent]):
return None
return server.delete_torrents(delete_file=delete_file, ids=hashs)
def start_torrents(self, hashs: Union[list, str],
downloader: Optional[str] = None) -> Optional[bool]:
def start_torrents(
self, hashs: Union[list, str], downloader: Optional[str] = None
) -> Optional[bool]:
"""
开始下载
:param hashs: 种子Hash
@@ -369,7 +459,9 @@ class RtorrentModule(_ModuleBase, _DownloaderBase[Rtorrent]):
return None
return server.start_torrents(ids=hashs)
def stop_torrents(self, hashs: Union[list, str], downloader: Optional[str] = None) -> Optional[bool]:
def stop_torrents(
self, hashs: Union[list, str], downloader: Optional[str] = None
) -> Optional[bool]:
"""
停止下载
:param hashs: 种子Hash
@@ -381,7 +473,9 @@ class RtorrentModule(_ModuleBase, _DownloaderBase[Rtorrent]):
return None
return server.stop_torrents(ids=hashs)
def torrent_files(self, tid: str, downloader: Optional[str] = None) -> Optional[List[Dict]]:
def torrent_files(
self, tid: str, downloader: Optional[str] = None
) -> Optional[List[Dict]]:
"""
获取种子文件列表
"""
@@ -390,7 +484,9 @@ class RtorrentModule(_ModuleBase, _DownloaderBase[Rtorrent]):
return None
return server.get_files(tid=tid)
def downloader_info(self, downloader: Optional[str] = None) -> Optional[List[schemas.DownloaderInfo]]:
def downloader_info(
self, downloader: Optional[str] = None
) -> Optional[List[schemas.DownloaderInfo]]:
"""
下载器信息
"""
@@ -406,10 +502,12 @@ class RtorrentModule(_ModuleBase, _DownloaderBase[Rtorrent]):
info = server.transfer_info()
if not info:
continue
ret_info.append(schemas.DownloaderInfo(
download_speed=info.get("dl_info_speed"),
upload_speed=info.get("up_info_speed"),
download_size=info.get("dl_info_data"),
upload_size=info.get("up_info_data")
))
ret_info.append(
schemas.DownloaderInfo(
download_speed=info.get("dl_info_speed"),
upload_speed=info.get("up_info_speed"),
download_size=info.get("dl_info_data"),
upload_size=info.get("up_info_data"),
)
)
return ret_info