1. 修复获取新信息数量会获取到既往消息数量的bug

2. 同时增加获取公告消息数量

pt_site/UtilityTool.py

@@ -883,14 +883,6 @@ class PtSpider:
                     msg=StatusCodeEnum.WEB_CONNECT_ERR.errmsg + '请检查网站访问是否正常？'
                 )
             # seed = len(seed_vol_list)
-            ratio = ''.join(
-                details_html.xpath(site.ratio_rule)
-            ).replace(',', '').replace('无限', 'inf').replace('∞', 'inf').replace('---', 'inf').strip(']:').strip()
-            # 分享率告警通知
-            print('ratio', ratio)
-            if ratio != 'inf' and float(ratio) <= 1:
-                message = '# <font color="red">' + site.name + ' 站点分享率告警：' + str(ratio) + '</font>  \n'
-                self.send_text(message)
 
             downloaded = ''.join(
                 details_html.xpath(site.downloaded_rule)
@@ -982,11 +974,26 @@ class PtSpider:
             # print('上传数：', seed)
             # print('下载数：', leech)
             try:
+                ratio = ''.join(
+                    details_html.xpath(site.ratio_rule)
+                ).replace(',', '').replace('无限', 'inf').replace('∞', 'inf').replace('---', 'inf').strip(']:').strip()
+                # 分享率告警通知
+                print('ratio', ratio)
+                if ratio != 'inf' and float(ratio) <= 1:
+                    message = '# <font color="red">' + site.name + ' 站点分享率告警：' + str(ratio) + '</font>  \n'
+                    self.send_text(message)
+                # 检查邮件
                 mail_str = ''.join(details_html.xpath(site.mailbox_rule))
-                mail_count = re.findall('\d', mail_str)[-1]
-                if int(mail_count) > 0:
-                    template = '### <font color="red">{} 有{}条新短消息，请注意及时查收！</font>'
-                    self.send_text(template.format(site.name, mail_count))
+                notice_str = ''.join(details_html.xpath(site.notice_rule))
+                if mail_str or notice_str:
+                    mail_count = re.sub(u"([^\u0030-\u0039])", "", mail_str)
+                    notice_count = re.sub(u"([^\u0030-\u0039])", "", notice_str)
+                    mail_count = int(mail_count) if mail_count else 0
+                    notice_count = int(notice_count) if notice_count else 0
+                    if mail_count + notice_count > 0:
+                        template = '### <font color="red">{} 有{}条新短消息，请注意及时查收！</font>'
+                        self.send_text(template.format(site.name, mail_count + notice_count))
+
                 res_sp_hour = self.get_hour_sp(my_site=my_site)
                 if res_sp_hour.code != StatusCodeEnum.OK.code:
                     logging.error(my_site.site.name + res_sp_hour.msg)
@@ -1012,7 +1019,7 @@ class PtSpider:
             except Exception as e:
                 message = my_site.site.name + '解析个人主页信息：失败！原因：' + str(e)
                 logging.error(message)
-                # raise
+                raise
                 self.send_text(site.name + '解析个人主页信息：失败！原因：' + str(e))
                 return CommonResponse.error(msg=message)
 

pt_site/migrations/0006_site_notice_rule_alter_site_mailbox_rule.py

@@ -0,0 +1,33 @@
+# Generated by Django 4.1 on 2022-09-05 20:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("pt_site", "0005_alter_torrentinfo_hr"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="site",
+            name="notice_rule",
+            field=models.CharField(
+                default='//a[@href="index.php"]/font/text()[1]',
+                help_text="获取新公告",
+                max_length=128,
+                verbose_name="公告规则",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="site",
+            name="mailbox_rule",
+            field=models.CharField(
+                default='//a[@href="messages.php"]/font/text()',
+                help_text="获取新邮件",
+                max_length=128,
+                verbose_name="邮件规则",
+            ),
+        ),
+    ]

pt_site/models.py

@@ -209,9 +209,13 @@ class Site(BaseEntity):
                                      help_text='需对数据做处理',
                                      max_length=128)
     mailbox_rule = models.CharField(verbose_name='邮件规则',
-                                    default='//a[@href="messages.php"]/following-sibling::text()[1]',
+                                    default='//a[@href="messages.php"]/font/text()',
                                     help_text='获取新邮件',
                                     max_length=128)
+    notice_rule = models.CharField(verbose_name='公告规则',
+                                   default='//a[@href="index.php"]/font/text()[1]',
+                                   help_text='获取新公告',
+                                   max_length=128)
     # HASH RULE
     hash_rule = models.CharField(verbose_name='种子HASH',
                                  default='//tr[11]//td[@class="no_border_wide"][2]/text()',