Added additional excluded folders check

- Added additional excluded folders check
- Updated README.md
- Centralized font

Author: Pixel-Master

FF_Compare.py

@@ -188,7 +188,6 @@ def generate_title_label(self, text, text2, color) -> tuple[QLabel, QLabel]:
 
         # Defining the font
         font2 = QFont(FF_Files.DEFAULT_FONT, FF_Files.SMALLER_FONT_SIZE)
-        # font2.setBold(True)
         # Configure the font
         label2.setFont(font2)
 

FF_Files.py

@@ -17,7 +17,7 @@
 import hashlib
 
 # Versions
-VERSION: str = "rc_27-may-24"
+VERSION: str = "4-july-24"
 VERSION_SHORT: str = "0.0-rc2"
 # Versions of file formats
 FF_FILTER_VERSION = 1

FF_Main_UI.py

@@ -1187,9 +1187,9 @@ def menu_bar(self, shell_cmd):
         switch_tab_basic.triggered.connect(lambda: self.tabbed_widget.setCurrentIndex(0))
         switch_tab_basic.setShortcut("Ctrl+1")
         # File Content
-        switch_tab_file_content = QAction("Switch to tab File Content", self.Root_Window)
-        switch_tab_file_content.triggered.connect(lambda: self.tabbed_widget.setCurrentIndex(1))
-        switch_tab_file_content.setShortcut("Ctrl+2")
+        switch_tab_properties = QAction("Switch to tab Properties", self.Root_Window)
+        switch_tab_properties.triggered.connect(lambda: self.tabbed_widget.setCurrentIndex(1))
+        switch_tab_properties.setShortcut("Ctrl+2")
         # Advanced
         switch_tab_advanced = QAction("Switch to tab Advanced", self.Root_Window)
         switch_tab_advanced.triggered.connect(lambda: self.tabbed_widget.setCurrentIndex(2))
@@ -1199,7 +1199,7 @@ def menu_bar(self, shell_cmd):
         switch_tab_sorting.triggered.connect(lambda: self.tabbed_widget.setCurrentIndex(3))
         switch_tab_sorting.setShortcut("Ctrl+4")
         # Add options to menu
-        tabs_menu.addActions([switch_tab_basic, switch_tab_file_content, switch_tab_advanced, switch_tab_sorting])
+        tabs_menu.addActions([switch_tab_basic, switch_tab_properties, switch_tab_advanced, switch_tab_sorting])
 
         # Search Status Menu
         global search_status_menu

FF_Search.py

@@ -229,6 +229,17 @@ def __init__(self, data_name, data_in_name, data_filetype, data_file_size_min, d
 
         logging.debug(f"{size_data = }, {data_file_size_min = }, {data_file_size_max = }")
 
+        # Loading excluded files
+        with open(os.path.join(FF_Files.FF_LIB_FOLDER, "Settings")) as excluded_file:
+            data_excluded_files = load(excluded_file)["excluded_files"]
+
+        # Checking if the search scope is an excluded directory
+        excluded_files_block_search = False
+        for excluded_file in data_excluded_files:
+            if data_search_from_valid.startswith(excluded_file):
+                excluded_files_block_search = True
+                break
+
         # Fetching Errors
         # Testing if file ending, file groups or name contains are used together with name,
         # because if they do no file will be found
@@ -308,6 +319,20 @@ def __init__(self, data_name, data_in_name, data_filetype, data_file_size_min, d
                                                              "No files would be found, because no file type "
                                                              "category is selected.",
                                                              parent=None)
+
+        # If the search scope is an excluded file
+        elif excluded_files_block_search:
+            # Debug
+            logging.error("Directory Error! Search in directory is in an excluded directory")
+
+            # Show Popup
+            FF_Additional_UI.PopUps.show_critical_messagebox(
+                "Directory Error!",
+                "Directory Error!\n\n"
+                "The directory you searched in is in an excluded folder.\n\n"
+                "You can edit the excluded folders in the File Find Settings. \n(File Find > Preferences...)",
+                parent=None)
+
         # Start Searching
         else:
 
@@ -348,15 +373,15 @@ class SignalClass(QObject):
                 lambda: self.searching(
                     data_name, data_in_name, data_filetype, data_file_size_min, data_file_size_max, data_library,
                     data_search_from_valid, data_search_for, data_content, unix_time_list, data_sort_by,
-                    data_reverse_sort, data_file_group, parent))
+                    data_reverse_sort, data_file_group, data_excluded_files, parent))
 
             # Debug
             logging.debug("Finished Setting up QThreadPool!")
 
     # The search engine
     def searching(self, data_name, data_in_name, data_filetype, data_file_size_min, data_file_size_max, data_library,
                   data_search_from, data_search_for, data_content, data_time, data_sort_by, data_reverse_sort,
-                  data_file_group, parent):
+                  data_file_group, data_excluded_files, parent):
         # Debug
         logging.info("Starting Search...")
         self.ui_logger.update("Starting Search...")
@@ -402,12 +427,15 @@ def searching(self, data_name, data_in_name, data_filetype, data_file_size_min,
             logging.debug("Files and folders checking is NOT needed")
             data_search_for_needed = True
 
-        # Loading excluded files and checking if the need to be scanned
-        with open(os.path.join(FF_Files.FF_LIB_FOLDER, "Settings")) as excluded_file:
-            data_excluded_files = load(excluded_file)["excluded_files"]
+        # Testing if one of the excluded folder is in the search scope, if not checking isn't necessary
+        exclude_file_in_scope = False
+        for excluded_test_file in data_excluded_files:
+            if excluded_test_file.startswith(data_search_from):
+                exclude_file_in_scope = True
+                break
 
-        # If data_excluded_files is an empty list
-        if not data_excluded_files:
+        # If data_excluded_files is an empty list or no file in the excluded list is in the search scope
+        if not data_excluded_files or not exclude_file_in_scope:
             # If the list is empty
             logging.debug("Excluded files checking is NOT needed")
             data_excluded_files_needed = False

FF_Settings.py

@@ -75,7 +75,7 @@ def __init__(self, parent):
 
         # Excluded Files
         # Define the Label
-        exclude_label = QLabel("Always excluded files:", parent=self.Settings_Window)
+        exclude_label = QLabel("Always excluded folders:", parent=self.Settings_Window)
         # Change Font
         exclude_label.setFont(QFont(FF_Files.DEFAULT_FONT, FF_Files.SMALLER_FONT_SIZE))
         # Display the Label

README.md

@@ -10,8 +10,8 @@
 
 [![File Find build](https://img.shields.io/github/actions/workflow/status/Pixel-Master/File-Find/File-Find.yml?branch=main&label=File%20Find%20build%20status&logo=File%20Find&style=flat-square)](https://github.com/Pixel-Master/File-Find/actions/workflows/File-Find.yml)
 [![GPLv3 License](https://img.shields.io/badge/License-GPL%20v3-blue.svg?style=flat-square)](http://www.gnu.org/licenses/gpl-3.0.html) 
-[![GitLab last commit](https://img.shields.io/github/last-commit/Pixel-Master/File-Find.svg?style=flat-square)](https://github.com/Pixel-Master/File-Find/)
-[![GitHub stars](https://img.shields.io/github/stars/Pixel-Master/File-Find.svg?style=flat-square&label=Stars&color=yellow)](https://github.com/Pixel-Master/File-Find/)
+[![GitLab last commit](https://img.shields.io/github/last-commit/Pixel-Master/File-Find.svg?style=flat-square)](https://github.com/Pixel-Master/File-Find/commits)
+[![GitHub stars](https://img.shields.io/github/stars/Pixel-Master/File-Find.svg?style=flat-square&label=Stars&color=yellow)](https://Pixel-Master.github.io/File-Find/)
 [![GitLab forks](https://img.shields.io/github/forks/Pixel-Master/File-Find.svg?style=flat-square&label=Fork&color=red)](https://github.com/Pixel-Master/File-Find/forks/)
 
 #### Links: [GitHub](https://github.com/Pixel-Master/File-Find), [Website](https://pixel-master.github.io/File-Find)
@@ -29,7 +29,11 @@
 - [File Structure](#file-structure)
 
 ## Download
-File Find isn't ready for Release yet Run from source or download pre-build macOS, Windows or Linux Apps from the GitHub action Page.
+
+- [macOS](https://github.com/Pixel-Master/File-Find/releases/latest/download/File.Find.dmg)
+- [Windows](https://github.com/Pixel-Master/File-Find/releases/latest/download/File.Find.exe)
+
+File Find is still in beta. Build might be unstable. To get the newest version:
 - [Building from Source](#building-from-source)
 - [GitHub Action Page](https://github.com/Pixel-Master/File-Find/actions/workflows/File-Find.yml)