diff options
Diffstat (limited to 'main.c')
| -rw-r--r-- | main.c | 43 |
1 files changed, 7 insertions, 36 deletions
@@ -377,8 +377,6 @@ bool move_task(database_st *db, task_st *task, size_t target) { assert(task >= db->tasks && task < &db->tasks[db->count]); assert(target >= 0 && target < db->count); - - // Move tasks after the index position to their new positions. ptrdiff_t index = task - db->tasks; task_st *target_task = &db->tasks[target]; @@ -599,14 +597,7 @@ bool export_to_csv(const database_st *db, const char *path) { } fprintf(file, "%s,%s,%s,%s,%s,%s,%s,%s\n", - "task", - "sunday", - "monday", - "tuesday", - "wednesday", - "thursday", - "friday", - "saturday" + "task", "sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday" ); char name[MAX_TASK_NAME]; @@ -615,14 +606,7 @@ bool export_to_csv(const database_st *db, const char *path) { memcpy(name, task->name, MAX_TASK_NAME); replace_char(name, ',', ' '); fprintf(file, "%s,%" PRId64 ",%" PRId64 ",%" PRId64 ",%" PRId64 ",%" PRId64 ",%" PRId64 ",%" PRId64 "\n", - name, - task->times[0], - task->times[1], - task->times[2], - task->times[3], - task->times[4], - task->times[5], - task->times[6] + name, task->times[0], task->times[1], task->times[2], task->times[3], task->times[4], task->times[5], task->times[6] ); } @@ -669,16 +653,11 @@ bool import_from_csv(database_st *db, const char *path) { truncate_string_utf8(task->name, name_length); // Parse task times. - if(sscanf(name_delimiter+1, + if(sscanf(name_delimiter + 1, "%" SCNd64 ",%" SCNd64 ",%" SCNd64 ",%" SCNd64 ",%" SCNd64 ",%" SCNd64 ",%" SCNd64, - &task->times[0], - &task->times[1], - &task->times[2], - &task->times[3], - &task->times[4], - &task->times[5], - &task->times[6] - ) != NUM_WEEK_DAYS) { + &task->times[0], &task->times[1], &task->times[2], &task->times[3], &task->times[4], &task->times[5], &task->times[6] + ) != NUM_WEEK_DAYS + ) { replace_char(csv_buffer, '\n', ' '); fprintf(stderr, "Discarding invalid line '%s' and continuing.\n", csv_buffer); delete_task(db, task); @@ -687,7 +666,6 @@ bool import_from_csv(database_st *db, const char *path) { // Add task timer values to total timers. for (int idx = 0; idx < NUM_WEEK_DAYS; idx++) { -// db->total_times[idx] += task->times[idx]; TODO db->total_times[idx] = add_int64(db->total_times[idx], task->times[idx]); } } @@ -721,14 +699,7 @@ bool append_to_csv(task_st *task, const char *path) { memcpy(name, task->name, MAX_TASK_NAME); replace_char(name, ',', ' '); fprintf(file, "%s,%" PRId64 ",%" PRId64 ",%" PRId64 ",%" PRId64 ",%" PRId64 ",%" PRId64 ",%" PRId64 "\n", - name, - task->times[0], - task->times[1], - task->times[2], - task->times[3], - task->times[4], - task->times[5], - task->times[6] + name, task->times[0], task->times[1], task->times[2], task->times[3], task->times[4], task->times[5], task->times[6] ); fclose(file); |
