multiSSH3 5.47__py3-none-any.whl → 5.50__py3-none-any.whl

{multiSSH3-5.47.dist-info → multiSSH3-5.50.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: multiSSH3
-Version: 5.47
+Version: 5.50
 Summary: Run commands on multiple hosts via SSH
 Home-page: https://github.com/yufei-pan/multiSSH3
 Author: Yufei Pan
@@ -9,6 +9,8 @@ License: GPLv3+
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Operating System :: POSIX :: Linux
+Classifier: Operating System :: MacOS
+Classifier: Operating System :: Microsoft :: Windows
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 Requires-Dist: argparse

multiSSH3-5.50.dist-info/RECORD

@@ -0,0 +1,6 @@
+multiSSH3.py,sha256=4XPEcfGf7Gqq0YvVvsAve4x5Afb4Nse_0_nRJTm5T6A,137371
+multiSSH3-5.50.dist-info/METADATA,sha256=63ZfVMNdX55SxVFWL8EogyLiOHWDerdjsVovEbNCBf8,18092
+multiSSH3-5.50.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+multiSSH3-5.50.dist-info/entry_points.txt,sha256=xi2rWWNfmHx6gS8Mmx0rZL2KZz6XWBYP3DWBpWAnnZ0,143
+multiSSH3-5.50.dist-info/top_level.txt,sha256=tUwttxlnpLkZorSsroIprNo41lYSxjd2ASuL8-EJIJw,10
+multiSSH3-5.50.dist-info/RECORD,,

multiSSH3.py

@@ -34,6 +34,7 @@ import uuid
 import tempfile
 import math
 from itertools import count
+import queue
 
 try:
 	# Check if functiools.cache is available
@@ -46,8 +47,9 @@ except AttributeError:
 		# If neither is available, use a dummy decorator
 		def cache_decorator(func):
 			return func
-version = '5.47'
+version = '5.50'
 VERSION = version
+__version__ = version
 COMMIT_DATE = '2025-01-30'
 
 CONFIG_FILE_CHAIN = ['./multiSSH3.config.json',
@@ -90,31 +92,68 @@ def signal_handler(sig, frame):
 		os.system(f'pkill -ef {os.path.basename(__file__)}')
 		sys.exit(0)
 
+# def input_with_timeout_and_countdown(timeout, prompt='Please enter your selection'):
+# 	"""
+# 	Read an input from the user with a timeout and a countdown.
+
+# 	Parameters:
+# 	timeout (int): The timeout value in seconds.
+# 	prompt (str): The prompt message to display to the user. Default is 'Please enter your selection'.
+
+# 	Returns:
+# 	str or None: The user input if received within the timeout, or None if no input is received.
+# 	"""
+# 	import select
+# 	# Print the initial prompt with the countdown
+# 	eprint(f"{prompt} [{timeout}s]: ", end='', flush=True)
+# 	# Loop until the timeout
+# 	for remaining in range(timeout, 0, -1):
+# 		# If there is an input, return it
+# 		# this only works on linux
+# 		if sys.stdin in select.select([sys.stdin], [], [], 0)[0]:
+# 			return input().strip()
+# 		# Print the remaining time
+# 		eprint(f"\r{prompt} [{remaining}s]: ", end='', flush=True)
+# 		# Wait a second
+# 		time.sleep(1)
+# 	# If there is no input, return None
+# 	return None
+
 def input_with_timeout_and_countdown(timeout, prompt='Please enter your selection'):
 	"""
-	Read an input from the user with a timeout and a countdown.
-
-	Parameters:
-	timeout (int): The timeout value in seconds.
-	prompt (str): The prompt message to display to the user. Default is 'Please enter your selection'.
-
-	Returns:
-	str or None: The user input if received within the timeout, or None if no input is received.
+	Read input from the user with a timeout (cross-platform).
+	If the user does not enter any input within `timeout` seconds, return None.
+	Otherwise, return the input string.
 	"""
-	import select
-	# Print the initial prompt with the countdown
+	# Queue to receive user input from the background thread
+	input_queue = queue.Queue()
+	def read_input():
+		# Read line from stdin and put it in the queue
+		user_input = sys.stdin.readline()
+		input_queue.put(user_input)
+	# Start a thread that will block on input()
+	input_thread = threading.Thread(target=read_input, daemon=True)
+	input_thread.start()
+	# Print the initial prompt
 	eprint(f"{prompt} [{timeout}s]: ", end='', flush=True)
-	# Loop until the timeout
-	for remaining in range(timeout, 0, -1):
-		# If there is an input, return it
-		if sys.stdin in select.select([sys.stdin], [], [], 0)[0]:
-			return input().strip()
-		# Print the remaining time
+	# Countdown loop
+	start_time = time.time()
+	while True:
+		# Check if the input thread has finished (i.e., user pressed Enter)
+		if not input_queue.empty():
+			# We got user input
+			user_input = input_queue.get().strip()
+			eprint()  # move to the next line
+			return user_input
+		elapsed = int(time.time() - start_time)
+		remaining = timeout - elapsed
+		if remaining <= 0:
+			# Time is up, no input
+			eprint()  # move to the next line
+			return None
+		# Update prompt countdown
 		eprint(f"\r{prompt} [{remaining}s]: ", end='', flush=True)
-		# Wait a second
 		time.sleep(1)
-	# If there is no input, return None
-	return None
 
 @cache_decorator
 def getIP(hostname: str,local=False):
@@ -2137,18 +2176,7 @@ def curses_print(stdscr, hosts, threads, min_char_len = DEFAULT_CURSES_MINIMUM_C
 		#time.sleep(0.25)
 
 # ------------ Generate Output Block ----------------
-def print_output(hosts,usejson = False,quiet = False,greppable = False):
-	'''
-	Print / generate the output of the hosts to the terminal
-
-	Args:
-		hosts (list): A list of Host objects
-		usejson (bool, optional): Whether to print the output in JSON format. Defaults to False.
-		quiet (bool, optional): Whether to print the output. Defaults to False.
-
-	Returns:
-		str: The pretty output generated 
-	'''
+def generate_output(hosts, usejson = False, greppable = False):
 	global __keyPressesIn
 	global __global_suppress_printout
 	hosts = [dict(host) for host in hosts]
@@ -2213,6 +2241,21 @@ def print_output(hosts,usejson = False,quiet = False,greppable = False):
 			__keyPressesIn = [[]]
 		if __global_suppress_printout and not outputs:
 			rtnStr += 'Success'
+		return rtnStr
+
+def print_output(hosts,usejson = False,quiet = False,greppable = False):
+	'''
+	Print / generate the output of the hosts to the terminal
+
+	Args:
+		hosts (list): A list of Host objects
+		usejson (bool, optional): Whether to print the output in JSON format. Defaults to False.
+		quiet (bool, optional): Whether to print the output. Defaults to False.
+
+	Returns:
+		str: The pretty output generated 
+	'''
+	rtnStr = generate_output(hosts,usejson,greppable)
 	if not quiet:
 		print(rtnStr)
 	return rtnStr
@@ -2410,6 +2453,7 @@ def run_command_on_hosts(hosts = DEFAULT_HOSTS,commands = None,oneonone = DEFAUL
 	global __DEBUG_MODE
 	global __thread_start_delay
 	global __max_connections_nofile_limit_supported
+	global __keyPressesIn
 	_emo = False
 	_no_env = no_env
 	if os.path.exists(os.path.join(tempfile.gettempdir(),'__multiSSH3_UNAVAILABLE_HOSTS.csv')):
@@ -2473,6 +2517,8 @@ def run_command_on_hosts(hosts = DEFAULT_HOSTS,commands = None,oneonone = DEFAUL
 			unavailableHosts = __globalUnavailableHosts
 		else:
 			unavailableHosts = set()
+		# set global input to empty
+		__keyPressesIn = [[]]
 	else:
 		# if run in command line ( or emulating running in command line, we default to skip unreachable hosts within one command call )
 		if skipUnreachable:

multiSSH3-5.47.dist-info/RECORD

@@ -1,6 +0,0 @@
-multiSSH3.py,sha256=fLoImfnt8GQDs9kLWsySLcFFcB7yXyprRMfntEz_-jk,135786
-multiSSH3-5.47.dist-info/METADATA,sha256=b9DlbOVp-wi3Lu7nU5MuVcSk6CFZpAcdBDV02N_e328,18001
-multiSSH3-5.47.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-multiSSH3-5.47.dist-info/entry_points.txt,sha256=xi2rWWNfmHx6gS8Mmx0rZL2KZz6XWBYP3DWBpWAnnZ0,143
-multiSSH3-5.47.dist-info/top_level.txt,sha256=tUwttxlnpLkZorSsroIprNo41lYSxjd2ASuL8-EJIJw,10
-multiSSH3-5.47.dist-info/RECORD,,