diff --git a/include/core.h b/include/core.h index e12c938..4ed919a 100644 --- a/include/core.h +++ b/include/core.h @@ -13,71 +13,70 @@ extern "C" { #include #endif +// ==================== CONSTANTS ==================== // + +// ID of hole - an invalid record +#define HOLE_ID (0) + // ==================== STRUCTS AND TYPEDEFS ==================== // // Sasa (笹) - a file record typedef struct sasa { - uint64_t id; // Sasa ID - uint64_t created_ts; // Sasa creation timestamp - char *path; // File path + uint64_t id; // Sasa ID + uint64_t created_ts; // Sasa creation timestamp + char *path; // File path } Sasa; // Tanzaku (短冊) - a tag record typedef struct tanzaku { - uint64_t id; // Tanzaku ID - uint64_t created_ts; // Tanzaku creation timestamp - uint64_t modified_ts; // Tanzaku last modification timestamp - char *name; // Tanzaku name - char *alias; // Tanzaku alias - char *description; // Tanzaku description + uint64_t id; // Tanzaku ID + uint64_t created_ts; // Tanzaku creation timestamp + uint64_t modified_ts; // Tanzaku last modification timestamp + char *name; // Tanzaku name + char *alias; // Tanzaku alias + char *description; // Tanzaku description } Tanzaku; // Kazari (飾り) - a sasa-tanzaku association record typedef struct kazari { - uint64_t created_ts; // Kazari creation timestamp - uint64_t sasa_id; // Sasa ID - uint64_t tanzaku_id; // Tanzaku ID + uint64_t created_ts; // Kazari creation timestamp + uint64_t sasa_id; // Sasa ID + uint64_t tanzaku_id; // Tanzaku ID } Kazari; // Sasahyou (笹表) - database of files typedef struct sasahyou { - uint64_t created_ts; // Sasahyou creation timestamp - uint64_t modified_ts; // Sasahyou last modification timestamp - uint64_t size; // Sasahyou size (including unstaged units) - uint64_t removed_cnt; // Number of removed sasa - Sasa *contents; // Array of sasa - FILE *file; // Storage file for sasahyou + uint64_t created_ts; // Sasahyou creation timestamp + uint64_t modified_ts; // Sasahyou last modification timestamp + uint64_t size; // Sasahyou size (including holes) + Sasa *content; // Array of sasa + uint64_t hole_cnt; // Number of holes + Sasa **holes; // Array of pointers to holes + FILE *file; // Storage file for sasahyou } Sasahyou; // Sappyou (冊表) - database of tanzaku typedef struct sappyou { - uint64_t created_ts; // Sappyou creation timestamp - uint64_t modified_ts; // Sappyou last modification timestamp - uint64_t size; // Sappyou size - uint64_t removed_cnt; // Number of removed tanzaku - Tanzaku *contents; // Array of tanzaku - FILE *file; // Storage file for sappyou + uint64_t created_ts; // Sappyou creation timestamp + uint64_t modified_ts; // Sappyou last modification timestamp + uint64_t size; // Sappyou size (including holes) + Tanzaku *content; // Array of tanzaku + uint64_t hole_cnt; // Number of holes + Tanzaku **holes; // Array of pointers to holes + FILE *file; // Storage file for sappyou } Sappyou; // Shoppyou (飾表) - database of kazari typedef struct shoppyou { - uint64_t created_ts; // Shoppyou creation timestamp - uint64_t modified_ts; // Shoppyou last modification timestamp - uint64_t size; // Shoppyou size - uint64_t removed_cnt; // Number of removed kazari - Kazari *contents; // Array of kazari - FILE *file; // Storage file for shoppyou + uint64_t created_ts; // Shoppyou creation timestamp + uint64_t modified_ts; // Shoppyou last modification timestamp + uint64_t size; // Shoppyou size (including holes) + Kazari *content; // Array of kazari + uint64_t hole_cnt; // Number of holes + Kazari **holes; // Array of pointers to holes + FILE *file; // Storage file for shoppyou } Shoppyou; -// ==================== FILE SIGNATURES ==================== // - -// Sasahyou file signature: 七夕笹表 -static const uint16_t SASAHYOU_SIG[4] = {L'七', L'夕', L'笹', L'表'}; -// Sappyou file signature: 七夕冊表 -static const uint16_t SAPPYOU_SIG[4] = {L'七', L'夕', L'冊', L'表'}; -// Shoppyou file signature: 七夕飾表 -static const uint16_t SHOPPYOU_SIG[4] = {L'七', L'夕', L'飾', L'表'}; - // ==================== SASAHYOU SECTION ==================== // // Initialize empty sasahyou @@ -147,9 +146,6 @@ int shoppyou_init(Shoppyou *shoppyou); // Free shoppyou int shoppyou_free(Shoppyou *shoppyou); -// Weed shoppyou -int shoppyou_weed(Shoppyou *shoppyou); - // Load shoppyou from file int shoppyou_load(Shoppyou *shoppyou); diff --git a/src/core/sappyou.c b/src/core/sappyou.c index 0b49e24..24645f4 100644 --- a/src/core/sappyou.c +++ b/src/core/sappyou.c @@ -4,24 +4,27 @@ #include "../../include/core.h" +// Sappyou file signature: 七夕冊表 +const uint16_t SAPPYOU_SIG[4] = {L'七', L'夕', L'冊', L'表'}; + int sappyou_init(Sappyou *sappyou) { - uint64_t timestamp = time(NULL); - sappyou->created_ts = timestamp; - sappyou->modified_ts = timestamp; + sappyou->created_ts = time(NULL); + sappyou->modified_ts = sappyou->created_ts; sappyou->size = 0; - sappyou->removed_cnt = 0; - sappyou->contents = NULL; + sappyou->content = NULL; + sappyou->hole_cnt = 0; + sappyou->holes = NULL; sappyou->file = NULL; return 0; } int sappyou_free(Sappyou *sappyou) { for (uint64_t i = 0; i < sappyou->size; i++) { - free(sappyou->contents[i].name); - free(sappyou->contents[i].alias); - free(sappyou->contents[i].description); + free(sappyou->content[i].name); + free(sappyou->content[i].alias); + free(sappyou->content[i].description); } - free(sappyou->contents); + free(sappyou->content); if (sappyou->file != NULL) { fclose(sappyou->file); } @@ -43,20 +46,22 @@ int sappyou_load(Sappyou *sappyou) { fread(&sappyou->created_ts, 8, 1, sappyou->file); fread(&sappyou->modified_ts, 8, 1, sappyou->file); fread(&sappyou->size, 8, 1, sappyou->file); - sappyou->removed_cnt = 0; - sappyou->contents = malloc(sappyou->size * sizeof(Tanzaku)); + fread(&sappyou->hole_cnt, 8, 1, sappyou->file); + sappyou->content = malloc(sappyou->size * sizeof(Tanzaku)); + sappyou->holes = malloc(sappyou->hole_cnt * sizeof(Tanzaku *)); size_t max_string_len = SIZE_MAX; - for (uint64_t i = 0; i < sappyou->size; i++) { + for (uint64_t i = 0, r = sappyou->hole_cnt; i < sappyou->size; i++) { if (fgetc(sappyou->file) != 0) { - sappyou->contents[i].id = i + 1; - fread(&sappyou->contents[i].created_ts, 8, 1, sappyou->file); - fread(&sappyou->contents[i].modified_ts, 8, 1, sappyou->file); - getdelim(&sappyou->contents[i].name, &max_string_len, 0, sappyou->file); - getdelim(&sappyou->contents[i].alias, &max_string_len, 0, sappyou->file); - getdelim(&sappyou->contents[i].description, &max_string_len, 0, sappyou->file); + sappyou->content[i].id = i + 1; + fread(&sappyou->content[i].created_ts, 8, 1, sappyou->file); + fread(&sappyou->content[i].modified_ts, 8, 1, sappyou->file); + getdelim(&sappyou->content[i].name, &max_string_len, 0, sappyou->file); + getdelim(&sappyou->content[i].alias, &max_string_len, 0, sappyou->file); + getdelim(&sappyou->content[i].description, &max_string_len, 0, sappyou->file); } else { - sappyou->contents[i].id = 0; - sappyou->removed_cnt++; + sappyou->content[i].id = HOLE_ID; + r--; + sappyou->holes[r] = sappyou->content + i; } } return 0; @@ -72,17 +77,18 @@ int sappyou_save(Sappyou *sappyou) { fwrite(&sappyou->created_ts, 8, 1, sappyou->file); fwrite(&sappyou->modified_ts, 8, 1, sappyou->file); fwrite(&sappyou->size, 8, 1, sappyou->file); + fwrite(&sappyou->hole_cnt, 8, 1, sappyou->file); fflush(sappyou->file); for (uint64_t i = 0; i < sappyou->size; i++) { - if (sappyou->contents[i].id != 0) { + if (sappyou->content[i].id != HOLE_ID) { fputc(-1, sappyou->file); - fwrite(&sappyou->contents[i].created_ts, 8, 1, sappyou->file); - fwrite(&sappyou->contents[i].modified_ts, 8, 1, sappyou->file); - fputs(sappyou->contents[i].name, sappyou->file); + fwrite(&sappyou->content[i].created_ts, 8, 1, sappyou->file); + fwrite(&sappyou->content[i].modified_ts, 8, 1, sappyou->file); + fputs(sappyou->content[i].name, sappyou->file); fputc(0, sappyou->file); - fputs(sappyou->contents[i].alias, sappyou->file); + fputs(sappyou->content[i].alias, sappyou->file); fputc(0, sappyou->file); - fputs(sappyou->contents[i].description, sappyou->file); + fputs(sappyou->content[i].description, sappyou->file); fputc(0, sappyou->file); } else { fputc(0, sappyou->file); @@ -95,7 +101,7 @@ int sappyou_save(Sappyou *sappyou) { int sappyou_open(Sappyou *sappyou, const char *path) { sappyou->file = fopen(path, "r+b"); if (sappyou->file == NULL) { - fprintf(stderr, "Failed to dump sappyou: failed to open file '%s'\n", path); + fprintf(stderr, "Failed to dump sappyou: failed to open file\n"); return 1; } return sappyou_load(sappyou); @@ -104,14 +110,14 @@ int sappyou_open(Sappyou *sappyou, const char *path) { int sappyou_dump(Sappyou *sappyou, const char *path) { sappyou->file = fopen(path, "w+b"); if (sappyou->file == NULL) { - fprintf(stderr, "Failed to dump sappyou: failed to open file '%s'\n", path); + fprintf(stderr, "Failed to dump sappyou: failed to open file\n"); return 1; } return sappyou_save(sappyou); } int tanzaku_add(Sappyou *sappyou, const char *name, const char *alias, const char *description) { - if (sappyou->size == -1) { + if (sappyou->size == -1 && sappyou->hole_cnt == 0) { fprintf(stderr, "Failed to add tanzaku: sappyou is full\n"); return 1; } @@ -130,38 +136,53 @@ int tanzaku_add(Sappyou *sappyou, const char *name, const char *alias, const cha newbie.description = malloc(description_size + 1); strcpy(newbie.description, description); newbie.description[description_size] = 0; - sappyou->size++; - newbie.id = sappyou->size; - sappyou->contents = realloc(sappyou->contents, sappyou->size * sizeof(Tanzaku)); - sappyou->contents[sappyou->size - 1] = newbie; + if (sappyou->hole_cnt > 0) { + sappyou->hole_cnt--; + Tanzaku **hole_ptr = sappyou->holes + sappyou->hole_cnt; + newbie.id = *hole_ptr - sappyou->content + 1; + **hole_ptr = newbie; + sappyou->holes = realloc(sappyou->holes, sappyou->hole_cnt * sizeof(Tanzaku *)); + } else { + sappyou->size++; + newbie.id = sappyou->size; + sappyou->content = realloc(sappyou->content, sappyou->size * sizeof(Tanzaku)); + sappyou->content[sappyou->size - 1] = newbie; + } sappyou->modified_ts = newbie.created_ts; return 0; } int tanzaku_rem_by_id(Sappyou *sappyou, uint64_t tanzaku_id) { - if (tanzaku_id == 0) { - fprintf(stderr, "Failed to remove tanzaku: got zero ID\n"); + if (tanzaku_id == HOLE_ID) { + fprintf(stderr, "Failed to remove tanzaku: got hole ID\n"); return 1; } - for (uint64_t i = 0; i < sappyou->size; i++) { - if (sappyou->contents[i].id == tanzaku_id) { - sappyou->modified_ts = time(NULL); - sappyou->contents[i].id = 0; - sappyou->removed_cnt++; - return 0; - } + if (tanzaku_id > sappyou->size) { + fprintf(stderr, "Failed to remove tanzaku: target tanzaku does not exist\n"); + return 1; } - fprintf(stderr, "Failed to remove tanzaku: target tanzaku does not exist\n"); - return 1; + tanzaku_id--; + if (sappyou->content[tanzaku_id].id == HOLE_ID) { + fprintf(stderr, "Failed to remove tanzaku: target tanzaku is already removed\n"); + return 1; + } + sappyou->content[tanzaku_id].id = HOLE_ID; + sappyou->hole_cnt++; + sappyou->holes = realloc(sappyou->holes, sappyou->hole_cnt); + sappyou->holes[sappyou->hole_cnt - 1] = sappyou->content + tanzaku_id; + sappyou->modified_ts = time(NULL); + return 0; } int tanzaku_rem_by_name(Sappyou *sappyou, const char *name) { for (uint64_t i = 0; i < sappyou->size; i++) { - if (strcmp(sappyou->contents[i].name, name) == 0) { - if (sappyou->contents[i].id != 0) { + if (strcmp(sappyou->content[i].name, name) == 0) { + if (sappyou->content[i].id != HOLE_ID) { + sappyou->content[i].id = HOLE_ID; + sappyou->hole_cnt++; + sappyou->holes = realloc(sappyou->holes, sappyou->hole_cnt * sizeof(Tanzaku *)); + sappyou->holes[sappyou->hole_cnt - 1] = sappyou->content + i; sappyou->modified_ts = time(NULL); - sappyou->contents[i].id = 0; - sappyou->removed_cnt++; return 0; } else { fprintf(stderr, "Failed to remove tanzaku: target tanzaku is already removed\n"); @@ -175,11 +196,13 @@ int tanzaku_rem_by_name(Sappyou *sappyou, const char *name) { int tanzaku_rem_by_alias(Sappyou *sappyou, const char *alias) { for (uint64_t i = 0; i < sappyou->size; i++) { - if (strcmp(sappyou->contents[i].alias, alias) == 0) { - if (sappyou->contents[i].id != 0) { + if (strcmp(sappyou->content[i].alias, alias) == 0) { + if (sappyou->content[i].id != HOLE_ID) { + sappyou->content[i].id = HOLE_ID; + sappyou->hole_cnt++; + sappyou->holes = realloc(sappyou->holes, sappyou->hole_cnt * sizeof(Tanzaku *)); + sappyou->holes[sappyou->hole_cnt - 1] = sappyou->content + i; sappyou->modified_ts = time(NULL); - sappyou->contents[i].id = 0; - sappyou->removed_cnt++; return 0; } else { fprintf(stderr, "Failed to remove tanzaku: target tanzaku is already removed\n"); diff --git a/src/core/sasahyou.c b/src/core/sasahyou.c index e03f673..9330d44 100644 --- a/src/core/sasahyou.c +++ b/src/core/sasahyou.c @@ -5,21 +5,26 @@ #include "../../include/core.h" +// Sasahyou file signature: 七夕笹表 +const uint16_t SASAHYOU_SIG[4] = {L'七', L'夕', L'笹', L'表'}; + int sasahyou_init(Sasahyou *sasahyou) { sasahyou->created_ts = time(NULL); sasahyou->modified_ts = sasahyou->created_ts; sasahyou->size = 0; - sasahyou->removed_cnt = 0; - sasahyou->contents = NULL; + sasahyou->content = NULL; + sasahyou->hole_cnt = 0; + sasahyou->holes = NULL; sasahyou->file = NULL; return 0; } int sasahyou_free(Sasahyou *sasahyou) { for (uint64_t i = 0; i < sasahyou->size; i++) { - free(sasahyou->contents[i].path); + free(sasahyou->content[i].path); } - free(sasahyou->contents); + free(sasahyou->content); + free(sasahyou->holes); if (sasahyou->file != NULL) { fclose(sasahyou->file); } @@ -41,17 +46,19 @@ int sasahyou_load(Sasahyou *sasahyou) { fread(&sasahyou->created_ts, 8, 1, sasahyou->file); fread(&sasahyou->modified_ts, 8, 1, sasahyou->file); fread(&sasahyou->size, 8, 1, sasahyou->file); - sasahyou->removed_cnt = 0; - sasahyou->contents = malloc(sasahyou->size * sizeof(Sasa)); + fread(&sasahyou->hole_cnt, 8, 1, sasahyou->file); + sasahyou->content = malloc(sasahyou->size * sizeof(Sasa)); + sasahyou->holes = malloc(sasahyou->hole_cnt * sizeof(Sasa *)); size_t max_path_len = SIZE_MAX; - for (uint64_t i = 0; i < sasahyou->size; i++) { + for (uint64_t i = 0, r = sasahyou->hole_cnt; i < sasahyou->size; i++) { if (fgetc(sasahyou->file) != 0) { - sasahyou->contents[i].id = i + 1; - fread(&sasahyou->contents[i].created_ts, 8, 1, sasahyou->file); - getdelim(&sasahyou->contents[i].path, &max_path_len, 0, sasahyou->file); + sasahyou->content[i].id = i + 1; + fread(&sasahyou->content[i].created_ts, 8, 1, sasahyou->file); + getdelim(&sasahyou->content[i].path, &max_path_len, 0, sasahyou->file); } else { - sasahyou->contents[i].id = 0; - sasahyou->removed_cnt++; + sasahyou->content[i].id = HOLE_ID; + r--; + sasahyou->holes[r] = sasahyou->content + i; } } return 0; @@ -67,12 +74,13 @@ int sasahyou_save(Sasahyou *sasahyou) { fwrite(&sasahyou->created_ts, 8, 1, sasahyou->file); fwrite(&sasahyou->modified_ts, 8, 1, sasahyou->file); fwrite(&sasahyou->size, 8, 1, sasahyou->file); + fwrite(&sasahyou->hole_cnt, 8, 1, sasahyou->file); fflush(sasahyou->file); for (uint64_t i = 0; i < sasahyou->size; i++) { - if (sasahyou->contents[i].id != 0) { + if (sasahyou->content[i].id != HOLE_ID) { fputc(-1, sasahyou->file); - fwrite(&sasahyou->contents[i].created_ts, 8, 1, sasahyou->file); - fputs(sasahyou->contents[i].path, sasahyou->file); + fwrite(&sasahyou->content[i].created_ts, 8, 1, sasahyou->file); + fputs(sasahyou->content[i].path, sasahyou->file); fputc(0, sasahyou->file); } else { fputc(0, sasahyou->file); @@ -85,7 +93,7 @@ int sasahyou_save(Sasahyou *sasahyou) { int sasahyou_open(Sasahyou *sasahyou, const char *path) { sasahyou->file = fopen(path, "r+b"); if (sasahyou->file == NULL) { - fprintf(stderr, "Failed to dump sasahyou: failed to open file '%s'\n", path); + fprintf(stderr, "Failed to dump sasahyou: failed to open file\n"); return 1; } return sasahyou_load(sasahyou); @@ -94,55 +102,70 @@ int sasahyou_open(Sasahyou *sasahyou, const char *path) { int sasahyou_dump(Sasahyou *sasahyou, const char *path) { sasahyou->file = fopen(path, "w+b"); if (sasahyou->file == NULL) { - fprintf(stderr, "Failed to dump sasahyou: failed to open file '%s'\n", path); + fprintf(stderr, "Failed to dump sasahyou: failed to open file\n"); return 1; } return sasahyou_save(sasahyou); } int sasa_add(Sasahyou *sasahyou, const char *path) { - if (sasahyou->size == -1) { + if (sasahyou->size == -1 && sasahyou->hole_cnt == 0) { fprintf(stderr, "Failed to add sasa: sasahyou is full\n"); return 1; } Sasa newbie; - newbie.created_ts = (uint64_t) time(NULL); + newbie.created_ts = time(NULL); size_t path_size = strlen(path); newbie.path = malloc(path_size + 1); strcpy(newbie.path, path); newbie.path[path_size] = 0; - sasahyou->size++; - newbie.id = sasahyou->size; - sasahyou->contents = realloc(sasahyou->contents, sasahyou->size * sizeof(Sasa)); - sasahyou->contents[sasahyou->size - 1] = newbie; + if (sasahyou->hole_cnt > 0) { + sasahyou->hole_cnt--; + Sasa **hole_ptr = sasahyou->holes + sasahyou->hole_cnt; + newbie.id = *hole_ptr - sasahyou->content + 1; + **hole_ptr = newbie; + sasahyou->holes = realloc(sasahyou->holes, sasahyou->hole_cnt * sizeof(Sasa *)); + } else { + sasahyou->size++; + newbie.id = sasahyou->size; + sasahyou->content = realloc(sasahyou->content, sasahyou->size * sizeof(Sasa)); + sasahyou->content[sasahyou->size - 1] = newbie; + } sasahyou->modified_ts = newbie.created_ts; return 0; } int sasa_rem_by_id(Sasahyou *sasahyou, uint64_t sasa_id) { - if (sasa_id == 0) { - fprintf(stderr, "Failed to remove sasa: got zero ID\n"); + if (sasa_id == HOLE_ID) { + fprintf(stderr, "Failed to remove sasa: got hole ID\n"); return 1; } - for (uint64_t i = 0; i < sasahyou->size; i++) { - if (sasahyou->contents[i].id == sasa_id) { - sasahyou->modified_ts = time(NULL); - sasahyou->contents[i].id = 0; - sasahyou->removed_cnt++; - return 0; - } + if (sasa_id > sasahyou->size) { + fprintf(stderr, "Failed to remove sasa: target sasa does not exist\n"); + return 1; } - fprintf(stderr, "Failed to remove sasa: target sasa does not exist\n"); - return 1; + sasa_id--; + if (sasahyou->content[sasa_id].id == HOLE_ID) { + fprintf(stderr, "Failed to remove sasa: target sasa is already removed\n"); + return 1; + } + sasahyou->content[sasa_id].id = HOLE_ID; + sasahyou->hole_cnt++; + sasahyou->holes = realloc(sasahyou->holes, sasahyou->hole_cnt * sizeof(Sasa *)); + sasahyou->holes[sasahyou->hole_cnt - 1] = sasahyou->content + sasa_id; + sasahyou->modified_ts = time(NULL); + return 0; } int sasa_rem_by_path(Sasahyou *sasahyou, const char *path) { for (uint64_t i = 0; i < sasahyou->size; i++) { - if (strcmp(sasahyou->contents[i].path, path) == 0) { - if (sasahyou->contents[i].id != 0) { + if (strcmp(sasahyou->content[i].path, path) == 0) { + if (sasahyou->content[i].id != HOLE_ID) { + sasahyou->content[i].id = HOLE_ID; + sasahyou->hole_cnt++; + sasahyou->holes = realloc(sasahyou->holes, sasahyou->hole_cnt * sizeof(Sasa *)); + sasahyou->holes[sasahyou->hole_cnt - 1] = sasahyou->content + i; sasahyou->modified_ts = time(NULL); - sasahyou->contents[i].id = 0; - sasahyou->removed_cnt++; return 0; } else { fprintf(stderr, "Failed to remove sasa: target sasa is already removed\n"); diff --git a/src/core/shoppyou.c b/src/core/shoppyou.c index d820941..6fffefc 100644 --- a/src/core/shoppyou.c +++ b/src/core/shoppyou.c @@ -4,43 +4,29 @@ #include "../../include/core.h" +// Shoppyou file signature: 七夕飾表 +static const uint16_t SHOPPYOU_SIG[4] = {L'七', L'夕', L'飾', L'表'}; + int shoppyou_init(Shoppyou *shoppyou) { - uint64_t timestamp = time(NULL); - shoppyou->created_ts = timestamp; - shoppyou->modified_ts = timestamp; + shoppyou->created_ts = time(NULL); + shoppyou->modified_ts = shoppyou->created_ts; shoppyou->size = 0; - shoppyou->removed_cnt = 0; - shoppyou->contents = NULL; + shoppyou->content = NULL; + shoppyou->hole_cnt = 0; + shoppyou->holes = NULL; shoppyou->file = NULL; return 0; } int shoppyou_free(Shoppyou *shoppyou) { - free(shoppyou->contents); + free(shoppyou->content); + free(shoppyou->holes); if (shoppyou->file != NULL) { fclose(shoppyou->file); } return 0; } -int shoppyou_weed(Shoppyou *shoppyou) { - if (shoppyou->removed_cnt == 0) { - return 0; - } - uint64_t weeded_size = shoppyou->size - shoppyou->removed_cnt; - for (uint64_t i = 0, shift = 0; i < shoppyou->size; i++) { - if (shoppyou->contents[i].sasa_id != 0 && shoppyou->contents[i].tanzaku_id != 0) { - shoppyou->contents[i - shift] = shoppyou->contents[i]; - } else { - shift++; - } - } - shoppyou->size = weeded_size; - shoppyou->removed_cnt = 0; - shoppyou->contents = realloc(shoppyou->contents, shoppyou->size * sizeof(Kazari)); - return 0; -} - int shoppyou_load(Shoppyou *shoppyou) { if (shoppyou->file == NULL) { fprintf(stderr, "Failed to load shoppyou: file not specified\n"); @@ -56,12 +42,13 @@ int shoppyou_load(Shoppyou *shoppyou) { fread(&shoppyou->created_ts, 8, 1, shoppyou->file); fread(&shoppyou->modified_ts, 8, 1, shoppyou->file); fread(&shoppyou->size, 8, 1, shoppyou->file); - shoppyou->removed_cnt = 0; - shoppyou->contents = malloc(shoppyou->size * sizeof(Kazari)); + shoppyou->hole_cnt = 0; + free(shoppyou->holes); + shoppyou->content = malloc(shoppyou->size * sizeof(Kazari)); for (uint64_t i = 0; i < shoppyou->size; i++) { - fread(&shoppyou->contents[i].created_ts, 8, 1, shoppyou->file); - fread(&shoppyou->contents[i].sasa_id, 8, 1, shoppyou->file); - fread(&shoppyou->contents[i].tanzaku_id, 8, 1, shoppyou->file); + fread(&shoppyou->content[i].created_ts, 8, 1, shoppyou->file); + fread(&shoppyou->content[i].sasa_id, 8, 1, shoppyou->file); + fread(&shoppyou->content[i].tanzaku_id, 8, 1, shoppyou->file); } return 0; } @@ -71,20 +58,19 @@ int shoppyou_save(Shoppyou *shoppyou) { fprintf(stderr, "Failed to save shoppyou: file not specified\n"); return 1; } - if (shoppyou_weed(shoppyou) != 0) { - fprintf(stderr, "Failed to save shoppyou: failed to weed shoppyou\n"); - return 1; - } rewind(shoppyou->file); fwrite(SHOPPYOU_SIG, 2, 4, shoppyou->file); fwrite(&shoppyou->created_ts, 8, 1, shoppyou->file); fwrite(&shoppyou->modified_ts, 8, 1, shoppyou->file); - fwrite(&shoppyou->size, 8, 1, shoppyou->file); + uint64_t size = shoppyou->size - shoppyou->hole_cnt; + fwrite(&size, 8, 1, shoppyou->file); fflush(shoppyou->file); for (uint64_t i = 0; i < shoppyou->size; i++) { - fwrite(&shoppyou->contents[i].created_ts, 8, 1, shoppyou->file); - fwrite(&shoppyou->contents[i].sasa_id, 8, 1, shoppyou->file); - fwrite(&shoppyou->contents[i].tanzaku_id, 8, 1, shoppyou->file); + if (shoppyou->content[i].sasa_id != 0 && shoppyou->content[i].tanzaku_id != 0) { + fwrite(&shoppyou->content[i].created_ts, 8, 1, shoppyou->file); + fwrite(&shoppyou->content[i].sasa_id, 8, 1, shoppyou->file); + fwrite(&shoppyou->content[i].tanzaku_id, 8, 1, shoppyou->file); + } } fflush(shoppyou->file); return 0; @@ -109,7 +95,11 @@ int shoppyou_dump(Shoppyou *shoppyou, const char *path) { } int kazari_add(Shoppyou *shoppyou, uint64_t sasa_id, uint64_t tanzaku_id) { - if (shoppyou->size == -1) { + if (sasa_id == HOLE_ID || tanzaku_id == HOLE_ID) { + fprintf(stderr, "Failed to add kazari: got hole ID\n"); + return 1; + } + if (shoppyou->size == -1 && shoppyou->hole_cnt == 0) { fprintf(stderr, "Failed to add kazari: shoppyou is full\n"); return 1; } @@ -117,19 +107,31 @@ int kazari_add(Shoppyou *shoppyou, uint64_t sasa_id, uint64_t tanzaku_id) { newbie.created_ts = time(NULL); newbie.sasa_id = sasa_id; newbie.tanzaku_id = tanzaku_id; - shoppyou->size++; - shoppyou->contents = realloc(shoppyou->contents, shoppyou->size * sizeof(Kazari)); - shoppyou->contents[shoppyou->size - 1] = newbie; + if (shoppyou->hole_cnt > 0) { + shoppyou->hole_cnt--; + **(shoppyou->holes + shoppyou->hole_cnt) = newbie; + shoppyou->holes = realloc(shoppyou->holes, shoppyou->hole_cnt * sizeof(Kazari *)); + } else { + shoppyou->size++; + shoppyou->content = realloc(shoppyou->content, shoppyou->size * sizeof(Kazari)); + shoppyou->content[shoppyou->size - 1] = newbie; + } shoppyou->modified_ts = newbie.created_ts; return 0; } int kazari_rem(Shoppyou *shoppyou, uint64_t sasa_id, uint64_t tanzaku_id) { + if (sasa_id == HOLE_ID || tanzaku_id == HOLE_ID) { + fprintf(stderr, "Failed to remove kazari: got hole ID\n"); + return 1; + } for (uint64_t i = 0; i < shoppyou->size; i++) { - if (shoppyou->contents[i].sasa_id == sasa_id && shoppyou->contents[i].tanzaku_id == tanzaku_id) { + if (shoppyou->content[i].sasa_id == sasa_id && shoppyou->content[i].tanzaku_id == tanzaku_id) { + shoppyou->content[i].sasa_id = HOLE_ID; + shoppyou->hole_cnt++; + shoppyou->holes = realloc(shoppyou->holes, shoppyou->hole_cnt * sizeof(Kazari *)); + shoppyou->holes[shoppyou->hole_cnt - 1] = shoppyou->content + i; shoppyou->modified_ts = time(NULL); - shoppyou->contents[i].sasa_id = 0; - shoppyou->removed_cnt++; return 0; } }