diff --git a/deluge_peerbanhelperadapter/core.py b/deluge_peerbanhelperadapter/core.py index 0000d85..2ad00df 100644 --- a/deluge_peerbanhelperadapter/core.py +++ b/deluge_peerbanhelperadapter/core.py @@ -22,6 +22,7 @@ from datetime import datetime from deluge_peerbanhelperadapter.model.stats import SessionStatus, PersistenceStatus, LT_STATUS_NAMES +from deluge_peerbanhelperadapter.model.torrent import ActiveTorrent, Peer, Torrent log = logging.getLogger(__name__) @@ -123,75 +124,98 @@ def get_active_torrents_info(self): filter_dict["state"] = ["Active"] torrent_ids = self.filtermanager.filter_torrent_ids(filter_dict) - infos = [] + active_torrents = [] for torrent_id in torrent_ids: - info = {} - torrent = self.torrentmanager[torrent_id] - info["id"] = torrent_id - info["name"] = torrent.get_name() - info["info_hash"] = torrent_id - info["progress"] = torrent.get_progress() - info["size"] = torrent.status.total_wanted - info["upload_payload_rate"] = torrent.status.upload_payload_rate - info["download_payload_rate"] = torrent.status.download_payload_rate + torrent = ActiveTorrent() + deluge_torrent = self.torrentmanager[torrent_id] + torrent.id = torrent_id + torrent.name = deluge_torrent.get_name() + torrent.info_hash = torrent_id + torrent.progress = deluge_torrent.get_progress() + torrent.size = deluge_torrent.status.total_wanted + torrent.upload_payload_rate = deluge_torrent.status.upload_payload_rate + torrent.download_payload_rate = deluge_torrent.status.download_payload_rate # LT torrent_info - torrent_info = torrent.handle.torrent_file() - info["priv"] = torrent_info.priv() + torrent_info = deluge_torrent.handle.torrent_file() + torrent.priv = torrent_info.priv() # LT peer_info - peers = torrent.handle.get_peer_info() - peer_infos = [] - for peer in peers: - log.debug("peer_id: %s", str(peer.pid)) + lt_peers = deluge_torrent.handle.get_peer_info() + peers = [] + for lt_peer in lt_peers: + log.debug("peer_id: %s", str(lt_peer.pid)) # 必须排除半连接状态节点，否则可能进入等待阻塞 - if peer.flags & peer.connecting or peer.flags & peer.handshake: + if lt_peer.flags & lt_peer.connecting or lt_peer.flags & lt_peer.handshake: continue try: - client_name = decode_bytes(peer.client) + client_name = decode_bytes(lt_peer.client) except UnicodeDecodeError: client_name = "unknown" - peer_info = { - "ip": peer.ip[0], - "port": peer.ip[1], - "peer_id": str(peer.pid), - "client_name": client_name, - "up_speed": peer.up_speed, # 上传速度 - "down_speed": peer.down_speed, # 下载速度 - "payload_up_speed": peer.payload_up_speed, # 有效上传速度 - "payload_down_speed": peer.payload_down_speed, # 有效下载速度 - "total_upload": peer.total_upload, # 上传量 - "total_download": peer.total_download, # 下载量 - "progress": peer.progress, # 进度 - "flags": peer.flags, - "source": peer.source, - "local_endpoint_ip": peer.local_endpoint[0], - "local_endpoint_port": peer.local_endpoint[1], - "queue_bytes": peer.queue_bytes, # 队列字节数 - "request_timeout": peer.request_timeout, # 请求超时 - "num_hashfails": peer.num_hashfails, # 哈希失败次数 - "download_queue_length": peer.download_queue_length, # 下载队列长度 - "upload_queue_length": peer.upload_queue_length, # 上传队列长度 - "failcount": peer.failcount, # 失败次数 - "downloading_block_index": peer.downloading_block_index, # 下载块索引 - "downloading_progress": peer.downloading_progress, # 下载进度 - "downloading_total": peer.downloading_total, # 下载总量 - "connection_type": peer.connection_type, # 连接类型 - "send_quota": peer.send_quota, # 发送配额 - "receive_quota": peer.receive_quota, # 接收配额 - "rtt": peer.rtt, # 往返时间 - "num_pieces": peer.num_pieces, # 块数 - "download_rate_peak": peer.download_rate_peak, # 下载速率峰值 - "upload_rate_peak": peer.upload_rate_peak, # 上传速率峰值 - "progress_ppm": peer.progress_ppm, # 进度每分钟百分比 - } - - peer_infos.append(peer_info) - - info["peers"] = peer_infos - infos.append(info) - - return infos + peer = Peer( + ip=lt_peer.ip[0], + port=lt_peer.ip[1], + peer_id=str(lt_peer.pid), + client_name=client_name, + up_speed=lt_peer.up_speed, + down_speed=lt_peer.down_speed, + payload_up_speed=lt_peer.payload_up_speed, + payload_down_speed=lt_peer.payload_down_speed, + total_upload=lt_peer.total_upload, + total_download=lt_peer.total_download, + progress=lt_peer.progress, + flags=lt_peer.flags, + source=lt_peer.source, + local_endpoint_ip=lt_peer.local_endpoint[0], + local_endpoint_port=lt_peer.local_endpoint[1], + queue_bytes=lt_peer.queue_bytes, + request_timeout=lt_peer.request_timeout, + num_hashfails=lt_peer.num_hashfails, + download_queue_length=lt_peer.download_queue_length, + upload_queue_length=lt_peer.upload_queue_length, + failcount=lt_peer.failcount, + downloading_block_index=lt_peer.downloading_block_index, + downloading_progress=lt_peer.downloading_progress, + downloading_total=lt_peer.downloading_total, + connection_type=lt_peer.connection_type, + send_quota=lt_peer.send_quota, + receive_quota=lt_peer.receive_quota, + rtt=lt_peer.rtt, + num_pieces=lt_peer.num_pieces, + download_rate_peak=lt_peer.download_rate_peak, + upload_rate_peak=lt_peer.upload_rate_peak, + progress_ppm=lt_peer.progress_ppm, + ) + + peers.append(peer) + + torrent.peers = peers + active_torrents.append(torrent.dist()) + + return active_torrents + + @export + def get_torrents_info(self): + """返回所有种子的列表""" + torrent_ids = self.filtermanager.filter_torrent_ids(filter_dict={}) + + torrents = [] + + for torrent_id in torrent_ids: + torrent = Torrent() + deluge_torrent = self.torrentmanager[torrent_id] + torrent.id = torrent_id + torrent.name = deluge_torrent.get_name() + torrent.info_hash = torrent_id + torrent.progress = deluge_torrent.get_progress() + torrent.size = deluge_torrent.status.total_wanted + # LT torrent_info + torrent_info = deluge_torrent.handle.torrent_file() + torrent.priv = torrent_info.priv() + + torrents.append(torrent.dist()) + + return torrents @export def get_blocklist(self): diff --git a/deluge_peerbanhelperadapter/model/__init__.py b/deluge_peerbanhelperadapter/model/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/deluge_peerbanhelperadapter/model/base.py b/deluge_peerbanhelperadapter/model/base.py new file mode 100644 index 0000000..d0a8231 --- /dev/null +++ b/deluge_peerbanhelperadapter/model/base.py @@ -0,0 +1,7 @@ +from dataclasses import asdict, dataclass + + +@dataclass +class BaseModel: + def dist(self) -> dict: + return asdict(self) diff --git a/deluge_peerbanhelperadapter/model/stats.py b/deluge_peerbanhelperadapter/model/stats.py index 17cca3f..7d4579b 100644 --- a/deluge_peerbanhelperadapter/model/stats.py +++ b/deluge_peerbanhelperadapter/model/stats.py @@ -1,6 +1,8 @@ from dataclasses import dataclass, asdict, fields from datetime import datetime +from deluge_peerbanhelperadapter.model.base import BaseModel + LT_STATUS_NAMES = [ "net.sent_payload_bytes", "net.sent_bytes", @@ -24,7 +26,7 @@ @dataclass -class PersistenceStatus: +class PersistenceStatus(BaseModel): # 最后统计时间戳 stats_last_timestamp: int = int(datetime.now().timestamp()) @@ -82,9 +84,6 @@ def __add__(self, other): def persistence_dist(self) -> dict: return asdict(self) - def dist(self) -> dict: - return asdict(self) - _persistence_fields = {field.name for field in fields(PersistenceStatus)} diff --git a/deluge_peerbanhelperadapter/model/torrent.py b/deluge_peerbanhelperadapter/model/torrent.py new file mode 100644 index 0000000..03feec1 --- /dev/null +++ b/deluge_peerbanhelperadapter/model/torrent.py @@ -0,0 +1,98 @@ +from dataclasses import asdict, dataclass, field +from typing import List + +from deluge_peerbanhelperadapter.model.base import BaseModel + + +@dataclass +class Peer(BaseModel): + ip: str = "" + port: int = 0 + peer_id: str = "" + client_name: str = "" + # 上传速度 + up_speed: int = 0 + # 下载速度 + down_speed: int = 0 + # 有效上传速度 + payload_up_speed: int = 0 + # 有效下载速度 + payload_down_speed: int = 0 + # 上传量 + total_upload: int = 0 + # 下载量 + total_download: int = 0 + # 进度 + progress: float = 0 + flags: int = 0 + source: int = 0 + local_endpoint_ip: str = "" + local_endpoint_port: int = 0 + # 队列字节数 + queue_bytes: int = 0 + # 请求超时 + request_timeout: int = 0 + # 哈希失败次数 + num_hashfails: int = 0 + # 下载队列长度 + download_queue_length: int = 0 + # 上传队列长度 + upload_queue_length: int = 0 + # 失败次数 + failcount: int = 0 + # 下载块索引 + downloading_block_index: int = 0 + # 下载进度 + downloading_progress: int = 0 + # 下载总量 + downloading_total: int = 0 + # 连接类型 + connection_type: int = 0 + # 发送配额 + send_quota: int = 0 + # 接收配额 + receive_quota: int = 0 + # 往返时间 + rtt: int = 0 + # 块数 + num_pieces: int = 0 + # 下载速率峰值 + download_rate_peak: int = 0 + # 上传速率峰值 + upload_rate_peak: int = 0 + # 进度每分钟百分比 + progress_ppm: int = 0 + + def dist(self) -> dict: + return asdict(self) + +@dataclass +class Torrent(BaseModel): + id: str = "" + name: str = "" + + # 种子hash + info_hash: str = "" + + # 进度 + progress: float = 0 + + # 种子大小 + size: int = 0 + + # 是否为私有种子 + priv: bool = False + + def dist(self) -> dict: + return asdict(self) + + +@dataclass +class ActiveTorrent(Torrent): + # 有效上传速率 + upload_payload_rate: int = 0 + + # 有效下载速率 + download_payload_rate: int = 0 + + peers: List[Peer] = field(default_factory=list)