pyscriptbase 1.1.1__tar.gz → 1.1.2__tar.gz

{pyscriptbase-1.1.1 → pyscriptbase-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyscriptbase
-Version: 1.1.1
+Version: 1.1.2
 Summary: python script base library
 Home-page: 
 Author: ASMan

{pyscriptbase-1.1.1 → pyscriptbase-1.1.2}/pyscriptbase/script.py

@@ -2,6 +2,7 @@ from concurrent.futures import ThreadPoolExecutor, as_completed
 from traceback import format_exc
 from . import net
 from . import database
+import random
 
 
 class ScriptApp:
@@ -12,8 +13,10 @@ class ScriptApp:
         self,
         index: int = 1,
         useProxy: bool = True,
+        randomProxy: bool = False,
         debug: bool = False,
         useCloud: bool = True,
+        randomCloud: bool = False,
     ) -> None:
         self.index = index
         self.logs = []
@@ -21,6 +24,8 @@ class ScriptApp:
         self.net = net.NetRequest()
         self.cloudNet = net.CloudRequest()
         self.cloudNet.net = self.net
+        self.randomProxy = randomProxy
+        self.randomCloud = randomCloud
         useProxy and self.__setProxy__(index)
         useCloud and self.__setCloudProxy__(index)
 
@@ -57,7 +62,10 @@ class ScriptApp:
             except:
                 ScriptApp._proxies = [None]
         if len(ScriptApp._proxies):
-            self.net.proxies = ScriptApp._proxies[index % len(ScriptApp._proxies)]
+            if self.randomProxy:
+                self.net.proxies = random.choice(ScriptApp._proxies)
+            else:
+                self.net.proxies = ScriptApp._proxies[index % len(ScriptApp._proxies)]
 
     def __setCloudProxy__(self, index: int) -> None:
         config = database.getDataConfig("account", "cloud_proxy")
@@ -84,9 +92,10 @@ class ScriptApp:
             except:
                 ScriptApp._cloudProxies = []
         if len(ScriptApp._cloudProxies):
-            self.cloudNet.cloud = ScriptApp._cloudProxies[
-                index % len(ScriptApp._cloudProxies)
-            ]
+            if self.randomCloud:
+                self.cloudNet.cloud = random.choice(ScriptApp._cloudProxies)
+            else:
+                self.cloudNet.cloud = ScriptApp._cloudProxies[index % len(ScriptApp._cloudProxies)]
 
     def __log__(self, msg: str | dict = "", flush: bool = False):
         if flush or self.debug:

{pyscriptbase-1.1.1 → pyscriptbase-1.1.2}/pyscriptbase.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyscriptbase
-Version: 1.1.1
+Version: 1.1.2
 Summary: python script base library
 Home-page: 
 Author: ASMan

{pyscriptbase-1.1.1 → pyscriptbase-1.1.2}/setup.py

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