Improve filtype filtering

Author: j4321

setup.py

@@ -43,4 +43,5 @@
       keywords=['tkinter', 'filedialog', 'filebrowser'],
       packages=["tkfilebrowser"],
       package_data={"tkfilebrowser": ["images/*"]},
-      requires=["os", "locale", "time", "psutil", "tkinter", "math", "urllib", "babel"])
+      requires=["os", "locale", "time", "psutil", "tkinter", "math", "urllib", "babel",
+                "re", "subprocess"])

tkfilebrowser/__main__.py

@@ -55,7 +55,8 @@ def c_save_old():
 
 def c_open_file():
     rep = askopenfilenames(parent=root, initialdir='/', initialfile='tmp',
-                           filetypes=[("Pictures", "*.png|*.jpg|*.JPG"), ("All files", "*")])
+#                           filetypes=[("Pictures", "*.png|*.jpg|*.JPG"), ("All files", "*")])
+                           filetypes=[("archive", "*.tar.*"), ("archive gzip", "*.tar.gz"), ("All files", "*")])
     print(rep)
 
 
@@ -66,7 +67,11 @@ def c_open_dir():
 
 def c_save():
     rep = asksaveasfilename(parent=root, defaultext=".png", initialdir='/tmp', initialfile='image.png',
-                            filetypes=[("Pictures", "*.png|*.jpg|*.JPG"), ("All files", "*")])
+                            filetypes=[("Pictures", "*.png|*.jpg|*.JPG"),
+                                       ("PNG", "*.png"),
+                                       ("archive", "*.tar.*"),
+                                       ("archive gzip", "*.tar.gz"),
+                                       ("All files", "*")])
     print(rep)
 
 

tkfilebrowser/filebrowser.py

@@ -19,11 +19,10 @@
 
 Main class
 """
-# TODO: fix filetype display for extensions like .tar.xz
-# TODO: improve extension change
 
 
 import psutil
+from re import search
 from subprocess import check_output
 from os import walk, mkdir, stat, access, W_OK
 from os.path import exists, join, getmtime, realpath, split, expanduser, \
@@ -183,7 +182,7 @@ def __init__(self, parent, initialdir="", initialfile="", mode="openfile",
             for name, exts in filetypes:
                 if name not in self.filetypes:
                     self.filetypes[name] = []
-                self.filetypes[name].extend([ext.split("*")[-1].strip() for ext in exts.split("|")])
+                self.filetypes[name] = r'%s$' % exts.strip().replace('.', '\.').replace('*', '.*')
             values = list(self.filetypes.keys())
             w = max([len(f) for f in values] + [5])
             b_filetype = ttk.Combobox(self, textvariable=self.filetype,
@@ -197,10 +196,8 @@ def __init__(self, parent, initialdir="", initialfile="", mode="openfile",
                 self.filetype.trace_add('write', lambda *args: self._change_filetype())
             except AttributeError:
                 self.filetype.trace('w', lambda *args: self._change_filetype())
-#            b_filetype.bind('<<ComboboxSelected>>',
-#                            lambda e: self._change_filetype())
         else:
-            self.filetypes[""] = [""]
+            self.filetypes[""] = ".*"
 
         # ---  recent files
         self._recent_files = RecentFiles(cst.RECENT_FILES, 30)
@@ -720,8 +717,7 @@ def _display_recents(self):
                     f = "/"
                 if islink(p):
                     if isfile(p):
-                        ext = splitext(f)[-1]
-                        if extension == [""] or ext in extension:
+                        if search(extension, f):
                             tags.append("file_link")
                             stats = stat(p)
                             vals = (p, display_size(stats.st_size),
@@ -730,8 +726,7 @@ def _display_recents(self):
                         tags.append("folder_link")
                         vals = (p, "", get_modification_date(p))
                 elif isfile(p):
-                    ext = splitext(f)[-1]
-                    if extension == [""] or ext in extension:
+                    if search(extension, f):
                         tags.append("file")
                         stats = stat(p)
                         vals = (p, display_size(stats.st_size),
@@ -774,11 +769,16 @@ def _change_filetype(self):
         else:
             self._display_recents()
         if self.mode == 'save':
-            name, ext = splitext(self.entry.get())
-            new_ext = self.filetypes[self.filetype.get()][0]
-            if new_ext and ext not in self.filetypes[self.filetype.get()]:
-                self.entry.delete(len(name), 'end')
-                self.entry.insert('end', new_ext)
+            filename = self.entry.get()
+            new_ext = self.filetypes[self.filetype.get()]
+            if filename and not search(new_ext, filename):
+                old_ext = search(r'\..+$', filename).group()
+                exts = [e[2:].replace('\.', '.') for e in new_ext[:-1].split('|')]
+                exts = [e for e in exts if search(r'\.[^\*]+$', e)]
+                if exts:
+                    filename = filename.replace(old_ext, exts[0])
+                self.entry.delete(0, 'end')
+                self.entry.insert(0, filename)
 
     # ---  path completion in entries: key bindings
     def _down(self, event):
@@ -835,12 +835,11 @@ def _completion(self, action, modif, pos, prev_txt):
                     if self.mode is not "opendir":
                         files.sort(key=lambda n: n.lower())
                         extension = self.filetypes[self.filetype.get()]
-                        if extension == [""]:
+                        if extension == ".*":
                             l2.extend([i.replace(" ", "\ ") for i in files if i[:len(f)] == f])
                         else:
                             for i in files:
-                                ext = splitext(i)[-1]
-                                if ext in extension and i[:len(f)] == f:
+                                if search(extension, i) and i[:len(f)] == f:
                                     l2.append(i.replace(" ", "\ "))
                     l2.extend([i.replace(" ", "\ ") + "/" for i in dirs if i[:len(f)] == f])
 
@@ -997,7 +996,7 @@ def _display_folder_walk(self, folder, reset=True, update_bar=True):
             # display files
             files.sort(key=lambda n: n.lower())
             extension = self.filetypes[self.filetype.get()]
-            if extension == [""]:
+            if extension == ".*":
                 for f in files:
                     p = join(root, f)
                     if islink(p):
@@ -1027,8 +1026,7 @@ def _display_folder_walk(self, folder, reset=True, update_bar=True):
                                                        display_modification_date(stats.st_mtime)))
             else:
                 for f in files:
-                    ext = splitext(f)[-1]
-                    if ext in extension:
+                    if search(extension, f):
                         p = join(root, f)
                         if islink(p):
                             tags = ("file_link",)
@@ -1126,7 +1124,7 @@ def _display_folder_scandir(self, folder, reset=True, update_bar=True):
                     i += 1
                 stats = f.stat()
                 if b_file:
-                    if (extension == [""] or splitext(name)[-1] in extension):
+                    if search(extension, name):
                         self.right_tree.insert("", "end", f.path, text=name, tags=tags,
                                                values=("",
                                                        display_size(stats.st_size),