diff --git a/main.py b/main.py index 46ee0c8..64c687f 100644 --- a/main.py +++ b/main.py @@ -3,7 +3,7 @@ from utils.comic.ComicInfo import comicInfo import os,shutil def comics(): - for x in range(0,20): + for x in range(0,5): comicEntity.downladsComcis("https://rm01.xyz/books?&page="+str(x)) if __name__ == '__main__': diff --git a/utils/HtmlUtils.py b/utils/HtmlUtils.py index d2458d2..e152b3d 100644 --- a/utils/HtmlUtils.py +++ b/utils/HtmlUtils.py @@ -31,7 +31,9 @@ class htmlUtils: print(f"请求地址:{curl}") res = s.get(curl,stream=True, headers=cls.headers, timeout=50) if type == "bytes": - url_text = res + return res + if type == "json": + return res.json() else: url_text = html.fromstring(res.text) except: @@ -54,17 +56,7 @@ class htmlUtils: @classmethod def getJSON(cls,curl): - count = 0 - while count < 5: - try: - res = requests.get(curl, headers=cls.headers,timeout=50) - data_json = res.json() - return data_json - except: - ntfy.sendMsg(f"请求失败,重试中... {curl}") - count += 1 - time.sleep(1) - cls.getJSON(curl) + cls.getHTML(curl, type="json") @classmethod def xpathData(cls,c_xpath,url=None,num=None,not_eq=None):