Merge pull request #10 from Adam-Color/Develop

Merge for 1.2.0

Author: Adam-Color

README.md

@@ -1,6 +1,6 @@
-![version](https://img.shields.io/badge/Version-1.1.5-white.svg)
+![version](https://img.shields.io/badge/Version-1.2.0-white.svg)
 ![license](https://img.shields.io/badge/License-GPL%20v3-blue.svg)
-![python](https://img.shields.io/badge/Python-3.12.7-green.svg)
+![python](https://img.shields.io/badge/Python-3.12-green.svg)
 
 # AppUsageGUI
 ### Application Runtime Tracker
@@ -22,8 +22,13 @@ Find them [here](https://github.com/Adam-Color/AppUsageGUI/releases)
 
 ## Contributing
 
-Contributions are welcome and needed on the Develop branch! Here is a TODO list:
+### Contributions are welcome and needed! Here is a TODO list:
 
-1. Add ways to analyze app usage data in the app
-2. Move to a single QT UI instead of multiple 'screens'
-3. Add support for tracking more than one executable per session
+* add integrations with professional applications
+* Optimize everything
+* Add support for tracking more than one executable per session
+
+#### Version 2 ('v2-change-to-pyqt6' branch):
+
+* Move to a single QT UI instead of multiple 'screens'
+* Add ways to analyze app usage data in the app

build.py

@@ -32,7 +32,7 @@ def build_executable():
         f'--add-data "{icon_file}:." '
         f'--collect-submodules core '
         f'--collect-all psutil '
-        f'--collect-all pyautogui '
+        f'--collect-all pynput '
         f'--collect-all tkinter '
         f'--icon={icon_file} '
         f'--add-data "src/_version.py:." '

installer/macos_installer.sh renamed to installers/macos_installer.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 # This script is used to create the installer for the macOS version of the application
 
-create-dmg --volicon src/core/resources/icon.icns --volname AppUsageGUIsetup --window-pos 200 190 --window-size 800 400 --app-drop-link 600 185 --eula LICENSE.txt dist/AppUsageGUI_v1.1.5_MACOS_setup.dmg dist/AppUsageGUI.app
+create-dmg --volicon src/core/resources/icon.icns --volname AppUsageGUIsetup --window-pos 200 190 --window-size 800 400 --app-drop-link 600 185 --eula LICENSE.txt dist/AppUsageGUI_v1.2.0_MACOS_setup.dmg dist/AppUsageGUI.app

installer/windows_installer.iss renamed to installers/windows_installer.iss

@@ -2,11 +2,11 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "AppUsageGUI"
-#define MyAppVersion "1.1.5"
+#define MyAppVersion "1.2.0"
 #define MyAppPublisher "Adam Blair-Smith"
 #define MyAppURL "https://github.com/Adam-Color/AppUsageGUI"
 #define MyAppExeName "AppUsageGUI.exe"
-#define MyInstallerName "AppUsageGUI_v1.1.5_WINDOWS_setup"
+#define MyInstallerName "AppUsageGUI_v1.2.0_WINDOWS_setup"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.

pytest.ini

@@ -0,0 +1,4 @@
+# pytest.ini
+[pytest]
+testpaths = tests
+pythonpath = src

requirements.txt

@@ -1,6 +1,6 @@
 MouseInfo==0.1.3
 psutil==5.9.8
-PyAutoGUI==0.9.54
+pynput==1.8.1
 PyGetWindow==0.0.9
 PyMsgBox==1.0.9
 pyobjc-core==11.0; sys_platform == "darwin"
@@ -12,4 +12,4 @@ PyScreeze==1.0.1
 pytweening==1.2.0
 rubicon-objc==0.5.0
 pyinstaller
-requests
+requests==2.32.3

src/_version.py

@@ -1 +1 @@
-__version__ = "1.1.5"
+__version__ = "1.2.0"

src/core/gui_root.py

@@ -75,8 +75,6 @@ def reset_frames(self):
         except Exception as e:
             print(f"Crash in reset_frames(): {e}")
 
-
-
     def on_close(self):
         """Handle cleanup and close the application."""
         # Stop the AppTracker thread

src/core/logic/app_tracker.py

@@ -3,6 +3,23 @@
 import os
 import psutil
 
+excluded_apps = {
+    'python', 'AppUsageGUI', 'Adobe Crash Processor', 'AdobeIPCBroker',
+    'AdobeUpdateService', 'BMDStreamingServer', 'DesktopVideoUpdater',
+    'gamingservices', 'gamingservicesnet', 'Registry', 'services',
+    'System', 'system', 'System Idle Process', 'svchost', 'taskhostw',
+    'taskhostex', 'wmi', 'WmiPrvSE', 'Windows Internal Database',
+    'Windows Security Notification Icon', 'Windows Terminal',
+    'wininit', 'winlogon', 'wlanext', 'WmiApSrv','dwm', 'explorer', 
+    'SearchIndexer', 'SearchProtocolHost', 'xrdd', 'conhost', 'csrss',
+    'smss', 'lsass', 'win32k', 'SystemSettings', 'RuntimeBroker',
+    'Taskmgr', 'ApplicationFrameHost', 'ShellExperienceHost',
+    'SearchApp', 'ShellInfrastructureHost', 'amdfendrsr',
+    'CrossDeviceService', 'dwmcore', 'fontdrvhost',
+    'lghub_agent', 'lghub_updater', 'lghub_system_tray',
+    'AggregatorHost', 'sntlkeyssrvr', 'sntlsrvnt'
+}
+
 class AppTracker:
     def __init__(self, parent, logic_controller):
         self.app_names = []
@@ -20,6 +37,10 @@ def _start_tracking(self):
     def _fetch_app_names(self):
         apps = []
         seen_names = set()
+
+        # add excluded apps to seen_names
+        seen_names.update(excluded_apps)
+
         for process in psutil.process_iter(['name']):
             try:
                 app_name = process.info['name']
@@ -55,6 +76,7 @@ def set_selected_app(self, app):
         self.selected_app = app
 
     def stop(self):
+        print("Stopping App Tracker")
         self.stop_event.set()
         if self.update_thread is not None:
             try:
@@ -63,6 +85,7 @@ def stop(self):
                 pass
 
     def start(self):
+        print("Starting App Tracker")
         self.stop_event = threading.Event()
         self._start_tracking()
 

src/core/logic/file_handler.py

@@ -61,6 +61,16 @@ def load_session_data(self, filename):
             self.corrupt_sessions.append((filename, "No hash file found"))
             self.data = None
 
+    def delete_session(self, filename):
+        """Delete data and hash files of a session"""
+        file_path = os.path.join(self.directory, filename + '.dat')
+        hash_path = os.path.join(self.directory, filename + '.hash')
+
+        if os.path.exists(file_path):
+            os.remove(file_path)
+        if os.path.exists(hash_path):
+            os.remove(hash_path)
+
     def get_data(self):
         return self.data
 

src/core/logic/time_tracker.py

@@ -40,9 +40,11 @@ def clock(self):
             time.sleep(0.1)
 
     def start(self):
+        print("Starting time tracker")
         self.track = True
 
     def stop(self):
+        print("Stopping time tracker")
         self.track = False
 
     def pause(self):

src/core/logic/user_trackers.py

@@ -4,8 +4,7 @@
 """
 
 import threading
-import time
-import pyautogui
+import pynput
 
 from core.utils.file_utils import read_file, config_file
 
@@ -21,7 +20,7 @@ def __init__(self, parent, logic_controller):
         y = 0
         self.logic_controller = logic_controller
         self.mouse_position = x, y
-        self.last_mouse_position = x , y
+        self.last_mouse_position = x, y
         self.stop_event = threading.Event()  # Used to stop the thread gracefully
         try:
             self.enabled = read_file(config_file())["mouse_tracker_enabled"]
@@ -36,29 +35,34 @@ def _update_mouse_position(self):
         while not self.stop_event.is_set():
             self.last_mouse_position = self.mouse_position
 
-            # time limit handling
-            if not self.logic_controller.time_tracker.get_is_paused():
-                time.sleep(self.idle_time_limit)
-            else:
-                time.sleep(1)
+            wait_time = self.idle_time_limit if not self.logic_controller.time_tracker.get_is_paused() else 1
 
-            x, y = pyautogui.position()
+            # Wait for the idle time or exit early if stop_event is set
+            if self.stop_event.wait(timeout=wait_time):
+                break
+
+            x, y = pynput.mouse.Controller().position
             self.mouse_position = x, y
 
-            # pause the timer
+            # Pause the timer if mouse hasn’t moved
             if self.last_mouse_position == self.mouse_position:
                 self.logic_controller.time_tracker.pause()
                 self.pausing = True
             elif self.logic_controller.time_tracker.get_is_paused():
                 self.logic_controller.time_tracker.resume()
                 self.pausing = False
 
+
     def start(self):
-        if self.enabled and not self.update_thread:
+        if self.enabled:
+            self.stop_event = threading.Event()  # Reset the stop event to allow the thread to run again
+            self.update_thread = threading.Thread(target=self._update_mouse_position)
+            print("Starting mouse tracker")
             self.update_thread.start()
 
     def stop(self):
         self.stop_event.set()
+        print("Stopping mouse tracker")
         if self.update_thread is not None:
             try:
                 self.update_thread.join()

src/core/screens/save_window.py

@@ -1,5 +1,6 @@
 import tkinter as tk
-import pickle
+
+from core.utils.time_utils import format_time
 
 class SaveWindow(tk.Frame):
     def __init__(self, parent, controller, logic_controller):
@@ -23,9 +24,9 @@ def __init__(self, parent, controller, logic_controller):
     def save(self):
         if self.logic_controller.file_handler.get_continuing_session():
             session_time = self.logic_controller.time_tracker.get_total_time()
-            #print("Session time: ", session_time) #! debug print
+            print("Session time: ", format_time(round(session_time)))
             session_app_name = self.logic_controller.app_tracker.get_selected_app()
-            #print("Session_app_name: ", session_app_name) #! debug print
+            print("Session app name: ", session_app_name)
 
             data = {'app_name': session_app_name, 'time_spent': session_time}
 

src/core/screens/session_total_window.py

@@ -71,4 +71,4 @@ def stop_threads(self):
         except AttributeError:
             pass  # If no updates were scheduled yet, ignore error
         except ValueError:
-            pass  # If already cancelled, ignore error
+            pass  # If already cancelled, ignore error

src/core/screens/sessions_window.py

@@ -32,8 +32,12 @@ def __init__(self, parent, controller, logic_controller):
         self.load_sessions()
 
         # button to make the selection
-        select_button = tk.Button(self, text="Select", command=self.select_session)
-        select_button.pack(pady=10)
+        select_button = tk.Button(self, text="Continue from selected session", command=self.select_session)
+        select_button.pack(pady=5)
+
+        # button to delete the session
+        delete_button = tk.Button(self, text="Delete selected session", command=self.delete_session)
+        delete_button.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')
@@ -95,3 +99,15 @@ def select_session(self):
 
         # show the TrackerWindow
         self.controller.show_frame('TrackerWindow')
+
+    def delete_session(self):
+        if not self.get_session_text():
+            tk.messagebox.showerror("Error", "No session selected")
+            return 0
+        else:
+            selected_session_name = self.get_session_text().split(": ")[0]
+            # ask for confirmation
+            confirm = tk.messagebox.askyesno("Confirm Deletion", f"Are you sure you want to delete the session '{selected_session_name}'? \nThis action cannot be undone.")
+            if confirm:
+                self.logic_controller.file_handler.delete_session(selected_session_name)
+                self.session_listbox.delete(self.session_listbox.curselection())

src/core/screens/tracker_window.py

@@ -1,3 +1,5 @@
+"""Screen that displays the time tracked for a specific application. Needs optimazations"""
+
 import tkinter as tk
 import threading
 import queue
@@ -96,6 +98,7 @@ def update_time_label(self):
 
             time.sleep(0.1)
         if not self.stop_event.is_set():
+            self.controller.frames["SessionTotalWindow"].stop_threads()
             self.controller.show_frame("SaveWindow")
 
 

src/core/utils/file_utils.py

@@ -26,11 +26,13 @@ def config_file():
     """Returns the path to the config file"""
     return os.path.join(get_user_directory(), 'config.dat')
 
-def sessions_exist():
-    """Check if sessions exist, and if not, create the directory"""
+def sessions_exist(p=False):
+    """Check if sessions exist, and if not, create the directory.
+    Set p=True to print directory path"""
     file_extension = ".dat"
     sessions_dir = get_sessions_directory()
-    print("sessions_dir: %s" % sessions_dir) #!
+    if p:
+        print("sessions_dir: %s" % sessions_dir)
     # Ensure the directory exists
     if not os.path.exists(sessions_dir):
         os.makedirs(sessions_dir, exist_ok=True)
@@ -40,10 +42,12 @@ def sessions_exist():
             return True
     return False
 
-def user_dir_exists():
-    """Check if user directory exists, and if not, create the directory"""
+def user_dir_exists(p=False):
+    """Check if user directory exists, and if not, create the directory.
+    Set p=True to print directory path"""
     user_dir = get_user_directory()
-    print("user_dir: %s" % user_dir) #!
+    if p:
+        print("user_dir: %s" % user_dir)
     # Ensure the directory exists
     if not os.path.exists(user_dir):
         os.makedirs(user_dir, exist_ok=True)