Skip to content

Commit 62d7e5e

Browse files
committed
Don't use search if no filetering
1 parent 39c0f43 commit 62d7e5e

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

tkfilebrowser/filebrowser.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ def __init__(self, parent, initialdir="", initialfile="", mode="openfile",
197197
except AttributeError:
198198
self.filetype.trace('w', lambda *args: self._change_filetype())
199199
else:
200-
self.filetypes[""] = ".*"
200+
self.filetypes[""] = r".*$"
201201

202202
# --- recent files
203203
self._recent_files = RecentFiles(cst.RECENT_FILES, 30)
@@ -717,7 +717,7 @@ def _display_recents(self):
717717
f = "/"
718718
if islink(p):
719719
if isfile(p):
720-
if search(extension, f):
720+
if extension == r".*$" or search(extension, f):
721721
tags.append("file_link")
722722
stats = stat(p)
723723
vals = (p, display_size(stats.st_size),
@@ -726,7 +726,7 @@ def _display_recents(self):
726726
tags.append("folder_link")
727727
vals = (p, "", get_modification_date(p))
728728
elif isfile(p):
729-
if search(extension, f):
729+
if extension == r".*$" or search(extension, f):
730730
tags.append("file")
731731
stats = stat(p)
732732
vals = (p, display_size(stats.st_size),
@@ -835,7 +835,7 @@ def _completion(self, action, modif, pos, prev_txt):
835835
if self.mode is not "opendir":
836836
files.sort(key=lambda n: n.lower())
837837
extension = self.filetypes[self.filetype.get()]
838-
if extension == ".*":
838+
if extension == r".*$":
839839
l2.extend([i.replace(" ", "\ ") for i in files if i[:len(f)] == f])
840840
else:
841841
for i in files:
@@ -1026,7 +1026,7 @@ def _display_folder_walk(self, folder, reset=True, update_bar=True):
10261026
display_modification_date(stats.st_mtime)))
10271027
else:
10281028
for f in files:
1029-
if search(extension, f):
1029+
if extension == r".*$" or search(extension, f):
10301030
p = join(root, f)
10311031
if islink(p):
10321032
tags = ("file_link",)
@@ -1124,7 +1124,7 @@ def _display_folder_scandir(self, folder, reset=True, update_bar=True):
11241124
i += 1
11251125
stats = f.stat()
11261126
if b_file:
1127-
if search(extension, name):
1127+
if extension == r".*$" or search(extension, name):
11281128
self.right_tree.insert("", "end", f.path, text=name, tags=tags,
11291129
values=("",
11301130
display_size(stats.st_size),

0 commit comments

Comments
 (0)