multiCMD 1.21__tar.gz → 1.23__tar.gz

{multicmd-1.21 → multicmd-1.23}/PKG-INFO

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

{multicmd-1.21 → multicmd-1.23}/multiCMD.egg-info/PKG-INFO

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

{multicmd-1.21 → multicmd-1.23}/multiCMD.py

@@ -18,7 +18,7 @@ import re
 import itertools
 import signal
 
-version = '1.21'
+version = '1.23'
 __version__ = version
 
 __running_threads = []
@@ -28,6 +28,7 @@ class Task:
 		self.returncode = None
 		self.stdout = []
 		self.stderr = []
+		self.thread = None
 		self.stop = False
 	def __iter__(self):
 		return zip(['command', 'returncode', 'stdout', 'stderr'], [self.command, self.returncode, self.stdout, self.stderr])
@@ -35,6 +36,10 @@ class Task:
 		return f'Task(command={self.command}, returncode={self.returncode}, stdout={self.stdout}, stderr={self.stderr}, stop={self.stop})'
 	def __str__(self):
 		return str(dict(self))
+	def is_alive(self):
+		if self.thread is not None:
+			return self.thread.is_alive()
+		return False
 
 def _expand_ranges(inStr):
 	'''
@@ -239,19 +244,21 @@ def __run_command(task,sem, timeout=60, quiet=False,dry_run=False,with_stdErr=Fa
 					task.returncode = 137
 				else:
 					task.returncode = -1
-			if not quiet:
-				print(pre+'\n'+ '-'*100+post)
-				print(pre+f'Process exited with return code {task.returncode}'+post)
 		# if file not found
 		except FileNotFoundError as e:
-			task.stdout.append(f'Command / path not found: {task.command[0]}')
+			print(f'Command / path not found: {task.command[0]}',file=sys.stderr,flush=True)
 			task.stderr.append(str(e))
 			task.returncode = 127
 		except Exception as e:
 			import traceback
+			print(f'Error running command: {task.command}',file=sys.stderr,flush=True)
+			print(str(e).split('\n'))
 			task.stderr.extend(str(e).split('\n'))
 			task.stderr.extend(traceback.format_exc().split('\n'))
 			task.returncode = -1
+		if not quiet:
+			print(pre+'\n'+ '-'*100+post)
+			print(pre+f'Process exited with return code {task.returncode}'+post)
 		if with_stdErr:
 			return task.stdout + task.stderr
 		else:
@@ -348,7 +355,8 @@ def run_commands(commands, timeout=0,max_threads=1,quiet=False,dry_run=False,wit
 	if max_threads > 1 or not wait_for_return:
 		sem = threading.Semaphore(max_threads)  # Limit concurrent sessions
 		threads = [threading.Thread(target=__run_command, args=(task,sem,timeout,quiet,dry_run,...),daemon=True) for task in tasks]
-		for thread in threads:
+		for thread,task in zip(threads,tasks):
+			task.thread = thread
 			thread.start()
 		if wait_for_return:
 			for thread in threads:
@@ -525,7 +533,7 @@ def main():
 	parser.add_argument('-q','--quiet', action='store_true',help='quiet mode')
 	parser.add_argument('-V','--version', action='version', version=f'%(prog)s {version} by pan@zopyr.us')
 	args = parser.parse_args()
-	run_commands(args.commands, args.timeout, args.max_threads, args.quiet,parse = args.parse)
+	run_commands(args.commands, args.timeout, args.max_threads, args.quiet,parse = args.parse, with_stdErr=True)
 
 if __name__ == '__main__':
 	main()