diff --git a/requirements.txt b/requirements.txt index df77d9e..f601efe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,19 +1,18 @@ -requests==2.24.0 +requests==2.27.0 pytelegrambotapi==4.2.2 -beautifulsoup4==4.9.1 +beautifulsoup4==4.10.0 tgbot-ping -redis==3.5.3 -apscheduler==3.7.0 -pymongo==3.11.2 +redis==4.0.2 +apscheduler==3.8.1 +pymongo==4.0.1 tornado==6.1 -redis==3.5.3 captcha==0.3 passlib==1.7.4 -fakeredis==1.5.0 -pytz==2021.1 -filetype==1.0.7 +fakeredis==1.7.0 +pytz==2021.3 +filetype==1.0.9 requests[socks] -tqdm==4.61.1 +tqdm==4.62.3 retry==0.9.2 pymysql git+https://github.com/tgbot-collection/python-akismet diff --git a/yyetsweb/Mongo.py b/yyetsweb/Mongo.py index 42dc472..f132f76 100644 --- a/yyetsweb/Mongo.py +++ b/yyetsweb/Mongo.py @@ -559,6 +559,7 @@ class ResourceMongoResource(ResourceResource, Mongo): returned = dict(data=final) returned["extra"] = [] else: + # TODO how to generate code using ORDER here extra = self.fansub_search(NewzmzOnline.__name__, keyword) or \ self.fansub_search(ZhuixinfanOnline.__name__, keyword) or \ self.fansub_search(XL720.__name__, keyword) or \ @@ -1038,7 +1039,7 @@ class ResourceLatestMongoResource(ResourceLatestResource, Mongo): col = self.db["yyets"] projection = {"_id": False, "status": False, "info": False} episode_data = {} - for res in tqdm(col.find(projection=projection), total=col.count()): + for res in tqdm(col.find(projection=projection), total=col.count_documents({})): for season in res["data"].get("list", []): for item in season["items"].values(): for single in item: