GithubBackup/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-09-04 23:17:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(config): retire RuntimeSettingsCompat host usage

Browse Source
This commit is contained in:
jxxghp
2026-08-26 15:55:21 +08:00
parent cdab54254d
commit 9dbe424c3d
162 changed files with 1966 additions and 1745 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/modules/indexer/parser/__init__.py
+5 -6
View File
@@ -8,9 +8,8 @@ from urllib.parse import urljoin, urlsplit
from requests import Session
from app.runtime.settings import RuntimeSettingsCompat
from app.runtime.settings import get_runtime_setting
settings = RuntimeSettingsCompat()
from app.adapters.network.cloudflare import under_challenge
from app.runtime.log import logger
from app.adapters.network.http import RequestUtils
@@ -228,7 +227,7 @@ class SiteParserBase(metaclass=ABCMeta):
)
)
# 解析用户未读消息
if settings.SITE_MESSAGE:
if get_runtime_setting('SITE_MESSAGE'):
self._pase_unread_msgs()
# 解析用户上传、下载、分享率等信息
if self._user_traffic_page:
@@ -346,7 +345,7 @@ class SiteParserBase(metaclass=ABCMeta):
:return:
"""
req_headers = None
proxies = settings.PROXY if self._proxy else None
proxies = get_runtime_setting('PROXY') if self._proxy else None
if self._ua or headers or self._addition_headers:
if self.request_mode == "apikey":
@@ -408,8 +407,8 @@ class SiteParserBase(metaclass=ABCMeta):
f"{self._site_name} 检测到Cloudflare，请更新Cookie和UA")
return ""
return RequestUtils.get_decoded_html_content(res,
settings.ENCODING_DETECTION_PERFORMANCE_MODE,
settings.ENCODING_DETECTION_MIN_CONFIDENCE)
get_runtime_setting('ENCODING_DETECTION_PERFORMANCE_MODE'),
get_runtime_setting('ENCODING_DETECTION_MIN_CONFIDENCE'))
return ""
app/modules/indexer/parser/rousi.py
+3 -4
View File
@@ -4,9 +4,8 @@ from urllib.parse import urljoin
from typing import Optional, Tuple
from app.runtime.log import logger
from app.runtime.settings import RuntimeSettingsCompat
from app.runtime.settings import get_runtime_setting
settings = RuntimeSettingsCompat()
from app.adapters.network.http import RequestUtils
from app.domain import site as site_rules
from app.foundation import temporal as time_tools
@@ -195,7 +194,7 @@ class RousiSiteUserInfo(SiteParserBase):
res = RequestUtils(
headers=headers,
timeout=60,
proxies=settings.PROXY if self._proxy else None
proxies=get_runtime_setting('PROXY') if self._proxy else None
).get_res(
url=urljoin(self._base_url, "api/messages"),
params=params
@@ -231,7 +230,7 @@ class RousiSiteUserInfo(SiteParserBase):
RequestUtils(
headers=headers,
timeout=60,
proxies=settings.PROXY if self._proxy else None
proxies=get_runtime_setting('PROXY') if self._proxy else None
).post_res(
url=urljoin(self._base_url, "api/messages/read-all")
)
app/modules/indexer/spider/__init__.py
+8 -9
View File
@@ -9,9 +9,8 @@ from jinja2 import Template
from pyquery import PyQuery
from app.runtime.execution import run_in_threadpool
from app.runtime.settings import RuntimeSettingsCompat
from app.runtime.settings import get_runtime_setting
settings = RuntimeSettingsCompat()
from app.runtime.log import logger
from app.schemas.types import MediaType
from app.adapters.system import rust as rust_accel
@@ -136,9 +135,9 @@ class SiteSpider:
self.page = page
if self.domain and not str(self.domain).endswith("/"):
self.domain = self.domain + "/"
self.ua = indexer.get('ua') or settings.USER_AGENT
self.proxies = settings.PROXY if indexer.get('proxy') else None
self.proxy_server = settings.PROXY_SERVER if indexer.get('proxy') else None
self.ua = indexer.get('ua') or get_runtime_setting('USER_AGENT')
self.proxies = get_runtime_setting('PROXY') if indexer.get('proxy') else None
self.proxy_server = get_runtime_setting('PROXY_SERVER') if indexer.get('proxy') else None
self.cookie = indexer.get('cookie')
self.referer = referer
# 初始化属性
@@ -362,8 +361,8 @@ class SiteSpider:
return self.parse(
RequestUtils.get_decoded_html_content(
ret,
performance_mode=settings.ENCODING_DETECTION_PERFORMANCE_MODE,
confidence_threshold=settings.ENCODING_DETECTION_MIN_CONFIDENCE
performance_mode=get_runtime_setting('ENCODING_DETECTION_PERFORMANCE_MODE'),
confidence_threshold=get_runtime_setting('ENCODING_DETECTION_MIN_CONFIDENCE')
)
)
@@ -394,8 +393,8 @@ class SiteSpider:
self.parse,
RequestUtils.get_decoded_html_content(
ret,
performance_mode=settings.ENCODING_DETECTION_PERFORMANCE_MODE,
confidence_threshold=settings.ENCODING_DETECTION_MIN_CONFIDENCE
performance_mode=get_runtime_setting('ENCODING_DETECTION_PERFORMANCE_MODE'),
confidence_threshold=get_runtime_setting('ENCODING_DETECTION_MIN_CONFIDENCE')
)
)
app/modules/indexer/spider/haidan.py
+2 -3
View File
@@ -1,9 +1,8 @@
import urllib.parse
from typing import Tuple, List
from app.runtime.settings import RuntimeSettingsCompat
from app.runtime.settings import get_runtime_setting
settings = RuntimeSettingsCompat()
from app.application.configuration import get_configured_system_config
from app.runtime.log import logger
from app.schemas.types import MediaType
@@ -70,7 +69,7 @@ class HaiDanSpider:
self._searchurl = self._searchurl % self._url
self._name = indexer.get('name')
if indexer.get('proxy'):
self._proxy = settings.PROXY
self._proxy = get_runtime_setting('PROXY')
self._cookie = indexer.get('cookie')
self._ua = indexer.get('ua')
self._timeout = indexer.get('timeout') or 15
app/modules/indexer/spider/hddolby.py
+2 -3
View File
@@ -1,8 +1,7 @@
from typing import Tuple, List, Optional
from app.runtime.settings import RuntimeSettingsCompat
from app.runtime.settings import get_runtime_setting
settings = RuntimeSettingsCompat()
from app.application.configuration import get_configured_system_config
from app.runtime.log import logger
from app.schemas.types import MediaType
@@ -76,7 +75,7 @@ class HddolbySpider:
self._domain_host = site_rules.extract_domain(self._domain)
self._name = indexer.get('name')
if indexer.get('proxy'):
self._proxy = settings.PROXY
self._proxy = get_runtime_setting('PROXY')
self._cookie = indexer.get('cookie')
self._ua = indexer.get('ua')
self._apikey = indexer.get('apikey')
app/modules/indexer/spider/mtorrent.py
+2 -3
View File
@@ -4,9 +4,8 @@ import re
from typing import Tuple, List, Optional
from urllib.parse import urlparse
from app.runtime.settings import RuntimeSettingsCompat
from app.runtime.settings import get_runtime_setting
settings = RuntimeSettingsCompat()
from app.application.configuration import get_configured_system_config
from app.runtime.log import logger
from app.schemas.types import MediaType
@@ -75,7 +74,7 @@ class MTorrentSpider:
self._searchurl = self._searchurl % self._domain
self._name = indexer.get('name')
if indexer.get('proxy'):
self._proxy = settings.PROXY
self._proxy = get_runtime_setting('PROXY')
self._cookie = indexer.get('cookie')
self._ua = indexer.get('ua')
self._apikey = indexer.get('apikey')
app/modules/indexer/spider/rousi.py
+2 -3
View File
@@ -2,9 +2,8 @@ import base64
import json
from typing import List, Optional, Tuple
from app.runtime.settings import RuntimeSettingsCompat
from app.runtime.settings import get_runtime_setting
settings = RuntimeSettingsCompat()
from app.application.configuration import get_configured_system_config
from app.runtime.log import logger
from app.schemas.types import MediaType
@@ -60,7 +59,7 @@ class RousiSpider:
self._downloadurl = self._downloadurl % (self._domain, "%s")
self._name = indexer.get('name')
if indexer.get('proxy'):
self._proxy = settings.PROXY
self._proxy = get_runtime_setting('PROXY')
self._cookie = indexer.get('cookie')
self._ua = indexer.get('ua')
self._apikey = indexer.get('apikey')
app/modules/indexer/spider/sunnypt.py
+3 -4
View File
@@ -3,9 +3,8 @@ import json
import time
from typing import List, Optional, Tuple
from app.runtime.settings import RuntimeSettingsCompat
from app.runtime.settings import get_runtime_setting
settings = RuntimeSettingsCompat()
from app.runtime.log import logger
from app.schemas.types import MediaType
from app.adapters.network.http import AsyncRequestUtils, RequestUtils
@@ -34,9 +33,9 @@ class SunnyPTSpider:
self._api_url = str(
indexer.get("api_url") or "https://api.sunnypt.top/api/v1/mp"
).rstrip("/")
self._proxy = settings.PROXY if indexer.get("proxy") else None
self._proxy = get_runtime_setting('PROXY') if indexer.get("proxy") else None
self._use_proxy = bool(indexer.get("proxy"))
self._user_agent = indexer.get("ua") or settings.USER_AGENT
self._user_agent = indexer.get("ua") or get_runtime_setting('USER_AGENT')
self._api_key = indexer.get("apikey")
self._timeout = indexer.get("timeout") or 15
self._configured_categories = self._parse_configured_categories(
app/modules/indexer/spider/tnode.py
+2 -3
View File
@@ -2,9 +2,8 @@ import re
from typing import Tuple, List, Optional
from app.runtime.cache import cached
from app.runtime.settings import RuntimeSettingsCompat
from app.runtime.settings import get_runtime_setting
settings = RuntimeSettingsCompat()
from app.runtime.log import logger
from app.adapters.network.http import RequestUtils, AsyncRequestUtils
from app.foundation.singleton import SingletonClass
@@ -33,7 +32,7 @@ class TNodeSpider(metaclass=SingletonClass):
self._searchurl = self._baseurl % self._domain
self._name = indexer.get('name')
if indexer.get('proxy'):
self._proxy = settings.PROXY
self._proxy = get_runtime_setting('PROXY')
self._cookie = indexer.get('cookie')
self._ua = indexer.get('ua')
self._timeout = indexer.get('timeout') or 15
app/modules/indexer/spider/torrentleech.py
+2 -3
View File
@@ -1,9 +1,8 @@
from typing import List, Tuple, Optional
from urllib.parse import quote
from app.runtime.settings import RuntimeSettingsCompat
from app.runtime.settings import get_runtime_setting
settings = RuntimeSettingsCompat()
from app.runtime.log import logger
from app.schemas.types import MediaType
from app.adapters.network.http import RequestUtils, AsyncRequestUtils
@@ -34,7 +33,7 @@ class TorrentLeech:
"""初始化站点认证信息和媒体分类配置。"""
self._indexer = indexer
if indexer.get('proxy'):
self._proxy = settings.PROXY
self._proxy = get_runtime_setting('PROXY')
self._timeout = indexer.get('timeout') or 15
def __category_ids(self, mtype: MediaType = None) -> List[str]:
app/modules/indexer/spider/yema.py
+3 -4
View File
@@ -2,9 +2,8 @@ import base64
import json
from typing import List, Optional, Tuple
from app.runtime.settings import RuntimeSettingsCompat
from app.runtime.settings import get_runtime_setting
settings = RuntimeSettingsCompat()
from app.runtime.log import logger
from app.schemas.types import MediaType
from app.adapters.network.http import AsyncRequestUtils, RequestUtils
@@ -46,9 +45,9 @@ class YemaSpider:
indexer = indexer or {}
self._name = indexer.get("name") or "YemaPT"
self._site_url = str(indexer.get("domain") or "https://www.yemapt.org/").rstrip("/")
self._proxy = settings.PROXY if indexer.get("proxy") else None
self._proxy = get_runtime_setting('PROXY') if indexer.get("proxy") else None
self._use_proxy = bool(indexer.get("proxy"))
self._user_agent = indexer.get("ua") or settings.USER_AGENT
self._user_agent = indexer.get("ua") or get_runtime_setting('USER_AGENT')
self._api_key = indexer.get("apikey")
self._timeout = indexer.get("timeout") or 15
self._search_url = f"{self._site_url}/openApi/torrent/fetchOpenTorrentList.json"