Updated the "realtime script launcher" demo to use the Exec APIs. Changed timeout error handling in execute_get_results

PySimpleGUI · PySimpleGUI · commit dcd7a3c3e0fc · 2022-02-15T10:55:41.000-05:00
diff --git a/DemoPrograms/Demo_Script_Launcher_Realtime_Output.py b/DemoPrograms/Demo_Script_Launcher_Realtime_Output.py
@@ -1,51 +1,31 @@
-import subprocess
-import sys
 import PySimpleGUI as sg
 
 """
 	Demo Program - Realtime output of a shell command in the window
 		Shows how you can run a long-running subprocess and have the output
 		be displayed in realtime in the window.
+    
+    Copyright 2022 PySimpleGUI		
 """
 
-sg.theme('Dark Blue 3')
 
 def main():
-	layout = [
-				[sg.Output(size=(110,30), background_color='black', text_color='white')],
-				[sg.T('Promt> '), sg.Input(key='-IN-', do_not_clear=False)],
-				[sg.Button('Run', bind_return_key=True), sg.Button('Exit')] ]
-
-	window = sg.Window('Realtime Shell Command Output', layout)
-
-	while True:             # Event Loop
-		event, values = window.read()
-		# print(event, values)
-		if event in (sg.WIN_CLOSED, 'Exit'):
-			break
-		elif event == 'Run':
-			runCommand(cmd=values['-IN-'], window=window)
-	window.close()
-
-
-def runCommand(cmd, timeout=None, window=None):
-	nop = None
-	""" run shell command
-	@param cmd: command to execute
-	@param timeout: timeout for command execution
-	@param window: the PySimpleGUI window that the output is going to (needed to do refresh on)
-	@return: (return code from command, command output)
-	"""
-	p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-	output = ''
-	for line in p.stdout:
-		line = line.decode(errors='replace' if (sys.version_info) < (3, 5) else 'backslashreplace').rstrip()
-		output += line
-		print(line)
-		window.refresh() if window else nop        # yes, a 1-line if, so shoot me
-
-	retval = p.wait(timeout)
-	return (retval, output)
+    layout = [
+        [sg.Multiline(size=(110, 30), echo_stdout_stderr=True, reroute_stdout=True, autoscroll=True, background_color='black', text_color='white', key='-MLINE-')],
+        [sg.T('Promt> '), sg.Input(key='-IN-', focus=True, do_not_clear=False)],
+        [sg.Button('Run', bind_return_key=True), sg.Button('Exit')]]
+
+    window = sg.Window('Realtime Shell Command Output', layout)
+    while True:  # Event Loop
+        event, values = window.read()
+        if event in (sg.WIN_CLOSED, 'Exit'):
+            break
+        elif event == 'Run':
+            sp = sg.execute_command_subprocess(values['-IN-'], pipe_output=True, wait=False)
+            results = sg.execute_get_results(sp, timeout=1)
+            print(results[0])
+
+    window.close()
 
 
 main()
diff --git a/PySimpleGUI.py b/PySimpleGUI.py
@@ -1,11 +1,11 @@
 #!/usr/bin/python3
-version = __version__ = "4.57.0 Released 13-Feb-2022"
+version = __version__ = "4.57.0.1 Unreleased"
 
 _change_log = """
     Changelog since 4.57.0 released to PyPI on 13-Feb-2022
     
-    4.56.0.1
-
+    4.57.0.1
+        Added checking for timeout error to execute_get_results instead of showing an error popup as it's not truly an error in this case
     """
 
 __version__ = version.split()[0]  # For PEP 396 and PEP 345
@@ -21133,6 +21133,9 @@ def execute_get_results(subprocess_id, timeout=None):
             # will get an error if stdout and stderr are combined and attempt to read stderr
             # so ignore the error that would be generated
             pass
+        except subprocess.TimeoutExpired:
+            # a Timeout error is not actually an error that needs to be reported
+            pass
         except Exception as e:
             popup_error('Error in execute_get_results', e)
     return out_decoded, err_decoded
