multiCMD 1.28__tar.gz → 1.30__tar.gz

{multicmd-1.28 → multicmd-1.30}/PKG-INFO

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

{multicmd-1.28 → multicmd-1.30}/multiCMD.egg-info/PKG-INFO

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

{multicmd-1.28 → multicmd-1.30}/multiCMD.py

@@ -18,10 +18,11 @@ import re
 import itertools
 import signal
 
-version = '1.28'
+version = '1.30'
 __version__ = version
 
 __running_threads = []
+__variables = {}
 class Task:
 	def __init__(self, command):
 		self.command = command
@@ -42,7 +43,7 @@ class Task:
 		return False
 	
 class AsyncExecutor:
-	def __init__(self, max_threads=1,semaphore=None,timeout=0,quiet=True,dry_run=False,parse=False):
+	def __init__(self, max_threads=1,semaphore=...,timeout=0,quiet=True,dry_run=False,parse=False):
 		'''
 		AsyncExecutor class to run commands in parallel asynchronously
 		@params:
@@ -54,6 +55,8 @@ class AsyncExecutor:
 			parse: Whether to parse ranged input ( bool )
 		'''
 		self.max_threads = max_threads
+		if semaphore is ...:
+			semaphore = threading.Semaphore(max_threads)
 		self.semaphore = semaphore
 		self.runningThreads = []
 		self.tasks = []
@@ -61,6 +64,7 @@ class AsyncExecutor:
 		self.quiet = quiet
 		self.dry_run = dry_run
 		self.parse = parse
+		self.__lastNotJoined = 0
 
 	def __iter__(self):
 		return iter(self.tasks)
@@ -103,6 +107,15 @@ class AsyncExecutor:
 			parse = self.parse
 		if sem is ...:
 			sem = self.semaphore
+		if len(self.runningThreads) > 130000:
+			self.wait(timeout=0)
+			if len(self.runningThreads) > 130000:
+				print('The amount of running threads approching cpython limit of 130704. Waiting until some available.')
+				while len(self.runningThreads) > 120000:
+					self.wait(timeout=1)
+		elif len(self.runningThreads) + self.__lastNotJoined > 1000:
+			self.wait(timeout=0)
+			self.__lastNotJoined = len(self.runningThreads)
 		taskObjects: list[Task] = run_commands(commands,timeout=timeout,max_threads=max_threads,quiet=quiet,dry_run=dry_run,with_stdErr=False,
 				 return_code_only=False,return_object=True, parse = parse, wait_for_return = False, sem = sem)
 		self.tasks.extend(taskObjects)
@@ -139,7 +152,7 @@ class AsyncExecutor:
 		if timeout is ...:
 			timeout = self.timeout
 		for thread in threads:
-			if timeout > 0:
+			if timeout >= 0:
 				thread.join(timeout=timeout)
 			else:
 				thread.join()
@@ -224,6 +237,7 @@ def _expand_ranges(inStr):
 	@returns:
 		list[str]: The expanded string
 	'''
+	global __variables
 	expandingStr = [inStr]
 	expandedList = []
 	# all valid alphanumeric characters
@@ -238,14 +252,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}"