xtn-tools-pro 1.0.0.2.6__tar.gz → 1.0.0.2.7__tar.gz

{xtn-tools-pro-1.0.0.2.6/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.0.2.7}/PKG-INFO

@@ -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 → xtn-tools-pro-1.0.0.2.7}/setup.py

@@ -15,7 +15,7 @@ with open("README.md", "r") as f:
 
 setuptools.setup(
     name="xtn-tools-pro",  # 模块名称
-    version="1.0.0.2.6",  # 版本
+    version="1.0.0.2.7",  # 版本
     author="xtn",  # 作者
     author_email="czw011122@gmail.com",  # 作者邮箱
     description="xtn 开发工具",  # 模块简介

xtn-tools-pro-1.0.0.2.7/xtn_tools_pro/task_pro/go_fun.py

@@ -0,0 +1,54 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# 说明：
+#    程序说明xxxxxxxxxxxxxxxxxxx
+# History:
+# Date          Author    Version       Modification
+# --------------------------------------------------------------------------------------------------
+# 2025/1/14    xiatn     V00.01.000    新建
+# --------------------------------------------------------------------------------------------------
+import os
+import configparser
+from xtn_tools_pro.utils.file_utils import check_file_exists
+
+
+class GoFun:
+    def __init__(self, ini_dict):
+        # 读取配置信息
+        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://{host}"
+
+        download_url = task_host + "/filter_server/phone/get"
+        upload_url = task_host + "/filter_server/phone/update"
+
+        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 → xtn-tools-pro-1.0.0.2.7/xtn_tools_pro.egg-info}/PKG-INFO

@@ -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/xtn_tools_pro/task_pro/go_fun.py

@@ -1,43 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# 说明：
-#    程序说明xxxxxxxxxxxxxxxxxxx
-# History:
-# Date          Author    Version       Modification
-# --------------------------------------------------------------------------------------------------
-# 2025/1/14    xiatn     V00.01.000    新建
-# --------------------------------------------------------------------------------------------------
-import os
-import configparser
-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 配置文件不存在，请在当前文件夹中新建该配置文件")
-
-        # 读取配置信息
-        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}"
-        else:
-            task_host = f"http://{server_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)