multiCMD 1.31__tar.gz → 1.33__tar.gz

{multicmd-1.31 → multicmd-1.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multiCMD
-Version: 1.31
+Version: 1.33
 Summary: Run commands simultaneously
 Home-page: https://github.com/yufei-pan/multiCMD
 Author: Yufei Pan

{multicmd-1.31 → multicmd-1.33}/multiCMD.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multiCMD
-Version: 1.31
+Version: 1.33
 Summary: Run commands simultaneously
 Home-page: https://github.com/yufei-pan/multiCMD
 Author: Yufei Pan

{multicmd-1.31 → multicmd-1.33}/multiCMD.py

@@ -18,10 +18,10 @@ import re
 import itertools
 import signal
 
-version = '1.31'
+version = '1.33'
 __version__ = version
 
-__running_threads = []
+__running_threads = set()
 __variables = {}
 class Task:
 	def __init__(self, command):
@@ -232,7 +232,7 @@ _BRACKET_RX   = re.compile(r'\[([^\]]+)\]')
 _ALPHANUM     = string.digits + string.ascii_letters
 _ALPHA_IDX    = {c: i for i, c in enumerate(_ALPHANUM)}
 
-def _expand_piece(piece: str, vars_: dict[str, str]) -> list[str]:
+def _expand_piece(piece, vars_):
 	"""Turn one comma-separated element from inside [...] into a list of strings."""
 	piece = piece.strip()
 
@@ -267,7 +267,7 @@ def _expand_piece(piece: str, vars_: dict[str, str]) -> list[str]:
 	# plain token or ${var}
 	return [vars_.get(piece, piece)]
 
-def _expand_ranges_fast(inStr: str) -> list[str]:
+def _expand_ranges_fast(inStr):
 	global __variables
 	segments: list[list[str]] = []
 	pos = 0
@@ -662,7 +662,7 @@ def run_commands(commands, timeout=0,max_threads=1,quiet=False,dry_run=False,wit
 			for thread in threads:
 				thread.join()
 		else:
-			__running_threads.extend(threads)
+			__running_threads.update(threads)
 	else:
 		# just process the commands sequentially
 		sem = threading.Semaphore(1)
@@ -689,8 +689,11 @@ def join_threads(threads=__running_threads,timeout=None):
 	@returns:
 		None
 	'''
+	global __running_threads
 	for thread in threads:
 		thread.join(timeout=timeout)
+	if threads is __running_threads:
+		__running_threads = {t for t in threads if t.is_alive()}
 
 def input_with_timeout_and_countdown(timeout, prompt='Please enter your selection'):
 	"""