From 0a84a50a195659a7b7c943447f110fa3e3ee98a6 Mon Sep 17 00:00:00 2001 From: thsrite Date: Sat, 12 Aug 2023 15:42:37 +0800 Subject: [PATCH] =?UTF-8?q?fix=20tr=E8=BF=9E=E6=8E=A5=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/modules/qbittorrent/qbittorrent.py | 3 +-- app/modules/transmission/transmission.py | 3 +-- app/utils/string.py | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/modules/qbittorrent/qbittorrent.py b/app/modules/qbittorrent/qbittorrent.py index 96d6ddf0..3b33e1e6 100644 --- a/app/modules/qbittorrent/qbittorrent.py +++ b/app/modules/qbittorrent/qbittorrent.py @@ -13,7 +13,6 @@ from app.utils.string import StringUtils class Qbittorrent(metaclass=Singleton): - _host: str = None _port: int = None _username: str = None @@ -22,7 +21,7 @@ class Qbittorrent(metaclass=Singleton): qbc: Client = None def __init__(self): - self._host, self._port = StringUtils.get_domain_address(settings.QB_HOST) + self._host, self._port = StringUtils.get_domain_address(address=settings.QB_HOST, prefix=True) self._username = settings.QB_USER self._password = settings.QB_PASSWORD if self._host and self._port and self._username and self._password: diff --git a/app/modules/transmission/transmission.py b/app/modules/transmission/transmission.py index 0f0193d9..24f0c0b4 100644 --- a/app/modules/transmission/transmission.py +++ b/app/modules/transmission/transmission.py @@ -11,7 +11,6 @@ from app.utils.string import StringUtils class Transmission(metaclass=Singleton): - _host: str = None _port: int = None _username: str = None @@ -26,7 +25,7 @@ class Transmission(metaclass=Singleton): "error", "errorString", "doneDate", "queuePosition", "activityDate", "trackers"] def __init__(self): - self._host, self._port = StringUtils.get_domain_address(settings.TR_HOST) + self._host, self._port = StringUtils.get_domain_address(address=settings.TR_HOST, prefix=False) self._username = settings.TR_USER self._password = settings.TR_PASSWORD if self._host and self._port and self._username and self._password: diff --git a/app/utils/string.py b/app/utils/string.py index 6c293494..f4b866f4 100644 --- a/app/utils/string.py +++ b/app/utils/string.py @@ -543,13 +543,13 @@ class StringUtils: return reparse @staticmethod - def get_domain_address(address: str) -> Tuple[Optional[str], Optional[int]]: + def get_domain_address(address: str, prefix: bool = True) -> Tuple[Optional[str], Optional[int]]: """ 从地址中获取域名和端口号 """ if not address: return None, None - if not address.startswith("http"): + if prefix and not address.startswith("http"): address = "http://" + address parts = address.split(":") if len(parts) > 3: