dotask 0.2.1__tar.gz → 0.2.3__tar.gz

{dotask-0.2.1 → dotask-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dotask
-Version: 0.2.1
+Version: 0.2.3
 Summary: 发布订阅注解方式
 Home-page: https://gitee.com/d-yz/task-manager
 Author: dyz

{dotask-0.2.1 → dotask-0.2.3}/dotask/util/shell.py

@@ -4,22 +4,34 @@ import subprocess
 from typing import Optional,Callable
 
 class Shell:
-    def __init__(self,max_concurrent:int):
-        self.max_concurrent = max_concurrent
-        self.shell_semaphore = threading.Semaphore(max_concurrent)
+    _shell_semaphore:threading.Semaphore = None
+    _semaphore_lock = threading.Lock()
 
-    def set_max_concurrent(self,new_max:int) -> None:
-        if new_max <= 0:
-            raise ValueError("最大并发数必须大于0")
-        self.max_concurrent = new_max
-        self.shell_semaphore = threading.Semaphore(new_max)
-        logger.debug(f"最大并发数已更新为:{new_max}")
+    def __init__(self,max_concurrent:int,global_sem=False):
+        self.global_sem = global_sem
+        if global_sem:
+            if max_concurrent <= 0:
+                raise ValueError("最大并发数必须大于0")
+            self._shell_semaphore = threading.Semaphore(max_concurrent)
+            self._max_concurrent = max_concurrent
+        else:
+            with Shell._semaphore_lock:
+                if Shell._shell_semaphore is None:
+                    if max_concurrent <= 0:
+                        raise ValueError("最大并发数必须大于0")
+                    Shell._shell_semaphore = threading.Semaphore(max_concurrent)
+                    self._max_concurrent = max_concurrent
+                else:
+                    if Shell._shell_semaphore._value != max_concurrent:
+                        logger.warning(f"全局信号量已存在（并发数：{Shell._shell_semaphore._value}），忽略传入的max_concurrent={max_concurrent}")
+                    self._max_concurrent = Shell._shell_semaphore._value
 
     def local_shell_execute(self,cmd:str,callback: Optional[Callable[[bool, str], None]] = None) -> bool:
         def execute_and_wait():
-            # 关键：信号量放在线程内，覆盖整个命令执行周期
-            with self.shell_semaphore:
-                logger.debug(f"剩余并发名额: {self.shell_semaphore._value} | 开始执行命令: {cmd[:50]}")
+            semaphore = self._shell_semaphore if self.global_sem else Shell._shell_semaphore
+
+            with semaphore:
+                logger.debug(f"实例:{id(self)}-剩余并发名额: {semaphore._value} | 开始执行命令: {cmd[:50]}")
                 proc = None
                 try:
                     # 创建并执行命令

{dotask-0.2.1 → dotask-0.2.3}/dotask.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dotask
-Version: 0.2.1
+Version: 0.2.3
 Summary: 发布订阅注解方式
 Home-page: https://gitee.com/d-yz/task-manager
 Author: dyz

{dotask-0.2.1 → dotask-0.2.3}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = dotask
-version = 0.2.1
+version = 0.2.3
 author = dyz
 author_email = 837701454@qq.com
 description = 发布订阅注解方式