bugfixes, changed config.ini structure ,naming of functions

Author: wrecks-code

config.ini

@@ -1,6 +1,6 @@
 [Settings]
-SEARCH_PATHS = C:\Users\Wreck\Downloads\,I:\Downloads,J:\Downloads
-EXTRACTABLE_EXTENSIONS = zip|rar
+SEARCH_PATHS = C:\Users\Wreck\Downloads\,I:\Downloads,J:\Downloads,G:\testfolder
+EXTRACTABLE_EXTENSIONS = zip, rar, 7z, tar, gz, bzip2, iso, img, dmg
 DAYS_UNTIL_DELETION = 14
 START_WITH_WINDOWS = true
 MAX_LOG_SIZE_MB = 2

wfc/config.py

@@ -8,7 +8,7 @@
 ENCODING = "utf-8"
 
 
-def get_config_values() -> Tuple[list[str], str, int, bool, int]:
+def _get_config_values() -> Tuple[list[str], str, int, bool, int]:
     if not os.path.exists(paths.CONFIG_PATH):
         logger.log(
             logger.ERROR,
@@ -19,10 +19,20 @@ def get_config_values() -> Tuple[list[str], str, int, bool, int]:
     config = configparser.ConfigParser()
     config.read(paths.CONFIG_PATH, encoding=ENCODING)
 
-    search_paths = config[SECTION_NAME]["SEARCH_PATHS"].split(",")
-    extractable_extensions = config[SECTION_NAME]["EXTRACTABLE_EXTENSIONS"]
+    search_paths = (
+        config[SECTION_NAME]["SEARCH_PATHS"]
+        .replace(" ", "")
+        .removesuffix(",")
+        .split(",")
+    )
+    extractable_extensions = (
+        config[SECTION_NAME]["EXTRACTABLE_EXTENSIONS"]
+        .replace(" ", "")
+        .removesuffix(",")
+        .replace(",", "|")
+    )
     days_until_deletion = int(config[SECTION_NAME]["DAYS_UNTIL_DELETION"])
-    start_with_windows = bool(config[SECTION_NAME]["START_WITH_WINDOWS"])
+    start_with_windows = config[SECTION_NAME]["START_WITH_WINDOWS"].lower() == "true"
     max_log_size_mb = int(config[SECTION_NAME]["MAX_LOG_SIZE_MB"])
 
     return (
@@ -34,4 +44,4 @@ def get_config_values() -> Tuple[list[str], str, int, bool, int]:
     )
 
 
-data = get_config_values()
+data = _get_config_values()

wfc/file.py

@@ -11,7 +11,7 @@
 TESTMODE = True
 
 
-def get_things_to_delete() -> (
+def _get_things_to_delete() -> (
     Tuple[List[Tuple[str, float, str]], List[Tuple[str, float, str]]]
 ):
     (
@@ -36,33 +36,33 @@ def get_things_to_delete() -> (
 
             if (
                 os.path.isdir(item_path)
-                and get_days_since_creation(item_path) > days_until_deletion
+                and _get_days_since_creation(item_path) > days_until_deletion
             ):
-                _folder_results.append((item_path, get_size_bytes(item_path), "age"))
+                _folder_results.append((item_path, _get_size_bytes(item_path), "age"))
             if os.path.isfile(item_path):
-                if re.match(pattern, item) and has_extracted_folder(item_path):
+                if re.match(pattern, item) and _has_extracted_folder(item_path):
                     _file_results.append(
                         (
                             item_path,
-                            get_size_bytes(item_path),
+                            _get_size_bytes(item_path),
                             "unpacked",
                         )
                     )
                     continue
-                if get_days_since_creation(item_path) > days_until_deletion:
-                    _file_results.append((item_path, get_size_bytes(item_path), "age"))
+                if _get_days_since_creation(item_path) > days_until_deletion:
+                    _file_results.append((item_path, _get_size_bytes(item_path), "age"))
 
     return _file_results, _folder_results
 
 
-def bytes_to_string(bytes_size: float) -> str:
+def _bytes_to_string(bytes_size: float) -> str:
     if bytes_size >= 1024**3:
         return f"{bytes_size / 1024**3:.2f} GB"
     else:
         return f"{bytes_size / 1024**2:.2f} MB"
 
 
-def get_size_bytes(path: str) -> float:
+def _get_size_bytes(path: str) -> float:
     return_size_bytes = 0
     if os.path.isfile(path):
         return_size_bytes = os.path.getsize(path)
@@ -75,7 +75,7 @@ def get_size_bytes(path: str) -> float:
     return return_size_bytes
 
 
-def get_days_since_creation(path: str) -> int:
+def _get_days_since_creation(path: str) -> int:
     if os.path.isfile(path):
         creation_time = os.path.getctime(path)
     elif os.path.isdir(path):
@@ -88,12 +88,12 @@ def get_days_since_creation(path: str) -> int:
     return (current_date - creation_date).days
 
 
-def has_extracted_folder(file_path: str) -> bool:
+def _has_extracted_folder(file_path: str) -> bool:
     folder_path = os.path.splitext(file_path)[0]
     return os.path.isdir(folder_path)
 
 
-def delete_file_or_folder(path: str, isfile: bool):
+def _delete_file_or_folder(path: str, isfile: bool):
     if TESTMODE:
         return
     with contextlib.suppress(FileNotFoundError):
@@ -103,7 +103,7 @@ def delete_file_or_folder(path: str, isfile: bool):
         shutil.rmtree(path)
 
 
-def handle_startup() -> None:
+def _handle_startup() -> None:
     (
         _,
         _,
@@ -114,6 +114,8 @@ def handle_startup() -> None:
 
     if start_with_windows:
         registry.add_to_autostart()
+    else:
+        registry.remove_from_autostart()
 
     max_log_size_bytes = max_log_size_mb * 1024 * 1024
     if (
@@ -125,9 +127,9 @@ def handle_startup() -> None:
 
 
 def process_things():
-    handle_startup()
+    _handle_startup()
 
-    things_to_delete = get_things_to_delete()
+    things_to_delete = _get_things_to_delete()
     files_to_delete, folders_to_delete = things_to_delete
 
     bytes_to_delete = 0
@@ -152,17 +154,17 @@ def process_things():
 
             logger.log(
                 logger.INFO,
-                f"{type_label}: {basename} SIZE: {bytes_to_string(size_bytes)} REASON: {reason}",
+                f"{type_label}: {basename} SIZE: {_bytes_to_string(size_bytes)} REASON: {reason}",
             )
 
             bytes_to_delete += size_bytes
-            delete_file_or_folder(path, is_file)
+            _delete_file_or_folder(path, is_file)
 
-    if bytes_to_delete <= 0:
+    if bytes_to_delete == 0.0:
         logger.show_summary()
     else:
         popup.show_notification(
-            f"Deleted {bytes_to_string(bytes_to_delete)} from your computer.",
+            f"Deleted {_bytes_to_string(bytes_to_delete)} from your computer.",
             f"{len(files_to_delete)} files and {len(folders_to_delete)} folders.\n"
             + f"{amount_reason_unpacked} files already unpacked, {amount_reason_age} too old ({config.data[2]} days)",
         )

wfc/logger.py

@@ -29,7 +29,7 @@ def show_summary():
             if "Program startup" in line:
                 continue
 
-            timestamp, _, size, _ = extract_line_data(line)
+            timestamp, _, size, _ = _extract_line_data(line)
             if timestamp == "":
                 continue
             timestamp_datetime = datetime.strptime(timestamp, DATE_FORMAT)
@@ -44,7 +44,7 @@ def show_summary():
     )
 
 
-def extract_line_data(line) -> Tuple[str, str, str, str]:
+def _extract_line_data(line) -> Tuple[str, str, str, str]:
     # sourcery skip: extract-method, inline-variable, remove-unnecessary-else
     # Define regular expressions to match different parts of the log line
     timestamp_regex = r"(\d{2}\.\d{2}\.\d{4} \d{2}:\d{2}:\d{2})"

wfc/paths.py

@@ -2,15 +2,15 @@
 import sys
 
 
-def get_base_path() -> str:
+def _get_base_path() -> str:
     if getattr(sys, "frozen", False):
         module_dir = os.path.dirname(sys.executable)
     else:
         module_dir = os.path.dirname(os.path.abspath(__file__))
-    return strip_package_name_from_path(module_dir)
+    return _strip_package_name_from_path(module_dir)
 
 
-def strip_package_name_from_path(path) -> str:
+def _strip_package_name_from_path(path) -> str:
     suffix = "wfc"  # Removed the backslash for platform independence
     return path[: -len(suffix)] if path.endswith(suffix) else path
 
@@ -23,7 +23,7 @@ def strip_package_name_from_path(path) -> str:
 LOG_FILE_NAME = "wfc.log"
 ICON_FILE_NAME = "clean.ico"
 
-BASE_PATH = get_base_path()
+BASE_PATH = _get_base_path()
 EXE_PATH = os.path.join(BASE_PATH, EXE_FILE_NAME)
 
 CONFIG_PATH = os.path.join(BASE_PATH, CONFIG_FILE_NAME)

wfc/popup.py

@@ -7,7 +7,7 @@
 RECYCLE_BIN_BUTTON_TXT = "Open Recycle Bin"
 
 
-def tray_clicked(button: dict):
+def _tray_clicked(button: dict):
     button_name_pressed = button["arguments"].split(":")[1].strip()
     if button_name_pressed == LOG_BUTTON_TXT:
         os.startfile(paths.LOG_PATH)
@@ -25,7 +25,7 @@ def show_notification(title: str, message: str):
         message,
         audio={"silent": "true"},
         duration="long",
-        on_click=lambda args: tray_clicked(args),
+        on_click=lambda args: _tray_clicked(args),
         buttons=[LOG_BUTTON_TXT, RECYCLE_BIN_BUTTON_TXT],
         icon=icon,
     )