3.14.2

don't notify if exact log item is running.
MayGo · May 26, 2020 · b9a5691 · b9a5691
1 parent 2fa85b2
commit b9a5691
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 16 deletions.
diff --git a/electron/app/config.ts b/electron/app/config.ts
@@ -9,7 +9,7 @@ let root = path.join(__dirname, '..');
 let client = isDevelopment ? path.join(root, '..', 'client', 'build') : path.join(root, 'dist');
 // Load real data even when in development
 
-let useRealDataInDev = true;
+let useRealDataInDev = false;
 let userDir =
     isDevelopment && useRealDataInDev
         ? `/Users/${OS.userInfo().username}/Library/Application Support/Tockler`

diff --git a/electron/app/task-analyser.ts b/electron/app/task-analyser.ts
@@ -4,6 +4,7 @@ import { settingsService } from './services/settings-service';
 import { TrackItemType } from './enums/track-item-type';
 import { showNotification } from './notification';
 import * as randomcolor from 'randomcolor';
+import { stateManager } from './state-manager';
 export interface TrackItemRaw {
     app?: string;
     taskName?: TrackItemType;
@@ -69,20 +70,27 @@ export class TaskAnalyser {
                 let title = this.findFirst(item.title, patObj.takeTitle) || item.title;
                 let app = this.findFirst(item.title, patObj.takeGroup) || foundStr;
 
-                this.newItem = {
-                    app: app,
-                    title: title,
-                    taskName: TrackItemType.LogTrackItem,
-                    beginDate: new Date(),
-                    endDate: new Date(),
-                    color: randomcolor(),
-                };
-                showNotification({
-                    body: `Click to create: "${app} - ${title}"`,
-                    title: 'Create new task?',
-                    onClick: this.onNotificationClick,
-                    silent: true,
-                });
+                const runningItem = stateManager.getLogTrackItemMarkedAsRunning();
+
+                const sameItem =
+                    runningItem && runningItem.app == app && runningItem.title === title;
+
+                if (!sameItem) {
+                    this.newItem = {
+                        app: app,
+                        title: title,
+                        taskName: TrackItemType.LogTrackItem,
+                        beginDate: new Date(),
+                        endDate: new Date(),
+                        color: randomcolor(),
+                    };
+                    showNotification({
+                        body: `Click to create: "${app} - ${title}"`,
+                        title: 'Create new task?',
+                        onClick: this.onNotificationClick,
+                        silent: true,
+                    });
+                }
             }
         } catch (e) {
             logger.error('analyseAndNotify:', e);

diff --git a/electron/package.json b/electron/package.json
@@ -1,6 +1,6 @@
 {
     "name": "tockler",
-    "version": "3.14.1",
+    "version": "3.14.2",
     "description": "Automatically track applications usage and working time",
     "author": "Maigo Erit <[email protected]>",
     "license": "GPL-2.0",