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

fix 认证失败后插件站点缺失bug

Browse Source
This commit is contained in:
thsrite 2023-10-28 19:14:08 +08:00
parent 262bda94c4
commit 8874723632
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/plugins/autosignin/__init__.py
View File

@ -96,9 +96,10 @@ class AutoSignIn(_PluginBase):
self._clean = config.get("clean") self._clean = config.get("clean")
# 过滤掉已删除的站点 # 过滤掉已删除的站点
all_sites = [site for site in self.sites.get_indexers() if not site.get("public")] + self.__custom_sites() all_sites = [site.id for site in self.siteoper.list_order_by_pri()] + [site.get("id") for site in
self._sign_sites = [site.get("id") for site in all_sites if site.get("id") in self._sign_sites] self.__custom_sites()]
self._login_sites = [site.get("id") for site in all_sites if site.get("id") in self._login_sites] self._sign_sites = [site_id for site_id in all_sites if site_id in self._sign_sites]
self._login_sites = [site_id for site_id in all_sites if site_id in self._login_sites]
# 保存配置 # 保存配置
self.__update_config() self.__update_config()

21
app/plugins/iyuuautoseed/__init__.py
View File

@ -115,8 +115,9 @@ class IYUUAutoSeed(_PluginBase):
self._success_caches = [] if self._clearcache else config.get("success_caches") or [] self._success_caches = [] if self._clearcache else config.get("success_caches") or []
# 过滤掉已删除的站点 # 过滤掉已删除的站点
self._sites = [site.get("id") for site in self.sites.get_indexers() if all_sites = [site.id for site in self.siteoper.list_order_by_pri()] + [site.get("id") for site in
not site.get("public") and site.get("id") in self._sites] self.__custom_sites()]
self._sites = [site_id for site_id in all_sites if site_id in self._sites]
self.__update_config() self.__update_config()
# 停止现有任务 # 停止现有任务
@ -175,9 +176,14 @@ class IYUUAutoSeed(_PluginBase):
""" """
拼装插件配置页面，需要返回两块数据：1、页面配置；2、数据结构 拼装插件配置页面，需要返回两块数据：1、页面配置；2、数据结构
""" """
# 站点的可选项（内置站点 + 自定义站点）
customSites = self.__custom_sites()
# 站点的可选项 # 站点的可选项
site_options = [{"title": site.name, "value": site.id} site_options = ([{"title": site.name, "value": site.id}
for site in self.siteoper.list_order_by_pri()] for site in self.siteoper.list_order_by_pri()]
+ [{"title": site.get("name"), "value": site.get("id")}
for site in customSites])
return [ return [
{ {
'component': 'VForm', 'component': 'VForm',
@ -986,6 +992,13 @@ class IYUUAutoSeed(_PluginBase):
except Exception as e: except Exception as e:
print(str(e)) print(str(e))
def __custom_sites(self) -> List[Any]:
custom_sites = []
custom_sites_config = self.get_config("CustomSites")
if custom_sites_config and custom_sites_config.get("enabled"):
custom_sites = custom_sites_config.get("sites")
return custom_sites
@eventmanager.register(EventType.SiteDeleted) @eventmanager.register(EventType.SiteDeleted)
def site_deleted(self, event): def site_deleted(self, event):
""" """

6
app/plugins/sitestatistic/__init__.py
View File

@ -89,9 +89,9 @@ class SiteStatistic(_PluginBase):
self._statistic_sites = config.get("statistic_sites") or [] self._statistic_sites = config.get("statistic_sites") or []
# 过滤掉已删除的站点 # 过滤掉已删除的站点
all_sites = [site for site in self.sites.get_indexers() if not site.get("public")] + self.__custom_sites() all_sites = [site.id for site in self.siteoper.list_order_by_pri()] + [site.get("id") for site in
self._statistic_sites = [site.get("id") for site in all_sites if self.__custom_sites()]
not site.get("public") and site.get("id") in self._statistic_sites] self._statistic_sites = [site_id for site_id in all_sites if site_id in self._statistic_sites]
self.__update_config() self.__update_config()
if self._enabled or self._onlyonce: if self._enabled or self._onlyonce: