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

Merge pull request #4910 from PySimpleGUI/Dev-latest 

Dev latest
This commit is contained in:
PySimpleGUI 2021-10-31 13:54:00 -04:00 committed by GitHub
parent 7193fabe39 d3012ea16b
commit e458acbe2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
DemoPrograms/Browser_START_HERE_Demo_Programs_Browser.py
View File

@ -261,26 +261,28 @@ def find_in_file(string, demo_files_dict, regex=False, verbose=False, window=Non
matches = re.finditer(br'^' + bytes(".*("+re.escape(string) + ").*$", 'utf-8'), s, re.MULTILINE) matches = re.finditer(br'^' + bytes(".*("+re.escape(string) + ").*$", 'utf-8'), s, re.MULTILINE)
if matches: if matches:
if show_first_match: if show_first_match:
file_list.append(file) #file_list.append(file)
num_files += 1 #num_files += 1
match_array = [] match_array = []
matched_str = matches.group(0).decode('utf-8') matched_str = matches.group(0).decode('utf-8')
if ("==" not in matched_str and "b'" not in matched_str): if not all(x in matched_str for x in ("b'", '=')) and len(matched_str) < 500:
# safe to assume this is not a base64 string as it does not contain the proper ending # safe to assume this is not a base64 string as it does not contain the proper ending
match_array.append(matches.group(0).decode('utf-8')) match_array.append(matches.group(0).decode('utf-8'))
matched_dict[full_filename] = match_array matched_dict[full_filename] = match_array
file_list.append(file)
num_files += 1
else: else:
# We need to do this because strings are "falsy" in Python, but empty matches still return True... # We need to do this because strings are "falsy" in Python, but empty matches still return True...
append_file = False append_file = False
match_array = [] match_array = []
for match_ in matches: for match_ in matches:
match_str = match_.group(0).decode('utf-8') matched_str = match_.group(0).decode('utf-8')
if match_str: if matched_str:
if len(match_str) < 500 and "==" not in match_str and "b'" not in match_str: if not all(x in matched_str for x in ("b'", '=')) and len(matched_str) < 500:
match_array.append(match_str) # if len(match_str) < 500 and "=" not in match_str and "b'" not in match_str:
if append_file is False: match_array.append(matched_str)
append_file = True append_file = True
if append_file: if append_file:
file_list.append(file) file_list.append(file)
num_files += 1 num_files += 1