d0zingcat/MoviePilot-Plugins
1
0
Fork 0
mirror of https://github.com/d0zingcat/MoviePilot-Plugins.git synced 2026-05-15 15:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

下载器助手仪表板优化

Browse Source
This commit is contained in:
Allen
2024-05-15 20:12:02 +08:00
parent ba089bd616
commit 895d08a9ad
4 changed files with 108 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@@ -621,11 +621,12 @@
"name": "下载器助手",
"description": "自动做种、站点标签、自动删种。",
"labels": "下载管理",
"version": "1.9",
"version": "2.0",
"icon": "DownloaderHelper.png",
"author": "hotlcc",
"level": 2,
"history": {
"v2.0": "优化了仪表板种子状态；提升仪表板对TR的适配度。",
"v1.9": "优化了仪表板组件性能。",
"v1.8": "新增仪表板活动种子组件，qb完美支持，tr尚未测试，有问题提Issue并@hotlcc",
"v1.7": "优化了表单界面和一些逻辑。",

115
plugins/downloaderhelper/__init__.py
View File

@@ -33,7 +33,7 @@ class DownloaderHelper(_PluginBase):
# 插件图标
plugin_icon = "DownloaderHelper.png"
# 插件版本
plugin_version = "1.9"
plugin_version = "2.0"
# 插件作者
plugin_author = "hotlcc"
# 作者主页
@@ -1955,26 +1955,39 @@ class DownloaderHelper(_PluginBase):
torrent]
@staticmethod
def __process_torrent_for_qbittorrent(torrent: TorrentDictionary):
def __process_torrent_for_qbittorrent(torrent: TorrentDictionary, fields: List[TorrentField]):
"""
加工qb种子
"""
if not torrent:
return
def calculate_remaining_size(torrent: TorrentDictionary):
"""
计算剩余大小
"""
remaining_size = torrent.get(TorrentField.REMAINING.qb)
if not remaining_size:
remaining_size = torrent.get(TorrentField.SELECT_SIZE.qb) - torrent.get(TorrentField.COMPLETED.qb)
torrent[TorrentField.REMAINING.qb] = remaining_size
return remaining_size
try:
# 剩余大小
remaining_size = torrent.get(TorrentField.SELECT_SIZE.qb) - torrent.get(TorrentField.COMPLETED.qb)
torrent[TorrentField.REMAINING.qb] = remaining_size
if TorrentField.REMAINING in fields:
calculate_remaining_size(torrent=torrent)
# 剩余时间
if torrent.get(TorrentField.STATE.qb) == TorrentState.DOWNLOADING.value:
download_speed = torrent.get(TorrentField.DOWNLOAD_SPEED.qb)
if download_speed <= 0:
remaining_time = -1
if TorrentField.REMAINING_TIME in fields:
if torrent.get(TorrentField.STATE.qb) == TorrentState.DOWNLOADING.value:
download_speed = torrent.get(TorrentField.DOWNLOAD_SPEED.qb)
if download_speed <= 0:
remaining_time = -1
else:
remaining_size = calculate_remaining_size(torrent=torrent)
remaining_time = remaining_size / download_speed
else:
remaining_time = remaining_size / download_speed
else:
remaining_time = 0
torrent[TorrentField.REMAINING_TIME.qb] = remaining_time
remaining_time = 0
torrent[TorrentField.REMAINING_TIME.qb] = remaining_time
except Exception as e:
logger.error(f'加工qb种子: {str(e)}, torrent = {str(torrent)}', exc_info=True)
return None
@@ -1987,7 +2000,7 @@ class DownloaderHelper(_PluginBase):
if not torrent or not fields:
return None
# 加工qb种子
self.__process_torrent_for_qbittorrent(torrent=torrent)
self.__process_torrent_for_qbittorrent(torrent=torrent, fields=fields)
data = []
for field in fields:
value = self.__extract_torrent_value_for_qbittorrent(torrent=torrent, field=field)
@@ -2023,18 +2036,20 @@ class DownloaderHelper(_PluginBase):
arguments.append(TorrentField.NAME.tr)
arguments.append('hashString')
# 处理依赖的字段
if TorrentField.SELECT_SIZE in fields:
arguments.append('wanted')
if TorrentField.COMPLETED in fields:
arguments.append('fileStats')
if TorrentField.REMAINING in fields:
arguments.append('wanted')
arguments.append(TorrentField.SELECT_SIZE.tr)
arguments.append('fileStats')
if TorrentField.REMAINING_TIME in fields:
arguments.append(TorrentField.STATE.tr)
arguments.append(TorrentField.DOWNLOAD_SPEED.tr)
arguments.append('wanted')
arguments.append(TorrentField.SELECT_SIZE.tr)
arguments.append('fileStats')
if TorrentField.DOWNLOAD_LIMIT in fields:
arguments.append('downloadLimited')
if TorrentField.UPLOAD_LIMIT in fields:
arguments.append('uploadLimited')
return list(set(arguments))
def __get_transmission_torrent_data(self, fields: List[Union[str, TorrentField]] = None):
@@ -2069,30 +2084,62 @@ class DownloaderHelper(_PluginBase):
torrent]
@staticmethod
def __process_torrent_for_transmission(torrent: Torrent):
def __process_torrent_for_transmission(torrent: Torrent, fields: List[TorrentField]):
"""
加工tr种子
"""
if not torrent or not fields:
return
def calculate_completed(torrent: Torrent):
"""
计算已完成大小
"""
completed = torrent.get(TorrentField.COMPLETED.tr)
if not completed:
completed = sum(x["bytesCompleted"] for x in torrent.fields["fileStats"])
torrent.fields[TorrentField.COMPLETED.tr] = completed
return completed
def calculate_remaining_size(torrent: Torrent):
"""
计算剩余大小
"""
remaining_size = torrent.get(TorrentField.REMAINING.tr)
if not remaining_size:
select_size = torrent.get(TorrentField.SELECT_SIZE.tr)
completed = calculate_completed(torrent=torrent)
remaining_size = select_size - completed
torrent.fields[TorrentField.REMAINING.tr] = remaining_size
return remaining_size
try:
# 选定大小
select_size = sum(x["bytesCompleted"] for x in torrent.fields["wanted"])
torrent.fields[TorrentField.SELECT_SIZE.tr] = select_size
# 已完成大小
completed = sum(x["bytesCompleted"] for x in torrent.fields["fileStats"])
torrent.fields[TorrentField.COMPLETED.tr] = completed
if TorrentField.COMPLETED in fields:
calculate_completed(torrent=torrent)
# 剩余大小
remaining_size = select_size - completed
torrent.fields[TorrentField.REMAINING.tr] = remaining_size
if TorrentField.REMAINING in fields:
calculate_remaining_size(torrent=torrent)
# 剩余时间
if torrent.get(TorrentField.STATE.tr) == TorrentStatus.DOWNLOADING.value:
download_speed = torrent.get(TorrentField.DOWNLOAD_SPEED.tr)
if download_speed <= 0:
remaining_time = -1
if TorrentField.REMAINING_TIME in fields:
if torrent.get(TorrentField.STATE.tr) == TorrentStatus.DOWNLOADING.value:
download_speed = torrent.get(TorrentField.DOWNLOAD_SPEED.tr)
if download_speed <= 0:
remaining_time = -1
else:
remaining_size = calculate_remaining_size(torrent=torrent)
remaining_time = remaining_size / download_speed
else:
remaining_time = remaining_size / download_speed
else:
remaining_time = 0
torrent.fields[TorrentField.REMAINING_TIME.tr] = remaining_time
remaining_time = 0
torrent.fields[TorrentField.REMAINING_TIME.tr] = remaining_time
# 下载限速
if TorrentField.DOWNLOAD_LIMIT in fields:
if not torrent.get('downloadLimited'):
torrent.fields[TorrentField.DOWNLOAD_LIMIT.tr] = None
# 上传限速
if TorrentField.UPLOAD_LIMIT in fields:
if not torrent.get('uploadLimited'):
torrent.fields[TorrentField.UPLOAD_LIMIT.tr] = None
except Exception as e:
logger.error(f'加工tr种子异常: {str(e)}, torrent = {str(torrent.fields)}', exc_info=True)
return None
@@ -2105,7 +2152,7 @@ class DownloaderHelper(_PluginBase):
if not torrent or not fields:
return None
# 加工tr种子
self.__process_torrent_for_transmission(torrent=torrent)
self.__process_torrent_for_transmission(torrent=torrent,fields=fields)
data = []
for field in fields:
value = self.__extract_torrent_value_for_transmission(torrent=torrent, field=field)

23
plugins/downloaderhelper/convertor.py
View File

@@ -67,6 +67,8 @@ class StateConvertor(IConvertor, metaclass=Singleton):
return '暂停'
if data == TorrentState.STALLED_DOWNLOAD.value:
return '等待'
if data == TorrentState.CHECKING_DOWNLOAD.value:
return '校验'
# tr
if data == 6:
return '做种'
@@ -76,6 +78,8 @@ class StateConvertor(IConvertor, metaclass=Singleton):
return '暂停'
if data == 3:
return '等待'
if data == 2:
return '校验'
return data
except Exception as e:
logger.error(f'{__name__} Error: {str(e)}, data = {data}', exc_info=True)
@@ -121,7 +125,7 @@ class TimestampConvertor(IConvertor, metaclass=Singleton):
"""
def convert(self, data: any) -> any:
if data is None:
if not data or data <= 0:
return None
try:
return StringUtils.format_timestamp(timestamp=data, date_format='%Y/%m/%d %H:%M:%S')
@@ -181,3 +185,20 @@ class LimitRatioConvertor(IConvertor, metaclass=Singleton):
except Exception as e:
logger.error(f'{__name__} Error: {str(e)}, data = {data}', exc_info=True)
return None
class TagsConvertor(IConvertor, metaclass=Singleton):
"""
标签转换器
"""
def convert(self, data: any) -> any:
if not data:
return None
try:
if isinstance(data, list):
return ', '.join(data)
return data
except Exception as e:
logger.error(f'{__name__} Error: {str(e)}, data = {data}', exc_info=True)
return None

6
plugins/downloaderhelper/module.py
View File

@@ -1,6 +1,6 @@
from typing import Set, List, Optional
from enum import Enum
from app.plugins.downloaderhelper.convertor import IConvertor, ByteSizeConvertor, PercentageConvertor, StateConvertor, SpeedConvertor, RatioConvertor, TimestampConvertor, LimitSpeedConvertor, LimitRatioConvertor, TimeIntervalConvertor
from app.plugins.downloaderhelper.convertor import IConvertor, ByteSizeConvertor, PercentageConvertor, StateConvertor, SpeedConvertor, RatioConvertor, TimestampConvertor, LimitSpeedConvertor, LimitRatioConvertor, TimeIntervalConvertor, TagsConvertor
class Downloader(Enum):
@@ -272,7 +272,7 @@ class TorrentField(Enum):
种子字段枚举
"""
NAME = ('名称', 'name', 'name', None)
SELECT_SIZE = ('选定大小', 'size', '#SELECT_SIZE', ByteSizeConvertor())
SELECT_SIZE = ('选定大小', 'size', 'sizeWhenDone', ByteSizeConvertor())
TOTAL_SIZE = ('总大小', 'total_size', 'totalSize', ByteSizeConvertor())
PROGRESS = ('已完成', 'progress', 'percentDone', PercentageConvertor())
STATE = ('状态', 'state', 'status', StateConvertor())
@@ -281,7 +281,7 @@ class TorrentField(Enum):
REMAINING_TIME = ('剩余时间', '#REMAINING_TIME', '#REMAINING_TIME', TimeIntervalConvertor())
RATIO = ('比率', 'ratio', 'uploadRatio', RatioConvertor())
CATEGORY = ('分类', 'category', None, None)
TAGS = ('标签', 'tags', 'labels', None)
TAGS = ('标签', 'tags', 'labels', TagsConvertor())
ADD_TIME = ('添加时间', 'added_on', 'addedDate', TimestampConvertor())
COMPLETE_TIME = ('完成时间', 'completion_on', 'doneDate', TimestampConvertor())
DOWNLOAD_LIMIT = ('下载限制', 'dl_limit', 'downloadLimit', LimitSpeedConvertor())