merge for 1.7.0

README.md

@@ -1,11 +1,11 @@
-![version](https://img.shields.io/badge/Version-1.6.0-white.svg)
+![version](https://img.shields.io/badge/Version-1.7.0-white.svg)
 ![license](https://img.shields.io/badge/License-GPL%20v3-blue.svg)
-![python](https://img.shields.io/badge/Python-3.12-green.svg)
+![python](https://img.shields.io/badge/Python-3.13-green.svg)
 
 # AppUsageGUI
 ### Application Runtime Tracker
 
-This program tracks the runtime of specified applications, organizing sessions into projects for better management. Users can create multiple projects, each containing multiple tracking sessions, providing comprehensive time tracking and organization capabilities.
+This program tracks the runtime of specified applications, organizing sessions into projects. Users can create multiple projects, each containing multiple tracking sessions, providing comprehensive time tracking and data analysis.
 
 ## Installation
 
@@ -18,24 +18,25 @@ To install, follow the instructions for your platform found here:
 ### Contributions are welcome and needed! Here is a TODO list:
 
 * Add integrations with professional applications
-* Optimize everything
-* Add support for tracking more than one executable per session
+* Detach the GIL for windows version
 * Add a better way to filter out non-GUI apps on macOS
 * Full linux support with packages
 
+NOTE: GIL is detached for the macOS build; use Python 3.13.7t
+
 ## How It Works
 
 AppUsageGUI is a cross-platform desktop application built with Python and Tkinter that monitors application usage time with project-based organization. The application works by:
 
 1. **Project Organization**: Users create projects to organize related tracking sessions, with each project containing multiple sessions
-2. **Session Creation**: Before tracking begins, users select a project and name their session, establishing clear organization upfront
+2. **Session Creation**: Before tracking begins, users select a project and name their session
 3. **Process Monitoring**: Uses the `psutil` library to detect running applications and monitor their process status
 4. **Time Tracking**: Implements a precise time tracker that runs in a separate thread, capable of pausing and resuming
 5. **Session Management**: Creates named sessions within projects that can be saved, loaded, and continued across application restarts
 6. **Data Persistence**: Saves session data with integrity checking using hash verification, organized by project directories
 7. **Cross-Platform Support**: Handles Windows and macOS differences in process detection and GUI application filtering
 
-The application follows a Model-View-Controller (MVC) architecture with separate logic and GUI components, ensuring clean separation of concerns and maintainable code.
+The application follows a Model-View-Controller (MVC) architecture with separate logic and GUI components.
 
 ## Project and Session Structure
 
@@ -128,18 +129,9 @@ Each session file contains comprehensive tracking information:
 }
 ```
 
-### Benefits of Project Organization
-
-1. **Better Organization**: Group related work sessions together
-2. **Easier Management**: Quickly find and manage sessions by project
-3. **Project Analytics**: View total time spent on specific projects
-4. **Scalability**: Handle many sessions without interface clutter
-5. **Backup & Restore**: Backup entire projects or migrate between systems
-6. **Future Extensibility**: Foundation for project-specific settings and reporting
-
 ## Features
 
-- **Project Management**: Organize sessions into projects for better organization and management
+- **Project Management**: Organize sessions into projects for organization and management
 - **Session Tracking**: Track the total runtime of any executable with named sessions
 - **Session Continuation**: Continue from previous sessions within any project
 - **User Customizable Rules**: Configure custom tracking rules and application filtering

build.py

@@ -3,7 +3,6 @@
 import shutil
 import subprocess
 import platform
-from src._version import __version__
 
 # Project details
 PROJECT_NAME = "AppUsageGUI"
@@ -31,25 +30,28 @@ def build_executable():
         windows_only_1 = ""
     else:
         run_command('set PYTHONOPTIMIZE=1')
-        windows_only_1 = '--collect-all pywinauto'
+        windows_only_1 = '--collect-submodules pywinauto'
     run_command(
         f'{python_executable} -m PyInstaller -D --clean --name {PROJECT_NAME} '
         f'--noconfirm '
-        f'--windowed --clean '
+        f'--windowed '
         f'--add-data "src/core:core" '
         f'--add-data "{icon_file}:." '
-        f'--collect-submodules core '
-        f'--collect-all psutil '
-        f'--collect-all tkinter '
-        f'--collect-all pynput '
-        f'--collect-all requests '
-        f'--collect-all PIL '
+        f'--add-data "LICENSE.txt:." '
         f'{windows_only_1} '
+        f'--collect-submodules core '
+        f'--collect-submodules psutil '
+        f'--collect-submodules tkinter '
+        f'--collect-submodules pynput '
+        f'--collect-submodules requests '
+        f'--collect-submodules PIL '
+        f'--exclude-module PIL.tests '
+        f'--exclude-module tkinter.test '
         f'--icon={icon_file} '
         f'--add-data "src/_version.py:." '
         f'--add-data "src/_path.py:." '
         f'--target-architecture {platform.machine()} '
-        f'--debug=imports {ENTRY_POINT}'
+        f'{ENTRY_POINT}'
     )
 
 def clean_up():

dev/macos_installer.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # This script is used to create the installer for the macOS version of the application
-app_version='1.6.0'
+app_version='1.7.0'
 
 mv dist/AppUsageGUI.app dist/AppUsageGUI/
 

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.6.0"
+#define MyAppVersion "1.7.0"
 #define MyAppPublisher "Adam Blair-Smith"
 #define MyAppURL "https://github.com/Adam-Color/AppUsageGUI"
 #define MyAppExeName "AppUsageGUI.exe"
-#define MyInstallerName "AppUsageGUI_v1.6.0_WINDOWS_setup"
+#define MyInstallerName "AppUsageGUI_v1.7.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.

docs/install_windows.md

@@ -1,5 +1,6 @@
 ## Windows Installation Steps:
 * download the windows setup .exe [here](https://github.com/Adam-Color/AppUsageGUI/releases/latest) (under the "assets" section)
+* ensure that the old version of AppUsageGUI is closed if you are updating
 * double-click the setup .exe to open it
 * click "More info"
 * click "Run anyway"

requirements.txt

@@ -1,5 +1,5 @@
 MouseInfo==0.1.3
-psutil==5.9.8
+psutil==7.1.0
 pynput==1.8.1
 PyGetWindow==0.0.9
 PyMsgBox==1.0.9
@@ -14,4 +14,4 @@ rubicon-objc==0.5.0
 pyinstaller==6.12.0
 requests==2.32.4
 pillow==11.3.0
-pywinauto==0.6.8; sys_platform == "win32"
+pywinauto==0.6.9; sys_platform == "win32"

src/_version.py

@@ -1 +1 @@
-__version__ = "1.6.0"
+__version__ = "1.7.0"