xtn-tools-pro 1.0.0.5.8__tar.gz → 1.0.0.6.0__tar.gz

{xtn-tools-pro-1.0.0.5.8/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.0.6.0}/PKG-INFO

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

{xtn-tools-pro-1.0.0.5.8 → xtn-tools-pro-1.0.0.6.0}/setup.py

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

{xtn-tools-pro-1.0.0.5.8 → xtn-tools-pro-1.0.0.6.0}/xtn_tools_pro/task_pro/go_fun_v2.py

@@ -133,7 +133,7 @@ class GoFunTaskV2:
         go_task_fun_task_process.start()
 
         while True:
-            logger.info("进程正常...")
+            logger.debug("进程正常...")
             time.sleep(10)
 
     def _download_and_upload_task(self, ini_info, logger, download_queue, upload_queue, proxies_dict):
@@ -323,6 +323,7 @@ class GoFunTaskV2:
                                         go_task_function))
                         processes_start_list.append(p)
                         p.start()
+                        time.sleep(1)
 
                 if not restart_time:
                     # 一直执行 不退出
@@ -353,3 +354,35 @@ class GoFunTaskV2:
             # 等待所有线程完成
             for future in concurrent.futures.as_completed(futures):
                 future.result()
+
+    def get_download_task(self, download_queue, block, timeout):
+        """
+            获取下载任务
+        :param download_queue:下载队列
+        :param block: 是否阻塞等待 True阻塞/False不阻塞
+        :param timeout:
+        :return:
+        """
+        try:
+            task_item = download_queue.get(block=block, timeout=timeout)
+            return task_item
+        except Exception as e:
+            self.logger.critical(f"get_download_task 获取下载任务 {download_queue, block, timeout} 报错 {e}")
+            return False
+
+    def update_upload_task(self, upload_queue, task_item):
+        """
+            更新任务
+        :param upload_queue:
+        :param task_item:
+        :return:
+        """
+        try:
+            task_item = upload_queue.put(task_item)
+            return task_item
+        except Exception as e:
+            self.logger.critical(f"update_upload_task 更新任务 {upload_queue, task_item} 报错 {e}")
+            return False
+
+    def reboot_process(self):
+        pass

{xtn-tools-pro-1.0.0.5.8 → xtn-tools-pro-1.0.0.6.0/xtn_tools_pro.egg-info}/PKG-INFO

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