xtn-tools-pro 1.0.0.3.6__py3-none-any.whl → 1.0.0.3.8__py3-none-any.whl

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.
@@ -35,14 +35,14 @@ class GoFun:
35
35
 
36
36
  self.__ini_info = {
37
37
  "host": host,
38
- "port": port,
38
+ "port": int(port),
39
39
  "task": task,
40
40
  "auto": auto,
41
- "processes_num": processes_num,
42
- "thread_num": thread_num,
43
- "restart_time": restart_time,
44
- "update_proxies_time": update_proxies_time,
45
- "upload_task_tine": upload_task_tine,
41
+ "processes_num": int(processes_num),
42
+ "thread_num": int(thread_num),
43
+ "restart_time": int(restart_time),
44
+ "update_proxies_time": int(update_proxies_time),
45
+ "upload_task_tine": int(upload_task_tine),
46
46
  }
47
47
 
48
48
  for server_k, server_v in self.__ini_info.items():
@@ -50,6 +50,8 @@ class GoFun:
50
50
  "update_proxies_time", "upload_task_tine"]:
51
51
  raise Exception(f"ini_dict 配置 {server_k} 不存在")
52
52
 
53
+ logger.info(f"\n当前设置配置如下:\n\t功能函数重启间隔:{restart_time};进程数:{processes_num};线程数:{thread_num}\n\t代理更新间隔:{update_proxies_time};回写间隔{upload_task_tine}\n")
54
+
53
55
  if port:
54
56
  task_host = f"http://{host}:{port}"
55
57
  else:
@@ -149,6 +151,9 @@ class GoFun:
149
151
  time.sleep(2)
150
152
  continue
151
153
  for task_item in result_list:
154
+ phone_item = task_item["phone"]
155
+ if not phone_item.isdigit(): # 判断是否全是整数(不包括小数点或负号)
156
+ continue
152
157
  download_queue.put(task_item)
153
158
  logger.info(f"成功获取任务个数:{len(result_list)}")
154
159
  except Exception as e:
@@ -308,3 +313,21 @@ class GoFun:
308
313
  # 等待所有线程完成
309
314
  for future in concurrent.futures.as_completed(futures):
310
315
  future.result()
316
+
317
+ def get_ini_dict(self):
318
+ """
319
+ 配置解释
320
+ :return:
321
+ """
322
+ ini_dict = {
323
+ "host": "域名",
324
+ "port": "端口",
325
+ "task": "任务",
326
+ "auto": "token",
327
+ "processes_num": "进程数",
328
+ "thread_num": "线程数",
329
+ "restart_time": "间隔x秒强制重启",
330
+ "update_proxies_time": "间隔x秒更新代理",
331
+ "upload_task_tine": "回写间隔",
332
+ }
333
+ return ini_dict
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: xtn-tools-pro
3
- Version: 1.0.0.3.6
3
+ Version: 1.0.0.3.8
4
4
  Summary: xtn 开发工具
5
5
  Author: xtn
6
6
  Author-email: czw011122@gmail.com
@@ -10,7 +10,7 @@ xtn_tools_pro/proxy/XiaoXiangProxy.py,sha256=45SsMZDc-3Ta4THX38vScjaeRBJSp420AJw
10
10
  xtn_tools_pro/proxy/__init__.py,sha256=WRwh6s2lruMu5buh0ejo9EK54kWT_VQhCsFGNFAmcyo,418
11
11
  xtn_tools_pro/proxy/proxy.py,sha256=No6E1pFY5yx2F4976pXPrLtq-QEVp79KupzcufjSN58,8703
12
12
  xtn_tools_pro/task_pro/__init__.py,sha256=nK3U47hWwE1H875ieEToH9r-jzXHS-PXk8cDstOvRE8,418
13
- xtn_tools_pro/task_pro/go_fun.py,sha256=AkmnrszCV45Y-2x5I5_q-GpsELMBlxcRK9K01C-pKHM,13069
13
+ xtn_tools_pro/task_pro/go_fun.py,sha256=vDJgoMvAFLCJxF7jOpWbhQH8HnzyNY4z0TUt-MWzjuE,14048
14
14
  xtn_tools_pro/utils/__init__.py,sha256=I1_n_NP23F2lBqlF4EOlnOdLYxM8M4pbn63UhJN1hRE,418
15
15
  xtn_tools_pro/utils/crypto.py,sha256=RZ5AET4udlraACWMeNF-17JiZ2R6Ahb47_j4tjkV7LE,3190
16
16
  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
19
19
  xtn_tools_pro/utils/retry.py,sha256=0wjHsR5DBBKpv4naMfxiky8kprrZes4WURIfFQ4H708,1657
20
20
  xtn_tools_pro/utils/sql.py,sha256=EAKzbkZP7Q09j15Gm6o0_uq0qgQmcCQT6EAawbpp4v0,6263
21
21
  xtn_tools_pro/utils/time_utils.py,sha256=TUtzG61PeVYXhaQd6pBrXAdlz7tBispNIRQRcGhE2No,4859
22
- xtn_tools_pro-1.0.0.3.6.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
23
- xtn_tools_pro-1.0.0.3.6.dist-info/METADATA,sha256=sZpRVP-8TnYb2rx06kwQsXSvQjDogTyUs-upWFLAMlo,455
24
- xtn_tools_pro-1.0.0.3.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
25
- xtn_tools_pro-1.0.0.3.6.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
26
- xtn_tools_pro-1.0.0.3.6.dist-info/RECORD,,
22
+ xtn_tools_pro-1.0.0.3.8.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
23
+ xtn_tools_pro-1.0.0.3.8.dist-info/METADATA,sha256=NghnbDziwyg7d95lLnpc9pK3a_K_vrqMX1J5zb9wCXI,455
24
+ xtn_tools_pro-1.0.0.3.8.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
25
+ xtn_tools_pro-1.0.0.3.8.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
26
+ xtn_tools_pro-1.0.0.3.8.dist-info/RECORD,,