Merge pull request #7 from Adam-Color/Develop

v1.0.4

Author: Adam-Color

README.md

@@ -1,4 +1,4 @@
-# App Usage GUI
+# AppUsageGUI
 ### Application Runtime Tracker
 
 This program tracks the runtime of a specified application, logging the duration the application is running over multiple instances, with unique sessions created by the user.

build.py

@@ -2,9 +2,10 @@
 import sys
 import shutil
 import subprocess
+from src._version import __version__
 
 # Project details
-PROJECT_NAME = "AppUsageGUI"
+PROJECT_NAME = f"AppUsageGUI-v{__version__}"
 ENTRY_POINT = "src/main.py"
 BUILD_DIR = "build"
 DIST_DIR = "dist"
@@ -25,7 +26,7 @@ def build_executable():
     icon_file = "src/core/resources/icon.ico" if os.name == 'nt' else "src/core/resources/icon.icns"
     print("Building the application...")
     run_command(
-        f'{python_executable} -m PyInstaller --onefile --name {PROJECT_NAME} '
+        f'{python_executable} -m PyInstaller --onefile --clean --name {PROJECT_NAME} '
         f'--windowed --clean '
         f'--add-data "src/core:core" '
         f'--add-data "{icon_file}:." '

installer/windows_installer.iss

@@ -1,5 +1,5 @@
 [Setup]
-AppName=App Usage GUI
+AppName=AppUsageGUI
 AppVersion={#MyAppVersion}
 DefaultDirName={autopf}\AppUsageGUI
 DefaultGroupName=AppUsageGUI
@@ -12,5 +12,5 @@ SolidCompression=yes
 Source: "dist\App-${#MyAppVersion}.exe"; DestDir: "{app}"
 
 [Icons]
-Name: "{group}\App Usage GUI"; Filename: "{app}\App-${#MyAppVersion}.exe"
-Name: "{commondesktop}\App Usage GUI"; Filename: "{app}\App-${#MyAppVersion}.exe"
+Name: "{group}\AppUsageGUI"; Filename: "{app}\App-${#MyAppVersion}.exe"
+Name: "{commondesktop}\AppUsageGUI"; Filename: "{app}\App-${#MyAppVersion}.exe"

src/_version.py

@@ -1 +1 @@
-__version__ = "1.0.0"
+__version__ = "1.0.4"

src/core/gui_root.py

@@ -46,25 +46,45 @@ def show_frame(self, page_name):
         frame = self.frames[page_name]
         frame.tkraise()
 
+    #FIXME: thread duplication in update_total_time
     def reset_frames(self):
-        """Reset the GUI frames."""
-        # Stop the AppTracker thread
-        if self.logic_controller.app_tracker:
-            self.logic_controller.app_tracker.reset()
+        print("Resetting frames...")  #! Debugging prints
+
+        try:
+            # Stop trackers
+            if self.logic_controller.app_tracker:
+                print("Stopping AppTracker...")
+                self.logic_controller.app_tracker.reset()
+
+            if self.logic_controller.time_tracker:
+                print("Stopping TimeTracker...")
+                self.logic_controller.time_tracker.reset()
+
+            if self.logic_controller.mouse_tracker:
+                print("Stopping MouseTracker...")
+                self.logic_controller.mouse_tracker.stop()
+
+            # Stop GUI threads
+            for frame_name, frame in self.frames.items():
+                if hasattr(frame, "stop_threads"):
+                    print(f"Stopping threads for {frame_name}...")
+                    frame.stop_threads()
+
+            # Destroy frames
+            for frame_name, frame in self.frames.items():
+                print(f"Destroying frame {frame_name}...")
+                frame.destroy()
+
+            self.frames = {}
+
+            # Reinitialize screens
+            print("Reinitializing screens...")
+            self.init_screens()
+
+        except Exception as e:
+            print(f"Crash in reset_frames(): {e}")
+
 
-        # stop the TimeTracker thread
-        if self.logic_controller.time_tracker:
-            self.logic_controller.time_tracker.reset()
-        
-        # stop the MouseTracker thread
-        if self.logic_controller.mouse_tracker:
-            self.logic_controller.mouse_tracker.stop()
-        
-        # Reset the frames and initialize them again
-        for frame in self.frames.values():
-            frame.destroy()
-        self.frames = {}
-        self.init_screens()
 
     def on_close(self):
         """Handle cleanup and close the application."""

src/core/logic/app_tracker.py

@@ -22,7 +22,7 @@ def _fetch_app_names(self):
         seen_names = set()
         for process in psutil.process_iter(['name']):
             try:
-                app_name = process.info['name'].split(" ")[0]
+                app_name = process.info['name']
                 app_name = app_name.split(".")[0]  # Use the base name of the process
                 if app_name not in seen_names and len(app_name) > 0:
                     apps.append(app_name)

src/core/screens/create_session_window.py

@@ -18,6 +18,9 @@ def __init__(self, parent, controller, logic_controller):
         confirm_button = tk.Button(self, text="Confirm", command=self.on_confirm)
         confirm_button.pack(side="top", fill="x", pady=5)
 
+        back_button = tk.Button(self, text="Main Menu", command=lambda: (self.controller.reset_frames(), self.controller.show_frame("MainWindow")))
+        back_button.pack(pady=5, side='bottom')
+
     def on_confirm(self):
         """Resets trackers upon confirmation"""
         session_name = self.session_name_input.get()

src/core/screens/save_window.py

@@ -17,6 +17,9 @@ def __init__(self, parent, controller, logic_controller):
         button_no = tk.Button(self, text="No", command=self.dont_save)
         button_no.pack(pady=5)
 
+        back_button = tk.Button(self, text="Main Menu", command=lambda: (self.controller.reset_frames(), self.controller.show_frame("MainWindow")))
+        back_button.pack(pady=5, side='bottom')
+
     def save(self):
         if self.logic_controller.file_handler.get_continuing_session():
             session_time = self.logic_controller.time_tracker.get_total_time()

src/core/screens/select_app_window.py

@@ -83,6 +83,7 @@ def refresh_apps(self):
         else:
             for app in self.all_apps:
                 self.app_listbox.insert(tk.END, app)
+        self.update_search()
 
     @threaded
     def update_search(self, *args):

src/core/screens/session_total_window.py

@@ -13,6 +13,8 @@ def __init__(self, parent, controller, logic_controller):
 
         self.update_queue = queue.Queue()
 
+        self.stop_event = threading.Event()
+
         self.time_readout = "loading..."
 
         # Display the page label
@@ -43,10 +45,10 @@ def update_total_time(self):
             pass
 
         # Call this method again after 1000 ms (1 second) to keep updating the label
-        self.after(1000, self.update_total_time)
+        self.update_total_time_id = self.after(1000, self.update_total_time)
 
     def total_time_thread(self):
-        while True:
+        while not self.stop_event.is_set():
             try:
                 if self.logic_controller.time_tracker.get_time() > 0 and self.logic_controller.time_tracker.is_running():
                     # Get the total session time from the logic controller
@@ -57,5 +59,16 @@ def total_time_thread(self):
             except TypeError:
                 pass
 
-            # Sleep for 3 seconds before the next update
+            # Sleep for 1 second before the next update
             time.sleep(1)
+    
+    def stop_threads(self):
+        self.stop_event.set()
+
+        # Cancel scheduled update_total_time calls
+        try:
+            self.after_cancel(self.update_total_time_id)
+        except AttributeError:
+            pass  # If no updates were scheduled yet, ignore error
+        except ValueError:
+            pass  # If already cancelled, ignore error

src/core/screens/tracker_window.py

@@ -14,6 +14,7 @@ def __init__(self, parent, controller, logic_controller):
         self.app = ""
         self.track_time_disp = "Looking for app..."
         self.rec_time = 0
+        self.stop_event = threading.Event()
 
         # Display the note label
         self.note_label = tk.Label(self, text="Tracking stops automatically when tracked app is fully closed")
@@ -44,7 +45,7 @@ def __init__(self, parent, controller, logic_controller):
 
     def update_time_label(self):
         secs = 0
-        while True:
+        while not self.stop_event.is_set():
             self.app = self.logic_controller.app_tracker.get_selected_app()
 
             app_names = self.logic_controller.app_tracker.get_app_names()
@@ -96,7 +97,8 @@ def update_time_label(self):
                 self.update_queue.put(("time", "Looking for application..."))
 
             time.sleep(0.1)
-        self.controller.show_frame("SaveWindow")
+        if not self.stop_event.is_set():
+            self.controller.show_frame("SaveWindow")
 
 
     def periodic_update(self):
@@ -111,3 +113,6 @@ def periodic_update(self):
         except queue.Empty:
             pass
         self.after(500, self.periodic_update)
+
+    def stop_threads(self):
+        self.stop_event.set()

src/main.py

@@ -1,6 +1,7 @@
 """
     Application runtime tracker.
-    Copyright (C) 2025  Adam Blair-Smith
+
+    Copyright (C) 2025 Adam Blair-Smith
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -59,7 +60,7 @@ def main():
     icon_path = resource_path(icon_name)
 
     root.iconbitmap(icon_path)
-    root.title(f"App Usage GUI - v{__version__}")
+    root.title(f"AppUsageGUI - v{__version__}")
 
     win = GUIRoot(root)
     win.pack(side="top", fill="both", expand=True)