removed trayicon, added summary notification

Author: wrecks-code

config.ini

@@ -1,5 +1,5 @@
 [Settings]
-SEARCH_PATHS = C:\Users\Wreck\Downloads\,I:\Downloads,J:\Downloads,F:\Recordings
+SEARCH_PATHS = C:\Users\Wreck\Downloads\,I:\Downloads,J:\Downloads
 EXTRACTABLE_EXTENSIONS = zip|rar
 DAYS_UNTIL_DELETION = 14
 START_WITH_WINDOWS = true

wfc/file.py

@@ -5,8 +5,7 @@
 import re
 from typing import List, Tuple
 
-from wfc.logger import log, INFO, ERROR
-from wfc import popup, config, registry, paths
+from wfc import popup, config, registry, paths, logger
 
 # TODO: Testmode toggle
 TESTMODE = True
@@ -29,7 +28,7 @@ def get_things_to_delete() -> (
 
     for search_path in search_paths:
         if not os.path.exists(search_path):
-            log(ERROR, f"Path {search_path} not found!")
+            logger.log(logger.ERROR, f"Path {search_path} not found!")
             continue
 
         for item in os.listdir(search_path):
@@ -113,7 +112,6 @@ def handle_startup() -> None:
         max_log_size_mb,
     ) = config.data
 
-    registry.remove_from_autostart()
     if start_with_windows:
         registry.add_to_autostart()
 
@@ -152,16 +150,19 @@ def process_things():
             else:
                 type_label = "DIR"
 
-            log(
-                INFO,
+            logger.log(
+                logger.INFO,
                 f"{type_label}: {basename} SIZE: {bytes_to_string(size_bytes)} REASON: {reason}",
             )
 
             bytes_to_delete += size_bytes
             delete_file_or_folder(path, is_file)
 
-    popup.show_notification(
-        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)",
-    )
+    if bytes_to_delete <= 0:
+        logger.show_summary()
+    else:
+        popup.show_notification(
+            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

@@ -1,9 +1,14 @@
+import re
+from datetime import datetime
 import logging
-from wfc import paths
+from typing import Tuple
+from wfc import paths, popup
+
 
 ENCODING = "utf-8"
 INFO = "info"
 ERROR = "error"
+DATE_FORMAT = "%d.%m.%Y %H:%M:%S"
 
 LOG: logging.Logger
 STARTUP = True
@@ -16,12 +21,65 @@ def log(log_type: str, text: str):
         LOG.info(text)
 
 
+def show_summary():
+    current_date = datetime.now()
+    size_saved = 0.0
+    with open(paths.LOG_PATH, "r", encoding=ENCODING) as log_file:
+        for line in log_file:
+            if "Program startup" in line:
+                continue
+
+            timestamp, _, size, _ = extract_line_data(line)
+            if timestamp == "":
+                continue
+            timestamp_datetime = datetime.strptime(timestamp, DATE_FORMAT)
+
+            if (current_date - timestamp_datetime).days <= 30:
+                size_saved += float(size[:-3])
+
+    size_saved /= 1024.0
+    popup.show_notification(
+        "There's nothing to delete!",
+        f"You have saved {size_saved:.2f} GB in the last 30 days.",
+    )
+
+
+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})"
+    filename_regex = r"FILE: (.*?) SIZE:"
+    size_regex = r"SIZE: ([\d.]+) (.)B"
+    reason_regex = r"REASON: (.+)"
+
+    # Compile the regex patterns
+    timestamp_match = re.search(timestamp_regex, line)
+    filename_match = re.search(filename_regex, line)
+    size_match = re.search(size_regex, line)
+    reason_match = re.search(reason_regex, line)
+
+    # Check if all parts were matched
+    if timestamp_match and filename_match and size_match and reason_match:
+        timestamp = timestamp_match[1]
+        filename = filename_match[1]
+        # Convert size to float (assuming MB for demonstration)
+        size_value = float(size_match[1])
+        if size_match[2] == "G":
+            size_value *= 1024  # Convert to MB if size is in GB
+        size = f"{size_value:.2f} MB"
+        reason = reason_match[1]
+        return timestamp, filename, size, reason
+    else:
+        # print(f"LINE FORMAT INVALID! {filename_match}")
+        return "", "", "", ""
+
+
 if STARTUP:
     logging.basicConfig(
         filename=paths.LOG_PATH,
         level=logging.INFO,
         format="%(asctime)s - %(message)s",
-        datefmt="%d-%m-%Y %H:%M:%S",
+        datefmt=DATE_FORMAT,
     )
     LOG = logging.getLogger(__name__)
     LOG.critical("Program startup")

wfc/paths.py

@@ -21,9 +21,11 @@ def strip_package_name_from_path(path) -> str:
 EXE_FILE_NAME = f"{APP_NAME}.exe"
 CONFIG_FILE_NAME = "config.ini"
 LOG_FILE_NAME = "wfc.log"
+ICON_FILE_NAME = "clean.ico"
 
 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)
 LOG_PATH = os.path.join(BASE_PATH, LOG_FILE_NAME)
+ICON_PATH = os.path.join(BASE_PATH, ICON_FILE_NAME)

wfc/popup.py

@@ -1,23 +1,31 @@
 import os
 import time
 import win11toast
+from wfc import paths
 
+LOG_BUTTON_TXT = "Open Log"
+RECYCLE_BIN_BUTTON_TXT = "Open Recycle Bin"
 
-# from wfc import config
 
+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)
+    elif button_name_pressed == RECYCLE_BIN_BUTTON_TXT:
+        os.startfile("shell:RecycleBinFolder")
 
-def tray_clicked():
-    # os.startfile(config.data[0][0])  -> Downloads
-    # os.startfile("::{20D04FE0-3AEA-1069-A2D8-08002B30309D}")  -> This PC
-    os.startfile("shell:RecycleBinFolder")
 
-
-def show_notification(title: str, message: str) -> None:
+def show_notification(title: str, message: str):
     time.sleep(1)
+
+    icon = {"src": paths.ICON_PATH, "placement": "appLogoOverride"}
+
     win11toast.toast(
         title,
         message,
         audio={"silent": "true"},
         duration="long",
-        on_click=lambda args: tray_clicked(),
+        on_click=lambda args: tray_clicked(args),
+        buttons=[LOG_BUTTON_TXT, RECYCLE_BIN_BUTTON_TXT],
+        icon=icon,
     )