multiSSH3 5.50__tar.gz → 5.52__tar.gz

{multissh3-5.50 → multissh3-5.52}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: multiSSH3
-Version: 5.50
+Version: 5.52
 Summary: Run commands on multiple hosts via SSH
 Home-page: https://github.com/yufei-pan/multiSSH3
 Author: Yufei Pan

{multissh3-5.50 → multissh3-5.52}/multiSSH3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: multiSSH3
-Version: 5.50
+Version: 5.52
 Summary: Run commands on multiple hosts via SSH
 Home-page: https://github.com/yufei-pan/multiSSH3
 Author: Yufei Pan

{multissh3-5.50 → multissh3-5.52}/multiSSH3.py

@@ -1,4 +1,11 @@
 #!/usr/bin/env python3
+# /// script
+# requires-python = ">=3.6"
+# dependencies = [
+#     "argparse",
+#     "ipaddress",
+# ]
+# ///
 __curses_available = False
 __resource_lib_available = False
 try:
@@ -47,10 +54,10 @@ except AttributeError:
 		# If neither is available, use a dummy decorator
 		def cache_decorator(func):
 			return func
-version = '5.50'
+version = '5.52'
 VERSION = version
 __version__ = version
-COMMIT_DATE = '2025-01-30'
+COMMIT_DATE = '2025-03-01'
 
 CONFIG_FILE_CHAIN = ['./multiSSH3.config.json',
 					 '~/multiSSH3.config.json',
@@ -483,49 +490,69 @@ def replace_magic_strings(string,keys,value,case_sensitive=False):
 			string = re.sub(re.escape(key),value,string,flags=re.IGNORECASE)
 	return string
 
-def pretty_format_table(data):
-	version = 1.0
-	if not data:
-		return ''
-	if type(data) == str:
-		data = data.strip('\n').split('\n')
-		data = [line.split('\t') for line in data]
-	elif isinstance(data, dict):
-		# flatten the 2D dict to a list of lists
-		if isinstance(next(iter(data.values())), dict):
-			tempData = [['key'] + list(next(iter(data.values())).keys())]
-			tempData.extend( [[key] + list(value.values()) for key, value in data.items()])
-			data = tempData
-		else:
-			# it is a dict of lists
-			data = [[key] + list(value) for key, value in data.items()]
-	elif type(data) != list:
-		data = list(data)
-	# format the list into 2d list of list of strings
-	if isinstance(data[0], dict):
-		tempData = [data[0].keys()]
-		tempData.extend([list(item.values()) for item in data])
-		data = tempData
-	data = [[str(item) for item in row] for row in data]
-	num_cols = len(data[0])
-	col_widths = [0] * num_cols
-	# Calculate the maximum width of each column
-	for c in range(num_cols):
-		col_widths[c] = max(len(row[c]) for row in data)
-	# Build the row format string
-	row_format = ' | '.join('{{:<{}}}'.format(width) for width in col_widths)
-	# Print the header
-	header = data[0]
-	outTable = []
-	outTable.append(row_format.format(*header))
-	outTable.append('-+-'.join('-' * width for width in col_widths))
-	for row in data[1:]:
-		# if the row is empty, print an divider
-		if not any(row):
-			outTable.append('-+-'.join('-' * width for width in col_widths))
-		else:
-			outTable.append(row_format.format(*row))
-	return '\n'.join(outTable) + '\n'
+def pretty_format_table(data, delimiter = '\t',header = None):
+    version = 1.1
+    if not data:
+        return ''
+    if type(data) == str:
+        data = data.strip('\n').split('\n')
+        data = [line.split(delimiter) for line in data]
+    elif isinstance(data, dict):
+        # flatten the 2D dict to a list of lists
+        if isinstance(next(iter(data.values())), dict):
+            tempData = [['key'] + list(next(iter(data.values())).keys())]
+            tempData.extend( [[key] + list(value.values()) for key, value in data.items()])
+            data = tempData
+        else:
+            # it is a dict of lists
+            data = [[key] + list(value) for key, value in data.items()]
+    elif type(data) != list:
+        data = list(data)
+    # format the list into 2d list of list of strings
+    if isinstance(data[0], dict):
+        tempData = [data[0].keys()]
+        tempData.extend([list(item.values()) for item in data])
+        data = tempData
+    data = [[str(item) for item in row] for row in data]
+    num_cols = len(data[0])
+    col_widths = [0] * num_cols
+    # Calculate the maximum width of each column
+    for c in range(num_cols):
+        #col_widths[c] = max(len(row[c]) for row in data)
+        # handle ansii escape sequences
+        col_widths[c] = max(len(re.sub(r'\x1b\[[0-?]*[ -/]*[@-~]','',row[c])) for row in data)
+    # Build the row format string
+    row_format = ' | '.join('{{:<{}}}'.format(width) for width in col_widths)
+    # Print the header
+    if not header:
+        header = data[0]
+        outTable = []
+        outTable.append(row_format.format(*header))
+        outTable.append('-+-'.join('-' * width for width in col_widths))
+        for row in data[1:]:
+            # if the row is empty, print an divider
+            if not any(row):
+                outTable.append('-+-'.join('-' * width for width in col_widths))
+            else:
+                outTable.append(row_format.format(*row))
+    else:
+        # pad / truncate header to appropriate length
+        if isinstance(header,str):
+            header = header.split(delimiter)
+        if len(header) < num_cols:
+            header += ['']*(num_cols-len(header))
+        elif len(header) > num_cols:
+            header = header[:num_cols]
+        outTable = []
+        outTable.append(row_format.format(*header))
+        outTable.append('-+-'.join('-' * width for width in col_widths))
+        for row in data:
+            # if the row is empty, print an divider
+            if not any(row):
+                outTable.append('-+-'.join('-' * width for width in col_widths))
+            else:
+                outTable.append(row_format.format(*row))
+    return '\n'.join(outTable) + '\n'
 
 # ------------ Compacting Hostnames ----------------
 def __tokenize_hostname(hostname):
@@ -1359,7 +1386,7 @@ def run_command(host, sem, timeout=60,passwds=None, retry_limit = 5):
 			# Monitor the subprocess and terminate it after the timeout
 			host.lastUpdateTime = time.time()
 			timeoutLineAppended = False
-			sleep_interval = 1.0e-8 # 10 nanoseconds 
+			sleep_interval = 1.0e-7 # 100 nanoseconds 
 			while proc.poll() is None:  # while the process is still running
 				if timeout > 0:
 					if time.time() - host.lastUpdateTime > timeout:
@@ -2264,13 +2291,27 @@ def print_output(hosts,usejson = False,quiet = False,greppable = False):
 def processRunOnHosts(timeout, password, max_connections, hosts, returnUnfinished, nowatch, json, called, greppable,unavailableHosts,willUpdateUnreachableHosts,curses_min_char_len = DEFAULT_CURSES_MINIMUM_CHAR_LEN, curses_min_line_len = DEFAULT_CURSES_MINIMUM_LINE_LEN,single_window = DEFAULT_SINGLE_WINDOW):
 	global __globalUnavailableHosts
 	global _no_env
+	sleep_interval =  1.0e-7 # 0.1 microseconds
 	threads = start_run_on_hosts(hosts, timeout=timeout,password=password,max_connections=max_connections)
-	if __curses_available and not nowatch and threads and not returnUnfinished and any([thread.is_alive() for thread in threads]) and sys.stdout.isatty() and os.get_terminal_size() and os.get_terminal_size().columns > 10:
-		curses.wrapper(curses_print, hosts, threads, min_char_len = curses_min_char_len, min_line_len = curses_min_line_len, single_window = single_window)
+	if __curses_available and not nowatch and threads and not returnUnfinished  and sys.stdout.isatty() and os.get_terminal_size() and os.get_terminal_size().columns > 10:
+		total_sleeped = 0
+		while any([host.returncode is None for host in hosts]):
+			time.sleep(sleep_interval)  # avoid busy-waiting
+			total_sleeped += sleep_interval
+			if sleep_interval < 0.001:
+				sleep_interval *= 2
+			elif sleep_interval < 0.01:
+				sleep_interval *= 1.1
+			if total_sleeped > 0.1:
+				break
+		if any([host.returncode is None for host in hosts]):
+			curses.wrapper(curses_print, hosts, threads, min_char_len = curses_min_char_len, min_line_len = curses_min_line_len, single_window = single_window)
 	if not returnUnfinished:
 		# wait until all hosts have a return code
 		while any([host.returncode is None for host in hosts]):
-			time.sleep(0.01)
+			time.sleep(sleep_interval)  # avoid busy-waiting
+			if sleep_interval < 0.01:
+				sleep_interval *= 1.1
 		for thread in threads:
 			thread.join(timeout=3)
 	# update the unavailable hosts and global unavailable hosts