From 3474bd508e5599b7f5d47939b624bda545dfaf43 Mon Sep 17 00:00:00 2001 From: BennyThink Date: Thu, 28 Jul 2022 22:20:28 +0800 Subject: [PATCH] upadte BD2020 link, use order generation, supress error --- yyetsbot/config.py | 2 +- yyetsweb/Mongo.py | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/yyetsbot/config.py b/yyetsbot/config.py index 9bd8be6..e074b98 100644 --- a/yyetsbot/config.py +++ b/yyetsbot/config.py @@ -34,7 +34,7 @@ NEWZMZ_SEARCH = "https://newzmz.com/subres/index/getres.html?keyword={}" NEWZMZ_RESOURCE = "https://ysfx.tv/view/{}" # BD2020 -BD2020_SEARCH = "https://www.bd2020.com/search.jspx?q={}" +BD2020_SEARCH = "https://v.bd2020.me/search.jspx?q={}" # XL720 XL720_SEARCH = "https://www.xl720.com/?s={}" diff --git a/yyetsweb/Mongo.py b/yyetsweb/Mongo.py index cdd6577..82921eb 100644 --- a/yyetsweb/Mongo.py +++ b/yyetsweb/Mongo.py @@ -527,6 +527,8 @@ class ResourceMongoResource(ResourceResource, Mongo): return data def search_resource(self, keyword: str) -> dict: + order = os.getenv("ORDER") or 'YYeTsOffline,ZimuxiaOnline,NewzmzOnline,ZhuixinfanOnline,XL720,BD2020'.split(",") + order.pop(0) final = [] returned = {} @@ -569,12 +571,12 @@ class ResourceMongoResource(ResourceResource, Mongo): returned = dict(data=final) returned["extra"] = [] else: - # TODO how to generate code using ORDER here - extra = self.fansub_search(ZimuxiaOnline.__name__, keyword) or \ - self.fansub_search(NewzmzOnline.__name__, keyword) or \ - self.fansub_search(ZhuixinfanOnline.__name__, keyword) or \ - self.fansub_search(XL720.__name__, keyword) or \ - self.fansub_search(BD2020.__name__, keyword) + extra = [] + with contextlib.suppress(requests.exceptions.RequestException): + for name in order: + extra = self.fansub_search(name, keyword) + if extra: + break returned["data"] = [] returned["extra"] = extra