pyscriptbase 1.0.4__tar.gz → 1.1.0__tar.gz

pyscriptbase-1.1.0/PKG-INFO

@@ -0,0 +1,12 @@
+Metadata-Version: 2.1
+Name: pyscriptbase
+Version: 1.1.0
+Summary: python script base library
+Home-page: 
+Author: ASMan
+Author-email: 
+Description-Content-Type: text/markdown
+
+# Instructions
+
+python script base library

{pyscriptbase-1.0.4 → pyscriptbase-1.1.0}/pyscriptbase/pusher.py

@@ -15,10 +15,16 @@ class HtmlTableEmail:
     def __init__(self, title: str, headers: list[str] = [], appendIndex: bool = True):
         self.title = title
         self.headers: list[str] = headers
-        self.rows: list[str | int] = []
+        self.rows: list[list[str | int | tuple]] = []
         self.extras: list[str] = []
         self.appendIndex = appendIndex
 
+    def addRow(self, row: list[str | int | tuple]) -> None:
+        self.rows.append(row)
+
+    def addExtra(self, extra: str) -> None:
+        self.extras.append(extra)
+
     def toStr(self) -> str:
         result = ""
         for index, row in enumerate(self.rows):
@@ -132,12 +138,18 @@ class SMTPParams:
         self.password = password
 
 
-def sendQQMail(title: str, content: str, receiver: str = None, params: SMTPParams = None):
+def sendQQMail(
+    title: str, content: str, receiver: str = None, params: SMTPParams = None
+):
     # 设置SMTP服务器地址和端口
     smtp_server = params.server if params else Env.get("smtp_server")
-    port = params.port if params else Env.getInt("smtp_port")  # 对于TLS，通常使用587端口；对于SSL，使用465端口
+    port = (
+        params.port if params else Env.getInt("smtp_port")
+    )  # 对于TLS，通常使用587端口；对于SSL，使用465端口
     sender = params.sender if params else Env.get("smtp_sender")  # 你的电子邮件地址
-    password = params.password if params else Env.get("smtp_password")  # 你的电子邮件密码（对于某些电子邮件提供商，你可能需要生成一个应用专用密码）
+    password = (
+        params.password if params else Env.get("smtp_password")
+    )  # 你的电子邮件密码（对于某些电子邮件提供商，你可能需要生成一个应用专用密码）
     receiver = receiver if receiver else Env.get("smtp_receiver")
 
     if not sender or not password:
@@ -161,12 +173,21 @@ def sendQQMail(title: str, content: str, receiver: str = None, params: SMTPParam
         print(f"Error: unable to send email. {e}")
 
 
-def sendMail(title: str, content: str | HtmlTableEmail, receiver: str = None, params: SMTPParams = None):
+def sendMail(
+    title: str,
+    content: str | HtmlTableEmail,
+    receiver: str = None,
+    params: SMTPParams = None,
+):
     # 设置SMTP服务器地址和端口
     smtp_server = params.server if params else Env.get("smtp_server")
-    port = params.port if params else Env.getInt("smtp_port")  # 对于TLS，通常使用587端口；对于SSL，使用465端口
+    port = (
+        params.port if params else Env.getInt("smtp_port")
+    )  # 对于TLS，通常使用587端口；对于SSL，使用465端口
     sender = params.sender if params else Env.get("smtp_sender")  # 你的电子邮件地址
-    password = params.password if params else Env.get("smtp_password")  # 你的电子邮件密码（对于某些电子邮件提供商，你可能需要生成一个应用专用密码）
+    password = (
+        params.password if params else Env.get("smtp_password")
+    )  # 你的电子邮件密码（对于某些电子邮件提供商，你可能需要生成一个应用专用密码）
     receiver = receiver if receiver else Env.get("smtp_receiver")
 
     if not sender or not password:

{pyscriptbase-1.0.4 → pyscriptbase-1.1.0}/pyscriptbase/script.py

@@ -1,4 +1,5 @@
 from concurrent.futures import ThreadPoolExecutor, as_completed
+from traceback import format_exc
 from . import net
 from . import database
 
@@ -7,7 +8,13 @@ class ScriptApp:
     _proxies = []
     _cloudProxies = []
 
-    def __init__(self, index: int = 1, useProxy: bool = True, debug: bool = False, useCloud: bool = True) -> None:
+    def __init__(
+        self,
+        index: int = 1,
+        useProxy: bool = True,
+        debug: bool = False,
+        useCloud: bool = True,
+    ) -> None:
         self.index = index
         self.logs = []
         self.debug = debug
@@ -23,13 +30,29 @@ class ScriptApp:
             return
         if len(ScriptApp._proxies) == 0:
             try:
-                sql = database.SQLHelper(user=config.user, password=config.password, port=config.port, database=config.database, host=config.host)
+                sql = database.SQLHelper(
+                    user=config.user,
+                    password=config.password,
+                    port=config.port,
+                    database=config.database,
+                    host=config.host,
+                )
                 fields = ["host", "port"]
                 wheres = [["type", 1], ["state", 1]]
-                datas = sql.set_table(config.table).set_wheres(wheres).set_fields(fields).query_dict()
+                datas = (
+                    sql.set_table(config.table)
+                    .set_wheres(wheres)
+                    .set_fields(fields)
+                    .query_dict()
+                )
                 proxies = [None]
                 for data in datas:
-                    proxies.append({"http": f"http://{data['host']}:{data['port']}", "https": f"http://{data['host']}:{data['port']}"})
+                    proxies.append(
+                        {
+                            "http": f"http://{data['host']}:{data['port']}",
+                            "https": f"http://{data['host']}:{data['port']}",
+                        }
+                    )
                 ScriptApp._proxies = proxies
             except:
                 ScriptApp._proxies = [None]
@@ -42,15 +65,28 @@ class ScriptApp:
             return
         if len(ScriptApp._cloudProxies) == 0:
             try:
-                sql = database.SQLHelper(user=config.user, password=config.password, port=config.port, database=config.database, host=config.host)
+                sql = database.SQLHelper(
+                    user=config.user,
+                    password=config.password,
+                    port=config.port,
+                    database=config.database,
+                    host=config.host,
+                )
                 fields = ["url", "token"]
                 wheres = [["state", 1]]
-                datas = sql.set_table(config.table).set_wheres(wheres).set_fields(fields).query_dict()
+                datas = (
+                    sql.set_table(config.table)
+                    .set_wheres(wheres)
+                    .set_fields(fields)
+                    .query_dict()
+                )
                 ScriptApp._cloudProxies = datas
             except:
                 ScriptApp._cloudProxies = []
         if len(ScriptApp._cloudProxies):
-            self.cloudNet.cloud = ScriptApp._cloudProxies[index % len(ScriptApp._cloudProxies)]
+            self.cloudNet.cloud = ScriptApp._cloudProxies[
+                index % len(ScriptApp._cloudProxies)
+            ]
 
     def __log__(self, msg: str | dict = "", flush: bool = False):
         if flush or self.debug:
@@ -65,7 +101,7 @@ class ScriptApp:
         try:
             return fun(*args, **kwargs)
         except Exception as e:
-            self.__log__(e)
+            self.__log__(format_exc())
 
 
 class InviteObj:

{pyscriptbase-1.0.4 → pyscriptbase-1.1.0}/pyscriptbase/util.py

@@ -6,7 +6,15 @@ import string
 
 def generateRandomPhoneUA():
     # 手机设备品牌与型号
-    devices = ["Samsung Galaxy S21", "Xiaomi Mi 11", "Google Pixel 6", "Huawei P40", "OPPO Reno5", "Vivo X60", "OnePlus 9"]
+    devices = [
+        "Samsung Galaxy S21",
+        "Xiaomi Mi 11",
+        "Google Pixel 6",
+        "Huawei P40",
+        "OPPO Reno5",
+        "Vivo X60",
+        "OnePlus 9",
+    ]
 
     # 操作系统版本
     os_versions = ["Android 11", "Android 12", "Android 13"]
@@ -78,9 +86,12 @@ def daysDifference(date_str: str) -> int:
     return days_diff
 
 
-def threadPool(func, args, num=5):
+def threadPool(func, args, num=5) -> list:
     # 启用线程池
     executor = ThreadPoolExecutor(max_workers=num)
     tasks = [executor.submit(func, arg, index + 1) for index, arg in enumerate(args)]
+    results = []
     for future in as_completed(tasks):
         data = future.result()
+        results.append(data)
+    return results

pyscriptbase-1.1.0/pyscriptbase.egg-info/PKG-INFO

@@ -0,0 +1,12 @@
+Metadata-Version: 2.1
+Name: pyscriptbase
+Version: 1.1.0
+Summary: python script base library
+Home-page: 
+Author: ASMan
+Author-email: 
+Description-Content-Type: text/markdown
+
+# Instructions
+
+python script base library

{pyscriptbase-1.0.4 → pyscriptbase-1.1.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="pyscriptbase",  # 包名
-    version="1.0.4",  # 版本号
+    version="1.1.0",  # 版本号
     packages=find_packages(),  # 自动查找包
     author="ASMan",
     author_email="",

pyscriptbase-1.0.4/PKG-INFO

@@ -1,24 +0,0 @@
-Metadata-Version: 2.1
-Name: pyscriptbase
-Version: 1.0.4
-Summary: python script base library
-Home-page: 
-Author: ASMan
-Author-email: 
-Description-Content-Type: text/markdown
-Requires-Dist: loguru
-Requires-Dist: selenium
-Requires-Dist: pymysql
-Requires-Dist: pycryptodome
-Requires-Dist: pyyaml
-Requires-Dist: xmltodict
-Requires-Dist: prettytable
-Requires-Dist: pyjwt
-Requires-Dist: fake_useragent
-Requires-Dist: beautifulsoup4
-Requires-Dist: requests
-Requires-Dist: lxml
-
-# Instructions
-
-python script base library

pyscriptbase-1.0.4/pyscriptbase.egg-info/PKG-INFO

@@ -1,24 +0,0 @@
-Metadata-Version: 2.1
-Name: pyscriptbase
-Version: 1.0.4
-Summary: python script base library
-Home-page: 
-Author: ASMan
-Author-email: 
-Description-Content-Type: text/markdown
-Requires-Dist: loguru
-Requires-Dist: selenium
-Requires-Dist: pymysql
-Requires-Dist: pycryptodome
-Requires-Dist: pyyaml
-Requires-Dist: xmltodict
-Requires-Dist: prettytable
-Requires-Dist: pyjwt
-Requires-Dist: fake_useragent
-Requires-Dist: beautifulsoup4
-Requires-Dist: requests
-Requires-Dist: lxml
-
-# Instructions
-
-python script base library