mlaga97
/
PySimpleGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved global into a function property, changed the verbose output.

This commit is contained in:
PySimpleGUI 2021-02-11 16:35:49 -05:00
parent 7adbc3c742
commit d19c92ef83
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
DemoPrograms/Demo_Project_File_Searcher_Launcher.py
View File

@ -2,7 +2,7 @@ import os.path
import subprocess import subprocess
import sys import sys
import mmap, re import mmap, re
import warnings
import PySimpleGUI as sg import PySimpleGUI as sg
""" """
@ -13,13 +13,15 @@ import PySimpleGUI as sg
Filter the list of : Filter the list of :
* Search using filename * Search using filename
* Searching within the demo program's source code (like grep) * Searching within the programs' source code (like grep)
The basic file operations are The basic file operations are
* Edit a file in your editor * Edit a file in your editor
* Run a file * Run a file
* Filter file list * Filter file list
* Search in files * Search in files
* Run a regular expression search on all files
* Display the matching line in a file
Additional operations Additional operations
* Edit this file in editor * Edit this file in editor
@ -110,10 +112,12 @@ def get_theme():
return sg.user_settings_get_entry('-theme-', global_theme) return sg.user_settings_get_entry('-theme-', global_theme)
old_file_list = None # We handle our code properly. But in case the user types in a flag, the flags are now in the middle of a regex. Ignore this warning.
warnings.filterwarnings("ignore", category=DeprecationWarning)
def find_in_file(string, demo_files_dict, regex=False, verbose=False, window=None): def find_in_file(string, demo_files_dict, regex=False, verbose=False, window=None):
global old_file_list
""" """
Search through the demo files for a string. Search through the demo files for a string.
The case of the string and the file contents are ignored The case of the string and the file contents are ignored
@ -148,7 +152,7 @@ def find_in_file(string, demo_files_dict, regex=False, verbose=False, window=Non
if (regex): if (regex):
window['-FIND NUMBER-'].update(f'{num_files} files') window['-FIND NUMBER-'].update(f'{num_files} files')
window.refresh() window.refresh()
matches = re.finditer(bytes(string + ".*", 'utf-8'), s, re.MULTILINE) matches = re.finditer(bytes("^.*(" + string + ").*$", 'utf-8'), s, re.MULTILINE)
if matches: if matches:
for match in matches: for match in matches:
if match is not None: if match is not None:
@ -161,7 +165,7 @@ def find_in_file(string, demo_files_dict, regex=False, verbose=False, window=Non
else: else:
window['-FIND NUMBER-'].update(f'{num_files} files') window['-FIND NUMBER-'].update(f'{num_files} files')
window.refresh() window.refresh()
matches = re.search(br'(?i)' + bytes(re.escape(string.lower()) + ".*", 'utf-8'), s) matches = re.search(br'(?i)^' + bytes(".*("+re.escape(string.lower()) + ").*$", 'utf-8'), s, re.M)
if matches: if matches:
file_list.append(file) file_list.append(file)
num_files += 1 num_files += 1
@ -180,12 +184,13 @@ def find_in_file(string, demo_files_dict, regex=False, verbose=False, window=Non
print(f'{file}', e, file=sys.stderr) print(f'{file}', e, file=sys.stderr)
if not regex: if not regex:
old_file_list = new_demo_files_dict find_in_file.old_file_list = new_demo_files_dict
file_list = list(set(file_list)) file_list = list(set(file_list))
return file_list return file_list
def settings_window(): def settings_window():
""" """
Show the settings window. Show the settings window.
@ -284,6 +289,8 @@ def make_window():
sg.cprint_set_output_destination(window, ML_KEY) sg.cprint_set_output_destination(window, ML_KEY)
return window return window
# --------------------------------- Main Program Layout --------------------------------- # --------------------------------- Main Program Layout ---------------------------------
def main(): def main():
@ -291,7 +298,8 @@ def main():
The main program that contains the event loop. The main program that contains the event loop.
It will call the make_window function to create the window. It will call the make_window function to create the window.
""" """
global old_file_list
find_in_file.old_file_list = None
old_typed_value = None old_typed_value = None
@ -320,7 +328,8 @@ def main():
execute_command_subprocess('python', f'{file_to_run}') execute_command_subprocess('python', f'{file_to_run}')
# run_py(file_to_run) # run_py(file_to_run)
elif event.startswith('Edit Me'): elif event.startswith('Edit Me'):
sg.cprint(f'opening using {editor_program}\nThis file - {__file__}', text_color='white', background_color='green', end='') sg.cprint(f'opening using {editor_program}:')
sg.cprint(f'{__file__}', text_color='white', background_color='red', end='')
execute_command_subprocess(f'{editor_program}', f'"{__file__}"') execute_command_subprocess(f'{editor_program}', f'"{__file__}"')
elif event == '-FILTER-': elif event == '-FILTER-':
new_list = [i for i in file_list if values['-FILTER-'].lower() in i.lower()] new_list = [i for i in file_list if values['-FILTER-'].lower() in i.lower()]
@ -333,13 +342,13 @@ def main():
current_typed_value = str(values['-FIND-']) current_typed_value = str(values['-FIND-'])
if values['-VERBOSE-']: if values['-VERBOSE-']:
window[ML_KEY].update('') window[ML_KEY].update('')
if old_file_list is None or old_typed_value is None: if find_in_file.old_file_list is None or old_typed_value is None:
# New search. # New search.
old_typed_value = current_typed_value old_typed_value = current_typed_value
file_list = find_in_file(values['-FIND-'], get_file_list_dict(), verbose=values['-VERBOSE-'],window=window) file_list = find_in_file(values['-FIND-'], get_file_list_dict(), verbose=values['-VERBOSE-'],window=window)
elif current_typed_value.startswith(old_typed_value): elif current_typed_value.startswith(old_typed_value):
old_typed_value = current_typed_value old_typed_value = current_typed_value
file_list = find_in_file(values['-FIND-'], old_file_list, verbose=values['-VERBOSE-'],window=window) file_list = find_in_file(values['-FIND-'], find_in_file.old_file_list, verbose=values['-VERBOSE-'],window=window)
else: else:
old_typed_value = current_typed_value old_typed_value = current_typed_value
file_list = find_in_file(values['-FIND-'], get_file_list_dict(), verbose=values['-VERBOSE-'],window=window) file_list = find_in_file(values['-FIND-'], get_file_list_dict(), verbose=values['-VERBOSE-'],window=window)
@ -384,13 +393,13 @@ def main():
window[ML_KEY].update('') window[ML_KEY].update('')
if values['-FIND-']: if values['-FIND-']:
current_typed_value = str(values['-FIND-']) current_typed_value = str(values['-FIND-'])
if old_file_list is None or old_typed_value is None: if find_in_file.old_file_list is None or old_typed_value is None:
# New search. # New search.
old_typed_value = current_typed_value old_typed_value = current_typed_value
file_list = find_in_file(values['-FIND-'], get_file_list_dict(), verbose=values['-VERBOSE-'],window=window) file_list = find_in_file(values['-FIND-'], get_file_list_dict(), verbose=values['-VERBOSE-'],window=window)
elif current_typed_value.startswith(old_typed_value): elif current_typed_value.startswith(old_typed_value):
old_typed_value = current_typed_value old_typed_value = current_typed_value
file_list = find_in_file(values['-FIND-'], old_file_list, verbose=values['-VERBOSE-'],window=window) file_list = find_in_file(values['-FIND-'], find_in_file.old_file_list, verbose=values['-VERBOSE-'],window=window)
else: else:
old_typed_value = current_typed_value old_typed_value = current_typed_value
file_list = find_in_file(values['-FIND-'], get_file_list_dict(), verbose=values['-VERBOSE-'],window=window) file_list = find_in_file(values['-FIND-'], get_file_list_dict(), verbose=values['-VERBOSE-'],window=window)