X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Ftw.c;h=d363e4532fa1ce4737aa1a3c06b1c120a0dcfcc3;hb=e06d9acceda1d719f542a46e3718efc0571b5815;hp=30f5dcb0ba45821c7f65b162ec353e72756ac50c;hpb=3a4f20601cd297f4e7db412e377a0f649363e136;p=ptask.git

diff --git a/src/tw.c b/src/tw.c
index 30f5dcb..d363e45 100644
--- a/src/tw.c
+++ b/src/tw.c
@@ -16,19 +16,32 @@
  * 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>
+#include <json.h>
 
 #include <log.h>
 #include "note.h"
 #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;
@@ -36,6 +49,8 @@ static char *task_exec(char *opts)
 	size_t s;
 	char *str, *tmp, *cmd, buf[1024];
 
+	log_fct_enter();
+
 	cmd = malloc(strlen("task ") + strlen(opts) + 1);
 	strcpy(cmd, "task ");
 	strcat(cmd, opts);
@@ -66,6 +81,8 @@ static char *task_exec(char *opts)
 	if (ret == -1)
 		log_err("pclose fails");
 
+	log_fct_exit();
+
 	return str;
 }
 
@@ -91,7 +108,9 @@ static int task_check_version()
 
 	log_debug("task version: %s", ver);
 
-	if (!strcmp(ver, "2.2.0") || !strcmp(ver, "2.0.0"))
+	if (!strcmp(ver, "2.2.0")
+	    || !strcmp(ver, "2.0.0")
+	    || !strcmp(ver, "2.3.0"))
 		return 1;
 	else
 		return 0;
@@ -116,7 +135,7 @@ static char *tw_exec(char *opts)
 	return task_exec(opts2);
 }
 
-static struct json_object *task_exec_json(char *opts)
+static struct json_object *task_exec_json(const char *opts)
 {
 	struct json_object *o;
 	char *str, *cmd;
@@ -136,18 +155,120 @@ static struct json_object *task_exec_json(char *opts)
 
 	free(cmd);
 
+	if (o && is_error(o))
+		return NULL;
+
 	return o;
 }
 
+char **json_to_tags(struct json_object *jtask)
+{
+	struct json_object *jtags, *jtag;
+	char **tags;
+	int n, i;
+
+	jtags = json_object_object_get(jtask, "tags");
+
+	if (!jtags)
+		return NULL;
+
+
+	n = json_object_array_length(jtags);
+
+	tags = malloc((n + 1) * sizeof(char *));
+
+	for (i = 0; i < n; i++) {
+		jtag = json_object_array_get_idx(jtags, i);
+		tags[i] = strdup(json_object_get_string(jtag));
+	}
+
+	tags[n] = NULL;
+
+	return tags;
+}
+
+struct task *json_to_task(struct json_object *jtask)
+{
+	struct task *task;
+	const char *urg;
+	struct json_object *json;
+
+	task = malloc(sizeof(struct task));
+
+	json = json_object_object_get(jtask, "id");
+	task->id = json_object_get_int(json);
+
+	json = json_object_object_get(jtask, "description");
+	task->description = strdup(json_object_get_string(json));
+
+	json = json_object_object_get(jtask, "status");
+	task->status = strdup(json_object_get_string(json));
+
+	json = json_object_object_get(jtask, "project");
+	if (json)
+		task->project
+			= strdup(json_object_get_string(json));
+	else
+		task->project = strdup("");
+
+	json = json_object_object_get(jtask, "priority");
+	if (json)
+		task->priority
+			= strdup(json_object_get_string(json));
+	else
+		task->priority = strdup("");
+
+	json = json_object_object_get(jtask, "uuid");
+	task->uuid = strdup(json_object_get_string(json));
+
+	json = json_object_object_get(jtask, "urgency");
+	urg = json_object_get_string(json);
+	if (urg)
+		task->urgency = strdup(urg);
+	else
+		task->urgency = NULL;
+
+	task->note = note_get(task->uuid);
+
+	json = json_object_object_get(jtask, "entry");
+	task->entry = parse_time(json_object_get_string(json));
+
+	json = json_object_object_get(jtask, "due");
+	if (json)
+		task->due
+			= parse_time(json_object_get_string(json));
+	else
+		task->due = NULL;
+
+	json = json_object_object_get(jtask, "start");
+	if (json)
+		task->start
+			= parse_time(json_object_get_string(json));
+	else
+		task->start = NULL;
+
+	json = json_object_object_get(jtask, "recur");
+	if (json)
+		task->recur = strdup(json_object_get_string(json));
+	else
+		task->recur = NULL;
+
+	task->tags = json_to_tags(jtask);
+
+	return task;
+}
+
 struct task **tw_get_all_tasks(const char *status)
 {
 	int i, n;
-	struct json_object *jtasks, *jtask, *json;
+	struct json_object *jtasks, *jtask;
 	struct task **tasks;
 	char *opts;
 
 	opts = malloc(strlen("export status:") + strlen(status) + 1);
-	sprintf(opts, "export status:%s", status);
+
+	strcpy(opts, "export status:");
+	strcat(opts, status);
 
 	jtasks = task_exec_json(opts);
 	free(opts);
@@ -162,35 +283,7 @@ struct task **tw_get_all_tasks(const char *status)
 	for (i = 0; i < n; i++) {
 		jtask = json_object_array_get_idx(jtasks, i);
 
-		tasks[i] = malloc(sizeof(struct task));
-
-		json = json_object_object_get(jtask, "id");
-		tasks[i]->id = json_object_get_int(json);
-
-		json = json_object_object_get(jtask, "description");
-		tasks[i]->description = strdup(json_object_get_string(json));
-
-		json = json_object_object_get(jtask, "status");
-		tasks[i]->status = strdup(json_object_get_string(json));
-
-		json = json_object_object_get(jtask, "project");
-		if (json)
-			tasks[i]->project
-				= strdup(json_object_get_string(json));
-		else
-			tasks[i]->project = NULL;
-
-		json = json_object_object_get(jtask, "priority");
-		if (json)
-			tasks[i]->priority
-				= strdup(json_object_get_string(json));
-		else
-			tasks[i]->priority = strdup("");
-
-		json = json_object_object_get(jtask, "uuid");
-		tasks[i]->uuid = strdup(json_object_get_string(json));
-
-		tasks[i]->note = note_get(tasks[i]->uuid);
+		tasks[i] = json_to_task(jtask);
 	}
 
 	tasks[n] = NULL;
@@ -211,16 +304,12 @@ static char *escape(const char *txt)
 	while (*txt) {
 		switch (*txt) {
 		case '"':
-			*c = '\\'; c++;
-			*c = '"';
-			break;
 		case '$':
-			*c = '\\'; c++;
-			*c = '$';
-			break;
 		case '&':
+		case '<':
+		case '>':
 			*c = '\\'; c++;
-			*c = '&';
+			*c = *txt;
 			break;
 		default:
 			*c = *txt;
@@ -236,22 +325,18 @@ static char *escape(const char *txt)
 
 void tw_modify_description(const char *uuid, const char *newdesc)
 {
-	char *str;
 	char *opts;
 
-	str = escape(newdesc);
-
 	opts = malloc(1
 		      + strlen(uuid)
 		      + strlen(" modify :\"")
-		      + strlen(str)
+		      + strlen(newdesc)
 		      + strlen("\"")
 		      + 1);
-	sprintf(opts, " %s modify \"%s\"", uuid, str);
+	sprintf(opts, " %s modify \"%s\"", uuid, newdesc);
 
 	tw_exec(opts);
 
-	free(str);
 	free(opts);
 }
 
@@ -281,6 +366,8 @@ void tw_modify_priority(const char *uuid, const char *priority)
 	char *str;
 	char *opts;
 
+	log_fct_enter();
+
 	str = escape(priority);
 
 	opts = malloc(1
@@ -295,29 +382,55 @@ void tw_modify_priority(const char *uuid, const char *priority)
 
 	free(str);
 	free(opts);
+
+	log_fct_exit();
 }
 
-void tw_add(const char *newdesc)
+void tw_add(const char *newdesc, const char *prj, const char *prio)
 {
-	char *str;
-	char *opts;
+	char *opts, *eprj;
 
-	str = escape(newdesc);
+	log_fct_enter();
 
-	opts = malloc(1
-		      + strlen(" add \"")
-		      + strlen(str)
+	eprj = escape(prj);
+
+	opts = malloc(strlen("add")
+		      + strlen(" priority:")
+		      + 1
+		      + strlen(" project:\\\"")
+		      + strlen(eprj)
+		      + strlen("\\\"")
+		      + strlen(" \"")
+		      + strlen(newdesc)
 		      + strlen("\"")
 		      + 1);
-	sprintf(opts, " add \"%s\"", str);
+
+	strcpy(opts, "add");
+
+	if (prio && strlen(prio) == 1) {
+		strcat(opts, " priority:");
+		strcat(opts, prio);
+	}
+
+	if (eprj && strlen(prj)) {
+		strcat(opts, " project:\\\"");
+		strcat(opts, eprj);
+		strcat(opts, "\\\"");
+	}
+
+	strcat(opts, " \"");
+	strcat(opts, newdesc);
+	strcat(opts, "\"");
 
 	tw_exec(opts);
 
-	free(str);
 	free(opts);
+	free(eprj);
+
+	log_fct_exit();
 }
 
-void tw_done(const char *uuid)
+void tw_task_done(const char *uuid)
 {
 	char *opts;
 
@@ -332,8 +445,55 @@ void tw_done(const char *uuid)
 	free(opts);
 }
 
+void tw_task_start(const char *uuid)
+{
+	char *opts;
+
+	opts = malloc(1
+		      + strlen(uuid)
+		      + strlen(" start")
+		      + 1);
+	sprintf(opts, " %s start", uuid);
+
+	tw_exec(opts);
+
+	free(opts);
+}
+
+void tw_task_stop(const char *uuid)
+{
+	char *opts;
+
+	opts = malloc(1
+		      + strlen(uuid)
+		      + strlen(" stop")
+		      + 1);
+	sprintf(opts, " %s stop", uuid);
+
+	tw_exec(opts);
+
+	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)
 {
+	char **tags;
+
 	if (!task)
 		return ;
 
@@ -343,6 +503,20 @@ 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->recur);
+
+	tags = task->tags;
+	if (tags) {
+		while (*tags) {
+			free(*tags);
+			tags++;
+		}
+		free(tags);
+	}
 
 	free(task);
 }
@@ -359,3 +533,116 @@ void tw_task_list_free(struct task **tasks)
 
 	free(tasks);
 }
+
+static void project_free(struct project *p)
+{
+	if (!p)
+		return ;
+
+	free(p->name);
+	free(p);
+}
+
+void tw_project_list_free(struct project **prjs)
+{
+	struct project **cur;
+
+	if (!prjs)
+		return ;
+
+	for (cur = prjs; *cur; cur++)
+		project_free(*cur);
+
+	free(prjs);
+}
+
+static struct project *project_list_get(struct project **prjs, const char *name)
+{
+	struct project **cur;
+
+	for (cur = prjs; *cur; cur++)
+		if (!strcmp((*cur)->name, name))
+			return *cur;
+
+	return NULL;
+}
+
+static struct project *project_new(const char *name, int count)
+{
+	struct project *prj;
+
+	prj = malloc(sizeof(struct project));
+
+	prj->name = strdup(name);
+	prj->count = count;
+
+	return prj;
+}
+
+static int projects_length(struct project **list)
+{
+	int n;
+
+	if (!list)
+		return 0;
+
+	n = 0;
+	while (*list) {
+		n++;
+		list++;
+	}
+
+	return n;
+}
+
+static struct project **projects_add(struct project **list, void *item)
+{
+	int n;
+	struct project **result;
+
+	n = projects_length(list);
+
+	result = (struct project **)malloc
+		((n + 1 + 1) * sizeof(struct project *));
+
+	if (list)
+		memcpy(result, list, n * sizeof(struct project *));
+
+	result[n] = item;
+	result[n + 1] = NULL;
+
+	return result;
+}
+
+struct project **tw_get_projects(struct task **tasks)
+{
+	struct task **t_cur;
+	struct project **prjs, **tmp, *prj;
+	const char *prj_name;
+
+	log_fct_enter();
+
+	prjs = malloc(2 * sizeof(struct project *));
+	prjs[0] = project_new("ALL", 0);
+	prjs[1] = NULL;
+
+	for (t_cur = tasks; *t_cur; t_cur++) {
+		prj_name = (*t_cur)->project;
+		prj = project_list_get(prjs, prj_name);
+		if (prj) {
+			prj->count++;
+		} else {
+			prj = project_new(prj_name, 1);
+
+			tmp = projects_add(prjs, prj);
+
+			free(prjs);
+			prjs = tmp;
+		}
+		prjs[0]->count++;
+	}
+
+	log_fct_exit();
+
+	return prjs;
+}