Fix flatten folders option

library/constants.py

@@ -2,7 +2,7 @@
 import pathlib
 
 PROGRAM_NAME = "Start Menu Helper"
-VERSION_NUMBER = "1.1.4"
+VERSION_NUMBER = "1.1.5"
 ICON_FILE_NAME = "icon.ico"
 TIME_BETWEEN_SCANS_IN_MINUTES = 5
 APP_DATA_PATH = pathlib.WindowsPath.home().joinpath("AppData")

library/start_menu_helper.py

@@ -123,11 +123,14 @@ def flatten_folders_with_whitelist() -> None:
         nested_directories = get_nested_directories(path)
         nested_directories.reverse()  # Reverse the list to flatten the deepest folders first
         for directory in nested_directories:
-            if (directory.name in whitelist and
-                    directory.name not in constants.PROTECTED_FOLDERS):
-                for item in directory.iterdir():
-                    item.replace(path.joinpath(item.name))
-                logging.info(f"Flattened folder: {str(directory)}")
+            if directory.name in constants.PROTECTED_FOLDERS:
+                continue
+            for word in whitelist:
+                if word in directory.name:
+                    for item in directory.iterdir():
+                        item.replace(path.joinpath(item.name))
+                    logging.info(f"Flattened folder: {str(directory)}")
+                    break
 
 
 def flatten_folders_with_blacklist() -> None:
@@ -141,8 +144,12 @@ def flatten_folders_with_blacklist() -> None:
         nested_directories = get_nested_directories(path)
         nested_directories.reverse()  # Reverse the list to flatten the deepest folders first
         for directory in nested_directories:
-            if (directory.name not in blacklist and
-                    directory.name not in constants.PROTECTED_FOLDERS):
+            if directory.name in constants.PROTECTED_FOLDERS:
+                continue
+            for word in blacklist:
+                if word in directory.name:
+                    break
+            else:
                 for item in directory.iterdir():
                     item.replace(path.joinpath(item.name))
                 logging.info(f"Flattened folder: {str(directory)}")

scripts/setup_script.iss

@@ -1,6 +1,6 @@
 ; This file is a script for generating the setup of the app using Inno Setup (http://www.jrsoftware.org/isinfo.php)
 #define MyAppName "Start Menu Helper"
-#define MyAppVersion "1.1.4"
+#define MyAppVersion "1.1.5"
 #define MyAppPublisher "Jarik Marwede"
 #define MyAppURL "https://github.com/jarikmarwede/Start-Menu-Helper"
 #define MyAppExeName "Start Menu Helper.exe"