xtn-tools-pro 1.0.0.7.6__py3-none-any.whl → 1.0.0.7.7__py3-none-any.whl

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

{xtn_tools_pro-1.0.0.7.6.dist-info → xtn_tools_pro-1.0.0.7.7.dist-info}/METADATA

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

{xtn_tools_pro-1.0.0.7.6.dist-info → xtn_tools_pro-1.0.0.7.7.dist-info}/RECORD

@@ -12,7 +12,7 @@ xtn_tools_pro/proxy/proxy.py,sha256=No6E1pFY5yx2F4976pXPrLtq-QEVp79KupzcufjSN58,
 xtn_tools_pro/task_pro/__init__.py,sha256=nK3U47hWwE1H875ieEToH9r-jzXHS-PXk8cDstOvRE8,418
 xtn_tools_pro/task_pro/go_fun.py,sha256=hWEt2uJ9FCvJH7PhVZttS-11A7J6zbRKwX7c5YLYQag,19144
 xtn_tools_pro/task_pro/go_fun_v2.py,sha256=SgcXgtEBGSVL1V2LyqO0z8Md2H8JZxucYrLLIwqtiLM,18489
-xtn_tools_pro/task_pro/go_fun_v3.py,sha256=hrep1qgZwHdt06UA03gnCqHN3dJQPIOVDlgfHMQ-b3U,16202
+xtn_tools_pro/task_pro/go_fun_v3.py,sha256=v8w6EayuhUcHQxJ0m7XFExI3cV_JZZaFIxhsTX4JxH4,16406
 xtn_tools_pro/utils/__init__.py,sha256=I1_n_NP23F2lBqlF4EOlnOdLYxM8M4pbn63UhJN1hRE,418
 xtn_tools_pro/utils/crypto.py,sha256=oyzFqWum_oimUtzhfVCELQhdMjxDbLu-nOWfcNmazcc,4087
 xtn_tools_pro/utils/file_utils.py,sha256=obaBP7CaBCsXxzqGeWzV2l0yw7vicgKOaXzmpMV8ips,2567
@@ -22,8 +22,8 @@ xtn_tools_pro/utils/retry.py,sha256=0wjHsR5DBBKpv4naMfxiky8kprrZes4WURIfFQ4H708,
 xtn_tools_pro/utils/set_data.py,sha256=IthfAclck7AbaxOIKOgJZ2wdcfEmlvC-C63Tywcr4bA,11180
 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.7.6.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xtn_tools_pro-1.0.0.7.6.dist-info/METADATA,sha256=tmwkoN88fvaSp5NKuzBXMSllaKXplaUQx0RhIlfjoho,498
-xtn_tools_pro-1.0.0.7.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-xtn_tools_pro-1.0.0.7.6.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
-xtn_tools_pro-1.0.0.7.6.dist-info/RECORD,,
+xtn_tools_pro-1.0.0.7.7.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xtn_tools_pro-1.0.0.7.7.dist-info/METADATA,sha256=9IZ1bUfo7MvRmyO-rJot0uDqpV5sEnqMtgyK4TmrWAo,498
+xtn_tools_pro-1.0.0.7.7.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+xtn_tools_pro-1.0.0.7.7.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
+xtn_tools_pro-1.0.0.7.7.dist-info/RECORD,,