multiCMD 1.29__tar.gz → 1.31__tar.gz

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

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

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

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

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

@@ -18,10 +18,11 @@ import re
 import itertools
 import signal
 
-version = '1.29'
+version = '1.31'
 __version__ = version
 
 __running_threads = []
+__variables = {}
 class Task:
 	def __init__(self, command):
 		self.command = command
@@ -226,6 +227,66 @@ class AsyncExecutor:
 		'''
 		return [task.returncode for task in self.tasks]
 
+# immutable helpers compiled once at import time
+_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]:
+	"""Turn one comma-separated element from inside [...] into a list of strings."""
+	piece = piece.strip()
+
+	# variable assignment  foo:BAR
+	if ':' in piece:
+		var, _, value = piece.partition(':')
+		vars_[var] = value
+		return                            # bracket disappears
+
+	# explicit range  start-end
+	if '-' in piece:
+		start, _, end = (p.strip() for p in piece.partition('-'))
+
+		start = vars_.get(start, start)
+		end   = vars_.get(end,   end)
+
+		if start.isdigit() and end.isdigit():               # decimal range
+			pad = max(len(start), len(end))
+			return [f"{i:0{pad}d}" for i in range(int(start), int(end) + 1)]
+
+		if all(c in string.hexdigits for c in start + end): # hex range
+			return [format(i, 'x') for i in range(int(start, 16),
+												  int(end,   16) + 1)]
+
+		# alphanumeric range (0-9a-zA-Z)
+		try:
+			return [_ALPHANUM[i]
+					for i in range(_ALPHA_IDX[start], _ALPHA_IDX[end] + 1)]
+		except KeyError:
+			pass                                            # fall through
+
+	# plain token or ${var}
+	return [vars_.get(piece, piece)]
+
+def _expand_ranges_fast(inStr: str) -> list[str]:
+	global __variables
+	segments: list[list[str]] = []
+	pos = 0
+	# split the template into literal pieces + expandable pieces
+	for m in _BRACKET_RX.finditer(inStr):
+		if m.start() > pos:
+			segments.append([inStr[pos:m.start()]])          # literal
+		choices: list[str] = []
+		for sub in m.group(1).split(','):
+			expandedPieces = _expand_piece(sub, __variables)
+			if expandedPieces:
+				choices.extend(expandedPieces)
+		segments.append(choices or [''])                        # keep length
+		pos = m.end()
+	segments.append([inStr[pos:]])                           # tail
+
+	# cartesian product of all segments
+	return [''.join(parts) for parts in itertools.product(*segments)]
+
 def _expand_ranges(inStr):
 	'''
 	Expand ranges in a string
@@ -236,6 +297,7 @@ def _expand_ranges(inStr):
 	@returns:
 		list[str]: The expanded string
 	'''
+	global __variables
 	expandingStr = [inStr]
 	expandedList = []
 	# all valid alphanumeric characters
@@ -250,14 +312,22 @@ def _expand_ranges(inStr):
 		parts = group.split(',')
 		for part in parts:
 			part = part.strip()
-			if '-' in part:
+			if ':' in part:
+				variableName, _, part = part.partition(':')
+				__variables[variableName] = part
+				expandingStr.append(currentStr.replace(match.group(0), '', 1))
+			elif '-' in part:
 				try:
 					range_start,_, range_end = part.partition('-')
 				except ValueError:
 					expandedList.append(currentStr)
 					continue
 				range_start = range_start.strip()
+				if range_start in __variables:
+					range_start = __variables[range_start]
 				range_end = range_end.strip()
+				if range_end in __variables:
+					range_end = __variables[range_end]
 				if range_start.isdigit() and range_end.isdigit():
 					padding_length = min(len(range_start), len(range_end))
 					format_str = "{:0" + str(padding_length) + "d}"
@@ -528,7 +598,7 @@ def __format_command(command,expand = False):
 	'''
 	if isinstance(command,str):
 		if expand:
-			commands = _expand_ranges(command)
+			commands = _expand_ranges_fast(command)
 		else:
 			commands = [command]
 		return [command.split() for command in commands]
@@ -542,7 +612,7 @@ def __format_command(command,expand = False):
 				sanitized_command.append(repr(field))
 		if not expand:
 			return [sanitized_command]
-		sanitized_expanded_command = [_expand_ranges(field) for field in sanitized_command]
+		sanitized_expanded_command = [_expand_ranges_fast(field) for field in sanitized_command]
 		# now the command had been expanded to list of list of fields with each field expanded to all possible options
 		# we need to generate all possible combinations of the fields
 		# we will use the cartesian product to do this