Try this?

This commit is contained in:
PySimpleGUI 2021-10-31 13:47:51 -04:00
parent ed5d443682
commit 0c3959efb0
1 changed files with 5 additions and 3 deletions

View File

@ -261,15 +261,17 @@ 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)
if matches:
if show_first_match:
file_list.append(file)
num_files += 1
#file_list.append(file)
#num_files += 1
match_array = []
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'", '==')):
# 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'))
matched_dict[full_filename] = match_array
file_list.append(file)
num_files += 1
else:
# We need to do this because strings are "falsy" in Python, but empty matches still return True...
append_file = False