From e5ac7f10d484ed65f506ec343fcc6422478e3595 Mon Sep 17 00:00:00 2001 From: honue Date: Wed, 29 Nov 2023 13:23:28 +0800 Subject: [PATCH] update downloader init --- app/modules/qbittorrent/qbittorrent.py | 14 ++++++++++---- app/modules/transmission/transmission.py | 14 ++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/app/modules/qbittorrent/qbittorrent.py b/app/modules/qbittorrent/qbittorrent.py index b0acaf14..54746ba5 100644 --- a/app/modules/qbittorrent/qbittorrent.py +++ b/app/modules/qbittorrent/qbittorrent.py @@ -20,10 +20,16 @@ class Qbittorrent(metaclass=Singleton): qbc: Client = None - def __init__(self): - self._host, self._port = StringUtils.get_domain_address(address=settings.QB_HOST, prefix=True) - self._username = settings.QB_USER - self._password = settings.QB_PASSWORD + def __init__(self, host: str = None, port: int = None, username: str = None, password: str = None): + """ + 若不设置参数，则创建配置文件设置的下载器 + """ + if host and port: + self._host, self._port = host, port + else: + self._host, self._port = StringUtils.get_domain_address(address=settings.QB_HOST, prefix=True) + self._username = username if username else settings.QB_USER + self._password = password if password else settings.QB_PASSWORD if self._host and self._port: self.qbc = self.__login_qbittorrent() diff --git a/app/modules/transmission/transmission.py b/app/modules/transmission/transmission.py index fa7b9bd8..4824df33 100644 --- a/app/modules/transmission/transmission.py +++ b/app/modules/transmission/transmission.py @@ -24,10 +24,16 @@ class Transmission(metaclass=Singleton): "peersGettingFromUs", "peersSendingToUs", "uploadRatio", "uploadedEver", "downloadedEver", "downloadDir", "error", "errorString", "doneDate", "queuePosition", "activityDate", "trackers"] - def __init__(self): - self._host, self._port = StringUtils.get_domain_address(address=settings.TR_HOST, prefix=False) - self._username = settings.TR_USER - self._password = settings.TR_PASSWORD + def __init__(self, host: str = None, port: int = None, username: str = None, password: str = None): + """ + 若不设置参数，则创建配置文件设置的下载器 + """ + if host and port: + self._host, self._port = host, port + else: + self._host, self._port = StringUtils.get_domain_address(address=settings.TR_HOST, prefix=False) + self._username = username if username else settings.TR_USER + self._password = password if password else settings.TR_PASSWORD if self._host and self._port: self.trc = self.__login_transmission()