multiSSH3 5.81__tar.gz → 5.82__tar.gz

{multissh3-5.81 → multissh3-5.82}/PKG-INFO

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

{multissh3-5.81 → multissh3-5.82}/multiSSH3.egg-info/PKG-INFO

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

{multissh3-5.81 → multissh3-5.82}/multiSSH3.py

@@ -55,10 +55,10 @@ except AttributeError:
 		# If neither is available, use a dummy decorator
 		def cache_decorator(func):
 			return func
-version = '5.81'
+version = '5.82'
 VERSION = version
 __version__ = version
-COMMIT_DATE = '2025-07-15'
+COMMIT_DATE = '2025-07-16'
 
 CONFIG_FILE_CHAIN = ['./multiSSH3.config.json',
 					 '~/multiSSH3.config.json',
@@ -2298,11 +2298,8 @@ def curses_print(stdscr, hosts, threads, min_char_len = DEFAULT_CURSES_MINIMUM_C
 		#time.sleep(0.25)
 
 #%% ------------ Generate Output Block ----------------
-def generate_output(hosts, usejson = False, greppable = False):
-	global __keyPressesIn
-	global __global_suppress_printout
-	global __encoding
-	if __global_suppress_printout:
+def generate_output(hosts, usejson = False, greppable = False,quiet = False,encoding = _encoding,keyPressesIn = [[]]):
+	if quiet:
 		# remove hosts with returncode 0
 		hosts = [dict(host) for host in hosts if host.returncode != 0]
 		if not hosts:
@@ -2334,8 +2331,8 @@ def generate_output(hosts, usejson = False, greppable = False):
 			rtnList.append(['','','',''])
 		rtnStr += pretty_format_table(rtnList)
 		rtnStr += '*'*80+'\n'
-		if __keyPressesIn[-1]:
-			CMDsOut = [''.join(cmd).encode(encoding=_encoding,errors='backslashreplace').decode(encoding=_encoding,errors='backslashreplace').replace('\\n', '↵') for cmd in __keyPressesIn if cmd]
+		if keyPressesIn[-1]:
+			CMDsOut = [''.join(cmd).encode(encoding=encoding,errors='backslashreplace').decode(encoding=encoding,errors='backslashreplace').replace('\\n', '↵') for cmd in keyPressesIn if cmd]
 			rtnStr += 'User Inputs: '+ '\nUser Inputs: '.join(CMDsOut)
 			#rtnStr += '\n'
 	else:
@@ -2357,23 +2354,21 @@ def generate_output(hosts, usejson = False, greppable = False):
 		for output, hostSet in outputs.items():
 			compact_hosts = compact_hostnames(hostSet)
 			rtnStr += '*'*80+'\n'
-			if __global_suppress_printout:
+			if quiet:
 				rtnStr += f'Abnormal returncode produced by {",".join(compact_hosts)}:\n'
 				rtnStr += output+'\n'
 			else:
 				rtnStr += f'These hosts: "{",".join(compact_hosts)}" have a response of:\n'
 				rtnStr += output+'\n'
-		if not __global_suppress_printout or outputs:
+		if not quiet or outputs:
 			rtnStr += '*'*80+'\n'
-		if __keyPressesIn[-1]:
-			CMDsOut = [''.join(cmd).encode(encoding=_encoding,errors='backslashreplace').decode(encoding=_encoding,errors='backslashreplace').replace('\\n', '↵') for cmd in __keyPressesIn if cmd]
-			#rtnStr += f"Key presses: {''.join(__keyPressesIn).encode('unicode_escape').decode()}\n"
-			#rtnStr += f"Key presses: {__keyPressesIn}\n"
+		if keyPressesIn[-1]:
+			CMDsOut = [''.join(cmd).encode(encoding=encoding,errors='backslashreplace').decode(encoding=encoding,errors='backslashreplace').replace('\\n', '↵') for cmd in keyPressesIn if cmd]
 			rtnStr += "User Inputs: \n  "
 			rtnStr += '\n  '.join(CMDsOut)
 			rtnStr += '\n'
-			__keyPressesIn[-1].clear()
-		if __global_suppress_printout and not outputs:
+			keyPressesIn[-1].clear()
+		if quiet and not outputs:
 			rtnStr += 'Success'
 	return rtnStr
 
@@ -2389,7 +2384,10 @@ def print_output(hosts,usejson = False,quiet = False,greppable = False):
 	Returns:
 		str: The pretty output generated 
 	'''
-	rtnStr = generate_output(hosts,usejson,greppable)
+	global __global_suppress_printout
+	global _encoding
+	global __keyPressesIn
+	rtnStr = generate_output(hosts,usejson,greppable,quiet=__global_suppress_printout,encoding=_encoding,keyPressesIn=__keyPressesIn)
 	if not quiet:
 		print(rtnStr)
 	return rtnStr
@@ -2473,7 +2471,7 @@ def processRunOnHosts(timeout, password, max_connections, hosts, returnUnfinishe
 		print_output(hosts,json,greppable=greppable)
 
 #%% ------------ Stringfy Block ----------------
-@cache_decorator
+
 def formHostStr(host) -> str:
 	"""
 	Forms a comma-separated string of hosts.