multiSSH3 5.69__tar.gz → 5.71__tar.gz

{multissh3-5.69 → multissh3-5.71}/PKG-INFO

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

{multissh3-5.69 → multissh3-5.71}/multiSSH3.egg-info/PKG-INFO

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

{multissh3-5.69 → multissh3-5.71}/multiSSH3.py

@@ -54,10 +54,10 @@ except AttributeError:
 		# If neither is available, use a dummy decorator
 		def cache_decorator(func):
 			return func
-version = '5.69'
+version = '5.71'
 VERSION = version
 __version__ = version
-COMMIT_DATE = '2025-05-09'
+COMMIT_DATE = '2025-05-13'
 
 CONFIG_FILE_CHAIN = ['./multiSSH3.config.json',
 					 '~/multiSSH3.config.json',
@@ -1191,12 +1191,13 @@ def __handle_writing_stream(stream,stop_event,host):
 			line = '> ' + ''.join(__keyPressesIn[sentInput]).encode().decode().replace('\n', '↵')
 			host.output.append(line)
 			host.stdout.append(line)
+			host.lineNumToPrintSet.add(len(host.output)-1)
 			sentInput += 1
 			host.lastUpdateTime = time.monotonic()
 		else:
 			time.sleep(0.01) # sleep for 10ms
 	if sentInput < len(__keyPressesIn) - 1 :
-		eprint(f"Warning: {len(__keyPressesIn)-sentInput} key presses are not sent before the process is terminated!")
+		eprint(f"Warning: {len(__keyPressesIn)-sentInput} lines of key presses are not sent before the process is terminated!")
 	# # send the last line
 	# if __keyPressesIn and __keyPressesIn[-1]:
 	#     stream.write(''.join(__keyPressesIn[-1]).encode())
@@ -2263,7 +2264,7 @@ def generate_output(hosts, usejson = False, greppable = False):
 			rtnStr += "User Inputs: \n  "
 			rtnStr += '\n  '.join(CMDsOut)
 			rtnStr += '\n'
-			__keyPressesIn = [[]]
+			__keyPressesIn[-1].clear()
 		if __global_suppress_printout and not outputs:
 			rtnStr += 'Success'
 	return rtnStr
@@ -2438,7 +2439,7 @@ def getStrCommand(hosts = DEFAULT_HOSTS,commands = None,oneonone = DEFAULT_ONE_O
 						 copy_id = False, unavailable_host_expiry = DEFAULT_UNAVAILABLE_HOST_EXPIRY,no_history = DEFAULT_NO_HISTORY,
 						 history_file = DEFAULT_HISTORY_FILE, env_file = DEFAULT_ENV_FILE,
 						 repeat = DEFAULT_REPEAT,interval = DEFAULT_INTERVAL,
-						 shortend = False):
+						 shortend = False,tabSeperated = False):
 	_ = called
 	_ = returnUnfinished
 	_ = willUpdateUnreachableHosts
@@ -2462,7 +2463,10 @@ def getStrCommand(hosts = DEFAULT_HOSTS,commands = None,oneonone = DEFAULT_ONE_O
 	commandStr = '"' + '" "'.join(commands) + '"' if commands else ''
 	filePath = os.path.abspath(__file__)
 	programName = filePath if filePath else 'mssh'
-	return f'{programName} {argsStr} {hostStr} {commandStr}'
+	if tabSeperated:
+		return f'{programName}\t{argsStr}\t{hostStr}\t{commandStr}'
+	else:
+		return f'{programName} {argsStr} {hostStr} {commandStr}'
 
 #%% ------------ Record History Block ----------------
 def record_command_history(kwargs):
@@ -2486,7 +2490,7 @@ def record_command_history(kwargs):
 			for name in sig.parameters
 			if name in kwargs
 		}
-		strCommand = getStrCommand(**wanted)
+		strCommand = getStrCommand(**wanted,shortend=True,tabSeperated=True)
 		with open(history_file, 'a') as f:
 			# it follows <timestamp>\t<strCommand>\n
 			f.write(f'{int(time.time())}\t{strCommand}\n')