Merge pull request #26 from perryrh0dan/dev

Dev

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",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@perryrh0dan/taskline",
   "productName": "Taskline",
-  "version": "1.3.4",
+  "version": "1.4.0",
   "description": "Tasks, boards & notes for the command-line habitat",
   "repository": "https://github.com/perryrh0dan/taskline",
   "license": "MIT",

readme.md

@@ -74,6 +74,7 @@ Come over to [Gitter](https://gitter.im/taskline/community?source=orgpage) or [T
 - Possibility to cancel tasks
 - Possibility to rearrange item ids
 - Timetracking for tasks
+- Multilanguage support
 
 ### Coming
 
@@ -602,7 +603,17 @@ Run the build script from '/scripts/build.sh'
 
 ### Publish
 
-After 
+#### Npm
+
+100% automated;
+
+#### Snapcraft
+
+``` bash
+snapcraft login
+
+snapcraft push --release=stable taskline_1.3.4_multi.snap
+```
 
 ## Team
 
@@ -611,3 +622,5 @@ After
 ## License
 
 [MIT](https://github.com/perryrh0dan/taskline/blob/master/license.md)
+
+This repository was generated by [charon](https://github.com/perryrh0dan/charon)

snapcraft.sh renamed to scripts/snapcraft.sh

@@ -1,8 +1,9 @@
 #!/bin/bash
 set -e #stop on error
+echo 'Build Snap Package...'
 
 # Check if temp already exists if yes delete
-bash -c '[ -d temp ] && rm -r temp'
+if [ -d temp ]; then rm -r temp; fi;
 
 # Creating a temp directory for the build and navigate in
 echo 'Creating temp directory'
@@ -57,7 +58,8 @@ rm ./gulpfile.js
 
 # Build Snap
 echo 'Build snap'
-sudo snapcraft cleanbuild
+sudo snapcraft clean
+sudo snapcraft
 
 # Copy snap to main directory
 echo 'Copy snap to main directory'
@@ -68,5 +70,5 @@ find ./ -iname '*.snap' -exec cp {} ../ \;
 # Navigate out and delete temp directory
 echo 'Delete temp directory'
 cd ..
-sudo rm -r ./temp
+# sudo rm -r ./temp
 

snapcraft.yaml

@@ -1,5 +1,5 @@
 name: taskline
-version: '1.3.4'
+version: '1.4.0'
 summary: Tasks, boards & notes for the command-line habitat
 description: |
   By utilizing a simple and minimal usage syntax, that requires a flat learning curve, Taskline enables you
@@ -24,12 +24,13 @@ description: |
   * Multiple storage modules.
   * Save date on your local machine at `~/.taskline/storage` or
   * Use the firestore module to sync your tasks across all your devices.
+  * Timetracking for tasks
+  * Multilanguage support
   * Lightweight & fast
-  * Data written atomically to storage
+  * Data written automically to storage
   * Custom storage location
   * Progress overview
   * Simple & minimal usage syntax
-  * Update notifications
   * Configurable through `~/.taskline.json`
 
   More informations under https://github.com/perryrh0dan/taskline.
@@ -42,6 +43,13 @@ architectures:
   - amd64
   - i386
 
+parts:
+  taskline:
+    plugin: nodejs
+    nodejs-version: 12.16.1
+    nodejs-package-manager: npm
+    source: .
+
 apps:
   taskline:
     command: tl
@@ -50,10 +58,3 @@ apps:
       - network
       - network-control
       - x11
-
-parts:
-  taskline:
-    plugin: nodejs
-    node-engine: 12.16.1
-    node-package-manager: npm
-    source: .

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()
     );