Added 'add to project' and 'add label to task features'

Author: moranje

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### 3.0.0
+- [FEATURE] Add labels to your tasks
+- [FEATURE] Add a task to an existing project
+- [BREAKING] Changed the API
+
 ### 2.0.1
 - [FIX] Auto create missing workflow directory, thanks etaming!
 
@@ -13,13 +18,14 @@
 - [FEATURE]: Updated to Todoist API v7 
 
 ### 1.0.1
-  * [FIX] Undo bundle id change, since it's needed for updating packal
+- [FIX] Undo bundle id change, since it's needed for updating packal
 
-### 1.0.0_   * [BREAKING]: changed bundle id from `com.alfred-workflow-todoist` tot `com.moranje.alfred-workflow-todoist`
-  * [FEATURE]: Easier configuration with `todo:config {api token}, {language}, {max list items}`, see README.md for further reference
+### 1.0.0   
+- [BREAKING]: changed bundle id from `com.alfred-workflow-todoist` tot `com.moranje.alfred-workflow-todoist`
+- [FEATURE]: Easier configuration with `todo:config {api token}, {language}, {max list items}`, see README.md for further reference
 
 ### 0.6.0
-  * [FEATURE]: List tasks using `todo` and mark a task done using navigation + ENTER
+- [FEATURE]: List tasks using `todo` and mark a task done using navigation + ENTER
 
 ### 0.5.0
-  * initial release
+- initial release

README.md

@@ -1,7 +1,7 @@
 # ALFRED TODOIST WORKFLOW
-Add tasks to your [Todoist](https://todoist.com/ "Todoist") inbox or list upcoming tasks straight from [Alfred](https://www.alfredapp.com "Alfred"). I nicked the idea from [Ruben Schmidtmann](https://github.com/rubenschmidtmann "Ruben Schmidtmann")'s [todoist-alfred-workflow](https://github.com/rubenschmidtmann/todoist-alfred-workflow "todoist-alfred-workflow"), and further expanded on it. It uses Todoist `v7` API.
+Add tasks to your [Todoist](https://todoist.com/ "Todoist") inbox or list upcoming tasks straight from [Alfred](https://www.alfredapp.com "Alfred"). I nicked the idea from [Ruben Schmidtmann](https://github.com/rubenschmidtmann "Ruben Schmidtmann")'s [todoist-alfred-workflow](https://github.com/rubenschmidtmann/todoist-alfred-workflow "todoist-alfred-workflow"), and further expanded on it. It uses Todoist `v7` API. For this workflow to work you need version `3.x` of Alfred.
 
-The task listing feature relies on javascript (sorry no PHP, perl of ruby foo) which means it needs node.js to function (OSX javascript proved to be clunky for modules and file io). The task adding feature should work on any Mac OSX version.
+The task listing feature, adding project and labels to tasks relies on javascript (sorry no PHP, perl of ruby foo) which means it needs node.js to function (OSX javascript proved to be clunky for modules and file io). The task adding feature should work on any Mac OSX version.
 
 ## Installation
 [Download](https://github.com/moranje/alfred-workflow-todoist/raw/master/dist/Alfred%20Workflow%20Todoist.alfredworkflow) and import workflow.
@@ -40,25 +40,42 @@ Uninstall Homebrew (terminal): _ruby -e "$(curl -fsSL https://raw.githubusercont
 ![](https://raw.githubusercontent.com/moranje/alfred-workflow-todoist/master/images/add-task.png "Add a task to your Todoist Inbox")  
 
 **Add a task**  
-`todo {task}, {date}, {priority}`  
-Example: _todo Get milk, tomorrow @ 9, 3_  
+`todo {task}, {date}, {project}` _{priority} and {labels} can go anywhere_  
+Example: _todo Get stuff done, tomorrow @ 9, work_  
+Example: _todo Build tree house, tomorrow @ 9, home !!2_  
+Example: _todo Get milk, tomorrow @ 9, home @on_road @5min  
 
 ### Task
 Can be any string as long as there are no comma's in it. Markdown in the string will be parsed, but anything else won't.
 
 ### Date
 See the [Todoist documentation](https://support.todoist.com/hc/en-us/articles/205325931-Dates-and-Times "Todoist documentation") for supported date formats.
 
+### Project*
+Add task to an existing project. If no project is selected the task will be added to your inbox.
+
+### Labels*
+You can now add labels to your tasks. Any string that has a `@` before it will be checked against your existing labels. If it matches (case insensitive) the label will be added. The labels can be added anywhere in the todo command so these are all valid:  
+Example: _todo Get stuff done, tomorrow @ 9, work @delayed_  
+Example: _todo Get stuff done , tomorrow @ 9 @delayed, work_  
+Example: _todo Get stuff done @delayed, tomorrow @ 9, work @delayed_  
+
 ### Priority
-A number between 1 and 4, where 1 is the lowest and 4 would be the highest priority.
+A number between 1 and 4, where 1 is the lowest and 4 would be the highest priority. The priority tags can be added anywhere in the todo command so these are all valid:  
+Example: _todo Get stuff done, tomorrow @ 9, work !!2_  
+Example: _todo Get stuff done , tomorrow @ 9 !!2, work_  
+Example: _todo Get stuff done !!2, tomorrow @ 9, work_  
+
+*_Relies on node.js to work_
 
+### Hacks
 Use a comma to separate the parameters, leading or trailing whitespace is ignored. If you wish to change the delimiter with which the parameters (task, date and priority) are separated, you'll need to change a line in the bash script. For instance if you'd like to use ';' as a delimiter, change:  
 ```bash
-IFS=',' read -r -a items <<< "{query}"
+IFS=',' read -r -a items <<< "query"
 ```  
 to:    
 ```bash
-IFS=':' read -r -a items <<< "{query}"
+IFS=':' read -r -a items <<< "query"
 ```  
 
 ![](https://raw.githubusercontent.com/moranje/alfred-workflow-todoist/master/images/list-tasks.png "List your Todoist tasks ")  

dist/Alfred Workflow Todoist.alfredworkflow

@@ -51,14 +51,11 @@ var calls = {
    * Get a list of projects from Todoist.
    *
    * @author moranje <martieno@gmail.com>
+   * @param {String} name The project's name.
    * @since  2016-07-04
    * @return {Object}
    */
-  getProjects: function() {
-    var list = {
-      items: []
-    };
-
+  getProjects: function( name ) {
     todoist.getProjects( settings.token, function( res ) {
       var response = JSON.parse( res );
       var projects = {};
@@ -67,9 +64,41 @@ var calls = {
         projects[ project.name.toLowerCase() ] = project.id;
       } );
 
-      settings.projects = projects;
+      if ( name ) {
+        return echo( projects[ name ] );
+      }
+
+      return echo( projects );
+    }, function( err ) {
+      // The 'Error' suffix signals something has failed to the notification
+      // handler
+      console.log( 'Error', err );
+    } );
+  },
+
+  /**
+   * Get a list of labels from Todoist.
+   *
+   * @author moranje <martieno@gmail.com>
+   * @param {String} string The label names string.
+   * @since  2016-07-04
+   * @return {Object}
+   */
+  getLabels: function( string ) {
+    todoist.getLabels( settings.token, function( res ) {
+      var response = JSON.parse( res );
+      var names = string.split( ',' );
+      var labels = [];
+
+      response.labels.forEach( function( label, index ) {
+        names.forEach( function ( name ) {
+          if ( string && name === label.name ) {
+            labels.push( label.id );
+          }
+        });
+      } );
 
-      return echo( 'Projects updated' );
+      return echo( labels );
     }, function( err ) {
       // The 'Error' suffix signals something has failed to the notification
       // handler
@@ -81,11 +110,12 @@ var calls = {
    * Mark a todo item 'done'.
    *
    * @author moranje <martieno@gmail.com>
+   * @param {String|Number} id The task's id.
    * @since  2016-07-03
    * @return {String}
    */
-  markDone: function() {
-    todoist.markTaskDone( arg, settings.token, function( res ) {
+  markDone: function( id ) {
+    todoist.markTaskDone( id, settings.token, function( res ) {
       // Notification message.
       echo( 'Done, done and done!' );
     }, function( err ) {
@@ -111,4 +141,4 @@ function echo( response ) {
 /**
  * This returns the call to the Todoist API
  */
-calls[ call ]();
+calls[ call ]( arg );