✨ 适配达量降速流量包

Cp0204 · Dec 31, 2024 · ad8cff7 · ad8cff7
1 parent 8d5d1ea
commit ad8cff7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/telecom_class.py b/telecom_class.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 # _*_ coding:utf-8 _*_
 
+import re
 import base64
 import random
 import requests
@@ -237,17 +238,26 @@ def to_summary(self, data, phonenum=""):
         for item in flow_lists:
             if "流量" not in item["title"]:
                 continue
-            if "已用" in item["leftTitle"]:
+            # 常规流量
+            if "已用" in item["leftTitle"] and "剩余" in item["rightTitle"]:
                 item_use = self.convert_flow(item["leftTitleHh"], "KB")
                 item_balance = self.convert_flow(item["rightTitleHh"], "KB")
                 item_total = item_use + item_balance
-            elif "超出" in item["leftTitle"]:
+            # 常规流量，超流量
+            elif "超出" in item["leftTitle"] and "/" in item["rightTitleEnd"]:
                 item_balance = -self.convert_flow(item["leftTitleHh"], "KB")
                 item_use = (
                     self.convert_flow(item["rightTitleEnd"].split("/")[1], "KB")
                     - item_balance
                 )
                 item_total = item_use + item_balance
+            # 无限流量，达量降速
+            elif "已用" in item["leftTitle"] and "降速" in item["rightTitle"]:
+                item_total = self.convert_flow(
+                    re.search(r"(\d+[KMGT]B)", item["rightTitle"]).group(1), "KB"
+                )
+                item_use = self.convert_flow(item["leftTitleHh"], "KB")
+                item_balance = item_total - item_use
             flowItems.append(
                 {
                     "name": item["title"],

diff --git a/telecom_monitor.py b/telecom_monitor.py
@@ -128,7 +128,7 @@ def auto_login():
         summary = telecom.to_summary(important_data["responseData"]["data"])
     except Exception as e:
         exit(
-            f"简化主要信息出错，提 Issue 请提供以下信息（隐私打码）：\n\n{important_data['responseData']['data']}\n\n{e}"
+            f"简化主要信息出错，提 Issue 请提供以下信息（隐私打码）：\n\n{json.dumps(important_data['responseData']['data'], ensure_ascii=False)}\n\n{e}"
         )
     if summary:
         print(f"简化主要信息：{summary}")
@@ -150,7 +150,11 @@ def auto_login():
             )
             flux_package_str += f"\n{package_icon}{package['title']}\n"
             for product in package["productInfos"]:
-                flux_package_str += f"""🔹[{product['title']}]{product['leftTitle']}{product['leftHighlight']}{product['rightCommon']}\n"""
+                if product["infiniteTitle"]:
+                    # 无限流量
+                    flux_package_str += f"""🔹[{product['title']}]{product['infiniteTitle']}{product['infiniteValue']}{product['infiniteUnit']}/无限\n"""
+                else:
+                    flux_package_str += f"""🔹[{product['title']}]{product['leftTitle']}{product['leftHighlight']}{product['rightCommon']}\n"""
     # 流量字符串
     common_str = (
         f"{telecom.convert_flow(summary['commonUse'],'GB',2)} / {telecom.convert_flow(summary['commonTotal'],'GB',2)} GB 🟢"