Thu Dec 29 12:01:07 AM CST 2022 automatic backup

diff --git a/odot.c b/odot.c
index 37a1397c4418af08a682053fe41ba6d9bb24004e..3b81899636dc40e9db2bdbd1bc39f3e9278c003d 100644 (file)
--- a/odot.c
+++ b/odot.c
@@ -4,7 +4,10 @@
 int showdone = 0,
     showall  = 0;
 
+u_int hash;
+
 char    *group,
+        *newgroup,
         *task,
         *action;
 
@@ -16,11 +19,12 @@ int main(int argc, char *argv[]){
     sqlcmd(db,BUILDTABLE);
 
 
-    group = malloc(MAXLINE * sizeof(char));
-    task = malloc(MAXLINE * sizeof(char));
-    action = malloc(MAXLINE * sizeof(char));
+    group = calloc(MAXLINE,sizeof(char));
+    task = calloc(MAXLINE,sizeof(char));
+    action = calloc(MAXLINE,sizeof(char));
     
     parseopt(argc,argv);
+    hash = genhash();
 
     operate(db);
 
@@ -44,12 +48,14 @@ void parseopt(int n, char **args){
             case 'g':
                 sprintf(group,"%s",optarg);
                 break;
+            case 'G':
+                sprintf(newgroup,"%s",optarg);
+                break;
             case '?':
                 printf("Unknown Option: %c\n", optopt);
         }
     }
 
-    sprintf(group,"%s",(strcmp(group,"") == 0) ? "" : group);
     sprintf(action,"%s",args[optind]);
 
     for (int j = optind + 1; j < n; j++){
@@ -62,23 +68,33 @@ void operate(sqlite3 *db){
     char *cmd = malloc(MAXLINE*sizeof(char));
 
     if (strcmp(action,"new") == 0){
-        sprintf(cmd,"%s%s' ,'%s', 0);",INSERT,task,group);
+        sprintf(cmd,"%s (%ui, '%s', '%s', 0);",INSERT,hash,task,group);
         sqlcmd(db,cmd);
     } else if (strcmp(action,"done") == 0){
-        sprintf(cmd,"%s%s';",DONE,task);
+        sprintf(cmd,"%s %ui;",DONE,hash);
         sqlcmd(db,cmd);
-        sprintf(cmd,"%s%s';", GETGROUP,task);
+
+        sprintf(cmd,"%s %ui;", GETGROUP,hash);
         sqlgroup(db,cmd);
-        sprintf(cmd,"SELECT Done, Task FROM Tasks WHERE Task = '%s'",task);
+
+        sprintf(cmd,"SELECT Done, Task FROM Tasks WHERE Hash = %ui",hash);
         printf("\n");
         sqlprint(db,cmd);
     } else if (strcmp(action,"remove") == 0){
-        sprintf(cmd,"%s%s';",DELETE,task);
+        sprintf(cmd,"%s %ui;",DELETE,hash);
+        sqlcmd(db,cmd);
+    } else if (strcmp(action,"update") == 0){
+        sprintf(cmd,"%s '%s' WHERE Hash = %ui;",CHANGEGROUP,newgroup,hash);          
         sqlcmd(db,cmd);
     } else if (strcmp(action,"show") != 0) {
         fprintf(stderr,"\033[33;1mUnknown subcommand\033[0m: %s\n",action);
     }
+
     printf("\n\t\033[35;1mTODO\033[0m: \033[36m%s\033[0m\n\n",group);
+    if (showdone < 1) {
+        sqlprint(db,PRINT);
+    }
+
     if (showall == 1) {
         if (showdone == 1) {
             sqlprint(db,PRINTALL);
@@ -87,10 +103,10 @@ void operate(sqlite3 *db){
         }
     } else {
         if (showdone == 1) {
-            sprintf(cmd,"%s%s' ORDER BY Done;",PRINTGROUPALL,group);
+            sprintf(cmd,"%s '%s' ORDER BY Done;",PRINTGROUPALL,group);
             sqlprint(db,cmd);
-        } else if (strcmp(group,"\t") != 0) {
-            sprintf(cmd,"%s%s';",PRINTGROUP,group);
+        } else if (strcmp(group,"") != 0) {
+            sprintf(cmd,"%s '%s';",PRINTGROUP,group);
             sqlprint(db,cmd);
         } else {
             sqlprint(db,PRINT);
@@ -98,6 +114,15 @@ void operate(sqlite3 *db){
     }
 }
 
+u_int genhash(void){
+    char *tmp = malloc((strlen(task)+strlen(group)) * sizeof(char));
+    sprintf(tmp,"%s%s",task,group);
+    int h = 11235813;
+
+    while (*tmp++) h = (~(h << 5) ^ *tmp);
+    return h;
+}
+
 char *filepath(void){
     char *dir = getenv("XDG_DATA_HOME");
     char *db = malloc(MAXLINE * sizeof(char));

diff --git a/odot.h b/odot.h
index 754a7830529a5e55ceef9a9acb16aa7d8e1068c0..44761dd176709ac29e752233ee691d17099f73c7 100644 (file)
--- a/odot.h
+++ b/odot.h
@@ -11,22 +11,24 @@
 
 #define MAXLINE 10000
 
-#define BUILDTABLE "CREATE TABLE IF NOT EXISTS Tasks (Task varchar(1000) NOT NULL PRIMARY KEY, Type varchar(8), Done int NOT NULL DEFAULT 0);"
+#define BUILDTABLE "CREATE TABLE IF NOT EXISTS Tasks (Hash int NOT NULL PRIMARY KEY, Task varchar(1000) NOT NULL, Type varchar(8), Done int NOT NULL DEFAULT 0);"
 
-#define INSERT "INSERT INTO Tasks VALUES ( '"
-#define DELETE "DELETE FROM Tasks WHERE Task = '"
-#define DONE "UPDATE Tasks SET Done = 1 WHERE Task = '"
-#define GETGROUP "SELECT Type FROM Tasks WHERE Task = '"
+#define INSERT "INSERT INTO Tasks VALUES"
+#define DELETE "DELETE FROM Tasks WHERE Hash ="
+#define DONE "UPDATE Tasks SET Done = 1 WHERE Hash ="
+#define GETGROUP "SELECT Type FROM Tasks WHERE Hash ="
+#define CHANGEGROUP "UPDATE Tasks SET Group ="
 #define PRINT "SELECT Done, Type, Task FROM Tasks WHERE Done = 0 ORDER BY Type;"
 #define PRINTALL "SELECT Done, Type, Task FROM Tasks ORDER BY Type;"
-#define PRINTGROUP "SELECT Done, Task FROM Tasks WHERE Done = 0 AND Type = '"
-#define PRINTGROUPALL "SELECT Done, Task FROM Tasks WHERE Type = '"
+#define PRINTGROUP "SELECT Done, Task FROM Tasks WHERE Done = 0 AND Type ="
+#define PRINTGROUPALL "SELECT Done, Task FROM Tasks WHERE Type ="
 
 char *filepath(void);
 void error(int);
 void help(void);
 void parseopt(int, char**);
 void operate(sqlite3 *);
+u_int genhash(void);
 
 /* functions for interfacing with database: database.c */
 sqlite3 *accessdb(char *);