Add categories to task\n\nVersion bump, make sure to update your database scheme

src/daemon.c

@@ -14,7 +14,7 @@
 #include <stdbool.h>
 #include <pthread.h>
 #include <sys/types.h>
-#include <linux/inotify.h>
+#include <sys/inotify.h>
 
 #include "log/log.h"
 #include "main/include/db.h"

src/main.c

@@ -11,8 +11,8 @@
 void help(char* name) {
     printf(BLUE "\t-- TaKl " VERSION " --\n" RESET);
     printf("Utilisation: %s ( list | add | reschedule | info | rm | done )\n", name);
-    printf("\tlist [-a:voir les tâches complétées]\n");
-    printf("\tadd <task> [date]\n");
+    printf("\tlist [category] [-a:voir les tâches complétées]\n");
+    printf("\tadd [category:]<task> [date]\n");
     printf("\treschedule <id> [date]\n");
     printf("\tinfo <id1> <id2> ...\n");
     printf("\tdone <id1> <id2> ...\n");
@@ -35,7 +35,7 @@ time_t parseDateTime(const char* input) {
     date.tm_year = current_time->tm_year;
     date.tm_mon = current_time->tm_mon;
     date.tm_mday = current_time->tm_mday;
-    date.tm_hour = current_time->tm_hour;
+    date.tm_hour = current_time->tm_hour-1; //TODO: buggy in non-UTC
     date.tm_min = current_time->tm_min;
     date.tm_sec = current_time->tm_sec;
 
@@ -88,14 +88,27 @@ int add(int argc, char* argv[]) {
 
     task_t t = create_task(argv[2], due_to);
     if (t.id == -1) {
+        if (t.category) {
+            free(t.category);
+            free(t.text);
+        }
         return 1;
     }
     
     if (add_task(t) != 0) {
         printf("Erreur lors de l'ajout à la base de données\n");
+        if (t.category) {
+            free(t.category);
+            free(t.text);
+        }
         return 1;
     }
     
+
+    if (t.category) {
+        free(t.category);
+        free(t.text);
+    }
     printf(BOLD YELLOW "[%d]" RESET " ajoutée\n", t.id);
     return 0;
 }
@@ -135,9 +148,20 @@ int reschedule(int argc, char* argv[]) {
     return 0;
 }
 
-int list_tasks(bool show_completed) {
-    task_list_t* tasks = get_task_list(show_completed);
-    print_task_list(tasks, show_completed); // show_completed: true would work as all the tasks are not loaded if false
+int list_tasks(int argc, char* argv[]) {
+    bool show_completed = false;
+    char* category = NULL;
+
+    for (int i=2; i < argc; i++) {
+        if (!strcmp(argv[i], "-a")) {
+            show_completed = true;
+        } else {
+            category = argv[i];
+        }
+    }
+
+    task_list_t* tasks = get_task_list(category, show_completed);
+    print_task_list(tasks, !category, show_completed); // show_completed: true would work as all the tasks are not loaded if false
     free_task_list(tasks);
     
     return 0;
@@ -165,6 +189,9 @@ int info(int argc, char* argv[]) {
 
         print_task(t);
         free(t.text);
+        if (t.category) {
+            free(t.category);
+        }
     }
 
     return 0;
@@ -235,7 +262,7 @@ int main(int argc, char* argv[]) {
     } else if (!strcmp(argv[1], "reschedule")) {
         return reschedule(argc, argv);
     } else if (!strcmp(argv[1], "list")) {
-        return list_tasks(argc > 2 && !strcmp(argv[2], "-a"));
+        return list_tasks(argc, argv);
     } else if (!strcmp(argv[1], "info")) {
         return info(argc, argv);
     } else if (!strcmp(argv[1], "done")) {

src/main/db.c

@@ -15,6 +15,15 @@ Fonctions d'interaction avec la base de données
 #include "include/db.h"
 
 
+#define sqlCheck(ret) { sqlAssert(ret, db, __FILE__, __LINE__); }
+void sqlAssert(int ret, sqlite3* db, char* file, int line) {
+    if (ret != SQLITE_OK) {
+        printf( "%s:%d, error %d: %s\n", file, line, ret, sqlite3_errmsg(db));
+        exit(1);
+    }
+}
+
+
 char* get_db_path() {
     #ifndef DB_FILE
         //! We should check that $HOME/.config already exists even if it should be the case
@@ -50,6 +59,7 @@ sqlite3* get_db() {
             "CREATE TABLE tasks ( \
             id INTEGER PRIMARY KEY,\
             text TEXT NOT NULL,\
+            category TEXT DEFAULT '', \
             done INTEGER, \
             due_to INTEGER \
             );",
@@ -96,42 +106,30 @@ int add_task(task_t t) {
     sqlite3* db = get_db();
     sqlite3_stmt* stmt;
 
-    int ret = sqlite3_prepare_v2(db, "INSERT INTO tasks (id, text, done, due_to) VALUES (?1, ?2, ?3, ?4);", -1, &stmt, 0);
+    sqlCheck( sqlite3_prepare_v2(db, "INSERT INTO tasks (id, text, category, done, due_to) VALUES (?1, ?2, ?3, ?4, ?5);", -1, &stmt, 0) );
 
-    if (ret != SQLITE_OK) {
-        printf("(get_task) failure fetching data\n");
-        return 1;
-    }
 
     char str_id[10];
     sprintf(str_id, "%d", (int)t.id);
-    sqlite3_bind_text(stmt, 1, str_id, -1, SQLITE_STATIC);
-    sqlite3_bind_text(stmt, 2, t.text, -1, SQLITE_STATIC);
+    sqlCheck( sqlite3_bind_text(stmt, 1, str_id, -1, SQLITE_STATIC) );
+    sqlCheck( sqlite3_bind_text(stmt, 2, t.text, -1, SQLITE_STATIC) );
+    sqlCheck( sqlite3_bind_text(stmt, 3, t.category, -1, SQLITE_STATIC) );
 
     char str_done[2]; // Just a boolean
     sprintf(str_done, "%d", t.done);
-    sqlite3_bind_text(stmt, 3, str_done, -1, SQLITE_STATIC);
+    sqlCheck( sqlite3_bind_text(stmt, 4, str_done, -1, SQLITE_STATIC) );
 
     char str_due_to[15];
     sprintf(str_due_to, "%ld", t.due_to);
-    sqlite3_bind_text(stmt, 4, str_due_to, -1, SQLITE_STATIC);
+    sqlCheck( sqlite3_bind_text(stmt, 5, str_due_to, -1, SQLITE_STATIC) );
 
 
-    ret = sqlite3_step(stmt);
+    sqlite3_step(stmt);
 
-    sqlite3_finalize(stmt);
-    sqlite3_close(db);
+    sqlCheck( sqlite3_finalize(stmt) );
+    sqlCheck( sqlite3_close(db) );
     notify_change();
 
-    if (ret != SQLITE_DONE) {
-        if (ret == 19) {
-            printf("Identifiant déjà utilisé\n");
-        } else {
-            printf("Return value: %d\n", ret);
-        }
-
-        return 1;
-    }
     return 0;
 }
 
@@ -139,37 +137,26 @@ int update_task(task_t t) {
     sqlite3* db = get_db();
     sqlite3_stmt* stmt;
 
-    int ret = sqlite3_prepare_v2(db, "UPDATE tasks SET text=?2, done=?3, due_to=?4 WHERE id=?1;", -1, &stmt, 0);
+    sqlCheck( sqlite3_prepare_v2(db, "UPDATE tasks SET text=?2, done=?3, due_to=?4 WHERE id=?1;", -1, &stmt, 0) );
 
-    if (ret != SQLITE_OK) {
-        printf("(get_task) failure fetching data\n");
-        return 1;
-    }
 
     char str_id[10];
     sprintf(str_id, "%d", (int)t.id);
-    sqlite3_bind_text(stmt, 1, str_id, -1, SQLITE_STATIC);
-    sqlite3_bind_text(stmt, 2, t.text, -1, SQLITE_STATIC);
+    sqlCheck( sqlite3_bind_text(stmt, 1, str_id, -1, SQLITE_STATIC) );
+    sqlCheck( sqlite3_bind_text(stmt, 2, t.text, -1, SQLITE_STATIC) );
 
     char str_done[2]; // Just a boolean
     sprintf(str_done, "%d", t.done);
-    sqlite3_bind_text(stmt, 3, str_done, -1, SQLITE_STATIC);
+    sqlCheck( sqlite3_bind_text(stmt, 3, str_done, -1, SQLITE_STATIC) );
 
     char str_due_to[15];
     sprintf(str_due_to, "%ld", t.due_to);
-    sqlite3_bind_text(stmt, 4, str_due_to, -1, SQLITE_STATIC);
+    sqlCheck( sqlite3_bind_text(stmt, 4, str_due_to, -1, SQLITE_STATIC) );
 
-
-    ret = sqlite3_step(stmt);
-
-    sqlite3_finalize(stmt);
-    sqlite3_close(db);
+    sqlCheck( sqlite3_finalize(stmt) );
+    sqlCheck( sqlite3_close(db) );
     notify_change();
 
-    if (ret != SQLITE_DONE) {
-        printf("Return value: %d\n", ret);
-        return 1;
-    }
     return 0;
 }
 
@@ -178,21 +165,16 @@ void delete_task(int id) {
     sqlite3* db = get_db();
     sqlite3_stmt* stmt;
 
-    int ret = sqlite3_prepare_v2(db, "DELETE FROM tasks WHERE id=?1;", -1, &stmt, 0);
-
-    if (ret != SQLITE_OK) {
-        printf("(get_task) failure fetching data\n");
-        exit(1);
-    }
+    sqlCheck( sqlite3_prepare_v2(db, "DELETE FROM tasks WHERE id=?1;", -1, &stmt, 0) );
 
     char str_id[10];
     sprintf(str_id, "%d", id);
-    sqlite3_bind_text(stmt, 1, str_id, -1, SQLITE_STATIC);
+    sqlCheck( sqlite3_bind_text(stmt, 1, str_id, -1, SQLITE_STATIC) );
 
     sqlite3_step(stmt);
 
-    sqlite3_finalize(stmt);
-    sqlite3_close(db);
+    sqlCheck( sqlite3_finalize(stmt) );
+    sqlCheck( sqlite3_close(db) );
     notify_change();
 }
 
@@ -203,19 +185,13 @@ void get_task(int id, task_t* t) {
     sqlite3* db = get_db();
     sqlite3_stmt* stmt;
 
-    int ret = sqlite3_prepare_v2(db, "SELECT id, text, done, due_to FROM tasks WHERE id=?1;", -1, &stmt, 0);
-
-    if (ret != SQLITE_OK) {
-        printf("(get_task) failure fetching data\n");
-        exit(1);
-    }
-        
+    sqlCheck( sqlite3_prepare_v2(db, "SELECT id, text, done, due_to, category FROM tasks WHERE id=?1;", -1, &stmt, NULL) );
 
     char str_id[10];
     sprintf(str_id, "%d", id);
-    sqlite3_bind_text(stmt, 1, str_id, -1, SQLITE_STATIC);
+    sqlCheck( sqlite3_bind_text(stmt, 1, str_id, -1, SQLITE_STATIC) );
 
-    ret = sqlite3_step(stmt);
+    int ret = sqlite3_step(stmt);
     if (ret == SQLITE_ROW) {
         t->id = strtol((char*)sqlite3_column_text(stmt, 0), NULL, 10);
         t->done = strtol((char*)sqlite3_column_text(stmt, 2), NULL, 10);
@@ -224,25 +200,30 @@ void get_task(int id, task_t* t) {
         char* text = (char*)sqlite3_column_text(stmt, 1);
         t->text = malloc(sizeof(char)*(strlen(text)+1));
         strcpy(t->text, text);
+
+        char* category = (char*)sqlite3_column_text(stmt, 4);
+        t->category = malloc(sizeof(char)*(strlen(category)+1));
+        strcpy(t->category, category);
     }
 
-    sqlite3_finalize(stmt);
-    sqlite3_close(db);
+    sqlCheck( sqlite3_finalize(stmt) );
+    sqlCheck( sqlite3_close(db) );
 
     // t->id will be (-1) if not found
 }
 
-task_list_t* get_task_list(bool include_completed) {
+task_list_t* get_task_list(char* input_category, bool include_completed) {
     sqlite3* db = get_db();
     sqlite3_stmt *stmt;
 
-    int ret = sqlite3_prepare_v2(db, "SELECT id, text, done, due_to FROM tasks;", -1, &stmt, NULL);
-
-    if (ret != SQLITE_OK) {
-        printf("(get_task) failure fetching data\n");
-        return NULL;
+    if (!input_category) {
+        sqlCheck( sqlite3_prepare_v2(db, "SELECT id, text, done, due_to, category FROM tasks;", -1, &stmt, NULL) );
+    } else {
+        sqlCheck( sqlite3_prepare_v2(db, "SELECT id, text, done, due_to, category FROM tasks WHERE category=?1;", -1, &stmt, NULL) );
+        sqlCheck( sqlite3_bind_text(stmt, 1, input_category, -1, SQLITE_STATIC) );
     }
     
+
     task_list_t* list = NULL;
     while (sqlite3_step(stmt) == SQLITE_ROW) {
         task_t t;
@@ -256,6 +237,10 @@ task_list_t* get_task_list(bool include_completed) {
             t.text = malloc(sizeof(char)*(strlen(text)+1));
             strcpy(t.text, text);
 
+            char* category = (char*)sqlite3_column_text(stmt, 4);
+            t.category = malloc(sizeof(char)*(strlen(category)+1));
+            strcpy(t.category, category);
+
             task_list_t* cur = malloc(sizeof(task_list_t)); // Add the parsed task to the beginning of the list
             cur->task = t;
             cur->next = list;
@@ -263,8 +248,8 @@ task_list_t* get_task_list(bool include_completed) {
         }
     }
 
-    sqlite3_finalize(stmt);
-    sqlite3_close(db);
+    sqlCheck( sqlite3_finalize(stmt) );
+    sqlCheck( sqlite3_close(db) );
 
     return list;
 }

src/main/include/config.h

@@ -1,7 +1,7 @@
 #ifndef DEF_CONFIG_H
 #define DEF_CONFIG_H
 
-#define VERSION "1.1.0"
+#define VERSION "1.2.0"
 
 // By default, $HOME/.config/takl.sqlite3 is used. You can change this behaviour here
 //#define DB_FILE "takl.sqlite3"

src/main/include/db.h

@@ -40,7 +40,7 @@ void get_task(int id, task_t* t);
 /*
 Renvoie la liste des tâches de la base de données
 */
-task_list_t* get_task_list(bool include_completed);
+task_list_t* get_task_list(char* input_category, bool include_completed);
 
 /*
 Renvoie un identifiant de tâche encore non utilisé

src/main/include/struct.h

@@ -7,6 +7,7 @@
 struct task {
     int id;
     char* text;
+    char* category;
     bool done;
     time_t due_to;
 };

src/main/include/tasks.h

@@ -3,6 +3,12 @@
 #ifndef DEF_TASKS_H
 #define DEF_TASKS_H
 
+/*
+Sépare la chaîne d'entrée en deux chaînes, l'une avant, l'autre après le premier ':'.
+Si il n'y a pas de ':', out_category est NULL
+*/
+void parse_input(char* in_text, char** out_text, char** out_category);
+
 /*
 Renvoie une tâche avec un identifiant aléatoire valide
 */
@@ -16,7 +22,7 @@ void print_task(task_t task);
 /*
 Affiche une liste de tâches de manière compacte (et par catégorie: urgent, à faire, [complétée])
 */
-void print_task_list(task_list_t* list, bool show_completed);
+void print_task_list(task_list_t* list, bool show_category, bool show_completed);
 
 /*
 Libère la mémoire allouée à une liste de tâches

src/main/tasks.c

@@ -4,20 +4,47 @@ Fonctions utilitaires concernant les tâches
 #include <stdlib.h>
 #include <stdio.h>
 #include <time.h>
+#include <string.h>
 #include <libnotify/notify.h>
 
 #include "include/db.h"
 #include "include/struct.h"
 #include "include/colors.h"
 
+void parse_input(char* in_text, char** out_text, char** out_category) {
+    int n = strlen(in_text);
+
+    int i=0;
+    for (;i < n; i++) {
+        if (in_text[i] == ':') {
+            break;
+        }
+    }
+
+    if (i == n) {
+        *out_text = in_text;
+        *out_category = NULL;
+    } else {
+        *out_text = malloc(sizeof(char)*(n-i));
+        *out_category = malloc(sizeof(char)*i);
+        
+        memcpy(*out_text, (void*)in_text+((i+1)*sizeof(char)), (size_t)((n-i)*sizeof(char)));
+        memcpy(*out_category, in_text, (size_t)(i*sizeof(char)));
+        (*out_category)[i] = '\0';
+    }
+}
+
 
 task_t create_task(char* text, time_t due_to) {
     task_t task;
 
     task.id = get_new_task_id();
-    task.text = text;
     task.done = false;
     task.due_to = due_to;
+    task.text = NULL;
+    task.category = NULL;
+
+    parse_input(text, &(task.text), &(task.category));
 
     return task;
 }
@@ -25,6 +52,9 @@ task_t create_task(char* text, time_t due_to) {
 
 void print_task(task_t task) {
     printf(YELLOW "=== Tâche " BOLD "[%d]" RESET YELLOW " ===\n" RESET, task.id);
+    if (task.category) {
+        printf(BLUE "%s:" RESET, task.category);
+    }
     printf(BOLD "%s\n" RESET, task.text);
 
     printf("Statut: ");
@@ -53,13 +83,21 @@ void print_task(task_t task) {
 }
 
 
-void print_task_list(task_list_t* list, bool show_completed) {
+void print_single_task(task_t t, bool show_category, char* color) {
+    if (t.category && show_category) {
+        printf(BOLD "%s[%d]" RESET " " BLUE "%s:" RESET "%s\n", color, t.id, t.category, t.text);
+    } else {
+        printf(BOLD "%s[%d]" RESET " %s\n", color, t.id, t.text);
+    }
+}
+
+void print_task_list(task_list_t* list, bool show_category, bool show_completed) {
     task_list_t* cur = list;
     time_t now = time(0);
     while (cur) { // Show not completed red tasks first
         task_t t = cur->task;
         if (!t.done && difftime(now, t.due_to) >= 0 && t.due_to != 0) {
-            printf(BOLD RED "[%d]" RESET " %s\n", t.id, t.text); // Task not completed but should be !
+            print_single_task(t, show_category, RED); // Task not completed but should be !
         }
         cur = cur->next;
     }
@@ -68,7 +106,7 @@ void print_task_list(task_list_t* list, bool show_completed) {
     while (cur) { // Show not completed but not due_to now then
         task_t t = cur->task;
         if (!t.done && (difftime(now, t.due_to) <= 0 || t.due_to == 0)) {
-            printf(BOLD YELLOW "[%d]" RESET " %s\n", t.id, t.text); // Task not completed but fine
+            print_single_task(t, show_category, YELLOW); // Task not completed but fine
         }
         cur = cur->next;
     }
@@ -78,7 +116,7 @@ void print_task_list(task_list_t* list, bool show_completed) {
         while (cur) { // Show completed
             task_t t = cur->task;
             if (t.done) {
-                printf(BOLD GREEN "[%d]" RESET " %s\n", t.id, t.text); // Task already done
+                print_single_task(t, show_category, GREEN); // Task already done
             }
             cur = cur->next;
         }