xtn-tools-pro 1.0.0.7.5__tar.gz → 1.0.0.7.7__tar.gz

{xtn-tools-pro-1.0.0.7.5/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.0.7.7}/PKG-INFO

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

{xtn-tools-pro-1.0.0.7.5 → xtn-tools-pro-1.0.0.7.7}/setup.py

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

{xtn-tools-pro-1.0.0.7.5 → xtn-tools-pro-1.0.0.7.7}/xtn_tools_pro/task_pro/go_fun_v3.py

@@ -29,6 +29,7 @@ class GoFunTaskV3:
         port = ini_dict.get('port', 0)  # 端口
         task = ini_dict.get('task', '')  # 任务
         auto = ini_dict.get('auto', '')  # token
+        proxies_dict = ini_dict.get('proxies_dict', {})  # 自定义代理
         processes_num = ini_dict.get('processes_num', 0)  # 进程数
         thread_num = ini_dict.get('thread_num', 0)  # 线程数
         restart_time = ini_dict.get('restart_time', 0)  # 间隔x秒强制重启
@@ -60,6 +61,7 @@ class GoFunTaskV3:
             "port": int(port),
             "task": task,
             "auto": auto,
+            "proxies_dict": proxies_dict,
             "processes_num": int(processes_num),
             "thread_num": int(thread_num),
             "restart_time": int(restart_time),
@@ -83,7 +85,7 @@ class GoFunTaskV3:
         self.upload_queue = multiprocessing.Queue()
         manager = multiprocessing.Manager()  # 进程1
         self.manager_info = manager.dict()
-        self.proxies_dict = manager.dict()
+        self.proxies_dict = proxies_dict if proxies_dict else manager.dict()
 
         # 获取任务
         thread_download_task = threading.Thread(target=self.__download_task,
@@ -95,10 +97,11 @@ class GoFunTaskV3:
                                               args=(self.upload_queue, self.__ini_info, logger))
         thread_upload_task.start()
 
-        # 维护代理
-        thread_update_proxy = threading.Thread(target=self.__update_proxy,
-                                               args=(self.proxies_dict, self.manager_info, self.__ini_info, logger))
-        thread_update_proxy.start()
+        if not self.proxies_dict:
+            # 维护代理
+            thread_update_proxy = threading.Thread(target=self.__update_proxy,
+                                                   args=(self.proxies_dict, self.manager_info, self.__ini_info, logger))
+            thread_update_proxy.start()
 
         # go_task_fun_cnt = 0
         # go_task_fun_task_process = None
@@ -190,7 +193,7 @@ class GoFunTaskV3:
                 resp = requests.get(download_url, headers=headers, params=params, timeout=5)
                 json_data = resp.json()
                 result_list = json_data.get("result", [])
-                if len(result_list) <= 0:
+                if not result_list or len(result_list) <= 0:
                     # 判断任务响应是否为空
                     download_queue_exist_cnt -= 1
                     if download_queue_exist_cnt <= 0 and not manager_info["gofun_kill_status"]:

{xtn-tools-pro-1.0.0.7.5 → xtn-tools-pro-1.0.0.7.7/xtn_tools_pro.egg-info}/PKG-INFO

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