fix(task): fixed critical bugs in calculation and storage

Author: perryrh0dan

.vscode/launch.json

@@ -10,7 +10,7 @@
             "request": "launch",
             "name": "Launch Program",
             "program": "${workspaceFolder}/dist/cli.js",
-            "args": ["l", "canceled"]
+            "args": ["b", "2"]
         },
         {
           "type": "node",

readme.md

@@ -615,7 +615,6 @@ snapcraft login
 snapcraft push --release=stable taskline_1.3.4_multi.snap
 ```
 
-
 ## Team
 
 - Thomas Pöhlmann [(@perryrh0dan)](https://github.com/perryrh0dan)

src/renderer.ts

@@ -315,7 +315,7 @@ export class Renderer {
 
     let passedTime;
     if (item instanceof Task && item.passedTime > 0) {
-      passedTime = this.getPassedTime(item.passedTime);
+      passedTime = this.getPassedTime(item.getRealPassedTime());
     }
 
     const star = this.getStar(item);

src/task.ts

@@ -79,28 +79,36 @@ export class Task extends Item {
   }
 
   public get passedTime(): number {
-    if(this._lastStartTime != 0) {
-      return this._passedTime + (new Date().getTime() - this._lastStartTime);
-    }
     return this._passedTime;
   }
 
+  public getRealPassedTime(): number {
+    if(this.lastStartTime != 0) {
+      return this.passedTime + (new Date().getTime() - this.lastStartTime);
+    }
+    return this.passedTime;
+  }
+
   public get lastStartTime(): number {
     return this._lastStartTime;
   }
 
   public begin(): void {
+    debugger;
     const now: Date = new Date();
 
     // check if task is started or paused
     if(this.inProgress == true) {
-      this._passedTime += now.getTime() - this._lastStartTime;
+      // just for backwards compatibility
+      if (this.lastStartTime != 0) {
+        this._passedTime += now.getTime() - this.lastStartTime;
+      }
       this._lastStartTime = 0;
     } else {
       this._lastStartTime = now.getTime();
     }
 
-    this.inProgress = !this._inProgress;
+    this.inProgress = !this.inProgress;
     this.isComplete = false;
     this.isCanceled = false;
   }
@@ -109,7 +117,10 @@ export class Task extends Item {
     const now: Date = new Date();
 
     if(this.inProgress == true) {
-      this._passedTime += now.getTime() - this._lastStartTime;
+      // just for backwards compatibility
+      if (this.lastStartTime != 0) {
+        this._passedTime += now.getTime() - this.lastStartTime;
+      }
       this._lastStartTime = 0;
     }
 
@@ -122,7 +133,10 @@ export class Task extends Item {
     const now: Date = new Date();
 
     if(this.inProgress == true) {
-      this._passedTime += now.getTime() - this._lastStartTime;
+      // just for backwards compatibility
+      if (this.lastStartTime != 0) {
+        this._passedTime += now.getTime() - this.lastStartTime;
+      }
       this._lastStartTime = 0;
     }
 

test/begin.spec.ts

@@ -64,49 +64,74 @@ describe('Test begin functionality', () => {
 
   it('should begin one task', async() => {
     const now = new Date();
+    const oldData: Array<Item> = await helper.getData([2]);
+    const oldTask: Task = oldData[0] as Task;
+
     await taskline.beginTasks('2');
+
     const data: Array<Item> = await helper.getData([2]);
-    expect((data[0] as Task).inProgress).toBe(true);
-    expect((data[0] as Task).isCanceled).toBe(false);
-    expect((data[0] as Task).isComplete).toBe(false);
-    expect((data[0] as Task).lastStartTime).toBeGreaterThan(now.getTime());
+    const task: Task = data[0] as Task;
+
+    expect(task.inProgress).toBe(true);
+    expect(task.isCanceled).toBe(false);
+    expect(task.isComplete).toBe(false);
+    expect(task.lastStartTime).toBeGreaterThan(now.getTime());
+    expect(task.passedTime).toBe(oldTask.passedTime);
   });
 
   it('should pause one task', async() => {
+    const now = new Date();
+    const oldData: Array<Item> = await helper.getData([2]);
+    const oldTask: Task = oldData[0] as Task;
+
     await taskline.beginTasks('2');
+
     const data: Array<Item> = await helper.getData([2]);
-    expect((data[0] as Task).inProgress).toBe(false);
-    expect((data[0] as Task).isCanceled).toBe(false);
-    expect((data[0] as Task).isComplete).toBe(false);
-    expect((data[0] as Task).passedTime).toBeGreaterThan(0);
-    expect((data[0] as Task).lastStartTime).toBe(0);
+    const task: Task = data[0] as Task;
+
+    expect(task.inProgress).toBe(false);
+    expect(task.isCanceled).toBe(false);
+    expect(task.isComplete).toBe(false);
+    expect(task.passedTime).toBeGreaterThanOrEqual(oldTask.passedTime + now.getTime() - oldTask.lastStartTime);
+    expect(task.lastStartTime).toBe(0);
   });
 
   it('should continue one task', async() => {
     const now = new Date();
+    const oldData: Array<Item> = await helper.getData([2]);
+    const oldTask: Task = oldData[0] as Task;
+
     await taskline.beginTasks('2');
+
     const data: Array<Item> = await helper.getData([2]);
-    expect((data[0] as Task).inProgress).toBe(true);
-    expect((data[0] as Task).isCanceled).toBe(false);
-    expect((data[0] as Task).isComplete).toBe(false);
-    expect((data[0] as Task).passedTime).toBeGreaterThan(0);
-    expect((data[0] as Task).lastStartTime).toBeGreaterThanOrEqual(
+    const task: Task = data[0] as Task;
+
+    expect(task.inProgress).toBe(true);
+    expect(task.isCanceled).toBe(false);
+    expect(task.isComplete).toBe(false);
+    expect(task.passedTime).toBe(oldTask.passedTime);
+    expect(task.lastStartTime).toBeGreaterThanOrEqual(
       now.getTime()
     );
   });
 
   it('should begin multiple tasks', async() => {
     const now = new Date();
+    const oldData: Array<Item> = await helper.getData([2, 3]);
+
     await taskline.beginTasks('2,3');
+
     const data: Array<Item> = await helper.getData([2, 3]);
+
     expect((data[0] as Task).inProgress).toBe(false);
     expect((data[0] as Task).isCanceled).toBe(false);
     expect((data[0] as Task).isComplete).toBe(false);
-    expect((data[0] as Task).passedTime).toBeGreaterThan(0);
+    expect((data[0] as Task).passedTime).toBeGreaterThanOrEqual((oldData[0] as Task).passedTime + now.getTime() - (oldData[0] as Task).lastStartTime);
     expect((data[0] as Task).lastStartTime).toBe(0);
     expect((data[1] as Task).inProgress).toBe(true);
     expect((data[1] as Task).isCanceled).toBe(false);
     expect((data[1] as Task).isComplete).toBe(false);
+    expect((data[1] as Task).passedTime).toBe((oldData[1] as Task).passedTime);
     expect((data[1] as Task).lastStartTime).toBeGreaterThanOrEqual(
       now.getTime()
     );