Merge pull request #24 from perryrh0dan/dev

Dev

Author: perryrh0dan

.vscode/launch.json

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

cli.ts

@@ -6,6 +6,7 @@ import { UpdateNotifier } from 'update-notifier';
 // END SNAPCRAFT IGNORE
 
 import { Taskline } from './src/taskline';
+import { Localization } from './src/localization';
 import logger from './src/utils/logger';
 import pkg = require('./package.json');
 const taskline = new Taskline();
@@ -20,91 +21,91 @@ program.name('tl').usage('[command] [options]');
 program
   .command('archive')
   .alias('a')
-  .description('Display archived items')
+  .description(Localization.instance.get('help.archive'))
   .action(() => {
     taskline.displayArchive().catch(() => {});
   });
 
 program
   .command('begin <ids>')
   .alias('b')
-  .description('Start/pause task')
+  .description(Localization.instance.get('help.begin'))
   .action(ids => {
     taskline.beginTasks(ids).catch(() => {});
   });
 
 program
   .command('cancel <ids>')
-  .description('Cancel/revive task')
+  .description(Localization.instance.get('help.cancel'))
   .action(ids => {
     taskline.cancelTasks(ids).catch(() => {});
   });
 
 program
   .command('check <ids>')
   .alias('c')
-  .description('Check/uncheck task')
+  .description(Localization.instance.get('help.check'))
   .action(ids => {
     taskline.checkTasks(ids).catch(() => {});
   });
 
 program
   .command('clear')
-  .description('Delete all checked items')
+  .description(Localization.instance.get('help.clear'))
   .action(() => {
     taskline.clear().catch(() => {});
   });
 
 program
   .command('config')
-  .description('Display active config')
+  .description(Localization.instance.get('help.config'))
   .action(() => {
     taskline.displayConfig();
   });
 
 program
   .command('copy <ids>')
   .alias('y')
-  .description('Copy description to clipboard')
+  .description(Localization.instance.get('help.copy'))
   .action(ids => {
     taskline.copyToClipboard(ids).catch(() => {});
   });
 
 program
   .command('delete <ids>')
   .alias('d')
-  .description('Delete item')
+  .description(Localization.instance.get('help.delete'))
   .action(ids => {
     taskline.deleteItems(ids).catch(() => {});
   });
 
 program
   .command('due <ids> <dueDate>')
-  .description('Update duedateof task')
+  .description(Localization.instance.get('help.due'))
   .action((ids, dueDate) => {
     taskline.updateDueDate(ids, dueDate).catch(() => {});
   });
 
 program
   .command('edit <id> <description>')
   .alias('e')
-  .description('Edit item description')
+  .description(Localization.instance.get('help.edit'))
   .action((id, description) => {
     taskline.editDescription(id, description).catch(() => {});
   });
 
 program
   .command('find <terms>')
   .alias('f')
-  .description('Search for items')
+  .description(Localization.instance.get('help.find'))
   .action(query => {
     taskline.findItems(query).catch(() => {});
   });
 
 program
   .command('list <terms>')
   .alias('l')
-  .description('List items by attributes')
+  .description(Localization.instance.get('help.list'))
   .action(terms => {
     taskline.listByAttributes(terms).then(grouped => {
       taskline.displayStats(grouped);
@@ -114,15 +115,15 @@ program
 program
   .command('move <ids> <boards')
   .alias('m')
-  .description('Move item between boards')
+  .description(Localization.instance.get('help.move'))
   .action((ids, boards) => {
     taskline.moveBoards(ids, boards).catch(() => {});
   });
 
 program
   .command('note <description>')
   .alias('n')
-  .description('Create note')
+  .description(Localization.instance.get('help.note'))
   .option('-b, --board <board>', 'Board')
   .action((description, opts) => {
     taskline.createNote(description, opts.board).catch(() => {});
@@ -131,7 +132,7 @@ program
 program
   .command('priority <id> <priority>')
   .alias('p')
-  .description('Update priority of task')
+  .description(Localization.instance.get('help.priority'))
   .action((id, priority) => {
     taskline.updatePriority(id, priority).catch(() => {});
   });
@@ -140,23 +141,23 @@ program
   .command('restore <ids>')
 
   .alias('r')
-  .description('Restore items from archive')
+  .description(Localization.instance.get('help.restore'))
   .action(ids => {
     taskline.restoreItems(ids).catch(() => {});
   });
 
 program
   .command('star <ids>')
   .alias('s')
-  .description('Star/unstar item')
+  .description(Localization.instance.get('help.star'))
   .action(ids => {
     taskline.starItems(ids).catch(() => {});
   });
 
 program
   .command('task <description>') // Sub-command name
   .alias('t') // Alternative sub-command is `al`
-  .description('Create task') // Command description
+  .description(Localization.instance.get('help.task')) // Command description
   .option('-b, --board <board>', 'Board')
   .option('-p, --priority <priority>', 'Priority')
   .option('-d, --due <date>', 'Due date')
@@ -171,7 +172,7 @@ program
 program
   .command('timeline')
   .alias('i')
-  .description('Display timeline view')
+  .description(Localization.instance.get('help.timeline'))
   .action(() => {
     taskline.displayByDate().then(grouped => {
       taskline.displayStats(grouped);
@@ -180,7 +181,7 @@ program
 
 program
   .command('refactor')
-  .description('Rearrange the IDs of all items')
+  .description(Localization.instance.get('help.refactor'))
   .action(() => {
     taskline.refactorIDs().catch(() => {});
   });
@@ -197,7 +198,7 @@ if (process.argv.length === 2) {
 }
 
 program.on('command:*', function() {
-  console.error('Invalid command: %s\nSee --help for a list of available commands.', program.args.join(' '));
+  console.error(Localization.instance.getf('errors.invalidCommand', { params: program.args }));
   process.exit(1);
 });
 

i18n/de.json

@@ -1,5 +1,28 @@
 {
-  "help": "Tippe `tl --help` um anzufangen!",
+  "help": {
+    "default": "Benutze `--help` um anzufangen.",
+    "archive": "Archivierte Items anzeigen",
+    "begin": "Aufgabe starten/pausieren",
+    "cancel": "Aufgabe abbrechen/wiederaufnehmen",
+    "check": "Aufgabe abhaken/unabhaken",
+    "clear": "Alle abgeschlossenen Aufgaben archivieren",
+    "config": "Konfiguration anzeigen",
+    "copy": "Item in die Zwischenablage kopieren",
+    "delete": "Item löschen",
+    "due": "Fälligkeitsdatum ändern",
+    "edit": "Itembeschreibung ändern",
+    "find": "Nach Items suchen",
+    "list": "List items by attributes",
+    "move": "Items zwischen Tafeln verschieben",
+    "note": "Notiz erstellen",
+    "priority": "Priorität von Aufgabe/n updaten",
+    "restore": "Items wiederherstellen",
+    "star": "Item mit Stern markieren/unmarkieren",
+    "task": "Aufgabe erstellen",
+    "timeline": "Zeitleistenansicht",
+    "refactor": "ID Bereich aller Items zurücksetzen",
+    "footer": "Detaillierte Beschreibung auf: https://github.com/perryrh0dan/taskline#flight-manual"
+  },
   "config": {
     "path": "Konfiguration geladen aus {0}",
     "title": "Konfiguration"
@@ -28,7 +51,7 @@
     }
   },
   "errors": {
-
+    "invalidCommand": "Ungültiger Befehl: {0}\nÖffne --help für eine detaillierte Liste aller Befehle."
   },
   "stats": {
     "allDone": "Alles erledigt!",

i18n/en.json

@@ -1,5 +1,28 @@
 {
-  "help": "Type `tl --help` to get started!",
+  "help": {
+    "default": "Type `tl --help` to get started!",
+    "archive": "Display archived items",
+    "begin": "Start/pause task",
+    "cancel": "Cancel/revive task",
+    "check": "Check/uncheck task",
+    "clear": "Delete all checked items",
+    "config": "Display active config",
+    "copy": "Copy description to clipboard",
+    "delete": "Delete item",
+    "due": "Update duedate of task",
+    "edit": "Edit item description",
+    "find": "Search for items",
+    "list": "List items by attributes",
+    "move": "Move item between boards",
+    "note": "Create note",
+    "priority": "Update priority of task",
+    "restore": "Restore items from archive",
+    "star": "Star/unstar item",
+    "task": "Create task",
+    "timeline": "Display timeline view",
+    "refactor": "Rearrange the IDs of all items",
+    "footer": "Detailed description under: https://github.com/perryrh0dan/taskline#flight-manual"
+  },
   "config": {
     "path": "Config loaded from {0}",
     "title": "Configuration"
@@ -28,7 +51,7 @@
     }
   },
   "errors": {
-
+    "invalidCommand": "Invalid command: {0}\nSee --help for a list of available commands."
   },
   "stats": {
     "allDone": "All done!",

i18n/es.json

@@ -1,5 +1,7 @@
 {
-  "help": "Escriba `tl --help` para comenzar.",
+  "help": {
+    "default": "Escriba `tl --help` para comenzar."
+  },
   "config": {
     "path": "Configuracion cargada de {0}",
     "title": "Configuracion"

src/item.ts

@@ -1,5 +1,3 @@
-const now: Date = new Date();
-
 export interface ItemProperties {
   id: number;
   date?: string;
@@ -19,6 +17,8 @@ export abstract class Item {
   protected _boards: Array<string>;
 
   public constructor(kwArgs: ItemProperties) {
+    const now: Date = new Date();
+
     this.id = kwArgs.id;
     this.date = kwArgs.date || now.toDateString();
     this.timestamp = kwArgs.timestamp || now.getTime();

src/libs/date.ts

@@ -194,10 +194,8 @@ export const getRelativeHumanizedDate = function(dueDate: Date, now?: Date): str
   }
 
   const absValue = Math.abs(value);
-  debugger;
   unit = Localization.instance.get('date.units.' + unit, { type: absValue === 1 ? 0 : 1 });
   const humanizedDate = value >= 1 ? `${value} ${unit}` : `${absValue} ${unit}`;
-  debugger;
   const humanizedRelativeDate = value >= 1 ? Localization.instance.getf('date.due_in', { params: [humanizedDate] }) : Localization.instance.getf('date.due_ago', { params: [humanizedDate] });
   return humanizedRelativeDate;
 };

src/localization.ts

@@ -36,7 +36,6 @@ export class Localization {
       }
       this.default = this.load('en');
     } catch (error) {
-      debugger;
       Renderer.instance.invalidLanguageFile();
       process.exit(1);
     }

src/renderer.ts

@@ -191,6 +191,14 @@ export class Renderer {
     return this.printColor('pale', text);
   }
 
+  private getPassedTime(passedTime: number): string {
+    const seconds = passedTime / 1000;
+    const minutes = Math.floor((seconds / 60) % 60);
+    const hours = Math.floor(seconds / 3600);
+
+    return `${hours + Math.round(minutes/60 * 100) / 100} hours`;
+  }
+
   private getCorrelation(items: Array<Item>): string {
     const { tasks, complete } = this.getItemStats(items);
     return this.printColor('pale', `[${complete}/${tasks}]`);
@@ -305,6 +313,11 @@ export class Renderer {
       dueDate = this.getDueDate(item.dueDate);
     }
 
+    let passedTime;
+    if (item instanceof Task && item.passedTime > 0) {
+      passedTime = this.getPassedTime(item.passedTime);
+    }
+
     const star = this.getStar(item);
 
     const prefix = this.buildPrefix(item);
@@ -316,6 +329,12 @@ export class Renderer {
       suffix = age.length === 0 ? star : `${age} ${star}`;
     }
 
+    if (passedTime) {
+      suffix += ` (${passedTime})`;
+    }
+
+    suffix = suffix.replace('  ', ' ');
+
     const msgObj = {
       prefix,
       message,
@@ -428,12 +447,8 @@ export class Renderer {
       });
     }
 
-    if (pending + inProgress + complete + notes === 0) {
-      this.signale.log({
-        prefix: '\n ',
-        message: Localization.instance.get('help'),
-        suffix: this.printColor('icons.star', '★')
-      });
+    if (pending + inProgress + canceled + complete + notes === 0) {
+      return console.log(Localization.instance.get('help.default'));
     }
 
     this.signale.log({