Merge branch 'feature/out-of-focus-timeout' into develop

Author: twentyTwo

README.md

@@ -25,6 +25,7 @@ Simple Coding Time Tracker is a powerful extension for Visual Studio Code that h
 - **Configurable Settings**: 
   - Save Interval: Customize how often your coding time data is saved (default: 5 seconds)
   - Inactivity Timeout: Set how long to wait before stopping the timer when no activity is detected (default: 5 minutes)
+   - Focus Timeout: Set how long to continue tracking after VS Code loses focus (default: 60 seconds)
 
 ## Installation
 

package.json

@@ -19,16 +19,19 @@
   "contributes": {
     "configuration": {
       "title": "Simple Coding Time Tracker",
-      "properties": {
-        "simpleCodingTimeTracker.saveInterval": {
+      "properties": {        "simpleCodingTimeTracker.saveInterval": {
           "type": "number",
           "default": 5,
-          "description": "Interval in seconds to save the current coding session"
+          "description": "How often to save coding time data (in seconds)"
+        },        "simpleCodingTimeTracker.inactivityTimeout": {
+          "type": "number",
+          "default": 150,
+          "description": "Stop tracking after no keyboard/mouse activity (in seconds)"
         },
-        "simpleCodingTimeTracker.inactivityTimeout": {
+        "simpleCodingTimeTracker.focusTimeout": {
           "type": "number",
-          "default": 300,
-          "description": "Time in seconds of inactivity before tracking stops (default: 300 seconds = 5 minutes)"
+          "default": 180,
+          "description": "Continue tracking when switching apps (in seconds)"
         }
       }
     },

src/extension.ts

@@ -17,6 +17,15 @@ export function activate(context: vscode.ExtensionContext) {
         })
     );
 
+    // Register configuration change listener
+    context.subscriptions.push(
+        vscode.workspace.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration('simpleCodingTimeTracker')) {
+                timeTracker.updateConfiguration();
+            }
+        })
+    );
+
     // Register the existing command
     let disposable = vscode.commands.registerCommand('simpleCodingTimeTracker.showSummary', () => {
         summaryView.show();

src/timeTracker.ts

@@ -7,17 +7,16 @@ export class TimeTracker implements vscode.Disposable {
     private currentProject: string = '';
     private database: Database;
     private updateInterval: NodeJS.Timeout | null = null;
-    private saveInterval: NodeJS.Timeout | null = null;
-    private saveIntervalSeconds: number;
+    private saveInterval: NodeJS.Timeout | null = null;    private saveIntervalSeconds: number = 5;
     private lastCursorActivity: number = Date.now();
     private cursorInactivityTimeout: NodeJS.Timeout | null = null;
-    private inactivityTimeoutSeconds: number;
+    private inactivityTimeoutSeconds: number = 300;
+    private focusTimeoutHandle: NodeJS.Timeout | null = null;
+    private focusTimeoutSeconds: number = 60;
 
     constructor(database: Database) {
         this.database = database;
-        const config = vscode.workspace.getConfiguration('simpleCodingTimeTracker');
-        this.saveIntervalSeconds = config.get('saveInterval', 5);
-        this.inactivityTimeoutSeconds = config.get('inactivityTimeout', 300); // Default 5 minutes in seconds
+        this.updateConfiguration();
 
         // Track cursor movements
         vscode.window.onDidChangeTextEditorSelection(() => {
@@ -61,11 +60,33 @@ export class TimeTracker implements vscode.Disposable {
         // Track when VS Code window gains focus
         vscode.window.onDidChangeWindowState((e) => {
             if (e.focused) {
-                this.updateCursorActivity();
+                // Clear any pending timeout when focus returns
+                if (this.focusTimeoutHandle) {
+                    clearTimeout(this.focusTimeoutHandle);
+                    this.focusTimeoutHandle = null;
+                }
+                this.startTracking();
+            } else {
+                // Set timeout when focus is lost
+                if (this.focusTimeoutHandle) {
+                    clearTimeout(this.focusTimeoutHandle);
+                }
+                this.focusTimeoutHandle = setTimeout(() => {
+                    if (this.isTracking) {
+                        this.stopTracking();
+                    }
+                }, this.focusTimeoutSeconds * 1000);
             }
         });
     }
 
+    public updateConfiguration() {
+        const config = vscode.workspace.getConfiguration('simpleCodingTimeTracker');
+        this.saveIntervalSeconds = config.get('saveInterval', 5);
+        this.inactivityTimeoutSeconds = config.get('inactivityTimeout', 300); // Default 5 minutes in seconds
+        this.focusTimeoutSeconds = config.get('focusTimeout', 60);
+    }
+
     private setupCursorTracking() {
         if (this.cursorInactivityTimeout) {
             clearTimeout(this.cursorInactivityTimeout);