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

refactor(string): split utilities by responsibility

Browse Source
This commit is contained in:
jxxghp
2026-08-15 08:03:55 +08:00
parent a2117bafc8
commit 96118e73e7
99 changed files with 1608 additions and 1424 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/modules/rtorrent/__init__.py
+9 -6
View File
@@ -18,7 +18,10 @@ from app.schemas.types import (
TorrentQueryStatus,
TorrentStatus,
)
from app.domain.string import StringUtils
from app.domain import torrent as torrent_rules
from app.foundation import size as size_tools
from app.foundation import temporal as time_tools
from app.foundation import text as text_tools
class RtorrentModule(_ModuleBase, _DownloaderBase[Rtorrent]):
@@ -122,7 +125,7 @@ class RtorrentModule(_ModuleBase, _DownloaderBase[Rtorrent]):
torrent_content = content
if torrent_content:
if StringUtils.is_magnet_link(torrent_content):
if torrent_rules.is_magnet_link(torrent_content):
return None, torrent_content
else:
torrent_info = Torrent.from_string(torrent_content)
@@ -153,7 +156,7 @@ class RtorrentModule(_ModuleBase, _DownloaderBase[Rtorrent]):
return None
# 生成随机Tag
tag = StringUtils.generate_random_str(10)
tag = text_tools.random_string(10)
if label:
tags = label.split(",") + [tag]
elif settings.TORRENT_TAG:
@@ -347,10 +350,10 @@ class RtorrentModule(_ModuleBase, _DownloaderBase[Rtorrent]):
state=self.__normalize_torrent_state(
torrent_data.get("state"), torrent_data.get("complete")
),
dlspeed=StringUtils.str_filesize(dlspeed),
upspeed=StringUtils.str_filesize(upspeed),
dlspeed=size_tools.format_compact_size(dlspeed),
upspeed=size_tools.format_compact_size(upspeed),
tags=torrent_data.get("tags"),
left_time=StringUtils.str_secends((total_size - completed_size) / dlspeed)
left_time=time_tools.format_duration((total_size - completed_size) / dlspeed)
if dlspeed > 0
else "",
)