X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Ftw.c;h=e48ab59f01ce3a43c0b04f75cddf6e593a3082e0;hb=017d1fb012447d9b60b71e55fc637bf2422f8d5b;hp=ac8f82d834ef3502acd8474d2845394345f5b422;hpb=9f792471ae3b97b304470e97c0a43983b9517f83;p=ptask.git diff --git a/src/tw.c b/src/tw.c index ac8f82d..e48ab59 100644 --- a/src/tw.c +++ b/src/tw.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2012 jeanfi@gmail.com + * Copyright (C) 2012-2013 jeanfi@gmail.com * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -20,28 +20,38 @@ #include #include #include +#include +#include + +#include +#include #include "note.h" +#include +#include "tw.h" -char *task_exec(char *opts) +static char *task_exec(char *opts) { FILE *f; int ret; size_t s; char *str, *tmp, *cmd, buf[1024]; - cmd = malloc(strlen("task rc.json.array=on ") + strlen(opts) + 1); - strcpy(cmd, "task rc.json.array=on "); + log_fct_enter(); + + cmd = malloc(strlen("task ") + strlen(opts) + 1); + strcpy(cmd, "task "); strcat(cmd, opts); - printf("execute: %s\n", cmd); + log_debug("execute: %s", cmd); f = popen(cmd, "r"); + free(cmd); + if (!f) { perror("popen"); - str = NULL; - goto exit_free; + return NULL; } str = strdup(""); @@ -56,35 +66,82 @@ char *task_exec(char *opts) ret = pclose(f); - if (ret == -1) { - printf("pclose fails\n"); - perror("pclose"); - } + if (ret == -1) + log_err("pclose fails"); - exit_free: - free(cmd); + log_fct_exit(); return str; } -#include +static char *task_get_version() +{ + char *out; -#include "tw.h" + out = task_exec("--version"); + + trim(out); + + return out; +} + +static int task_check_version() +{ + char *ver; + + ver = task_get_version(); + + if (!ver) + return 0; + + log_debug("task version: %s", ver); + + if (!strcmp(ver, "2.2.0") || !strcmp(ver, "2.0.0")) + return 1; + else + return 0; +} -static struct json_object *task_exec_json(char *opts) +static char *tw_exec(char *opts) +{ + char *opts2; + + if (!task_check_version()) { + log_err("ptask is not compatible with the installed version of" + " taskwarrior."); + return NULL; + } + + opts2 = malloc(strlen("rc.confirmation:no ") + + strlen(opts) + + 1); + strcpy(opts2, "rc.confirmation:no "); + strcat(opts2, opts); + + return task_exec(opts2); +} + +static struct json_object *task_exec_json(const char *opts) { struct json_object *o; - char *str; + char *str, *cmd; - str = task_exec(opts); + cmd = malloc(strlen("rc.json.array=on ") + strlen(opts) + 1); + strcpy(cmd, "rc.json.array=on "); + strcat(cmd, opts); + + str = tw_exec(cmd); if (str) { o = json_tokener_parse(str); free(str); - return o; + } else { + o = NULL; } - return NULL; + free(cmd); + + return o; } struct task **tw_get_all_tasks(const char *status) @@ -93,9 +150,12 @@ 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); - sprintf(opts, "export status:%s", status); + + strcpy(opts, "export status:"); + strcat(opts, status); jtasks = task_exec_json(opts); free(opts); @@ -126,7 +186,7 @@ struct task **tw_get_all_tasks(const char *status) tasks[i]->project = strdup(json_object_get_string(json)); else - tasks[i]->project = NULL; + tasks[i]->project = strdup(""); json = json_object_object_get(jtask, "priority"); if (json) @@ -138,6 +198,13 @@ 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); } @@ -148,7 +215,7 @@ struct task **tw_get_all_tasks(const char *status) return tasks; } -char *escape(const char *txt) +static char *escape(const char *txt) { char *result; char *c; @@ -159,16 +226,12 @@ 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; @@ -184,22 +247,18 @@ 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); - task_exec(opts); + tw_exec(opts); - free(str); free(opts); } @@ -218,7 +277,7 @@ void tw_modify_project(const char *uuid, const char *newproject) + 1); sprintf(opts, " %s modify project:\"%s\"", uuid, str); - task_exec(opts); + tw_exec(opts); free(str); free(opts); @@ -229,6 +288,8 @@ void tw_modify_priority(const char *uuid, const char *priority) char *str; char *opts; + log_fct_enter(); + str = escape(priority); opts = malloc(1 @@ -239,30 +300,56 @@ void tw_modify_priority(const char *uuid, const char *priority) + 1); sprintf(opts, " %s modify priority:\"%s\"", uuid, str); - task_exec(opts); + tw_exec(opts); 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); - task_exec(opts); + 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) @@ -275,7 +362,22 @@ void tw_done(const char *uuid) + 1); sprintf(opts, " %s done", uuid); - task_exec(opts); + 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); } @@ -291,6 +393,7 @@ static void task_free(struct task *task) free(task->note); free(task->project); free(task->priority); + free(task->urgency); free(task); } @@ -307,3 +410,81 @@ 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; +} + +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 = (struct project **)list_add((void **)prjs, prj); + + free(prjs); + prjs = tmp; + } + prjs[0]->count++; + } + + log_fct_exit(); + + return prjs; +}