From 2a83925929b2c297bc0fb0ed7cdf5848c9bd767a Mon Sep 17 00:00:00 2001
From: ngfchl <ngfchl@126.com>
Date: Mon, 10 Oct 2022 16:55:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=85=A5=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E6=9C=AA=E6=88=90=E5=8A=9F=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?passkey=E5=9B=BE=E6=A0=87=E6=94=B9=E4=B8=BA=E9=BB=84=E8=89=B2?=
 =?UTF-8?q?=E8=AD=A6=E5=91=8A=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 auto_pt/views.py       |  5 +++++
 pt_site/UtilityTool.py | 45 ++++++++++++++++++------------------------
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/auto_pt/views.py b/auto_pt/views.py
index 77fc064..2255e2f 100644
--- a/auto_pt/views.py
+++ b/auto_pt/views.py
@@ -271,6 +271,11 @@ def import_from_ptpp(request):
                         'msg': msg,
                         'tag': 'success'
                     })
+                elif res.code == StatusCodeEnum.NO_PASSKEY_WARNING.code:
+                    message_list.append({
+                        'msg': msg,
+                        'tag': 'warning'
+                    })
                 else:
                     # error_messages.append(msg)
                     message_list.append({
diff --git a/pt_site/UtilityTool.py b/pt_site/UtilityTool.py
index 26fab78..02f500a 100644
--- a/pt_site/UtilityTool.py
+++ b/pt_site/UtilityTool.py
@@ -329,6 +329,7 @@ class PtSpider:
         passkey_msg = ''
         if not passkey:
             try:
+                logger.info('PTPP未配置PASSKEY，尝试获取中')
                 response = self.send_request(my_site, site.url + site.page_control_panel)
                 passkey = self.parse(response, site.my_passkey_rule)[0]
                 my_site.passkey = passkey
@@ -336,6 +337,7 @@ class PtSpider:
             except Exception as e:
                 passkey_msg = site.name + ' PassKey获取失败，请手动添加！'
                 logger.info(passkey_msg)
+        logger.info('开始导入PTPP历史数据')
         for key, value in userdatas.items():
             logger.info(key)
             try:
@@ -358,38 +360,29 @@ class PtSpider:
                                                          created_at__date=create_time).count()
                 if count_status >= 1:
                     continue
-                status = SiteStatus.objects.create(
+                res_status = SiteStatus.objects.update_or_create(
                     site=my_site,
-                    uploaded=uploaded,
-                    downloaded=downloaded,
-                    ratio=float(ratio),
-                    seed_vol=seeding_size,
-                    my_sp=my_sp
-                )
-                # res_status = SiteStatus.objects.update_or_create(
-                #     site=my_site,
-                #     created_at__date=create_time,
-                #     defaults={
-                #         'uploaded': uploaded,
-                #         'downloaded': downloaded,
-                #         'my_sp': my_sp,
-                #         'seed_vol': seeding_size,
-                #         'ratio': float(ratio),
-                #     })
-                status.created_at = create_time
-                status.save()
-                logger.info(status)
+                    created_at__date=create_time,
+                    defaults={
+                        'uploaded': uploaded,
+                        'downloaded': downloaded,
+                        'my_sp': my_sp,
+                        'seed_vol': seeding_size,
+                        'ratio': float(ratio),
+                    })
+                logger.info('数据导入结果，True为新建，false为更新')
+                logger.info(res_status)
             except Exception as e:
                 msg = '{}{} 数据导入出错，错误原因：{}'.format(site.name, key, e)
                 logger.info(msg)
                 continue
-        # if not passkey:
-        #     return CommonResponse.success(
-        #         status=StatusCodeEnum.NO_PASSKEY_WARNING,
-        #         msg=site.name + (' 信息导入成功！' if result[1] else ' 信息更新成功！ ') + passkey_msg
-        #     )
+        if not passkey:
+            return CommonResponse.success(
+                status=StatusCodeEnum.NO_PASSKEY_WARNING,
+                msg=site.name + (' 信息导入成功！' if result[1] else ' 信息更新成功！ ') + passkey_msg
+            )
         return CommonResponse.success(
-            status=StatusCodeEnum.NO_PASSKEY_WARNING,
+            # status=StatusCodeEnum.NO_PASSKEY_WARNING,
             msg=site.name + (' 信息导入成功！' if result[1] else ' 信息更新成功！ ') + passkey_msg
         )