injectlib/YYeTsBot
1
0
Fork 0
mirror of https://github.com/tgbot-collection/YYeTsBot.git synced 2025-11-25 11:29:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

upadte BD2020 link, use order generation, supress error

Browse Source
This commit is contained in:
BennyThink
2022-07-28 22:20:28 +08:00
parent 1984433a03
commit 3474bd508e
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yyetsbot/config.py
View File

@@ -34,7 +34,7 @@ NEWZMZ_SEARCH = "https://newzmz.com/subres/index/getres.html?keyword={}"
NEWZMZ_RESOURCE = "https://ysfx.tv/view/{}" NEWZMZ_RESOURCE = "https://ysfx.tv/view/{}"
# BD2020 # BD2020
BD2020_SEARCH = "https://www.bd2020.com/search.jspx?q={}" BD2020_SEARCH = "https://v.bd2020.me/search.jspx?q={}"
# XL720 # XL720
XL720_SEARCH = "https://www.xl720.com/?s={}" XL720_SEARCH = "https://www.xl720.com/?s={}"

14
yyetsweb/Mongo.py
View File

@@ -527,6 +527,8 @@ class ResourceMongoResource(ResourceResource, Mongo):
return data return data
def search_resource(self, keyword: str) -> dict: def search_resource(self, keyword: str) -> dict:
order = os.getenv("ORDER") or 'YYeTsOffline,ZimuxiaOnline,NewzmzOnline,ZhuixinfanOnline,XL720,BD2020'.split(",")
order.pop(0)
final = [] final = []
returned = {} returned = {}
@@ -569,12 +571,12 @@ class ResourceMongoResource(ResourceResource, Mongo):
returned = dict(data=final) returned = dict(data=final)
returned["extra"] = [] returned["extra"] = []
else: else:
# TODO how to generate code using ORDER here extra = []
extra = self.fansub_search(ZimuxiaOnline.__name__, keyword) or \ with contextlib.suppress(requests.exceptions.RequestException):
self.fansub_search(NewzmzOnline.__name__, keyword) or \ for name in order:
self.fansub_search(ZhuixinfanOnline.__name__, keyword) or \ extra = self.fansub_search(name, keyword)
self.fansub_search(XL720.__name__, keyword) or \ if extra:
self.fansub_search(BD2020.__name__, keyword) break
returned["data"] = [] returned["data"] = []
returned["extra"] = extra returned["extra"] = extra