Fixed QFileDialog filters, fixed windows separator

Author: Pixel-Master

FF_Additional_UI.py

@@ -109,7 +109,7 @@ def get_paths():
         # Check if "/" is at end of inputted path
         if check:
             # Going through all paths to look if auto-completion should be loaded
-            if path.endswith(os.sep):
+            if path.endswith(FF_Files.SEP):
                 completer_paths = get_paths()
                 logging.debug("Changed QCompleter")
             else:

FF_Compare.py

@@ -427,7 +427,7 @@ def load_second_search():
             parent=None,
             caption="Select Second Search",
             dir=FF_Files.USER_FOLDER,
-            filter="*.FFSearch;")
+            filter="*.FFSearch")
 
         # Debug
         logging.debug(f"Second search: {second_search_file[0]}, Reading file...")

FF_Files.py

@@ -38,14 +38,14 @@
 elif platform == "win32" or platform == "cygwin":
     FF_LIB_FOLDER = os.path.join(USER_FOLDER, "AppData", "Roaming", "File-Find")
     NORMAL_FONT_SIZE = 15
-    SMALLER_FONT_SIZE = 13
+    SMALLER_FONT_SIZE = 12
     # Standard file separator
     SEP = "\\"
 # On Linux
 else:
     FF_LIB_FOLDER = os.path.join(USER_FOLDER, ".file-find")
     NORMAL_FONT_SIZE = 15
-    SMALLER_FONT_SIZE = 14
+    SMALLER_FONT_SIZE = 12
     # Standard file separator
     SEP = os.sep
 
@@ -136,10 +136,10 @@ def remove_cache():
 # Convert a file path to the corresponding cache file or metadata
 def path_to_cache_file(path, metadata=False):
     if not metadata:
-        return os.path.join(CACHED_SEARCHES_FOLDER, path.replace(os.sep, "-") + ".FFCache")
+        return os.path.join(CACHED_SEARCHES_FOLDER, path.replace(SEP, "-") + ".FFCache")
     # If instead ask for metadata
     elif metadata:
-        return os.path.join(CACHE_METADATA_FOLDER, path.replace(os.sep, "-") + ".FFCache")
+        return os.path.join(CACHE_METADATA_FOLDER, path.replace(SEP, "-") + ".FFCache")
     else:
         logging.fatal("Wrong arguments used with the convert_path_to_cache_file() function in FF_Files.py")
 

FF_Main_UI.py

@@ -874,11 +874,11 @@ def reset_filters(self):
     def import_filters(self, import_path=None):
         if import_path is None:
             # Debug
-            logging.info("Asking for location for export")
+            logging.info("Asking for location for import")
             import_path = QFileDialog.getOpenFileName(parent=self.Root_Window,
                                                       dir=FF_Files.USER_FOLDER,
-                                                      caption="Export File Find Search",
-                                                      filter="*.FFFilter;*.FFSearch")[0]
+                                                      caption="Import Filer or Search",
+                                                      filter="File Find Filter or Search (*.FFFilter *.FFSearch)")[0]
 
             # If opened file is a search
             if import_path.endswith(".FFSearch"):
@@ -943,15 +943,24 @@ def import_filters(self, import_path=None):
     def export_filters(self):
         # Debug
         logging.info("Request location for export")
-        export_path = QFileDialog.getSaveFileName(parent=self.Root_Window,
-                                                  dir=FF_Files.USER_FOLDER,
-                                                  caption="Export File Find Search",
-                                                  filter="File Find Filter Preset (*.FFFilter);;"
-                                                         "JSON (JavaScript Object Notation) (*.json)")[0]
+        export_dialog = QFileDialog.getSaveFileName(parent=self.Root_Window,
+                                                    dir=FF_Files.USER_FOLDER,
+                                                    caption="Export File Find Search",
+                                                    filter="File Find Filter Preset (*.FFFilter);;"
+                                                           "JSON (JavaScript Object Notation) (*.json)")[0]
+        export_path = export_dialog[0]
+
         # If User pressed "Cancel"
         if export_path == "":
             return
 
+        # If the suffix wasn't added, add it
+        if not (export_path.endswith(".FFFilter") or export_path.endswith(".json")):
+            if "FFFilter" in export_dialog[1]:
+                export_path += ".FFFilter"
+            else:
+                export_path += ".json"
+
         # Debug
         logging.info(f"Exporting all filters to {export_path}, with {FF_Files.FF_FILTER_VERSION=}...")
         # Making user folder compatible

FF_Menubar.py

@@ -478,7 +478,7 @@ def open_in_app(self):
         selected_program = QFileDialog.getOpenFileName(
             parent=self.parent,
             dir="/Applications",
-            filter="*.app;")[0]
+            filter="Application/Executable (*.app *.bin *.exe")[0]
 
         # Tests if the user selected an app
         if selected_program != "":

FF_Search.py

@@ -20,7 +20,7 @@
 
 # PySide6 Gui Imports
 from PySide6.QtCore import QThreadPool, Signal, QObject, QDate, Qt
-from PySide6.QtWidgets import QFileDialog, QWidget
+from PySide6.QtWidgets import QWidget
 
 # Projects Libraries
 import FF_Additional_UI
@@ -100,16 +100,6 @@ def __str__(self):
 
 # Loading a saved search
 class LoadSearch:
-    def __init__(self, parent):
-        load_dialog = QFileDialog.getOpenFileName(parent,
-                                                  "Import File Find Search",
-                                                  FF_Files.USER_FOLDER,
-                                                  "*.FFSearch;")
-        self.load_file = load_dialog[0]
-
-        # Open file
-        self.open_file(self.load_file, parent)
-
     # Opening the user-interface and creating a cache file for the reload button
     @staticmethod
     def load_search_content(load_file):
@@ -579,7 +569,7 @@ def searching(self, data_name, data_in_name, data_filetype, data_file_size_min,
 
         for cache_file in os.listdir(FF_Files.CACHED_SEARCHES_FOLDER):
             # Looks if there is a cache file for a higher directory
-            if data_search_from.replace(os.sep, "-").startswith(cache_file.removesuffix(".FFCache")):
+            if data_search_from.replace(FF_Files.SEP, "-").startswith(cache_file.removesuffix(".FFCache")):
                 # Date created from separate file
                 with open(os.path.join(FF_Files.CACHE_METADATA_FOLDER, cache_file)) as time_file:
                     cache_file_c_date = load(time_file)["c_time"]
@@ -970,7 +960,7 @@ def searching(self, data_name, data_in_name, data_filetype, data_file_size_min,
                     # the broader cache which was created at the same time. Dividing by 10 so to only add fractions of
                     # a seconds to the c_time as to not get ranked over newer caches.
                     # Doing this so the already specialized cache gets used preferably
-                    c_time_adjust = data_search_from.count(os.sep) / 10
+                    c_time_adjust = data_search_from.count(FF_Files.SEP) / 10
                     logging.debug(f"Cache time {newest_fitting_cache_file_c_date} + adjuster: {c_time_adjust} "
                                   f"= {newest_fitting_cache_file_c_date + c_time_adjust}")
 

FF_Search_UI.py

@@ -140,11 +140,19 @@ def save_search():
                                                       FF_Files.USER_FOLDER,
                                                       "File Find Search (*.FFSearch);;Plain Text File (*.txt)")
             save_file = save_dialog[0]
+
+            # If the suffix wasn't added, add it
+            if not (save_file.endswith(".FFSearch") or save_file.endswith(".txt")):
+                if "FFFilter" in save_dialog[1]:
+                    save_file += ".FFFilter"
+                else:
+                    save_file += ".json"
+
             if save_file.endswith(".txt") and not os.path.exists(save_file):
                 with open(save_file, "w") as export_file:
                     for save_file in self.matched_list:
                         export_file.write(save_file + "\n")
-            elif save_file.endswith("FSearch") and not os.path.exists(save_file):
+            elif save_file.endswith(".FSearch") and not os.path.exists(save_file):
                 with open(save_file, "w") as export_file:
                     dump({"VERSION": FF_Files.FF_SEARCH_VERSION, "matched_list": self.matched_list}, export_file)
 

File-Find.py

@@ -56,13 +56,13 @@ def event(self, event: QEvent) -> bool:
                 path = QFileOpenEvent.url(event).path()
 
                 # If the opened file is a file find search
-                if path.endswith("FFSearch"):
+                if path.endswith(".FFSearch"):
                     # Debug
                     logging.info(f"Opening {path}...")
                     FF_Search.LoadSearch.open_file(path, None)
 
                 # Filter preset
-                elif path.endswith("FFFilter"):
+                elif path.endswith(".FFFilter"):
                     # Debug
                     logging.info(f"Opening {path}...")
                     main_window.import_filters(path)