codfrm/MoviePilot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #90 from thsrite/main

Browse Source
This commit is contained in:
jxxghp 2023-08-12 15:59:46 +08:00 committed by GitHub
commit 538ade89be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/modules/qbittorrent/qbittorrent.py
View File

@ -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:

3
app/modules/transmission/transmission.py
View File

@ -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:

4
app/utils/string.py
View File

@ -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: