xtn-tools-pro 1.0.0.7.6__tar.gz → 1.0.0.7.7__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {xtn-tools-pro-1.0.0.7.6/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.0.7.7}/PKG-INFO +1 -1
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/setup.py +1 -1
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/xtn_tools_pro/task_pro/go_fun_v3.py +8 -5
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7/xtn_tools_pro.egg-info}/PKG-INFO +1 -1
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/LICENSE +0 -0
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/README.md +0 -0
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/setup.cfg +0 -0
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/xtn_tools_pro/__init__.py +0 -0
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/xtn_tools_pro/db/MongoDB.py +0 -0
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/xtn_tools_pro/db/MysqlDB.py +0 -0
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/xtn_tools_pro/db/RedisDB.py +0 -0
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/xtn_tools_pro/db/__init__.py +0 -0
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/xtn_tools_pro/proxy/XiaoXiangProxy.py +0 -0
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/xtn_tools_pro/proxy/__init__.py +0 -0
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/xtn_tools_pro/proxy/proxy.py +0 -0
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/xtn_tools_pro/task_pro/__init__.py +0 -0
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/xtn_tools_pro/task_pro/go_fun.py +0 -0
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/xtn_tools_pro/task_pro/go_fun_v2.py +0 -0
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/xtn_tools_pro/tools.py +0 -0
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/xtn_tools_pro/utils/__init__.py +0 -0
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/xtn_tools_pro/utils/crypto.py +0 -0
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/xtn_tools_pro/utils/file_utils.py +0 -0
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/xtn_tools_pro/utils/helpers.py +0 -0
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/xtn_tools_pro/utils/log.py +0 -0
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/xtn_tools_pro/utils/retry.py +0 -0
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/xtn_tools_pro/utils/set_data.py +0 -0
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/xtn_tools_pro/utils/sql.py +0 -0
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/xtn_tools_pro/utils/time_utils.py +0 -0
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/xtn_tools_pro.egg-info/SOURCES.txt +0 -0
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/xtn_tools_pro.egg-info/dependency_links.txt +0 -0
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/xtn_tools_pro.egg-info/requires.txt +0 -0
- {xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/xtn_tools_pro.egg-info/top_level.txt +0 -0
|
@@ -29,6 +29,7 @@ class GoFunTaskV3:
|
|
|
29
29
|
port = ini_dict.get('port', 0) # 端口
|
|
30
30
|
task = ini_dict.get('task', '') # 任务
|
|
31
31
|
auto = ini_dict.get('auto', '') # token
|
|
32
|
+
proxies_dict = ini_dict.get('proxies_dict', {}) # 自定义代理
|
|
32
33
|
processes_num = ini_dict.get('processes_num', 0) # 进程数
|
|
33
34
|
thread_num = ini_dict.get('thread_num', 0) # 线程数
|
|
34
35
|
restart_time = ini_dict.get('restart_time', 0) # 间隔x秒强制重启
|
|
@@ -60,6 +61,7 @@ class GoFunTaskV3:
|
|
|
60
61
|
"port": int(port),
|
|
61
62
|
"task": task,
|
|
62
63
|
"auto": auto,
|
|
64
|
+
"proxies_dict": proxies_dict,
|
|
63
65
|
"processes_num": int(processes_num),
|
|
64
66
|
"thread_num": int(thread_num),
|
|
65
67
|
"restart_time": int(restart_time),
|
|
@@ -83,7 +85,7 @@ class GoFunTaskV3:
|
|
|
83
85
|
self.upload_queue = multiprocessing.Queue()
|
|
84
86
|
manager = multiprocessing.Manager() # 进程1
|
|
85
87
|
self.manager_info = manager.dict()
|
|
86
|
-
self.proxies_dict = manager.dict()
|
|
88
|
+
self.proxies_dict = proxies_dict if proxies_dict else manager.dict()
|
|
87
89
|
|
|
88
90
|
# 获取任务
|
|
89
91
|
thread_download_task = threading.Thread(target=self.__download_task,
|
|
@@ -95,10 +97,11 @@ class GoFunTaskV3:
|
|
|
95
97
|
args=(self.upload_queue, self.__ini_info, logger))
|
|
96
98
|
thread_upload_task.start()
|
|
97
99
|
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
100
|
+
if not self.proxies_dict:
|
|
101
|
+
# 维护代理
|
|
102
|
+
thread_update_proxy = threading.Thread(target=self.__update_proxy,
|
|
103
|
+
args=(self.proxies_dict, self.manager_info, self.__ini_info, logger))
|
|
104
|
+
thread_update_proxy.start()
|
|
102
105
|
|
|
103
106
|
# go_task_fun_cnt = 0
|
|
104
107
|
# go_task_fun_task_process = None
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{xtn-tools-pro-1.0.0.7.6 → xtn-tools-pro-1.0.0.7.7}/xtn_tools_pro.egg-info/dependency_links.txt
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|