xtn-tools-pro 1.0.0.5.1__py3-none-any.whl → 1.0.0.5.2__py3-none-any.whl

xtn_tools_pro/task_pro/go_fun.py

@@ -85,6 +85,7 @@ class GoFun:
                 "name": "_download_and_upload_task",
                 "args": (download_queue, upload_queue, proxies_dict, self.__ini_info, logger),
                 "start_time": 0,
+                "restart_time": int(restart_time),
             },
             "_go_task_fun_task": {
                 "target": self._go_task_fun_task,
@@ -107,7 +108,7 @@ class GoFun:
             for p_item_info in processes_item_info.values():
                 task_process = p_item_info["task_process"]
                 task_process_start_time = p_item_info["start_time"]
-                task_process_restart_time = p_item_info.get("restart_time",0)
+                task_process_restart_time = p_item_info.get("restart_time", 0)
                 # 检查子进程是否存活
                 task_process_pid = task_process.pid
                 task_process_name = task_process.name
@@ -125,8 +126,9 @@ class GoFun:
                 else:
                     if not task_process_restart_time:
                         continue
-                    if task_process_start_time+task_process_restart_time <= get_time_now_timestamp(is_time_10=True):
-                        logger.critical(f"进程已超过设置时间，正在强制关闭进程,{task_process_restart_time},{task_process_is_alive},{task_process_name},{task_process_pid}")
+                    if task_process_start_time + task_process_restart_time <= get_time_now_timestamp(is_time_10=True):
+                        logger.critical(
+                            f"进程已超过设置时间，正在强制关闭进程,{task_process_restart_time},{task_process_is_alive},{task_process_name},{task_process_pid}")
                         task_process.terminate()
                         task_process.join()  # 等待进程确实结束
                         p_item = processes_item_info[task_process_name]
@@ -386,3 +388,17 @@ class GoFun:
             "upload_task_tine": "回写间隔",
         }
         return ini_dict
+
+    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 获取下载任务 报错 {e}")

{xtn_tools_pro-1.0.0.5.1.dist-info → xtn_tools_pro-1.0.0.5.2.dist-info}/METADATA

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

{xtn_tools_pro-1.0.0.5.1.dist-info → xtn_tools_pro-1.0.0.5.2.dist-info}/RECORD

@@ -10,7 +10,7 @@ xtn_tools_pro/proxy/XiaoXiangProxy.py,sha256=45SsMZDc-3Ta4THX38vScjaeRBJSp420AJw
 xtn_tools_pro/proxy/__init__.py,sha256=WRwh6s2lruMu5buh0ejo9EK54kWT_VQhCsFGNFAmcyo,418
 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=4iVdUAbAxtUU6WszTY66Y1uxFhap6bPyXnMgOK8MkhQ,17504
+xtn_tools_pro/task_pro/go_fun.py,sha256=bUalIre1D1DZKAz87sYVYD4YY7zKsl_UNcv7Ro5hg9A,18106
 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
@@ -19,8 +19,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.1.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xtn_tools_pro-1.0.0.5.1.dist-info/METADATA,sha256=FjTctYZ-J7_hB-HFIoeknlOdiA-W0QCg_sKZqCRLod8,455
-xtn_tools_pro-1.0.0.5.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-xtn_tools_pro-1.0.0.5.1.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
-xtn_tools_pro-1.0.0.5.1.dist-info/RECORD,,
+xtn_tools_pro-1.0.0.5.2.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xtn_tools_pro-1.0.0.5.2.dist-info/METADATA,sha256=_tqvdchxRkhjxzCQY-kW-yEZMold07wZma49sksTyNY,455
+xtn_tools_pro-1.0.0.5.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+xtn_tools_pro-1.0.0.5.2.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
+xtn_tools_pro-1.0.0.5.2.dist-info/RECORD,,