refactor: unify site chain data port access

This commit is contained in:
jxxghp
2026-08-24 04:25:29 +08:00
parent 286b5836a1
commit 836cbfbbb2
6 changed files with 51 additions and 18 deletions
+15 -13
View File
@@ -11,7 +11,7 @@ from app.chain import ChainBase
from app.chain._interaction import InteractionChainMixin
from app.runtime.config import global_vars
from app.runtime.events import Event, eventmanager
from app.application.chain.data import SitePortProxy as SiteOper
from app.application.chain.data import get_chain_site_port
from app.application.configuration import get_configured_system_config
from app.adapters.network.browser import PlaywrightHelper
from app.adapters.network.cloudflare import under_challenge
@@ -68,9 +68,11 @@ class SiteChain(InteractionChainMixin, ChainBase):
"""
userdata: SiteUserData = self.run_module("refresh_userdata", site=site)
if userdata:
SiteOper().update_userdata(domain=site_rules.extract_domain(site.get("domain")),
name=site.get("name"),
payload=userdata.model_dump())
get_chain_site_port().update_userdata(
domain=site_rules.extract_domain(site.get("domain")),
name=site.get("name"),
payload=userdata.model_dump(),
)
# 发送事件
eventmanager.send_event(EventType.SiteRefreshed, {
"site_id": site.get("id")
@@ -421,7 +423,7 @@ class SiteChain(InteractionChainMixin, ChainBase):
self.messagehelper.put(msg, title="CookieCloud同步失败", role="system")
return False, msg
siteshelper = SitesHelper()
siteoper = SiteOper()
siteoper = get_chain_site_port()
rsshelper = RssHelper()
total_num = len(cookies)
update_count = add_count = fail_count = 0
@@ -485,7 +487,7 @@ class SiteChain(InteractionChainMixin, ChainBase):
cookie: str,
indexer: Optional[dict],
site_info: Any,
siteoper: SiteOper,
siteoper: Any,
rsshelper: RssHelper,
) -> Tuple[int, int, int, bool]:
"""处理单个域名,并返回计数与是否继续发送更新事件。"""
@@ -581,7 +583,7 @@ class SiteChain(InteractionChainMixin, ChainBase):
if str(domain).startswith("http"):
domain = site_rules.extract_domain(domain)
# 站点信息
siteoper = SiteOper()
siteoper = get_chain_site_port()
siteshelper = SitesHelper()
siteinfo = siteoper.get_by_domain(domain)
if not siteinfo:
@@ -659,7 +661,7 @@ class SiteChain(InteractionChainMixin, ChainBase):
"""
# 检查域名是否可用
domain = site_rules.extract_domain(url)
siteoper = SiteOper()
siteoper = get_chain_site_port()
site_info = siteoper.get_by_domain(domain)
if not site_info:
return False, f"站点【{url}】不存在"
@@ -737,7 +739,7 @@ class SiteChain(InteractionChainMixin, ChainBase):
return SiteInteractionHandler(
messenger=self,
cookie_updater=self.update_cookie,
repository=SiteOper(),
repository=get_chain_site_port(),
)
def remote_disable(self, arg_str: str, channel: NotificationChannel,
@@ -751,7 +753,7 @@ class SiteChain(InteractionChainMixin, ChainBase):
if not arg_str.isdigit():
return
site_id = int(arg_str)
siteoper = SiteOper()
siteoper = get_chain_site_port()
site = siteoper.get(site_id)
if not site:
self.post_message(Message(
@@ -775,7 +777,7 @@ class SiteChain(InteractionChainMixin, ChainBase):
if not arg_str:
return
arg_strs = str(arg_str).split()
siteoper = SiteOper()
siteoper = get_chain_site_port()
for arg_str in arg_strs:
arg_str = arg_str.strip()
if not arg_str.isdigit():
@@ -819,7 +821,7 @@ class SiteChain(InteractionChainMixin, ChainBase):
cookie, ua, msg = result
if not cookie:
return False, msg
SiteOper().update(site_info.id, {
get_chain_site_port().update(site_info.id, {
"cookie": cookie,
"ua": ua
})
@@ -867,7 +869,7 @@ class SiteChain(InteractionChainMixin, ChainBase):
# 站点ID
site_id = int(site_id)
# 站点信息
site_info = SiteOper().get(site_id)
site_info = get_chain_site_port().get(site_id)
if not site_info:
self.post_message(Message(
channel=channel,
+2 -2
View File
@@ -12,7 +12,7 @@ from app.domain.context import TorrentInfo, Context, MediaInfo
from app.domain.context import MusicInfo
from app.domain.meta.metamusic import MetaMusic
from app.domain.metainfo import MetaInfo
from app.application.chain.data import SitePortProxy as SiteOper
from app.application.chain.data import get_chain_site_port
from app.application.configuration import get_configured_system_config
from app.application.rss import RssHelper
from app.application.torrent import TorrentHelper
@@ -804,7 +804,7 @@ class TorrentsChain(ChainBase):
# 获取过期rss除去passkey部分
new_rss = re.sub(r'&passkey=([a-zA-Z0-9]+)', f'&passkey={new_passkey}', site.get("rss"))
logger.info(f"更新站点 {domain} RSS地址 ...")
SiteOper().update_rss(domain=domain, rss=new_rss)
get_chain_site_port().update_rss(domain=domain, rss=new_rss)
else:
# 发送消息
self.post_message(