diff --git a/auto_pt/views.py b/auto_pt/views.py index 9fd62fa..7d83374 100644 --- a/auto_pt/views.py +++ b/auto_pt/views.py @@ -106,7 +106,12 @@ def import_from_ptpp(request): data_list = json.loads(request.body).get('ptpp') datas = json.loads(data_list) print('content', len(datas)) - cookies = pt_spider.parse_ptpp_cookies(datas) + + res = pt_spider.parse_ptpp_cookies(datas) + if res.code == StatusCodeEnum.OK.code: + cookies = res.data + else: + return JsonResponse(res.to_dict(), safe=False) # success_messages = [] # error_messages = [] message_list = [] @@ -135,7 +140,7 @@ def import_from_ptpp(request): 'msg': message, 'tag': 'warning' }) - raise + # raise return JsonResponse(CommonResponse.success(data={ 'messages': message_list }).to_dict(), safe=False) diff --git a/pt_site/UtilityTool.py b/pt_site/UtilityTool.py index 9856331..32b4a74 100644 --- a/pt_site/UtilityTool.py +++ b/pt_site/UtilityTool.py @@ -230,18 +230,25 @@ class PtSpider: def parse_ptpp_cookies(self, datas): cookies = [] - for data in datas: - domain = data.get('host') - cookie_list = data.get('cookies') - cookie_str = '' - for cookie in cookie_list: - cookie_str += cookie.get('name') + '=' + cookie.get('value') + ';' - print(domain, cookie_str) - cookies.append({ - 'domain': domain, - 'cookies': cookie_str.rstrip(';') - }) - return cookies + try: + if datas[0].get('domain'): + print(datas[0].get('domain')) + return CommonResponse.success(data=self.parse_cookie_expire(datas)) + for data in datas: + domain = data.get('host') + cookie_list = data.get('cookies') + cookie_str = '' + for cookie in cookie_list: + cookie_str += cookie.get('name') + '=' + cookie.get('value') + ';' + print(domain, cookie_str) + cookies.append({ + 'domain': domain, + 'cookies': cookie_str.rstrip(';') + }) + return CommonResponse.success(data=cookies) + except Exception as e: + raise + return CommonResponse.error(msg='Cookies解析失败,请确认导入了正确的cookies备份文件!') def parse_cookie_expire(self, datas): """ diff --git a/templates/auto_pt/import_ptpp.html b/templates/auto_pt/import_ptpp.html index 835092c..14fc67e 100644 --- a/templates/auto_pt/import_ptpp.html +++ b/templates/auto_pt/import_ptpp.html @@ -25,7 +25,7 @@
- + 导入 {# { + this.$message({ + type: 'warning', + message: '访问出错!' + }); }) + }).catch(() => { this.$message({ type: 'info',