Merge pull request #33 from Adam-Color/Develop

merge for 1.8.3

Author: Adam-Color

README.md

@@ -1,4 +1,4 @@
-![version](https://img.shields.io/badge/Version-1.8.2-white.svg)
+![version](https://img.shields.io/badge/Version-1.8.3-white.svg)
 ![license](https://img.shields.io/badge/License-GPL%20v3-blue.svg)
 ![python](https://img.shields.io/badge/Python-3.13-green.svg)
 
@@ -19,7 +19,7 @@ To install, follow the instructions for your platform found here:
 
 * Add integrations with professional applications
 * Detach the GIL for windows version
-* Add a better way to filter out non-GUI apps on macOS
+* Find a better way to filter out non-GUI apps
 * Full linux support with packages
 
 NOTE: GIL is detached for the macOS build; use Python 3.13.7t
@@ -52,71 +52,6 @@ AppUsageGUI is a cross-platform desktop application built with Python and Tkinte
 
 The application follows a Model-View-Controller (MVC) architecture with separate logic and GUI components.
 
-## Project and Session Structure
-
-AppUsageGUI organizes your time tracking data using a hierarchical project-based structure. This allows you to group related sessions together and manage your time tracking more effectively.
-
-### Data Organization
-
-```
-AppUsageGUI/
-├── Sessions/                          # Standalone sessions (No Project)
-│   ├── session1.dat
-│   ├── session1.hash
-│   ├── session2.dat
-│   └── session2.hash
-├── Projects/                          # Project-organized sessions
-│   ├── Web Development/               # Custom project
-│   │   ├── frontend_work.dat
-│   │   ├── frontend_work.hash
-│   │   ├── backend_api.dat
-│   │   └── backend_api.hash
-│   ├── Design Projects/               # Another custom project
-│   │   ├── logo_design.dat
-│   │   ├── logo_design.hash
-│   │   └── ui_mockup.dat
-│   └── projects_metadata.json         # Project information and metadata
-└── User/
-    ├── config.dat                     # User configuration
-    └── apps.dat                       # Tracked applications list
-```
-
-### Project Structure Diagram
-
-```mermaid
-graph TD
-    A[AppUsageGUI Application] --> B[Sessions Directory]
-    A --> C[Projects Directory]
-    
-    B --> B1[Session 1]
-    B --> B2[Session 2]
-    B --> B3[Session N...]
-    
-    C --> D[Web Development]
-    C --> E[Design Projects]
-    C --> F[Other Projects...]
-    
-    D --> D1[Frontend Work]
-    D --> D2[Backend API]
-    D --> D3[Database Design]
-    
-    E --> E1[Logo Design]
-    E --> E2[UI Mockup]
-    E --> E3[Brand Guidelines]
-    
-    B1 --> B1A[session1.dat]
-    B1 --> B1B[session1.hash]
-    
-    D1 --> D1A[frontend_work.dat]
-    D1 --> D1B[frontend_work.hash]
-    
-    style A fill:#e1f5fe
-    style B fill:#fff3e0
-    style C fill:#f3e5f5
-    style D fill:#e8f5e8
-    style E fill:#fce4ec
-```
-
 ### Key Concepts
 
 - **Projects**: Top-level containers that group related sessions together, stored in the `Projects/` directory
@@ -126,23 +61,6 @@ graph TD
 - **Session Files**: Each session consists of a `.dat` file (data) and `.hash` file (integrity check)
 - **Metadata**: Project information is stored in `projects_metadata.json` including creation dates and session counts
 
-### Session Data Structure
-
-Each session file contains comprehensive tracking information:
-
-```python
-{
-    'app_name': 'Visual Studio Code',           # Application being tracked
-    'time_spent': 7200.5,                      # Total time in seconds
-    'session_version': '2.0.0',                # App version when created
-    'config': {...},                           # Tracking configuration
-    'time_captures': [...],                    # Detailed time capture data
-    'project_name': 'Web Development',         # Project this session belongs to
-    'created_date': '2024-01-15T10:30:00',    # When session was created
-    'last_modified': '2024-01-15T12:30:00'    # Last modification time
-}
-```
-
 ## Features
 
 - **Project Management**: Organize sessions into projects for organization and management
@@ -177,57 +95,3 @@ The application now uses a streamlined workflow where users select their project
 ### Continuing Existing Sessions
 - **Main Menu** → "Continue previous session" → Navigate through projects to find and resume sessions
 - Sessions can be continued across application restarts with full state preservation
-
-## Code Structure
-
-### Core Application Files
-
-- **`src/main.py`** - Application entry point that initializes the Tkinter root window, applies dark mode theming, sets up the application icon, and launches the splash screen
-- **`src/_version.py`** - Contains the application version number
-- **`src/_path.py`** - Handles resource path resolution for bundled applications
-
-### Core Logic (`src/core/`)
-
-#### Main Controllers
-- **`gui_root.py`** - Main GUI controller that manages the application's window system, initializes all screens, and handles navigation between different windows
-- **`logic_root.py`** - Central logic controller that coordinates all tracking components (AppTracker, TimeTracker, FileHandler, ProjectHandler, MouseTracker)
-
-#### Logic Components (`src/core/logic/`)
-- **`app_tracker.py`** - Monitors running processes using psutil, filters GUI applications from background processes, and maintains lists of available applications for tracking
-- **`time_tracker.py`** - Implements precise time tracking with pause/resume functionality, runs in a separate thread for accuracy, and captures timing data for analysis
-- **`file_handler.py`** - Manages session data persistence, handles file I/O operations with pickle serialization, and implements data integrity checking using hash verification
-- **`project_handler.py`** - Manages project creation, deletion, and organization, handles project metadata and session counts
-- **`user_trackers.py`** - Contains additional tracking modules like MouseTracker for user activity monitoring and ResolveProjectTracker for specific application integration
-
-#### User Interface (`src/core/screens/`)
-- **`main_window.py`** - Main menu screen providing options to start new sessions, manage projects, continue previous sessions, or configure settings
-- **`projects_window.py`** - Project management interface for viewing, creating, and deleting projects with session counts and total time
-- **`create_project_window.py`** - Project creation dialog with name validation and project setup
-- **`project_sessions_window.py`** - Project-specific session management interface for viewing and managing sessions within a project
-- **`create_session_window.py`** - Session creation dialog with project selection, name validation, and session setup
-- **`select_app_window.py`** - Application selection interface with search functionality and real-time app list updates
-- **`tracker_window.py`** - Active tracking display showing elapsed time, pause/resume controls, and stop functionality
-- **`sessions_window.py`** - Global session management interface for loading, analyzing, and deleting saved sessions across all projects
-- **`save_window.py`** - Session saving interface with data confirmation
-- **`session_total_window.py`** - Session summary display showing total tracked time and statistics
-- **`tracker_settings_window.py`** - Configuration interface for custom tracking rules and application filtering
-- **`splash_screen.py`** - Application startup splash screen with loading animation
-
-#### Utilities (`src/core/utils/`)
-- **`file_utils.py`** - File system operations, directory management, session file handling, project directory management, and data integrity functions
-- **`time_utils.py`** - Time formatting utilities for displaying elapsed time in human-readable format
-- **`logic_utils.py`** - Threading utilities and decorators for running functions in separate threads
-- **`tk_utils.py`** - Tkinter-specific utilities including window centering and dark mode detection
-
-### Resources (`src/core/resources/`)
-- **`icon.ico`** / **`icon.icns`** - Application icons for Windows and macOS respectively
-- **`icon-resources/`** - Source files for application icons
-
-### Development and Build Files
-- **`setup.py`** - Python package configuration and installation setup
-- **`build.py`** - Build script for creating distributable packages
-- **`requirements.txt`** - Python dependencies list
-- **`pytest.ini`** - Testing configuration
-- **`tests/`** - Unit tests for application components including project management and session creation workflows
-
-

dev/macos_installer.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
 # This script is used to create the installer for the macOS version of the application
-app_version='1.8.2'
+app_version='1.8.3'
 
-mv dist/AppUsageGUI.app dist/AppUsageGUI/
+plutil -replace CFBundleShortVersionString -string ${app_version} ../dist/AppUsageGUI.app/Contents/Info.plist
 
-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_v${app_version}_macOS_arm64_setup.dmg dist/
+mv ../dist/AppUsageGUI.app ../dist/AppUsageGUI/
+
+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_v${app_version}_macOS_arm64_setup.dmg ../dist/

dev/windows_installer.iss

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

docs/install_macos.md

@@ -9,13 +9,11 @@ Note: only arm-based systems are currently supported.
 * if asked to replace another folder, agree to do so
 
 ## Running on macOS:
->[!warning]
->Due to Apple's restrictions when it comes to open source applications such as ours, workarounds are needed to get AppUsageGUI to run on macOS.
 
 If you encounter the error message saying the app was not opened or was damaged, click "done" or "cancel", then enter this in your terminal:
 ```shell
 xattr -dr com.apple.quarantine /Applications/AppUsageGUI/AppUsageGUI.app
 ```
-If you mistakingly hit 'move to trash' or 'delete', repeat installation steps.
+If you mistakingly hit "move to trash" or "delete", repeat installation steps.
 
  If you continue to get error messsages, go into your security settings and allow AppUsageGUI to run on your device

src/_logging.py

@@ -39,7 +39,7 @@ def setup_logging():
     root_logger.addHandler(rotating_handler)
     root_logger.addHandler(console_handler)
 
-    cleanup_old_logs(logs_dir, backup_count=5)
+    cleanup_old_logs(logs_dir, backup_count=20)
 
     # quiet some libraries
     logging.getLogger("urllib3").setLevel(logging.WARNING)

src/_version.py

@@ -1 +1 @@
-__version__ = "1.8.2"
+__version__ = "1.8.3"

src/core/gui_root.py

@@ -8,7 +8,7 @@
 from _version import __version__ as version
 from _path import resource_path
 from _logging import get_current_log_file
-from core.utils.tk_utils import center_relative_to_parent, center
+from core.utils.tk_utils import center_relative_to_parent
 from core.utils.app_utils import new_updates, update
 
 from .screens.main_window import MainWindow
@@ -71,17 +71,15 @@ def __init__(self, parent):
         self.selected_project = None
         self.init_screens()
         self.show_frame("MainWindow")
-
-        center(self.parent, -13, -15)
-
+        
         self.parent.protocol("WM_DELETE_WINDOW", self.on_close)
 
     def setup_options(self):
         """Configure Options (About, License, etc.). Uses a Tk Menu for cross-platform behaviour.
            On macOS we also register the platform hooks so items appear in the native App menu."""
 
         if self.parent.tk.call("tk", "windowingsystem") == "aqua":
-            self.parent.createcommand("tk::mac::ShowAbout", self.show_about)
+            self.parent.createcommand("tk::mac::standardAboutPanel", self.show_about)
             self.parent.createcommand("tk::mac::ShowPreferences", self.show_license)
             self.parent.createcommand("tk::mac::Quit", self.on_close)
             menubar = tk.Menu(self.parent)
@@ -107,7 +105,7 @@ def fallback_buttons():
                 # Map standard mac menu actions to our callbacks
                 # "tk::mac::ShowAbout" -> About
                 # "tk::mac::ShowPreferences" -> Preferences (we map to License here)
-                self.parent.createcommand("tk::mac::ShowAbout", self.show_about)
+                self.parent.createcommand("tk::mac::standardAboutPanel", self.show_about)
                 self.parent.createcommand("tk::mac::ShowPreferences", self.show_license)
             except Exception:
                 # If anything goes wrong, fall back to having the menu (it's already set above)
@@ -195,7 +193,7 @@ def update_and_check(self, _=None):
             messagebox.showinfo("Update", "No new updates available.")
 
     def show_logs(self, _=None):
-        """Display live-updating logs in a scrollable window with fixed footer buttons."""
+        """Display logs in a scrollable window with fixed footer buttons."""
         # Prevent duplicate windows
         if hasattr(self, "log_window") and self.log_window and self.log_window.winfo_exists():
             self.log_window.lift()
@@ -426,4 +424,4 @@ def on_close(self):
             self.logic.mouse_tracker.stop()
 
         # Destroy the root window
-        self.parent.destroy()
+        self.parent.destroy()

src/core/logic/app_tracker.py

@@ -1,3 +1,7 @@
+"""
+App Tracking logic class. Used for app tracking, filtering, and listing.
+"""
+
 import threading
 import os
 import psutil # type: ignore
@@ -64,7 +68,7 @@ def _fetch_app_names(self):
                     apps.append(app_name)
                     seen_names.append(app_name)
                     if app_name == self.selected_app:
-                        #print(f"Selected app found: {app_name}")  # Debugging line
+                        logger.debug(f"Seleced App found: {app_name}")
                         break
                     #print(app_name)  # Debugging line to help optimize
             except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
@@ -176,9 +180,9 @@ def _has_gui(self, process_id):
                 for app in apps:
                     if app.processIdentifier() == process_id:
                         return True
-                if app.processIdentifier() is None:
-                    # Handle the case where the process is not found
-                    return True
+                    elif app.processIdentifier() is None:
+                        # Handle the case where the process is not found
+                        return True
                 return False
             except Exception as e:
                 logger.error(f"GUI check error: {e}")

src/core/logic/file_handler.py

@@ -32,6 +32,7 @@ def __init__(self, parent, logic_controller):
         self.continuing_session = False
         self.continuing_tracker = False
         self.corrupt_sessions = []
+        self.session_names = []
 
     def save_session_data(self, data):
         """Special function to save and hash session data"""
@@ -100,6 +101,7 @@ def load_session_data(self, filename, project_name=None):
                             self.current_project = saved_project # Set to saved project
                         else:
                             self.current_project = None # No project
+                    self.session_names.append(self.file_name)
                 else:
                     self.corrupt_sessions.append((filename, "Hash mismatch"))
                     self.data = None
@@ -144,6 +146,9 @@ def set_file_name(self, file_name):
     def get_file_name(self):
         return self.file_name
 
+    def get_session_names(self):
+        return self.session_names
+
     def set_continuing_session(self, continuation=bool):
         self.continuing_session = continuation
         if continuation:
@@ -245,4 +250,4 @@ def move_session_to_project(self, session_name, current_project, target_project)
 
         except Exception as e:
             logger.error(f"Error moving session {session_name}: {e}")
-            return False
+            return False

src/core/logic/user_trackers.py

@@ -88,17 +88,3 @@ def is_pausing(self):
     def is_enabled(self):
         return self.enabled
 
-class ResolveProjectTracker:
-    """Tracks if the user is in a specified DaVinci Resolve project or not"""
-    def __init__(self, parent, logic_controller):
-        self.parent = parent
-        self.logic = logic_controller
-        self.paused = False
-        self.project_name = None
-        self.project_open = False
-        self.stop_event = threading.Event()  # Used to stop the thread gracefully
-        try:
-            self.enabled = read_file(config_file())["resolve_tracker_enabled"]
-        except FileNotFoundError or KeyError: #! KeyError for dev
-            self.enabled = False  # Default value
-        self.update_thread = threading.Thread(target=self._update_project_status)