X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Ftw.c;h=abc98082da4d951a24f801ee4e735f2218eb98f4;hb=8d43529da6a9a3a469b107ab07f52991e9f18e75;hp=89b2761f817ea8dc408877f1d543df51e3b41462;hpb=a751a9a7d252f971af0d4794315455938c55448f;p=ptask.git

diff --git a/src/tw.c b/src/tw.c
index 89b2761..abc9808 100644
--- a/src/tw.c
+++ b/src/tw.c
@@ -16,11 +16,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
+#define _GNU_SOURCE
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
+#include <time.h>
 
 #include <json/json.h>
 
@@ -30,6 +32,17 @@
 #include <pstr.h>
 #include "tw.h"
 
+struct tm *parse_time(const char *t)
+{
+	struct tm *tm;
+
+	tm = malloc(sizeof(struct tm));
+	memset(tm, 0, sizeof(struct tm));
+	strptime(t, "%Y%m%dT%H%M%S%Z", tm);
+
+	return tm;
+}
+
 static char *task_exec(char *opts)
 {
 	FILE *f;
@@ -150,6 +163,7 @@ struct task **tw_get_all_tasks(const char *status)
 	struct json_object *jtasks, *jtask, *json;
 	struct task **tasks;
 	char *opts;
+	const char *urg;
 
 	opts = malloc(strlen("export status:") + strlen(status) + 1);
 
@@ -197,7 +211,31 @@ struct task **tw_get_all_tasks(const char *status)
 		json = json_object_object_get(jtask, "uuid");
 		tasks[i]->uuid = strdup(json_object_get_string(json));
 
+		json = json_object_object_get(jtask, "urgency");
+		urg = json_object_get_string(json);
+		if (urg)
+			tasks[i]->urgency = strdup(urg);
+		else
+			tasks[i]->urgency = NULL;
+
 		tasks[i]->note = note_get(tasks[i]->uuid);
+
+		json = json_object_object_get(jtask, "entry");
+		tasks[i]->entry = parse_time(json_object_get_string(json));
+
+		json = json_object_object_get(jtask, "due");
+		if (json)
+			tasks[i]->due
+				= parse_time(json_object_get_string(json));
+		else
+			tasks[i]->due = NULL;
+
+		json = json_object_object_get(jtask, "start");
+		if (json)
+			tasks[i]->start
+				= parse_time(json_object_get_string(json));
+		else
+			tasks[i]->start = NULL;
 	}
 
 	tasks[n] = NULL;
@@ -359,6 +397,21 @@ void tw_done(const char *uuid)
 	free(opts);
 }
 
+void tw_task_remove(const char *uuid)
+{
+	char *opts;
+
+	opts = malloc(1
+		      + strlen(uuid)
+		      + strlen(" delete")
+		      + 1);
+	sprintf(opts, " %s delete", uuid);
+
+	tw_exec(opts);
+
+	free(opts);
+}
+
 static void task_free(struct task *task)
 {
 	if (!task)
@@ -370,6 +423,10 @@ static void task_free(struct task *task)
 	free(task->note);
 	free(task->project);
 	free(task->priority);
+	free(task->urgency);
+	free(task->entry);
+	free(task->due);
+	free(task->start);
 
 	free(task);
 }