pyscriptbase 1.1.4__tar.gz → 1.1.5__tar.gz

{pyscriptbase-1.1.4 → pyscriptbase-1.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyscriptbase
-Version: 1.1.4
+Version: 1.1.5
 Summary: python script base library
 Home-page: 
 Author: ASMan

{pyscriptbase-1.1.4 → pyscriptbase-1.1.5}/pyscriptbase/pusher.py

@@ -213,3 +213,11 @@ def sendMail(
         server.sendmail(sender, receiver, message.as_string())  # 发送邮件
     except Exception as e:
         print(f"Error: unable to send email. {e}")
+
+
+def sendMailWithHtmlTable(
+    table: HtmlTableEmail,
+    receiver: str = None,
+    params: SMTPParams = None,
+):
+    sendMail(table.title, table, receiver, params)

{pyscriptbase-1.1.4 → pyscriptbase-1.1.5}/pyscriptbase/sms.py

@@ -82,7 +82,11 @@ class FeiyunApp:
             self.__log__("登录失败")
             self.isLogin = False
 
-    def getPhone(self):
+    def getPhone(self) -> str | None:
+        """
+        获取手机号
+        :return: 手机号 | invalid(不可用) | None(获取失败)
+        """
         headers = {
             "Sec-Ch-UA": '"Not/A)Brand";v="8", "Chromium";v="126", "Google Chrome";v="126"',
             "Sec-Ch-UA-Mobile": "?0",
@@ -106,6 +110,9 @@ class FeiyunApp:
         #     print(f"获取手机号失败: 预检 {text}")
         #     return None
 
+        if not self.isLogin:
+            return "invalid"
+
         url = f"{self.host}/index.php?m=home&c=Index&a=getxksjh"
         text = requests.get(
             url=url, headers=headers, proxies=self.proxies, verify=False
@@ -115,11 +122,23 @@ class FeiyunApp:
         if text and text.isdigit():
             print(f"获取手机号成功：{text}")
             return text
+        elif text == "buzu":
+            print(f"账号余额不足: {text}")
+            return "invalid"
         else:
             print(f"获取手机号失败: {text}")
             return None
 
-    def getCode(self, phone: str, project: str):
+    def getCode(self, phone: str, project: str) -> str | None:
+        """
+        获取验证码
+        :param phone: 手机号
+        :param project: 项目
+        :return: 验证码 | invalid(不可用) | None(获取失败)
+        """
+        if not self.isLogin:
+            return "invalid"
+
         params = urlencode(
             {
                 "gjz": project,
@@ -157,7 +176,7 @@ class FeiyunApp:
             return None
         elif text == "buzu":
             print(f"账号余额不足: {text}")
-            return None
+            return "invalid"
         elif text and text.find(project) > -1:
             codes = self.extract_verification_codes(text)
             if codes:
@@ -172,7 +191,7 @@ class FeiyunApp:
 
     def extract_verification_codes(self, text):
         """
-        从文本中提取所有独立的 4 位或 6 位数字验证码。
+        从文本中提取所有独立的 4 位、5 位或 6 位数字验证码。
 
         参数:
             text (str): 输入的文本字符串
@@ -182,8 +201,8 @@ class FeiyunApp:
         """
         # 正则表达式解释:
         # \b : 单词边界，确保数字前后不是其他数字或字母（防止匹配长数字的一部分）
-        # (\d{4}|\d{6}) : 匹配恰好 4 位 或 恰好 6 位的数字
-        pattern = r"\b(\d{4}|\d{6})\b"
+        # (\d{4}|\d{5}|\d{6}) : 匹配恰好 4 位、5 位或 6 位的数字
+        pattern = r"\b(\d{4}|\d{5}|\d{6})\b"
 
         matches = re.findall(pattern, text)
         return matches

{pyscriptbase-1.1.4 → pyscriptbase-1.1.5}/pyscriptbase.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyscriptbase
-Version: 1.1.4
+Version: 1.1.5
 Summary: python script base library
 Home-page: 
 Author: ASMan

{pyscriptbase-1.1.4 → pyscriptbase-1.1.5}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="pyscriptbase",  # 包名
-    version="1.1.4",  # 版本号
+    version="1.1.5",  # 版本号
     packages=find_packages(),  # 自动查找包
     author="ASMan",
     author_email="",
@@ -23,6 +23,6 @@ setup(
         "beautifulsoup4",
         "requests",
         "lxml",
-        "brotli"
+        "brotli",
     ],  # 依赖包列表
 )