修复阿童木做种信息规则和我堡消息规则

2023-07-10 13:41:22 +08:00 · 2022-12-06 05:50:21 +08:00
parent a2e8425732
commit 9a0f517d72
3 changed files with 41 additions and 11 deletions
--- a/pt.json
+++ b/pt.json
@@ -4,7 +4,7 @@
  "pk": 1,
  "fields": {
    "created_at": "2022-07-17T10:22:03.474",
-    "updated_at": "2022-11-30T02:39:16.890",
+    "updated_at": "2022-12-06T05:47:03.064",
    "url": "https://hdatmos.club/",
    "name": "阿童木",
    "logo": "https://hdatmos.club/favicon.ico",
@@ -72,7 +72,7 @@
    "leech_rule": "//img[@class=\"arrowdown\"][1]/following-sibling::text()[1]",
    "seed_rule": "//img[@class=\"arrowup\"][1]/following-sibling::text()[1]",
    "record_count_rule": "/html/body/b/text()",
-    "seed_vol_rule": "//tr/td[3]",
+    "seed_vol_rule": "//tr/td[4]",
    "mailbox_rule": "//a[@href=\"messages.php\"]/font[contains(text(),\"条\")]/text()[1]",
    "notice_rule": "//a[@href=\"index.php\"]/font/text()[1]",
    "hash_rule": "//tr[10]//td[@class=\"no_border_wide\"][2]/text()"
@@ -3480,7 +3480,7 @@
  "pk": 51,
  "fields": {
    "created_at": "2022-08-27T17:43:57.903",
-    "updated_at": "2022-11-30T02:39:17.035",
+    "updated_at": "2022-12-05T19:49:58.264",
    "url": "https://ourbits.club/",
    "name": "我堡",
    "logo": "https://ourbits.club/favicon.ico",
@@ -3549,8 +3549,8 @@
    "seed_rule": "//img[@class=\"arrowup\"]/following-sibling::text()[1]",
    "record_count_rule": "/html/body/b/text()",
    "seed_vol_rule": "//tr/td[3]",
-    "mailbox_rule": "//a[@href=\"messages.php\"]/font[contains(text(),\"条\")]/text()[1]",
-    "notice_rule": "//a[@href=\"index.php\"]/font[contains(text(),\"条\")]/text()[1]",
+    "mailbox_rule": "//a[@href=\"messages.php\"]/span[contains(text(),\"条\")]/text()[1]",
+    "notice_rule": "//a[@href=\"index.php\"]/span[contains(text(),\"条\")]/text()[1]",
    "hash_rule": "//tr[11]//td[@class=\"no_border_wide\"][2]/text()"
  }
 },
@@ -6084,6 +6084,34 @@
    "args": null
  }
 },
+{
+  "model": "auto_pt.taskjob",
+  "pk": 19,
+  "fields": {
+    "created_at": "2022-11-30T13:04:32.620",
+    "updated_at": "2022-11-30T13:09:08.694",
+    "task": 1,
+    "name": "1111",
+    "job_id": "1111",
+    "trigger": "cron",
+    "task_exec": false,
+    "replace_existing": true,
+    "expression_time": "20 */8 * * *",
+    "start_date": null,
+    "end_date": null,
+    "misfire_grace_time": 600,
+    "jitter": 1200,
+    "args": null
+  }
+},
+{
+  "model": "django_apscheduler.djangojob",
+  "pk": "1111",
+  "fields": {
+    "next_run_time": null,
+    "job_state": "gAWVGwQAAAAAAAB9lCiMB3ZlcnNpb26USwGMAmlklIwEMTExMZSMBGZ1bmOUjB1wdF9zaXRlLnZpZXdzOmF1dG9fZ2V0X3N0YXR1c5SMB3RyaWdnZXKUjBlhcHNjaGVkdWxlci50cmlnZ2Vycy5jcm9ulIwLQ3JvblRyaWdnZXKUk5QpgZR9lChoAUsCjAh0aW1lem9uZZSMG3B5dHpfZGVwcmVjYXRpb25fc2hpbS5faW1wbJSMCXdyYXBfem9uZZSTlIwIYnVpbHRpbnOUjAdnZXRhdHRylJOUjAh6b25laW5mb5SMCFpvbmVJbmZvlJOUjAlfdW5waWNrbGWUhpRSlIwNQXNpYS9TaGFuZ2hhaZRLAYaUUpSMDUFzaWEvU2hhbmdoYWmUhpRSlIwKc3RhcnRfZGF0ZZROjAhlbmRfZGF0ZZROjAZmaWVsZHOUXZQojCBhcHNjaGVkdWxlci50cmlnZ2Vycy5jcm9uLmZpZWxkc5SMCUJhc2VGaWVsZJSTlCmBlH2UKIwEbmFtZZSMBHllYXKUjAppc19kZWZhdWx0lIiMC2V4cHJlc3Npb25zlF2UjCVhcHNjaGVkdWxlci50cmlnZ2Vycy5jcm9uLmV4cHJlc3Npb25zlIwNQWxsRXhwcmVzc2lvbpSTlCmBlH2UjARzdGVwlE5zYmF1YmgjjApNb250aEZpZWxklJOUKYGUfZQoaCiMBW1vbnRolGgqiWgrXZRoLymBlH2UaDJOc2JhdWJoI4wPRGF5T2ZNb250aEZpZWxklJOUKYGUfZQoaCiMA2RheZRoKoloK12UaC8pgZR9lGgyTnNiYXViaCOMCVdlZWtGaWVsZJSTlCmBlH2UKGgojAR3ZWVrlGgqiGgrXZRoLymBlH2UaDJOc2JhdWJoI4wORGF5T2ZXZWVrRmllbGSUk5QpgZR9lChoKIwLZGF5X29mX3dlZWuUaCqJaCtdlGgvKYGUfZRoMk5zYmF1YmglKYGUfZQoaCiMBGhvdXKUaCqJaCtdlGgvKYGUfZRoMksIc2JhdWJoJSmBlH2UKGgojAZtaW51dGWUaCqJaCtdlGgtjA9SYW5nZUV4cHJlc3Npb26Uk5QpgZR9lChoMk6MBWZpcnN0lEsUjARsYXN0lEsUdWJhdWJoJSmBlH2UKGgojAZzZWNvbmSUaCqIaCtdlGheKYGUfZQoaDJOaGFLAGhiSwB1YmF1YmWMBmppdHRlcpROdWKMCGV4ZWN1dG9ylIwHZGVmYXVsdJSMBGFyZ3OUKYwGa3dhcmdzlH2UaCiMD2F1dG9fZ2V0X3N0YXR1c5SMEm1pc2ZpcmVfZ3JhY2VfdGltZZRNWAKMCGNvYWxlc2NllIiMDW1heF9pbnN0YW5jZXOUSwGMDW5leHRfcnVuX3RpbWWUTnUu"
+  }
+},
 {
  "model": "django_apscheduler.djangojob",
  "pk": "拉取最新种子",
--- a/pt_site/views.py
+++ b/pt_site/views.py
@@ -67,13 +67,15 @@ def auto_get_status():
            if res.code == StatusCodeEnum.OK.code:
                status = res.data[0]
                message = message_template.format(
+                    my_site.site.name,
                    my_site.my_level,
                    status.my_sp,
                    my_site.sp_hour,
                    status.my_bonus,
                    status.ratio,
-                    FileSizeConvert.parse_2_file_size(status.downloaded),
+                    FileSizeConvert.parse_2_file_size(status.seed_vol),
                    FileSizeConvert.parse_2_file_size(status.uploaded),
+                    FileSizeConvert.parse_2_file_size(status.downloaded),
                    my_site.seed,
                    my_site.leech,
                    my_site.invitation,
--- a/pt_site_site.json
+++ b/pt_site_site.json
@@ -2,7 +2,7 @@
  {
    "id": 1,
    "created_at": "2022-07-17 10:22:03.474000",
-    "updated_at": "2022-11-30 02:39:16.890713",
+    "updated_at": "2022-12-06 05:47:03.064752",
    "name": "阿童木",
    "url": "https://hdatmos.club/",
    "logo": "https://hdatmos.club/favicon.ico",
@@ -66,7 +66,7 @@
    "leech_rule": "//img[@class=\"arrowdown\"][1]/following-sibling::text()[1]",
    "seed_rule": "//img[@class=\"arrowup\"][1]/following-sibling::text()[1]",
    "record_count_rule": "/html/body/b/text()",
-    "seed_vol_rule": "//tr/td[3]",
+    "seed_vol_rule": "//tr/td[4]",
    "mailbox_rule": "//a[@href=\"messages.php\"]/font[contains(text(),\"条\")]/text()[1]",
    "hash_rule": "//tr[10]//td[@class=\"no_border_wide\"][2]/text()",
    "notice_rule": "//a[@href=\"index.php\"]/font/text()[1]",
@@ -3346,7 +3346,7 @@
  {
    "id": 51,
    "created_at": "2022-08-27 17:43:57.903000",
-    "updated_at": "2022-11-30 02:39:17.035426",
+    "updated_at": "2022-12-05 19:49:58.264626",
    "name": "我堡",
    "url": "https://ourbits.club/",
    "logo": "https://ourbits.club/favicon.ico",
@@ -3411,9 +3411,9 @@
    "seed_rule": "//img[@class=\"arrowup\"]/following-sibling::text()[1]",
    "record_count_rule": "/html/body/b/text()",
    "seed_vol_rule": "//tr/td[3]",
-    "mailbox_rule": "//a[@href=\"messages.php\"]/font[contains(text(),\"条\")]/text()[1]",
+    "mailbox_rule": "//a[@href=\"messages.php\"]/span[contains(text(),\"条\")]/text()[1]",
    "hash_rule": "//tr[11]//td[@class=\"no_border_wide\"][2]/text()",
-    "notice_rule": "//a[@href=\"index.php\"]/font[contains(text(),\"条\")]/text()[1]",
+    "notice_rule": "//a[@href=\"index.php\"]/span[contains(text(),\"条\")]/text()[1]",
    "my_passkey_rule": "//td[contains(text(),\"密钥\")]/following-sibling::td[1]/text()",
    "my_uid_rule": "//a[contains(@class,\"_Name\") and contains(@href,\"userdetails.php?id=\")]/@href",
    "page_control_panel": "usercp.php",