fix #2086 没有站点时订阅打不开的问题 && 默认洗版不生效的问题
This commit is contained in:
parent
e1e2779e48
commit
495d98c2b2
@ -42,7 +42,9 @@ def read_subscribes(
|
||||
subscribes = Subscribe.list(db)
|
||||
for subscribe in subscribes:
|
||||
if subscribe.sites:
|
||||
subscribe.sites = json.loads(subscribe.sites)
|
||||
subscribe.sites = json.loads(str(subscribe.sites))
|
||||
else:
|
||||
subscribe.sites = []
|
||||
return subscribes
|
||||
|
||||
|
||||
|
@ -141,7 +141,7 @@ class SubscribeChain(ChainBase):
|
||||
'effect': self.__get_default_subscribe_config(mediainfo.type, "effect"),
|
||||
'include': self.__get_default_subscribe_config(mediainfo.type, "include"),
|
||||
'exclude': self.__get_default_subscribe_config(mediainfo.type, "exclude"),
|
||||
'best_version': self.__get_default_subscribe_config(mediainfo.type, "best_version") if kwargs.get("best_version") is None else kwargs.get("best_version"),
|
||||
'best_version': self.__get_default_subscribe_config(mediainfo.type, "best_version") if not kwargs.get("best_version") else kwargs.get("best_version"),
|
||||
'search_imdbid': self.__get_default_subscribe_config(mediainfo.type, "search_imdbid"),
|
||||
'sites': self.__get_default_subscribe_config(mediainfo.type, "sites") or None,
|
||||
'save_path': self.__get_default_subscribe_config(mediainfo.type, "save_path"),
|
||||
|
@ -53,7 +53,7 @@ class Subscribe(BaseModel):
|
||||
# 订阅用户
|
||||
username: Optional[str] = None
|
||||
# 订阅站点
|
||||
sites: Optional[List[int]] = None
|
||||
sites: Optional[List[int]] = []
|
||||
# 是否洗版
|
||||
best_version: Optional[int] = 0
|
||||
# 当前优先级
|
||||
|
Loading…
x
Reference in New Issue
Block a user