Xavi/dodo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Xavi:b24aa19bac7a69b193ab1397de3ec663111fb52e
Branches Tags
Xavi:main
..
compare: Xavi:b65c098f3d571391d43410333e77ec87d2f29e54
Branches Tags
Xavi:main

No commits in common. "b24aa19bac7a69b193ab1397de3ec663111fb52e" and "b65c098f3d571391d43410333e77ec87d2f29e54" have entirely different histories.
b24aa19bac ... b65c098f3d

1 changed files with 27 additions and 136 deletions
Show Stats Expand all files Collapse all files

163
src/dodo.c
View File

@ -59,6 +59,7 @@ int prepare_sql_update_stmt(sqlite3 *db, sqlite3_stmt** out_stmt, filtered_tasks
char *sql_query;
int rc = 0;
int num_params = 0;
char test[SQLQUERY_MAX];
sql_query = malloc(SQLQUERY_MAX * sizeof(char));
@ -170,64 +171,13 @@ int bind_sql_update_stmt(filtered_tasks* task, int num_params, sqlite3_stmt* out
return 0;
}
int prepare_sql_delete_stmt(sqlite3 *db, sqlite3_stmt** out_stmt, filtered_tasks* task){
char *sql_query;
int rc = 0;
sql_query = malloc(SQLQUERY_MAX * sizeof(char));
x_strcpy(sql_query,"DELETE FROM tasks WHERE ", SQLQUERY_MAX);
if ( task->title ){
sql_query = concat_with_mem_cleanup(sql_query, "title=? AND active_id IS NOT NULL");
}
else if ( task->active_id != -1 ){
sql_query = concat_with_mem_cleanup(sql_query, "active_id=?");
}
else{
free(sql_query);
return -1;
}
rc = sqlite3_prepare_v2(db, sql_query, -1, out_stmt, NULL);
free(sql_query);
if (checksqlerr(rc, "prepare broken in gen_sql_insert_stmt")){
return -1;
}
return 0;
}
int bind_sql_delete_stmt(filtered_tasks* task, sqlite3_stmt* out_stmt){
int rc = 0;
const int param_pos = 1;
if ( task->title ){
rc = sqlite3_bind_text(out_stmt, param_pos, task->title, -1, SQLITE_STATIC);
}
else if ( task->active_id != -1 ){
rc = sqlite3_bind_int(out_stmt, param_pos, task->active_id);
}
else{
return -1;
}
if (checksqlerr(rc, "prepare broken in gen_sql_insert_stmt")){
return -1;
}
return 0;
}
int prepare_sql_insert_stmt(sqlite3 *db, sqlite3_stmt** out_stmt, filtered_tasks* task, char* values){
int gen_sql_delete_stmt(sqlite3 *db, sqlite3_stmt** out_stmt, filtered_tasks* task){
char sql_query[SQLQUERY_MAX];
int rc = 0;
snprintf(sql_query, SQLQUERY_MAX, "INSERT INTO tasks %s VALUES %s", task->selected_columns, values);
rc = sqlite3_prepare_v2(db, sql_query, -1, out_stmt, NULL);
snprintf(sql_query, SQLQUERY_MAX, "DELETE FROM tasks WHERE (title='%s' OR active_id='%d') AND active_id IS NOT NULL", task->title, task->active_id);
rc = sqlite3_prepare_v2(db, sql_query, -1, out_stmt, NULL);
if (checksqlerr(rc, "prepare broken in gen_sql_insert_stmt")){
return -1;
}
@ -235,62 +185,34 @@ int prepare_sql_insert_stmt(sqlite3 *db, sqlite3_stmt** out_stmt, filtered_tasks
return 0;
}
int bind_sql_insert_stmt(filtered_tasks* task, sqlite3_stmt* out_stmt){
int gen_sql_insert_stmt(sqlite3 *db, sqlite3_stmt** out_stmt, filtered_tasks* task, char* values){
char sql_query[SQLQUERY_MAX];
int rc = 0;
int param_pos = 1;
if ( task->title ){
rc = sqlite3_bind_text(out_stmt, param_pos, task->title, -1, SQLITE_STATIC);
}
if (checksqlerr(rc, "prepare broken in gen_sql_insert_stmt")){
return -1;
}
if ( task->due_date ){
param_pos = 2;
rc = sqlite3_bind_text(out_stmt, param_pos, task->due_date, -1, SQLITE_STATIC);
}
snprintf(sql_query, SQLQUERY_MAX, "INSERT INTO tasks %s VALUES %s",
task->selected_columns, values);
rc = sqlite3_prepare_v2(db, sql_query, -1, out_stmt, NULL);
if (checksqlerr(rc, "prepare broken in gen_sql_insert_stmt")){
return -1;
}
return 0;
}
// Generate the sql statement by giving the columns, table, and current task list wanted
int prepare_sql_select_stmt(sqlite3 *db, sqlite3_stmt** out_stmt, filtered_tasks* task){
int gen_sql_select_stmt(sqlite3 *db, sqlite3_stmt** out_stmt, filtered_tasks* task){
char sql_query[SQLQUERY_MAX];
int rc = 0;
snprintf(sql_query, SQLQUERY_MAX, "SELECT %s FROM tasks WHERE status=? AND active_id!='NULL' ORDER BY due_date NULLS LAST", task->selected_columns);
snprintf(sql_query, SQLQUERY_MAX, "SELECT %s FROM tasks WHERE status='%s' AND active_id!='NULL' ORDER BY due_date NULLS LAST", task->selected_columns, task->status);
rc = sqlite3_prepare_v2(db, sql_query, -1, out_stmt, NULL);
if (checksqlerr(rc, "prepare broken in gen_sql_select_stmt")){
return -1;
}
return 0;
}
int bind_sql_select_stmt(filtered_tasks* task, sqlite3_stmt* out_stmt){
int rc = 0;
const int param_pos = 1;
if ( task->status ){
rc = sqlite3_bind_text(out_stmt, param_pos, task->status, -1, SQLITE_STATIC);
}
if (checksqlerr(rc, "prepare broken in gen_sql_insert_stmt")){
return -1;
}
return 0;
}
// TODO: I think this needs a bit of a refactor not sure how
int checksqlerr(int rc, char *errmsg){
if( rc!=SQLITE_OK ){
@ -420,11 +342,7 @@ int get_num_rows(sqlite3 *db, char* table, char* status){
sqlite3_stmt *out_stmt;
int rc = 0;
if ( prepare_sql_select_stmt(db, &out_stmt, task) == 1 ){
return -1;
}
if ( ( rc = bind_sql_select_stmt(task, out_stmt) ) ){
if ( gen_sql_select_stmt(db, &out_stmt, task) == 1 ){
return -1;
}
@ -460,6 +378,7 @@ int display_task_list(int start_col, sqlite3 *db, filtered_tasks* task){
sqlite3_stmt* out_stmt;
char* table = "tasks";
// Get the number of rows in current task list
num_rows = get_num_rows(db, table, task->status);
// Then keep track of the furthest down we go
@ -468,11 +387,7 @@ int display_task_list(int start_col, sqlite3 *db, filtered_tasks* task){
}
// Generate the sql statement by giving the columns, table, and current task list wanted
if ( prepare_sql_select_stmt(db, &out_stmt, task) ){
return -1;
}
if ( bind_sql_select_stmt(task, out_stmt) ){
if ( gen_sql_select_stmt(db, &out_stmt, task) ){
return -1;
}
@ -569,6 +484,7 @@ int view_tasks(sqlite3 *db){
}
int add_new_task(sqlite3 *db, int argc, char** argv){
int rc = 0;
char values[ARG_MAX];
sqlite3_stmt* out_stmt;
@ -582,25 +498,16 @@ int add_new_task(sqlite3 *db, int argc, char** argv){
if ( task->title != NULL ){
if ( task->due_date != NULL ){
task->selected_columns = "(title, due_date)";
snprintf(values, ARG_MAX, "(?, ?)");
}
else{
snprintf(values, ARG_MAX, "('%s', '%s')", task->title, task->due_date);
}else{
task->selected_columns = "(title)";
snprintf(values, ARG_MAX, "(?)");
snprintf(values, ARG_MAX, "('%s')", task->title);
}
}
else{
if ( gen_sql_insert_stmt(db, &out_stmt, task, values) ){
return -1;
}
if ( ( rc = prepare_sql_insert_stmt(db, &out_stmt, task, values) ) ){
return -1;
}
if ( ( rc = bind_sql_insert_stmt(task, out_stmt) ) ){
return -1;
}
if ( ( rc = sqlite3_step(out_stmt) ) == SQLITE_DONE){
return 0;
}
@ -612,7 +519,6 @@ int add_new_task(sqlite3 *db, int argc, char** argv){
int update_task_status(sqlite3 *db, int argc, char** argv){
int rc = 0;
int num_params = 0;
sqlite3_stmt* out_stmt;
filtered_tasks* task = malloc(sizeof(filtered_tasks));
@ -621,16 +527,11 @@ int update_task_status(sqlite3 *db, int argc, char** argv){
parse_args(argc, argv, task);
task->status = argv[1];
if ( ( num_params = prepare_sql_update_stmt(db, &out_stmt, task) ) == -1 ){
if ( ( rc = prepare_sql_update_stmt(db, &out_stmt, task) ) ){
free(task);
return -1;
}
if ( ( rc = bind_sql_update_stmt(task, num_params, out_stmt) ) ){
free(task);
return -1;
}
if ( ( rc = sqlite3_step(out_stmt) ) == SQLITE_DONE){
free(task);
@ -647,24 +548,17 @@ int update_task_status(sqlite3 *db, int argc, char** argv){
int complete_task(sqlite3 *db, int argc, char** argv){
int rc = 0;
int num_params = 0;
sqlite3_stmt* out_stmt;
filtered_tasks* task = malloc(sizeof(filtered_tasks));
init_filtered_tasks(task);
task->status = "complete";
parse_args(argc, argv, task);
if ( ( num_params = prepare_sql_update_stmt(db, &out_stmt, task) ) == -1 ){
free(task);
return -1;
}
if ( ( rc = bind_sql_update_stmt(task, num_params, out_stmt) ) ){
if ( prepare_sql_update_stmt(db, &out_stmt, task) ){
free(task);
return -1;
}
if ( ( rc = sqlite3_step(out_stmt) ) == SQLITE_DONE){
free(task);
@ -687,6 +581,8 @@ int update_task(sqlite3 *db, int argc, char** argv){
parse_args(argc, argv, task);
// TODO this can definitely be made into one func with all the other updates
// no v2s allowed
if ( ( num_params = prepare_sql_update_stmt(db, &out_stmt, task) ) == -1 ){
free(task);
@ -703,7 +599,7 @@ int update_task(sqlite3 *db, int argc, char** argv){
return 0;
}
checksqlerr(rc, "broken in update_task");
checksqlerr(rc, "broken in complete_task");
free(task);
return -1;
@ -719,12 +615,7 @@ int del_task(sqlite3 *db, int argc, char** argv){
parse_args(argc, argv, task);
if ( prepare_sql_delete_stmt(db, &out_stmt, task) ){
free(task);
return -1;
}
if ( ( rc = bind_sql_delete_stmt(task, out_stmt) ) ){
if ( gen_sql_delete_stmt(db, &out_stmt, task) ){
free(task);
return -1;
}