xtn-tools-pro 1.0.0.2.6__py3-none-any.whl → 1.0.0.2.7__py3-none-any.whl

xtn_tools_pro/task_pro/go_fun.py

@@ -14,30 +14,41 @@ from xtn_tools_pro.utils.file_utils import check_file_exists
 
 
 class GoFun:
-    def __init__(self, ini_file=""):
-        if not ini_file:
-            ini_current_dir = os.getcwd()
-            ini_file = os.path.join(ini_current_dir, "st.ini")
-        if not check_file_exists(ini_file):
-            raise Exception("st.ini 配置文件不存在，请在当前文件夹中新建该配置文件")
-
+    def __init__(self, ini_dict):
         # 读取配置信息
-        config = configparser.ConfigParser()
-        config.read(ini_file)
-        server_host = config.get('server', 'host')
-        server_port = config.get('server', 'port')
-        server_task = config.get('server', 'task')
-        server_auto = config.get('server', 'auto')
-
-        print(server_host, server_port, server_task)
-        if server_port:
-            task_host = f"http://{server_host}:{server_port}"
+        host = ini_dict.get('host', '')
+        port = ini_dict.get('port', 0)
+        task = ini_dict.get('task', '')
+        auto = ini_dict.get('auto', '')
+        is_processes = ini_dict.get('is_processes', False)
+        processes_num = ini_dict.get('processes_num', 0)
+        is_thread = ini_dict.get('is_thread', False)
+        thread_num = ini_dict.get('thread_num', 0)
+
+        self.__ini_info = {
+            "host": host,
+            "port": port,
+            "task": task,
+            "auto": auto,
+            "is_processes": is_processes,
+            "processes_num": processes_num,
+            "is_thread": is_thread,
+            "thread_num": thread_num,
+        }
+
+        for server_k, server_v in self.__ini_info.items():
+            if not server_v and server_k not in ["port", "is_processes", "processes_num", "is_thread", "thread_num"]:
+                raise Exception(f"ini_dict 配置 {server_k} 不存在")
+
+        if port:
+            task_host = f"http://{host}:{port}"
         else:
-            task_host = f"http://{server_host}"
+            task_host = f"http://{host}"
 
         download_url = task_host + "/filter_server/phone/get"
         upload_url = task_host + "/filter_server/phone/update"
 
-        print(server_auto)
-        print(download_url)
-        print(upload_url)
+        self.__ini_info["download_url"] = download_url
+        self.__ini_info["upload_url"] = upload_url
+
+        print(self.__ini_info)

{xtn_tools_pro-1.0.0.2.6.dist-info → xtn_tools_pro-1.0.0.2.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xtn-tools-pro
-Version: 1.0.0.2.6
+Version: 1.0.0.2.7
 Summary: xtn 开发工具
 Author: xtn
 Author-email: czw011122@gmail.com

{xtn_tools_pro-1.0.0.2.6.dist-info → xtn_tools_pro-1.0.0.2.7.dist-info}/RECORD

@@ -10,7 +10,7 @@ xtn_tools_pro/proxy/XiaoXiangProxy.py,sha256=45SsMZDc-3Ta4THX38vScjaeRBJSp420AJw
 xtn_tools_pro/proxy/__init__.py,sha256=WRwh6s2lruMu5buh0ejo9EK54kWT_VQhCsFGNFAmcyo,418
 xtn_tools_pro/proxy/proxy.py,sha256=No6E1pFY5yx2F4976pXPrLtq-QEVp79KupzcufjSN58,8703
 xtn_tools_pro/task_pro/__init__.py,sha256=nK3U47hWwE1H875ieEToH9r-jzXHS-PXk8cDstOvRE8,418
-xtn_tools_pro/task_pro/go_fun.py,sha256=3vAdvr0pPQPuxX6f0sqqszIRbdzqAAeEdiiDqXBGceQ,1593
+xtn_tools_pro/task_pro/go_fun.py,sha256=x6RxA7wsqTfhlzlieJ3Q-sj9jz_ALanEMWTXIzWDBGE,1950
 xtn_tools_pro/utils/__init__.py,sha256=I1_n_NP23F2lBqlF4EOlnOdLYxM8M4pbn63UhJN1hRE,418
 xtn_tools_pro/utils/crypto.py,sha256=RZ5AET4udlraACWMeNF-17JiZ2R6Ahb47_j4tjkV7LE,3190
 xtn_tools_pro/utils/file_utils.py,sha256=VfdIxog4s1UW5NpKkCvQsUs9qHjLoNCnstZbnftkT4w,2046
@@ -19,8 +19,8 @@ xtn_tools_pro/utils/log.py,sha256=XZChGrKWgAz42o_gFi_d7DL28svF1OvAw7NS_xkIgnQ,10
 xtn_tools_pro/utils/retry.py,sha256=0wjHsR5DBBKpv4naMfxiky8kprrZes4WURIfFQ4H708,1657
 xtn_tools_pro/utils/sql.py,sha256=EAKzbkZP7Q09j15Gm6o0_uq0qgQmcCQT6EAawbpp4v0,6263
 xtn_tools_pro/utils/time_utils.py,sha256=TUtzG61PeVYXhaQd6pBrXAdlz7tBispNIRQRcGhE2No,4859
-xtn_tools_pro-1.0.0.2.6.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xtn_tools_pro-1.0.0.2.6.dist-info/METADATA,sha256=8JH_OeHQuVn6PRENDRw5DE_OOTrW4zZ775xkpxzFKY4,455
-xtn_tools_pro-1.0.0.2.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-xtn_tools_pro-1.0.0.2.6.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
-xtn_tools_pro-1.0.0.2.6.dist-info/RECORD,,
+xtn_tools_pro-1.0.0.2.7.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xtn_tools_pro-1.0.0.2.7.dist-info/METADATA,sha256=6oMhQBQO3wynl_-fvRDrKegTZyQqGiWe4y0UK-h-dik,455
+xtn_tools_pro-1.0.0.2.7.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+xtn_tools_pro-1.0.0.2.7.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
+xtn_tools_pro-1.0.0.2.7.dist-info/RECORD,,