multiSSH3 5.25__tar.gz → 5.30__tar.gz

{multissh3-5.25 → multissh3-5.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: multiSSH3
-Version: 5.25
+Version: 5.30
 Summary: Run commands on multiple hosts via SSH
 Home-page: https://github.com/yufei-pan/multiSSH3
 Author: Yufei Pan
@@ -96,7 +96,7 @@ An example .ssh/config:
 Host *
   StrictHostKeyChecking no
   ControlMaster auto
-  ControlPath /run/ssh_sockets_%r@%h-%p
+  ControlPath /tmp/%u_ssh_sockets_%r@%h-%p
   ControlPersist 3600
 ```
 
@@ -124,10 +124,10 @@ While leaving minimum 40 characters / 1 line for each host display by default. Y
 Use ```mssh --help``` for more info.
 
 ```bash
-usage: mssh [-h] [-u USERNAME] [-p PASSWORD] [-ea EXTRAARGS] [-11] [-f FILE] [-fs] [--scp] [-gm] [-t TIMEOUT] [-r REPEAT] [-i INTERVAL]
-            [--ipmi] [-mpre IPMI_INTERFACE_IP_PREFIX] [-pre INTERFACE_IP_PREFIX] [-q] [-ww WINDOW_WIDTH] [-wh WINDOW_HEIGHT] [-sw] [-eo]
-            [-no] [--no_env] [--env_file ENV_FILE] [-m MAX_CONNECTIONS] [-j] [--success_hosts] [-g] [-su] [-sh SKIP_HOSTS]
-            [--store_config_file] [--debug] [--copy-id] [-V]
+usage: mssh [-h] [-u USERNAME] [-p PASSWORD] [-k [KEY]] [-uk] [-ea EXTRAARGS] [-11] [-f FILE] [-fs] [--scp] [-gm] [-t TIMEOUT] [-r REPEAT]
+            [-i INTERVAL] [--ipmi] [-mpre IPMI_INTERFACE_IP_PREFIX] [-pre INTERFACE_IP_PREFIX] [-q] [-ww WINDOW_WIDTH] [-wh WINDOW_HEIGHT]
+            [-sw] [-eo] [-no] [--no_env] [--env_file ENV_FILE] [-m MAX_CONNECTIONS] [-j] [--success_hosts] [-g] [-su | -nsu]
+            [-sh SKIP_HOSTS] [--store_config_file] [--debug] [-ci] [-V]
             [hosts] [commands ...]
 
 Run a command on multiple hosts, Use #HOST# or #HOSTNAME# to replace the host name in the command. Config file: /etc/multiSSH3.config.json
@@ -144,6 +144,10 @@ options:
                         (default: None)
   -p PASSWORD, --password PASSWORD
                         The password to use to connect to the hosts, (default: )
+  -k [KEY], --key [KEY], --identity [KEY]
+                        The identity file to use to connect to the hosts. Implies --use_key. Specify a folder for program to search for a
+                        key. Use option without value to use ~/.ssh/ (default: None)
+  -uk, --use_key        Attempt to use public key file to connect to the hosts. (default: False)
   -ea EXTRAARGS, --extraargs EXTRAARGS
                         Extra arguments to pass to the ssh / rsync / scp command. Put in one string for multiple arguments.Use "=" ! Ex.
                         -ea="--delete" (default: None)
@@ -181,16 +185,20 @@ options:
                         Max number of connections to use (default: 4 * cpu_count)
   -j, --json            Output in json format. (default: False)
   --success_hosts       Output the hosts that succeeded in summary as wells. (default: False)
-  -g, --greppable       Output in greppable format. (default: False)
+  -g, --greppable, --table
+                        Output in greppable format. (default: False)
   -su, --skip_unreachable
-                        Skip unreachable hosts while using --repeat. Note: Timedout Hosts are considered unreachable. Note: multiple
-                        command sequence will still auto skip unreachable hosts. (default: False)
+                        Skip unreachable hosts. Note: Timedout Hosts are considered unreachable. Note: multiple command sequence will
+                        still auto skip unreachable hosts. (default: False)
+  -nsu, --no_skip_unreachable
+                        Do not skip unreachable hosts. Note: Timedout Hosts are considered unreachable. Note: multiple command sequence
+                        will still auto skip unreachable hosts. (default: True)
   -sh SKIP_HOSTS, --skip_hosts SKIP_HOSTS
                         Skip the hosts in the list. (default: None)
   --store_config_file   Store / generate the default config file from command line argument and current config at
                         /etc/multiSSH3.config.json
   --debug               Print debug information
-  --copy-id             Copy the ssh id to the hosts
+  -ci, --copy_id        Copy the ssh id to the hosts
   -V, --version         show program's version number and exit
 ```
 

{multissh3-5.25 → multissh3-5.30}/README.md

@@ -80,7 +80,7 @@ An example .ssh/config:
 Host *
   StrictHostKeyChecking no
   ControlMaster auto
-  ControlPath /run/ssh_sockets_%r@%h-%p
+  ControlPath /tmp/%u_ssh_sockets_%r@%h-%p
   ControlPersist 3600
 ```
 
@@ -108,10 +108,10 @@ While leaving minimum 40 characters / 1 line for each host display by default. Y
 Use ```mssh --help``` for more info.
 
 ```bash
-usage: mssh [-h] [-u USERNAME] [-p PASSWORD] [-ea EXTRAARGS] [-11] [-f FILE] [-fs] [--scp] [-gm] [-t TIMEOUT] [-r REPEAT] [-i INTERVAL]
-            [--ipmi] [-mpre IPMI_INTERFACE_IP_PREFIX] [-pre INTERFACE_IP_PREFIX] [-q] [-ww WINDOW_WIDTH] [-wh WINDOW_HEIGHT] [-sw] [-eo]
-            [-no] [--no_env] [--env_file ENV_FILE] [-m MAX_CONNECTIONS] [-j] [--success_hosts] [-g] [-su] [-sh SKIP_HOSTS]
-            [--store_config_file] [--debug] [--copy-id] [-V]
+usage: mssh [-h] [-u USERNAME] [-p PASSWORD] [-k [KEY]] [-uk] [-ea EXTRAARGS] [-11] [-f FILE] [-fs] [--scp] [-gm] [-t TIMEOUT] [-r REPEAT]
+            [-i INTERVAL] [--ipmi] [-mpre IPMI_INTERFACE_IP_PREFIX] [-pre INTERFACE_IP_PREFIX] [-q] [-ww WINDOW_WIDTH] [-wh WINDOW_HEIGHT]
+            [-sw] [-eo] [-no] [--no_env] [--env_file ENV_FILE] [-m MAX_CONNECTIONS] [-j] [--success_hosts] [-g] [-su | -nsu]
+            [-sh SKIP_HOSTS] [--store_config_file] [--debug] [-ci] [-V]
             [hosts] [commands ...]
 
 Run a command on multiple hosts, Use #HOST# or #HOSTNAME# to replace the host name in the command. Config file: /etc/multiSSH3.config.json
@@ -128,6 +128,10 @@ options:
                         (default: None)
   -p PASSWORD, --password PASSWORD
                         The password to use to connect to the hosts, (default: )
+  -k [KEY], --key [KEY], --identity [KEY]
+                        The identity file to use to connect to the hosts. Implies --use_key. Specify a folder for program to search for a
+                        key. Use option without value to use ~/.ssh/ (default: None)
+  -uk, --use_key        Attempt to use public key file to connect to the hosts. (default: False)
   -ea EXTRAARGS, --extraargs EXTRAARGS
                         Extra arguments to pass to the ssh / rsync / scp command. Put in one string for multiple arguments.Use "=" ! Ex.
                         -ea="--delete" (default: None)
@@ -165,16 +169,20 @@ options:
                         Max number of connections to use (default: 4 * cpu_count)
   -j, --json            Output in json format. (default: False)
   --success_hosts       Output the hosts that succeeded in summary as wells. (default: False)
-  -g, --greppable       Output in greppable format. (default: False)
+  -g, --greppable, --table
+                        Output in greppable format. (default: False)
   -su, --skip_unreachable
-                        Skip unreachable hosts while using --repeat. Note: Timedout Hosts are considered unreachable. Note: multiple
-                        command sequence will still auto skip unreachable hosts. (default: False)
+                        Skip unreachable hosts. Note: Timedout Hosts are considered unreachable. Note: multiple command sequence will
+                        still auto skip unreachable hosts. (default: False)
+  -nsu, --no_skip_unreachable
+                        Do not skip unreachable hosts. Note: Timedout Hosts are considered unreachable. Note: multiple command sequence
+                        will still auto skip unreachable hosts. (default: True)
   -sh SKIP_HOSTS, --skip_hosts SKIP_HOSTS
                         Skip the hosts in the list. (default: None)
   --store_config_file   Store / generate the default config file from command line argument and current config at
                         /etc/multiSSH3.config.json
   --debug               Print debug information
-  --copy-id             Copy the ssh id to the hosts
+  -ci, --copy_id        Copy the ssh id to the hosts
   -V, --version         show program's version number and exit
 ```
 

{multissh3-5.25 → multissh3-5.30}/multiSSH3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: multiSSH3
-Version: 5.25
+Version: 5.30
 Summary: Run commands on multiple hosts via SSH
 Home-page: https://github.com/yufei-pan/multiSSH3
 Author: Yufei Pan
@@ -96,7 +96,7 @@ An example .ssh/config:
 Host *
   StrictHostKeyChecking no
   ControlMaster auto
-  ControlPath /run/ssh_sockets_%r@%h-%p
+  ControlPath /tmp/%u_ssh_sockets_%r@%h-%p
   ControlPersist 3600
 ```
 
@@ -124,10 +124,10 @@ While leaving minimum 40 characters / 1 line for each host display by default. Y
 Use ```mssh --help``` for more info.
 
 ```bash
-usage: mssh [-h] [-u USERNAME] [-p PASSWORD] [-ea EXTRAARGS] [-11] [-f FILE] [-fs] [--scp] [-gm] [-t TIMEOUT] [-r REPEAT] [-i INTERVAL]
-            [--ipmi] [-mpre IPMI_INTERFACE_IP_PREFIX] [-pre INTERFACE_IP_PREFIX] [-q] [-ww WINDOW_WIDTH] [-wh WINDOW_HEIGHT] [-sw] [-eo]
-            [-no] [--no_env] [--env_file ENV_FILE] [-m MAX_CONNECTIONS] [-j] [--success_hosts] [-g] [-su] [-sh SKIP_HOSTS]
-            [--store_config_file] [--debug] [--copy-id] [-V]
+usage: mssh [-h] [-u USERNAME] [-p PASSWORD] [-k [KEY]] [-uk] [-ea EXTRAARGS] [-11] [-f FILE] [-fs] [--scp] [-gm] [-t TIMEOUT] [-r REPEAT]
+            [-i INTERVAL] [--ipmi] [-mpre IPMI_INTERFACE_IP_PREFIX] [-pre INTERFACE_IP_PREFIX] [-q] [-ww WINDOW_WIDTH] [-wh WINDOW_HEIGHT]
+            [-sw] [-eo] [-no] [--no_env] [--env_file ENV_FILE] [-m MAX_CONNECTIONS] [-j] [--success_hosts] [-g] [-su | -nsu]
+            [-sh SKIP_HOSTS] [--store_config_file] [--debug] [-ci] [-V]
             [hosts] [commands ...]
 
 Run a command on multiple hosts, Use #HOST# or #HOSTNAME# to replace the host name in the command. Config file: /etc/multiSSH3.config.json
@@ -144,6 +144,10 @@ options:
                         (default: None)
   -p PASSWORD, --password PASSWORD
                         The password to use to connect to the hosts, (default: )
+  -k [KEY], --key [KEY], --identity [KEY]
+                        The identity file to use to connect to the hosts. Implies --use_key. Specify a folder for program to search for a
+                        key. Use option without value to use ~/.ssh/ (default: None)
+  -uk, --use_key        Attempt to use public key file to connect to the hosts. (default: False)
   -ea EXTRAARGS, --extraargs EXTRAARGS
                         Extra arguments to pass to the ssh / rsync / scp command. Put in one string for multiple arguments.Use "=" ! Ex.
                         -ea="--delete" (default: None)
@@ -181,16 +185,20 @@ options:
                         Max number of connections to use (default: 4 * cpu_count)
   -j, --json            Output in json format. (default: False)
   --success_hosts       Output the hosts that succeeded in summary as wells. (default: False)
-  -g, --greppable       Output in greppable format. (default: False)
+  -g, --greppable, --table
+                        Output in greppable format. (default: False)
   -su, --skip_unreachable
-                        Skip unreachable hosts while using --repeat. Note: Timedout Hosts are considered unreachable. Note: multiple
-                        command sequence will still auto skip unreachable hosts. (default: False)
+                        Skip unreachable hosts. Note: Timedout Hosts are considered unreachable. Note: multiple command sequence will
+                        still auto skip unreachable hosts. (default: False)
+  -nsu, --no_skip_unreachable
+                        Do not skip unreachable hosts. Note: Timedout Hosts are considered unreachable. Note: multiple command sequence
+                        will still auto skip unreachable hosts. (default: True)
   -sh SKIP_HOSTS, --skip_hosts SKIP_HOSTS
                         Skip the hosts in the list. (default: None)
   --store_config_file   Store / generate the default config file from command line argument and current config at
                         /etc/multiSSH3.config.json
   --debug               Print debug information
-  --copy-id             Copy the ssh id to the hosts
+  -ci, --copy_id        Copy the ssh id to the hosts
   -V, --version         show program's version number and exit
 ```
 

{multissh3-5.25 → multissh3-5.30}/multiSSH3.py

@@ -24,6 +24,7 @@ import shutil
 import getpass
 import uuid
 import tempfile
+import math
 
 try:
 	# Check if functiools.cache is available
@@ -36,7 +37,7 @@ except AttributeError:
 		# If neither is available, use a dummy decorator
 		def cache_decorator(func):
 			return func
-version = '5.25'
+version = '5.30'
 VERSION = version
 
 CONFIG_FILE = '/etc/multiSSH3.config.json'	
@@ -179,12 +180,17 @@ class Host:
 		self.uuid = uuid
 		self.identity_file = identity_file
 		self.ip = ip if ip else getIP(name)
+		self.current_color_pair = [-1, -1, 1]
 
 	def __iter__(self):
 		return zip(['name', 'command', 'returncode', 'stdout', 'stderr'], [self.name, self.command, self.returncode, self.stdout, self.stderr])
 	def __repr__(self):
 		# return the complete data structure
-		return f"Host(name={self.name}, command={self.command}, returncode={self.returncode}, stdout={self.stdout}, stderr={self.stderr}, output={self.output}, printedLines={self.printedLines}, files={self.files}, ipmi={self.ipmi}, interface_ip_prefix={self.interface_ip_prefix}, scp={self.scp}, gatherMode={self.gatherMode}, extraargs={self.extraargs}, resolvedName={self.resolvedName}, i={self.i}, uuid={self.uuid}), identity_file={self.identity_file}"
+		return f"Host(name={self.name}, command={self.command}, returncode={self.returncode}, stdout={self.stdout}, stderr={self.stderr}, \
+output={self.output}, printedLines={self.printedLines}, files={self.files}, ipmi={self.ipmi}, \
+interface_ip_prefix={self.interface_ip_prefix}, scp={self.scp}, gatherMode={self.gatherMode}, \
+extraargs={self.extraargs}, resolvedName={self.resolvedName}, i={self.i}, uuid={self.uuid}), \
+identity_file={self.identity_file}, ip={self.ip}, current_color_pair={self.current_color_pair}"
 	def __str__(self):
 		return f"Host(name={self.name}, command={self.command}, returncode={self.returncode}, stdout={self.stdout}, stderr={self.stderr})"
 
@@ -341,7 +347,30 @@ if True:
 	__keyPressesIn = [[]]
 	_emo = False
 	_etc_hosts = __configs_from_file.get('_etc_hosts', __build_in_default_config['_etc_hosts'])
-
+	__curses_global_color_pairs = {(-1,-1):1}
+	__curses_current_color_pair_index = 2  # Start from 1, as 0 is the default color pair
+	__curses_color_table = {}
+	__curses_current_color_index = 10
+
+# Mapping of ANSI 4-bit colors to curses colors
+ANSI_TO_CURSES_COLOR = {
+	30: curses.COLOR_BLACK,
+	31: curses.COLOR_RED,
+	32: curses.COLOR_GREEN,
+	33: curses.COLOR_YELLOW,
+	34: curses.COLOR_BLUE,
+	35: curses.COLOR_MAGENTA,
+	36: curses.COLOR_CYAN,
+	37: curses.COLOR_WHITE,
+	90: curses.COLOR_BLACK,   # Bright Black (usually gray)
+	91: curses.COLOR_RED,     # Bright Red
+	92: curses.COLOR_GREEN,   # Bright Green
+	93: curses.COLOR_YELLOW,  # Bright Yellow
+	94: curses.COLOR_BLUE,    # Bright Blue
+	95: curses.COLOR_MAGENTA, # Bright Magenta
+	96: curses.COLOR_CYAN,    # Bright Cyan
+	97: curses.COLOR_WHITE    # Bright White
+}
 # ------------ Exportable Help Functions ----------------
 # check if command sshpass is available
 _binPaths = {}
@@ -758,7 +787,7 @@ def __filterSumDic(sumDic):
 	return newSumDic
 
 @cache_decorator
-def compact_hostnames(Hostnames):
+def __compact_hostnames(Hostnames):
 	"""
 	Compact a list of hostnames.
 	Compact numeric numbers into ranges.
@@ -803,6 +832,43 @@ def compact_hostnames(Hostnames):
 			rtnSet.add(''.join(hostnameList))
 	return frozenset(rtnSet)
 
+def compact_hostnames(Hostnames):
+	"""
+	Compact a list of hostnames.
+	Compact numeric numbers into ranges.
+
+	Args:
+		Hostnames (list): A list of hostnames.
+
+	Returns:
+		list: A list of comapcted hostname list.
+
+	Example:
+		>>> compact_hostnames(['server15', 'server16', 'server17'])
+		['server[15-17]']
+		>>> compact_hostnames(['server-1', 'server-2', 'server-3'])
+		['server-[1-3]']
+		>>> compact_hostnames(['server-1-2', 'server-1-1', 'server-2-1', 'server-2-2'])
+		['server-[1-2]-[1-2]']
+		>>> compact_hostnames(['server-1-2', 'server-1-1', 'server-2-2'])
+		['server-1-[1-2]', 'server-2-2']
+		>>> compact_hostnames(['test1-a', 'test2-a'])
+		['test[1-2]-a']
+		>>> compact_hostnames(['sub-s1', 'sub-s2'])
+		['sub-s[1-2]']
+	"""
+	global __global_suppress_printout
+	if not isinstance(Hostnames, frozenset):
+		hostSet = frozenset(Hostnames)
+	else:
+		hostSet = Hostnames
+	compact_hosts = __compact_hostnames(hostSet)
+	if set(expand_hostnames(compact_hosts)) != set(expand_hostnames(hostSet)):
+		if not __global_suppress_printout:
+			eprint(f"Error compacting hostnames: {hostSet} -> {compact_hosts}")
+		compact_hosts = hostSet
+	return compact_hosts
+
 # ------------ Expanding Hostnames ----------------
 @cache_decorator
 def __validate_expand_hostname(hostname):
@@ -823,10 +889,10 @@ def __validate_expand_hostname(hostname):
 		return [hostname]
 	elif not _no_env and hostname in os.environ:
 		# we will expand these hostnames again
-		return expand_hostnames(frozenset(os.environ[hostname].split(',')))
+		return expand_hostnames(os.environ[hostname].split(','))
 	elif hostname in readEnvFromFile():
 		# we will expand these hostnames again
-		return expand_hostnames(frozenset(readEnvFromFile()[hostname].split(',')))
+		return expand_hostnames(readEnvFromFile()[hostname].split(','))
 	elif getIP(hostname,local=False):
 		return [hostname]
 	else:
@@ -940,7 +1006,7 @@ def __expand_hostname(text, validate=True):# -> set:
 	return expandedhosts
 
 @cache_decorator
-def expand_hostnames(hosts) -> dict:
+def __expand_hostnames(hosts) -> dict:
 	'''
 	Expand the hostnames in the hosts into a dictionary
 
@@ -951,8 +1017,6 @@ def expand_hostnames(hosts) -> dict:
 		dict: A dictionary of expanded hostnames with key: hostname, value: resolved IP address
 	'''
 	expandedhosts = {}
-	if isinstance(hosts, str):
-		hosts = [hosts]
 	for host in hosts:
 		host = host.strip()
 		if not host:
@@ -986,6 +1050,24 @@ def expand_hostnames(hosts) -> dict:
 			[expandedhosts.update({host:ip}) for host,ip in zip(hostSetToAdd,iplist)]
 	return expandedhosts
 
+def expand_hostnames(hosts):
+	'''
+	Expand the hostnames in the hosts into a dictionary
+
+	Args:
+		hosts (list): A list of hostnames
+
+	Returns:
+		dict: A dictionary of expanded hostnames with key: hostname, value: resolved IP address
+	'''
+	if isinstance(hosts, str):
+		hosts = [hosts]
+	# change data type to frozenset if it is not hashable
+	if not isinstance(hosts, frozenset):
+		hosts = frozenset(hosts)
+	return __expand_hostnames(hosts)
+
+
 # ------------ Run Command Block ----------------
 def __handle_reading_stream(stream,target, host):
 	'''
@@ -1368,6 +1450,227 @@ def start_run_on_hosts(hosts, timeout=60,password=None,max_connections=4 * os.cp
 	return threads
 
 # ------------ Display Block ----------------
+def __approximate_color_8bit(color):
+	"""
+	Approximate an 8-bit color (0-255) to the nearest curses color.
+
+	Args:
+		color: 8-bit color code
+
+	Returns:
+		Curses color code
+	"""
+	if color < 8:  # Standard and bright colors
+		return ANSI_TO_CURSES_COLOR.get(color % 8 + 30, curses.COLOR_WHITE)
+	elif 8 <= color < 16:  # Bright colors
+		return ANSI_TO_CURSES_COLOR.get(color % 8 + 90, curses.COLOR_WHITE)
+	elif 16 <= color <= 231:  # Color cube
+		# Convert 216-color cube index to RGB
+		color -= 16
+		r = (color // 36) % 6 * 51
+		g = (color // 6) % 6 * 51
+		b = color % 6 * 51
+		return __approximate_color_24bit(r, g, b)  # Map to the closest curses color
+	elif 232 <= color <= 255:  # Grayscale
+		gray = (color - 232) * 10 + 8
+		return __approximate_color_24bit(gray, gray, gray)
+	else:
+		return curses.COLOR_WHITE  # Fallback to white for unexpected values
+
+def __approximate_color_24bit(r, g, b):
+	"""
+	Approximate a 24-bit RGB color to the nearest curses color.
+	Will initiate a curses color if curses.can_change_color() is True.
+
+	Globals:
+		__curses_color_table: Dictionary of RGB color to curses color code
+		__curses_current_color_index: Current index of the
+
+	Args:
+		r: Red component (0-255)
+		g: Green component (0-255)
+		b: Blue component (0-255)
+
+	Returns:
+		Curses color code
+	"""
+	if curses.can_change_color():
+		global __curses_color_table,__curses_current_color_index
+		# Initiate a new color if it does not exist
+		if (r, g, b) not in __curses_color_table:
+			if __curses_current_color_index >= curses.COLORS:
+				eprint("Warning: Maximum number of colors reached. Wrapping around.")
+				__curses_current_color_index = 10
+			curses.init_color(__curses_current_color_index, int(r/255*1000), int(g/255*1000), int(b/255*1000))
+			__curses_color_table[(r, g, b)] = __curses_current_color_index
+			__curses_current_color_index += 1
+		return __curses_color_table[(r, g, b)]
+	# Fallback to 8-bit color approximation
+	colors = {
+		curses.COLOR_BLACK: (0, 0, 0),
+		curses.COLOR_RED: (255, 0, 0),
+		curses.COLOR_GREEN: (0, 255, 0),
+		curses.COLOR_YELLOW: (255, 255, 0),
+		curses.COLOR_BLUE: (0, 0, 255),
+		curses.COLOR_MAGENTA: (255, 0, 255),
+		curses.COLOR_CYAN: (0, 255, 255),
+		curses.COLOR_WHITE: (255, 255, 255),
+	}
+	best_match = curses.COLOR_WHITE
+	min_distance = float("inf")
+	for color, (cr, cg, cb) in colors.items():
+		distance = math.sqrt((r - cr) ** 2 + (g - cg) ** 2 + (b - cb) ** 2)
+		if distance < min_distance:
+			min_distance = distance
+			best_match = color
+	return best_match
+
+def __parse_ansi_escape_sequence_to_curses_color(escape_code):
+	"""
+	Parse ANSI escape codes to extract foreground and background colors.
+
+	Args:
+		escape_code: ANSI escape sequence for color
+
+	Returns:
+		Tuple of (foreground, background) curses color pairs. 
+		If the escape code is a reset code, return (-1, -1).
+		None values indicate that the color should not be changed.
+	"""
+	if not escape_code:
+		return None, None
+	color_match = re.match(r"\x1b\[(\d+)(?:;(\d+))?(?:;(\d+))?(?:;(\d+);(\d+);(\d+))?m", escape_code)
+	if color_match:
+		params = color_match.groups()
+		if params[0] == "0" and not any(params[1:]):  # Reset code
+			return -1, -1
+		if params[0] == "38" and params[1] == "5":  # 8-bit foreground
+			return __approximate_color_8bit(int(params[2])), None
+		elif params[0] == "38" and params[1] == "2":  # 24-bit foreground
+			return __approximate_color_24bit(int(params[3]), int(params[4]), int(params[5])), None
+		elif params[0] == "48" and params[1] == "5":  # 8-bit background
+			return None , __approximate_color_8bit(int(params[2]))
+		elif params[0] == "48" and params[1] == "2":  # 24-bit background
+			return None, __approximate_color_24bit(int(params[3]), int(params[4]), int(params[5]))
+		else:
+			fg = None
+			bg = None
+			if params[0] and params[0].isdigit():  # 4-bit color
+				fg = ANSI_TO_CURSES_COLOR.get(int(params[0]), curses.COLOR_WHITE)
+			if params[1] and params[1].isdigit():
+				bg = ANSI_TO_CURSES_COLOR.get(int(params[1]), curses.COLOR_BLACK)
+			return fg, bg
+	return None, None
+
+def __get_curses_color_pair(fg, bg):
+	"""
+	Use curses color int values to create a curses color pair.
+
+	Globals:
+		__curses_global_color_pairs: Dictionary of color pairs
+		__curses_current_color_pair_index: Current index of the color pair
+
+	Args:
+		fg: Foreground color code
+		bg: Background color code
+
+	Returns:
+		Curses color pair code
+	"""
+	global __curses_global_color_pairs, __curses_current_color_pair_index
+	if (fg, bg) not in __curses_global_color_pairs:
+		if __curses_current_color_pair_index >= curses.COLOR_PAIRS:
+			print("Warning: Maximum number of color pairs reached, wrapping around.")
+			__curses_current_color_pair_index = 1
+		curses.init_pair(__curses_current_color_pair_index, fg, bg)
+		__curses_global_color_pairs[(fg, bg)] = __curses_current_color_pair_index
+		__curses_current_color_pair_index += 1
+	return curses.color_pair(__curses_global_color_pairs[(fg, bg)])
+
+def _curses_add_string_to_window(window, line, y = 0, x = 0, number_of_char_to_write = -1, color_pair_list = [-1,-1,1],fill_char=' ',parse_ascii_colors = True,centered = False,lead_str = '', trail_str = '',box_ansi_color = None):
+	"""
+	Add a string to a curses window with / without ANSI color escape sequences translated to curses color pairs.
+
+	Args:
+		window: curses window object
+		line: The line to add
+		y: Line position in the window. Use -1 to scroll the window up 1 line and add the line at the bottom
+		x: Column position in the window
+		number_of_char_to_write: Number of characters to write. -1 for all remaining space in line, 0 for no characters, and a positive integer for a specific number of characters.
+		color_pair_list: List of [foreground, background, color_pair] curses color pair values
+		fill_char: Character to fill the remaining space in the line
+		parse_ascii_colors: Parse ASCII color codes
+		centered: Center the text in the window
+		lead_str: Leading string to add to the line
+		trail_str: Trailing string to add to the line
+	
+	Returns:
+		None
+	"""
+	if window.getmaxyx()[0] == 0 or window.getmaxyx()[1] == 0 or x >= window.getmaxyx()[1]:
+		return
+	if x < 0:
+		x = window.getmaxyx()[1] + x
+	if number_of_char_to_write == -1:
+		numChar = window.getmaxyx()[1] - x -1
+	elif number_of_char_to_write == 0:
+		return
+	elif number_of_char_to_write + x > window.getmaxyx()[1]:
+		numChar = window.getmaxyx()[1] - x -1
+	else:
+		numChar = number_of_char_to_write
+	if numChar < 0:
+		return
+	if y < 0 or  y >= window.getmaxyx()[0]:
+		window.move(0, 0)
+		window.deleteln()
+		y = window.getmaxyx()[0] - 1
+	if parse_ascii_colors:
+		segments = re.split(r"(\x1b\[[\d;]*m)", line)  # Split line by ANSI escape codes
+	else:
+		segments = [line]
+	charsWritten = 0
+	boxFrontColor, boxBackColor = color_pair_list[0], color_pair_list[1]
+	newBoxFrontColor, newBoxBackColor = __parse_ansi_escape_sequence_to_curses_color(box_ansi_color)
+	if newBoxFrontColor:
+		boxFrontColor = newBoxFrontColor
+	if newBoxBackColor:
+		boxBackColor = newBoxBackColor
+	boxColorPair = __get_curses_color_pair(boxFrontColor, boxBackColor)
+	# first add the lead_str
+	window.addnstr(y, x, lead_str, numChar, boxColorPair)
+	charsWritten = min(len(lead_str), numChar)
+	# process centering
+	if centered:
+		fill_length = numChar - len(lead_str) - len(trail_str) - sum([len(segment) for segment in segments if not segment.startswith("\x1b[")])
+		window.addnstr(y, x + charsWritten, fill_char * (fill_length // 2), numChar - charsWritten, boxColorPair)
+		charsWritten += min(fill_length // 2, numChar - charsWritten)
+	# add the segments
+	for segment in segments:
+		if parse_ascii_colors and segment.startswith("\x1b["):
+			# Parse ANSI escape sequence
+			newFrontColor, newBackColor = __parse_ansi_escape_sequence_to_curses_color(segment)
+			if newFrontColor is not None:
+				color_pair_list[0] = newFrontColor
+			if newBackColor is not None:
+				color_pair_list[1] = newBackColor
+			color_pair_list[2] = __get_curses_color_pair(color_pair_list[0], color_pair_list[1])
+			#window.addnstr(y, x + charsWritten, str(color_pair_list[2]), numChar - charsWritten, color_pair_list[2])
+			#charsWritten += min(len(str(color_pair_list[2])), numChar - charsWritten)
+		else:
+			# Add text with current color
+			if charsWritten < numChar:
+				window.addnstr(y, x + charsWritten, segment, numChar - charsWritten, color_pair_list[2])
+				charsWritten += min(len(segment), numChar - charsWritten)
+	# if we have finished printing segments but we still have space, we will fill it with fill_char
+	if charsWritten + len(trail_str) < numChar:
+		fillStr = fill_char * (numChar - charsWritten - len(trail_str))
+		#fillStr = f'{color_pair_list}'
+		window.addnstr(y, x + charsWritten, fillStr + trail_str, numChar - charsWritten, boxColorPair)
+		charsWritten += numChar - charsWritten
+	else:
+		window.addnstr(y, x + charsWritten, trail_str, numChar - charsWritten, boxColorPair)
+
 def _get_hosts_to_display (hosts, max_num_hosts, hosts_to_display = None):
 	'''
 	Generate a list for the hosts to be displayed on the screen. This is used to display as much relevant information as possible.
@@ -1463,6 +1766,7 @@ def __generate_display(stdscr, hosts, lineToDisplay = -1,curserPosition = 0, min
 		stdscr.nodelay(True)
 		# we generate a stats window at the top of the screen
 		stat_window = curses.newwin(1, max_x, 0, 0)
+		stat_window.leaveok(True)
 		# We create a window for each host
 		host_windows = []
 		for i, host in enumerate(hosts_to_display):
@@ -1473,13 +1777,18 @@ def __generate_display(stdscr, hosts, lineToDisplay = -1,curserPosition = 0, min
 			#print(f"Creating a window at {y},{x}")
 			# We create the window
 			host_window = curses.newwin(host_window_height, host_window_width, y, x)
+			host_window.idlok(True)
+			host_window.scrollok(True)
+			host_window.leaveok(True)
 			host_windows.append(host_window)
 		# If there is space left, we will draw the bottom border
 		bottom_border = None
 		if y + host_window_height  < org_dim[0]:
 			bottom_border = curses.newwin(1, max_x, y + host_window_height, 0)
+			bottom_border.leaveok(True)
 			#bottom_border.clear()
-			bottom_border.addstr(0, 0, '-' * (max_x - 1))
+			#bottom_border.addnstr(0, 0, '-' * (max_x - 1), max_x - 1)
+			_curses_add_string_to_window(window=bottom_border, y=0, line='-' * (max_x - 1),fill_char='-')
 			bottom_border.refresh()
 		while host_stats['running'] > 0 or host_stats['waiting'] > 0:
 			# Check for keypress
@@ -1581,11 +1890,13 @@ def __generate_display(stdscr, hosts, lineToDisplay = -1,curserPosition = 0, min
 				#     encodedLine = encodedLine[:curserPosition] + ' ' + encodedLine[curserPosition:]
 				stats = '┍'+ f"Send CMD: {encodedLine}"[:max_x - 2].center(max_x - 2, "━")
 			if bottom_border:
-				bottom_stats = '└'+ f" Total: {len(hosts)} Running: {host_stats['running']} Failed: {host_stats['failed']} Finished: {host_stats['finished']} Waiting: {host_stats['waiting']} "[:max_x - 2].center(max_x - 2, "─")
+				target_length = max_x - 2 + len('\x1b[33m\x1b[0m\x1b[31m\x1b[0m\x1b[32m\x1b[0m')
+				bottom_stats = '└'+ f" Total: {len(hosts)} Running: \x1b[33m{host_stats['running']}\x1b[0m Failed: \x1b[31m{host_stats['failed']}\x1b[0m Finished: \x1b[32m{host_stats['finished']}\x1b[0m Waiting: {host_stats['waiting']} "[:target_length].center(target_length, "─")
 				if bottom_stats != old_bottom_stat:
 					old_bottom_stat = bottom_stats
 					#bottom_border.clear()
-					bottom_border.addstr(0, 0, bottom_stats)
+					#bottom_border.addnstr(0, 0, bottom_stats, max_x - 1)
+					_curses_add_string_to_window(window=bottom_border, y=0, line=bottom_stats)
 					bottom_border.refresh()
 			if stats != old_stat or curserPosition != old_cursor_position:
 				old_stat = stats
@@ -1598,9 +1909,9 @@ def __generate_display(stdscr, hosts, lineToDisplay = -1,curserPosition = 0, min
 				#stat_window.clear()
 				#stat_window.addstr(0, 0, stats)
 				# add the line with curser that inverses the color at the curser position
-				stat_window.addstr(0, 0, stats[:curserPositionStats], curses.color_pair(1))
-				stat_window.addstr(0, curserPositionStats, stats[curserPositionStats], curses.color_pair(2))
-				stat_window.addstr(0, curserPositionStats + 1, stats[curserPositionStats + 1:], curses.color_pair(1))
+				stat_window.addstr(0, 0, stats[:curserPositionStats])
+				stat_window.addch(0,curserPositionStats, stats[curserPositionStats], curses.A_REVERSE)
+				stat_window.addnstr(0, curserPositionStats + 1, stats[curserPositionStats + 1:], max_x - 1 - curserPositionStats)
 				stat_window.refresh()
 			# set the maximum refresh rate to 100 Hz
 			if time.perf_counter() - last_refresh_time < 0.01:
@@ -1614,17 +1925,19 @@ def __generate_display(stdscr, hosts, lineToDisplay = -1,curserPosition = 0, min
 						#host_window.clear()
 						# we will try to center the name of the host with ┼ at the beginning and end and ─ in between
 						linePrintOut = f'┼{(host.name+":["+host.command+"]")[:host_window_width - 2].center(host_window_width - 1, "─")}'.replace('\n', ' ').replace('\r', ' ').strip()
-						host_window.addstr(0, 0, linePrintOut)
+						host_window.addnstr(0, 0, linePrintOut, host_window_width - 1)
+						#_add_line_with_ascii_colors(window=host_window, y=0, x=0, line=linePrintOut, n=host_window_width - 1, color_pair_list = host.current_color_pair)
 						# we will display the latest outputs of the host as much as we can
 						for i, line in enumerate(host.output[-(host_window_height - 1):]):
 							# print(f"Printng a line at {i + 1} with length of {len('│'+line[:host_window_width - 1])}")
 							# time.sleep(10)
-							linePrintOut = ('│'+line[:host_window_width - 2].replace('\n', ' ').replace('\r', ' ')).strip().ljust(host_window_width - 1, ' ')
-							host_window.addstr(i + 1, 0, linePrintOut)
+							linePrintOut = ('│'+line[:host_window_width - 2].replace('\n', ' ').replace('\r', ' ')).strip()
+							#host_window.addnstr(i + 1, 0, linePrintOut, host_window_width - 1)
+							_curses_add_string_to_window(window=host_window, y=i + 1, line=linePrintOut, color_pair_list=host.current_color_pair)
 						# we draw the rest of the available lines
 						for i in range(len(host.output), host_window_height - 1):
 							# print(f"Printng a line at {i + 1} with length of {len('│')}")
-							host_window.addstr(i + 1, 0, '│'.ljust(host_window_width - 1, ' '))
+							host_window.addnstr(i + 1, 0, '│'.ljust(host_window_width - 1, ' '), host_window_width - 1)
 						host.printedLines = len(host.output)
 						host_window.refresh()
 					except Exception as e:
@@ -1654,33 +1967,39 @@ def curses_print(stdscr, hosts, threads, min_char_len = DEFAULT_CURSES_MINIMUM_C
 	'''
 	# We create all the windows we need
 	# We initialize the color pair
-	curses.start_color()
 	curses.curs_set(0)
-	curses.init_pair(1, curses.COLOR_WHITE, curses.COLOR_BLACK)
-	curses.init_pair(2, curses.COLOR_BLACK, curses.COLOR_WHITE)
-	curses.init_pair(3, curses.COLOR_RED, curses.COLOR_BLACK)
-	curses.init_pair(4, curses.COLOR_GREEN, curses.COLOR_BLACK)
-	curses.init_pair(5, curses.COLOR_YELLOW, curses.COLOR_BLACK)
-	curses.init_pair(6, curses.COLOR_BLUE, curses.COLOR_BLACK)
-	curses.init_pair(7, curses.COLOR_MAGENTA, curses.COLOR_BLACK)
-	curses.init_pair(8, curses.COLOR_CYAN, curses.COLOR_BLACK)
-	curses.init_pair(9, curses.COLOR_WHITE, curses.COLOR_RED)
-	curses.init_pair(10, curses.COLOR_WHITE, curses.COLOR_GREEN)
-	curses.init_pair(11, curses.COLOR_WHITE, curses.COLOR_YELLOW)
-	curses.init_pair(12, curses.COLOR_WHITE, curses.COLOR_BLUE)
-	curses.init_pair(13, curses.COLOR_WHITE, curses.COLOR_MAGENTA)
-	curses.init_pair(14, curses.COLOR_WHITE, curses.COLOR_CYAN)
-	curses.init_pair(15, curses.COLOR_BLACK, curses.COLOR_RED)
-	curses.init_pair(16, curses.COLOR_BLACK, curses.COLOR_GREEN)
-	curses.init_pair(17, curses.COLOR_BLACK, curses.COLOR_YELLOW)
-	curses.init_pair(18, curses.COLOR_BLACK, curses.COLOR_BLUE)
-	curses.init_pair(19, curses.COLOR_BLACK, curses.COLOR_MAGENTA)
-	curses.init_pair(20, curses.COLOR_BLACK, curses.COLOR_CYAN)
-
+	curses.start_color()
+	curses.use_default_colors()
+	curses.init_pair(1, -1, -1)
 	# do not generate display if the output window have a size of zero
 	if stdscr.getmaxyx()[0] < 2 or stdscr.getmaxyx()[1] < 2:
 		return
-
+	stdscr.idlok(True)
+	stdscr.scrollok(True)
+	stdscr.leaveok(True)
+	# generate some debug information before display initialization
+	try:
+		stdscr.clear()
+		_curses_add_string_to_window(window=stdscr, y=0, line='Initializing display...', n=stdscr.getmaxyx()[1] - 1)
+		# print the size
+		_curses_add_string_to_window(window=stdscr, y=1, line=f"Terminal size: {stdscr.getmaxyx()}", n=stdscr.getmaxyx()[1] - 1)
+		# print the number of hosts
+		_curses_add_string_to_window(window=stdscr, y=2, line=f"Number of hosts: {len(hosts)}", n=stdscr.getmaxyx()[1] - 1)
+		# print the number of threads
+		_curses_add_string_to_window(window=stdscr, y=3, line=f"Number of threads: {len(threads)}", n=stdscr.getmaxyx()[1] - 1)
+		# print the minimum character length
+		_curses_add_string_to_window(window=stdscr, y=4, line=f"Minimum character length: {min_char_len}", n=stdscr.getmaxyx()[1] - 1)
+		# print the minimum line length
+		_curses_add_string_to_window(window=stdscr, y=5, line=f"Minimum line length: {min_line_len}", n=stdscr.getmaxyx()[1] - 1)
+		# print the single window mode
+		_curses_add_string_to_window(window=stdscr, y=6, line=f"Single window mode: {single_window}", n=stdscr.getmaxyx()[1] - 1)
+		# print COLORS and COLOR_PAIRS count
+		_curses_add_string_to_window(window=stdscr, y=7, line=f"len(COLORS): {curses.COLORS} len(COLOR_PAIRS): {curses.COLOR_PAIRS}", n=stdscr.getmaxyx()[1] - 1)
+		# print if can change color
+		_curses_add_string_to_window(window=stdscr, y=8, line=f"Real color capability: {curses.can_change_color()}", n=stdscr.getmaxyx()[1] - 1)
+		stdscr.refresh()
+	except:
+		pass
 	params = (-1,0 , min_char_len, min_line_len, single_window,'new config')
 	while params:
 		params = __generate_display(stdscr, hosts, *params)
@@ -1763,17 +2082,13 @@ def print_output(hosts,usejson = False,quiet = False,greppable = False):
 			outputs.setdefault(hostPrintOut, set()).add(host['name'])
 		rtnStr = ''
 		for output, hostSet in outputs.items():
-			hostSet = frozenset(hostSet)
-			compact_hosts = compact_hostnames(hostSet)
-			if set(expand_hostnames(compact_hosts)) != set(expand_hostnames(hostSet)):
-				eprint(f"Error compacting hostnames: {hostSet} -> {compact_hosts}")
-				compact_hosts = hostSet
+			compact_hosts = sorted(compact_hostnames(hostSet))
 			if __global_suppress_printout:
 				rtnStr += f'Abnormal returncode produced by {",".join(compact_hosts)}:\n'
 				rtnStr += output+'\n'
 			else:
 				rtnStr += '*'*80+'\n'
-				rtnStr += f'These hosts: "{",".join(sorted(compact_hosts))}" have a response of:\n'
+				rtnStr += f'These hosts: "{",".join(compact_hosts)}" have a response of:\n'
 				rtnStr += output+'\n'
 		if not __global_suppress_printout or outputs:
 			rtnStr += '*'*80+'\n'
@@ -2065,13 +2380,13 @@ def run_command_on_hosts(hosts = DEFAULT_HOSTS,commands = None,oneonone = DEFAUL
 				if '@' not in host:
 					skipHostStr[i] = userStr + host
 			skipHostStr = ','.join(skipHostStr)
-	targetHostDic = expand_hostnames(frozenset(hostStr.split(',')))
+	targetHostDic = expand_hostnames(hostStr.split(','))
 	if __DEBUG_MODE:
 		eprint(f"Target hosts: {targetHostDic!r}")
-	skipHostsDic = expand_hostnames(frozenset(skipHostStr.split(',')))
-	if skipHostsDic:
-		eprint(f"Skipping hosts: {skipHostsDic!r}")
+	skipHostsDic = expand_hostnames(skipHostStr.split(','))
 	skipHostSet = set(skipHostsDic).union(skipHostsDic.values())
+	if skipHostSet:
+		eprint(f"Skipping hosts: \"{' '.join(sorted(compact_hostnames(skipHostSet)))}\"")
 	if copy_id:
 		if 'ssh-copy-id' in _binPaths:
 			# we will copy the id to the hosts
@@ -2421,18 +2736,15 @@ def main():
 			succeededHosts.add(host.name)
 	succeededHosts -= __failedHosts
 	# sort the failed hosts and succeeded hosts
-	__failedHosts = sorted(__failedHosts)
-	succeededHosts = sorted(succeededHosts)
 	if __mainReturnCode > 0:
-		if not __global_suppress_printout: eprint(f'Complete. Failed hosts (Return Code not 0) count: {__mainReturnCode}')
-		# with open('/tmp/bashcmd.stdin','w') as f:
-		#     f.write(f"export failed_hosts={__failedHosts}\n")
-		if not __global_suppress_printout: eprint(f'failed_hosts: {",".join(__failedHosts)}')
+		if not __global_suppress_printout: 
+			eprint(f'Complete. Failed hosts (Return Code not 0) count: {__mainReturnCode}')
+			eprint(f'failed_hosts: {",".join(sorted(compact_hostnames(__failedHosts)))}')
 	else:
 		if not __global_suppress_printout: eprint('Complete. All hosts returned 0.')
 	
 	if args.success_hosts and not __global_suppress_printout:
-		eprint(f'succeeded_hosts: {",".join(succeededHosts)}')
+		eprint(f'succeeded_hosts: {",".join(sorted(compact_hostnames(succeededHosts)))}')
 
 	if threading.active_count() > 1:
 		if not __global_suppress_printout: eprint(f'Remaining active thread: {threading.active_count()}')

{multissh3-5.25 → multissh3-5.30}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name='multiSSH3',
-    version='5.25',
+    version='5.30',
     description='Run commands on multiple hosts via SSH',
     long_description=open('README.md').read(),
     long_description_content_type='text/markdown',