From b080a2003fcccdde6e77e72db790800bf7338e27 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Thu, 27 Feb 2025 17:08:38 +0800 Subject: [PATCH] fix actions --- app/actions/add_download.py | 2 +- app/actions/fetch_medias.py | 22 ++++++++++++---------- app/actions/fetch_rss.py | 4 ++-- app/actions/fetch_torrents.py | 2 +- app/actions/filter_medias.py | 2 +- app/actions/filter_torrents.py | 4 ++-- app/actions/transfer_file.py | 2 +- 7 files changed, 20 insertions(+), 18 deletions(-) diff --git a/app/actions/add_download.py b/app/actions/add_download.py index a8716cec..5906d546 100644 --- a/app/actions/add_download.py +++ b/app/actions/add_download.py @@ -31,7 +31,7 @@ class AddDownloadAction(BaseAction): @property def name(self) -> str: - return "添加下载资源" + return "添加下载" @property def description(self) -> str: diff --git a/app/actions/fetch_medias.py b/app/actions/fetch_medias.py index 8e551b4b..b6998093 100644 --- a/app/actions/fetch_medias.py +++ b/app/actions/fetch_medias.py @@ -81,13 +81,24 @@ class FetchMediasAction(BaseAction): __medias = [] + def __init__(self): + super().__init__() + # 广播事件,请示额外的推荐数据源支持 + event_data = RecommendSourceEventData() + event = eventmanager.send_event(ChainEventType.RecommendSource, event_data) + # 使用事件返回的上下文数据 + if event and event.event_data: + event_data: RecommendSourceEventData = event.event_data + if event_data.extra_sources: + self.__inner_sources.extend([s.dict() for s in event_data.extra_sources]) + @property def name(self) -> str: return "获取媒体数据" @property def description(self) -> str: - return "获取媒体数据" + return "获取榜单等媒体数据列表" @property def data(self) -> dict: @@ -110,15 +121,6 @@ class FetchMediasAction(BaseAction): """ 获取媒体数据,填充到medias """ - # 广播事件,请示额外的推荐数据源支持 - event_data = RecommendSourceEventData() - event = eventmanager.send_event(ChainEventType.RecommendSource, event_data) - # 使用事件返回的上下文数据 - if event and event.event_data: - event_data: RecommendSourceEventData = event.event_data - if event_data.extra_sources: - self.__inner_sources.extend([s.dict() for s in event_data.extra_sources]) - for name in params.sources: source = self.__get_source(name) if not source: diff --git a/app/actions/fetch_rss.py b/app/actions/fetch_rss.py index 3622bf63..d8e0efc2 100644 --- a/app/actions/fetch_rss.py +++ b/app/actions/fetch_rss.py @@ -37,11 +37,11 @@ class FetchRssAction(BaseAction): @property def name(self) -> str: - return "获取RSS资源列表" + return "获取RSS资源" @property def description(self) -> str: - return "请求RSS地址获取数据,并解析为资源列表" + return "订阅RSS地址获取资源" @property def data(self) -> dict: diff --git a/app/actions/fetch_torrents.py b/app/actions/fetch_torrents.py index 42e5f7da..63952132 100644 --- a/app/actions/fetch_torrents.py +++ b/app/actions/fetch_torrents.py @@ -32,7 +32,7 @@ class FetchTorrentsAction(BaseAction): @property def name(self) -> str: - return "获取站点资源" + return "搜索站点资源" @property def description(self) -> str: diff --git a/app/actions/filter_medias.py b/app/actions/filter_medias.py index e89b7d3f..13c28a17 100644 --- a/app/actions/filter_medias.py +++ b/app/actions/filter_medias.py @@ -30,7 +30,7 @@ class FilterMediasAction(BaseAction): @property def description(self) -> str: - return "过滤媒体数据列表" + return "对媒体数据列表进行过滤" @property def data(self) -> dict: diff --git a/app/actions/filter_torrents.py b/app/actions/filter_torrents.py index f3f76576..4e787357 100644 --- a/app/actions/filter_torrents.py +++ b/app/actions/filter_torrents.py @@ -34,11 +34,11 @@ class FilterTorrentsAction(BaseAction): @property def name(self) -> str: - return "过滤资源数据" + return "过滤资源" @property def description(self) -> str: - return "过滤资源数据列表" + return "对资源列表数据进行过滤" @property def data(self) -> dict: diff --git a/app/actions/transfer_file.py b/app/actions/transfer_file.py index ad7e09d8..dcfe96e9 100644 --- a/app/actions/transfer_file.py +++ b/app/actions/transfer_file.py @@ -32,7 +32,7 @@ class TransferFileAction(BaseAction): @property def description(self) -> str: - return "整理和转移文件" + return "转移和重命名文件" @property def data(self) -> dict: