diff --git a/pt_site/UtilityTool.py b/pt_site/UtilityTool.py index 17e5066..d9f6d89 100644 --- a/pt_site/UtilityTool.py +++ b/pt_site/UtilityTool.py @@ -1492,44 +1492,44 @@ class PtSpider: # leeching_detail_url = site.url + site.page_leeching.lstrip('/').format(my_site.user_id) try: if site.url in ['https://filelist.io/']: - if my_site.expires > datetime.now(): - pass - else: - logger.info(f'{site.name} cookie 已过期,重新获取!') - session = requests.Session() - headers = { - 'user-agent': my_site.user_agent - } - res = session.get(url=site.url, headers=headers) - validator = ''.join(self.parse(res, '//input[@name="validator"]/@value')) - login_url = ''.join(self.parse(res, '//form/@action')) - login_method = ''.join(self.parse(res, '//form/@method')) - with open('db/ptools.toml', 'r') as f: - data = toml.load(f) - filelist = data.get('filelist') - username = filelist.get('username') - password = filelist.get('password') - login_res = session.request( - url=site.url + login_url, - method=login_method, - headers=headers, - data={ - 'validator': validator, - 'username': username, - 'password': password, - 'unlock': 0, - 'returnto': '', - }) - cookies = '' - logger.info(f'res: {login_res.text}') - logger.info(f'cookies: {session.cookies.get_dict()}') - # expires = [cookie for cookie in session.cookies if not cookie.expires] + # if my_site.expires > datetime.now(): + # pass + # else: + logger.info(f'{site.name} cookie 已过期,重新获取!') + session = requests.Session() + headers = { + 'user-agent': my_site.user_agent + } + res = session.get(url=site.url, headers=headers) + validator = ''.join(self.parse(res, '//input[@name="validator"]/@value')) + login_url = ''.join(self.parse(res, '//form/@action')) + login_method = ''.join(self.parse(res, '//form/@method')) + with open('db/ptools.toml', 'r') as f: + data = toml.load(f) + filelist = data.get('filelist') + username = filelist.get('username') + password = filelist.get('password') + login_res = session.request( + url=site.url + login_url, + method=login_method, + headers=headers, + data={ + 'validator': validator, + 'username': username, + 'password': password, + 'unlock': 0, + 'returnto': '', + }) + cookies = '' + logger.info(f'res: {login_res.text}') + logger.info(f'cookies: {session.cookies.get_dict()}') + # expires = [cookie for cookie in session.cookies if not cookie.expires] - for key, value in session.cookies.get_dict().items(): - cookies += f'{key}={value};' - my_site.expires = datetime.now() + timedelta(minutes=30) - my_site.cookie = cookies - my_site.save() + for key, value in session.cookies.get_dict().items(): + cookies += f'{key}={value};' + # my_site.expires = datetime.now() + timedelta(minutes=30) + my_site.cookie = cookies + my_site.save() # 发送请求,做种信息与正在下载信息,个人主页 if site.url in [ 'https://hdchina.org/',