From 31b0d061b42d9d74cc4a37ff81df571219942c5a Mon Sep 17 00:00:00 2001 From: jxxghp Date: Sun, 2 Jul 2023 16:46:22 +0800 Subject: [PATCH] add speed --- app/modules/qbittorrent/__init__.py | 4 +++- app/modules/transmission/__init__.py | 5 ++++- app/schemas/context.py | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/modules/qbittorrent/__init__.py b/app/modules/qbittorrent/__init__.py index 8a249748..c604b6b2 100644 --- a/app/modules/qbittorrent/__init__.py +++ b/app/modules/qbittorrent/__init__.py @@ -140,7 +140,9 @@ class QbittorrentModule(_ModuleBase): year=meta.year, season_episode=meta.season_episode, progress=torrent.get('progress'), - size=torrent.get('total_size') + size=torrent.get('total_size'), + dlspeed=StringUtils.str_filesize(torrent.get('dlspeed')), + upspeed=StringUtils.str_filesize(torrent.get('upspeed')), )) else: return None diff --git a/app/modules/transmission/__init__.py b/app/modules/transmission/__init__.py index 9bf1e0f8..dee5e3d0 100644 --- a/app/modules/transmission/__init__.py +++ b/app/modules/transmission/__init__.py @@ -8,6 +8,7 @@ from app.modules import _ModuleBase from app.modules.transmission.transmission import Transmission from app.schemas import TransferInfo, TransferTorrent, DownloadingTorrent from app.schemas.types import TorrentStatus +from app.utils.string import StringUtils class TransmissionModule(_ModuleBase): @@ -122,7 +123,9 @@ class TransmissionModule(_ModuleBase): year=meta.year, season_episode=meta.season_episode, progress=torrent.progress, - size=torrent.total_size + size=torrent.total_size, + dlspeed=StringUtils.str_filesize(torrent.download_speed), + ulspeed=StringUtils.str_filesize(torrent.upload_speed), )) else: return None diff --git a/app/schemas/context.py b/app/schemas/context.py index 6cced0ea..8be58e65 100644 --- a/app/schemas/context.py +++ b/app/schemas/context.py @@ -189,6 +189,8 @@ class DownloadingTorrent(BaseModel): size: Optional[float] = 0 progress: Optional[float] = 0 state: Optional[str] = 'downloading' + upspeed: Optional[str] = None + dlspeed: Optional[str] = None media: Optional[dict] = {}