xtn-tools-pro 1.0.0.4.2__tar.gz → 1.0.0.4.3__tar.gz

Sign up to get free protection for your applications and to get access to all the features.
Files changed (29) hide show
  1. {xtn-tools-pro-1.0.0.4.2/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.0.4.3}/PKG-INFO +1 -1
  2. {xtn-tools-pro-1.0.0.4.2 → xtn-tools-pro-1.0.0.4.3}/setup.py +1 -1
  3. {xtn-tools-pro-1.0.0.4.2 → xtn-tools-pro-1.0.0.4.3}/xtn_tools_pro/task_pro/go_fun.py +10 -4
  4. {xtn-tools-pro-1.0.0.4.2 → xtn-tools-pro-1.0.0.4.3}/xtn_tools_pro/utils/log.py +1 -0
  5. {xtn-tools-pro-1.0.0.4.2 → xtn-tools-pro-1.0.0.4.3/xtn_tools_pro.egg-info}/PKG-INFO +1 -1
  6. {xtn-tools-pro-1.0.0.4.2 → xtn-tools-pro-1.0.0.4.3}/LICENSE +0 -0
  7. {xtn-tools-pro-1.0.0.4.2 → xtn-tools-pro-1.0.0.4.3}/README.md +0 -0
  8. {xtn-tools-pro-1.0.0.4.2 → xtn-tools-pro-1.0.0.4.3}/setup.cfg +0 -0
  9. {xtn-tools-pro-1.0.0.4.2 → xtn-tools-pro-1.0.0.4.3}/xtn_tools_pro/__init__.py +0 -0
  10. {xtn-tools-pro-1.0.0.4.2 → xtn-tools-pro-1.0.0.4.3}/xtn_tools_pro/db/MongoDB.py +0 -0
  11. {xtn-tools-pro-1.0.0.4.2 → xtn-tools-pro-1.0.0.4.3}/xtn_tools_pro/db/MysqlDB.py +0 -0
  12. {xtn-tools-pro-1.0.0.4.2 → xtn-tools-pro-1.0.0.4.3}/xtn_tools_pro/db/RedisDB.py +0 -0
  13. {xtn-tools-pro-1.0.0.4.2 → xtn-tools-pro-1.0.0.4.3}/xtn_tools_pro/db/__init__.py +0 -0
  14. {xtn-tools-pro-1.0.0.4.2 → xtn-tools-pro-1.0.0.4.3}/xtn_tools_pro/proxy/XiaoXiangProxy.py +0 -0
  15. {xtn-tools-pro-1.0.0.4.2 → xtn-tools-pro-1.0.0.4.3}/xtn_tools_pro/proxy/__init__.py +0 -0
  16. {xtn-tools-pro-1.0.0.4.2 → xtn-tools-pro-1.0.0.4.3}/xtn_tools_pro/proxy/proxy.py +0 -0
  17. {xtn-tools-pro-1.0.0.4.2 → xtn-tools-pro-1.0.0.4.3}/xtn_tools_pro/task_pro/__init__.py +0 -0
  18. {xtn-tools-pro-1.0.0.4.2 → xtn-tools-pro-1.0.0.4.3}/xtn_tools_pro/tools.py +0 -0
  19. {xtn-tools-pro-1.0.0.4.2 → xtn-tools-pro-1.0.0.4.3}/xtn_tools_pro/utils/__init__.py +0 -0
  20. {xtn-tools-pro-1.0.0.4.2 → xtn-tools-pro-1.0.0.4.3}/xtn_tools_pro/utils/crypto.py +0 -0
  21. {xtn-tools-pro-1.0.0.4.2 → xtn-tools-pro-1.0.0.4.3}/xtn_tools_pro/utils/file_utils.py +0 -0
  22. {xtn-tools-pro-1.0.0.4.2 → xtn-tools-pro-1.0.0.4.3}/xtn_tools_pro/utils/helpers.py +0 -0
  23. {xtn-tools-pro-1.0.0.4.2 → xtn-tools-pro-1.0.0.4.3}/xtn_tools_pro/utils/retry.py +0 -0
  24. {xtn-tools-pro-1.0.0.4.2 → xtn-tools-pro-1.0.0.4.3}/xtn_tools_pro/utils/sql.py +0 -0
  25. {xtn-tools-pro-1.0.0.4.2 → xtn-tools-pro-1.0.0.4.3}/xtn_tools_pro/utils/time_utils.py +0 -0
  26. {xtn-tools-pro-1.0.0.4.2 → xtn-tools-pro-1.0.0.4.3}/xtn_tools_pro.egg-info/SOURCES.txt +0 -0
  27. {xtn-tools-pro-1.0.0.4.2 → xtn-tools-pro-1.0.0.4.3}/xtn_tools_pro.egg-info/dependency_links.txt +0 -0
  28. {xtn-tools-pro-1.0.0.4.2 → xtn-tools-pro-1.0.0.4.3}/xtn_tools_pro.egg-info/requires.txt +0 -0
  29. {xtn-tools-pro-1.0.0.4.2 → xtn-tools-pro-1.0.0.4.3}/xtn_tools_pro.egg-info/top_level.txt +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: xtn-tools-pro
3
- Version: 1.0.0.4.2
3
+ Version: 1.0.0.4.3
4
4
  Summary: xtn 开发工具
5
5
  Author: xtn
6
6
  Author-email: czw011122@gmail.com
@@ -15,7 +15,7 @@ with open("README.md", "r") as f:
15
15
 
16
16
  setuptools.setup(
17
17
  name="xtn-tools-pro", # 模块名称
18
- version="1.0.0.4.2", # 版本
18
+ version="1.0.0.4.3", # 版本
19
19
  author="xtn", # 作者
20
20
  author_email="czw011122@gmail.com", # 作者邮箱
21
21
  description="xtn 开发工具", # 模块简介
@@ -105,7 +105,7 @@ class GoFun:
105
105
  except Exception as e:
106
106
  pass
107
107
 
108
- def _download_and_upload_task(self, download_queue, upload_queue, proxies_dict, ini_info, logger):
108
+ def _download_and_upload_task(self, download_queue, upload_queue, proxies_dict, ini_info,logger):
109
109
  """
110
110
  使用两个线程 打开 获取任务、回写任务
111
111
  :param queue:
@@ -116,11 +116,17 @@ class GoFun:
116
116
  caller_class = caller.frame.f_locals.get('self', None) # 获取调用者的类实例
117
117
  if caller_name != "run" or caller_class is None:
118
118
  raise Exception("错误调用")
119
- thread_download_task = threading.Thread(target=self.__download_task, args=(download_queue, ini_info, logger))
119
+ # 获取任务
120
+ thread_download_task = threading.Thread(target=self.__download_task,
121
+ args=(download_queue, ini_info, logger))
120
122
  thread_download_task.start()
121
- thread_upload_task = threading.Thread(target=self.__upload_task, args=(upload_queue, ini_info, logger))
123
+ # 回写任务
124
+ thread_upload_task = threading.Thread(target=self.__upload_task,
125
+ args=(upload_queue, ini_info, logger))
122
126
  thread_upload_task.start()
123
- thread_update_proxy = threading.Thread(target=self.__update_proxy, args=(proxies_dict, ini_info, logger))
127
+ # 维护代理
128
+ thread_update_proxy = threading.Thread(target=self.__update_proxy,
129
+ args=(proxies_dict, ini_info, logger))
124
130
  thread_update_proxy.start()
125
131
 
126
132
  def __download_task(self, download_queue, ini_info, logger):
@@ -154,6 +154,7 @@ class Log:
154
154
  color_formatter = ColoredFormatter(
155
155
  # '\033[1m%(log_color)s[%(now_datestr)s] | %(levelname)-8s | [%(func_name)s] - %(message)s\033[0m',
156
156
  '%(log_color)s[%(now_datestr)s] | %(levelname)-8s | [%(func_name)s] - %(message)s',
157
+ # '%(log_color)s[%(now_datestr)s] | %(levelname)-8s | [%(func_name)-20s] | - %(message)s',
157
158
  log_colors=log_colors) # 加粗对齐
158
159
  # 设置控制台处理器的格式化器为带颜色的格式化器
159
160
  console_handler.setFormatter(color_formatter)
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: xtn-tools-pro
3
- Version: 1.0.0.4.2
3
+ Version: 1.0.0.4.3
4
4
  Summary: xtn 开发工具
5
5
  Author: xtn
6
6
  Author-email: czw011122@gmail.com