xtn-tools-pro 1.0.0.5.8__py3-none-any.whl → 1.0.0.6.0__py3-none-any.whl

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.dist-info → xtn_tools_pro-1.0.0.6.0.dist-info}/METADATA

@@ -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.dist-info → xtn_tools_pro-1.0.0.6.0.dist-info}/RECORD

@@ -11,7 +11,7 @@ xtn_tools_pro/proxy/__init__.py,sha256=WRwh6s2lruMu5buh0ejo9EK54kWT_VQhCsFGNFAmc
 xtn_tools_pro/proxy/proxy.py,sha256=No6E1pFY5yx2F4976pXPrLtq-QEVp79KupzcufjSN58,8703
 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=4IG8OU3rFyxkeqN4oue_u3XK_ajdlcLHG5jCd58D6cU,15733
+xtn_tools_pro/task_pro/go_fun_v2.py,sha256=p1-2HWiC7OYhFqbJ_OC56wjvD0IXxcoq-egKf-RRl6Q,16847
 xtn_tools_pro/utils/__init__.py,sha256=I1_n_NP23F2lBqlF4EOlnOdLYxM8M4pbn63UhJN1hRE,418
 xtn_tools_pro/utils/crypto.py,sha256=RZ5AET4udlraACWMeNF-17JiZ2R6Ahb47_j4tjkV7LE,3190
 xtn_tools_pro/utils/file_utils.py,sha256=VfdIxog4s1UW5NpKkCvQsUs9qHjLoNCnstZbnftkT4w,2046
@@ -20,8 +20,8 @@ xtn_tools_pro/utils/log.py,sha256=m0WtTWkkwtrki1ftP8vCDR8bMfK2gcfUGx5J2x2IlLQ,10
 xtn_tools_pro/utils/retry.py,sha256=0wjHsR5DBBKpv4naMfxiky8kprrZes4WURIfFQ4H708,1657
 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.5.8.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xtn_tools_pro-1.0.0.5.8.dist-info/METADATA,sha256=c35aQ7Hjoopv4zcnXGuri4dm7gDMR_6uOYJKqNaYCoA,455
-xtn_tools_pro-1.0.0.5.8.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-xtn_tools_pro-1.0.0.5.8.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
-xtn_tools_pro-1.0.0.5.8.dist-info/RECORD,,
+xtn_tools_pro-1.0.0.6.0.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xtn_tools_pro-1.0.0.6.0.dist-info/METADATA,sha256=_duujWW1faktkv4NjXsR6mAUz9u7kAAv0NesLD3fABg,455
+xtn_tools_pro-1.0.0.6.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+xtn_tools_pro-1.0.0.6.0.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
+xtn_tools_pro-1.0.0.6.0.dist-info/RECORD,,