H1K0-dev/tanabata
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(cli)!: significant interface improvements

Browse Source
This commit is contained in:
Masahiko AMANO 2022-12-29 18:35:01 +03:00
parent 2d46b72929
commit c4f2149291
1 changed files with 165 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

314
cli/cli.c
View File

@ -47,21 +47,26 @@ void print_tanzaku_all() {
} }
// Sasa view menu handler // Sasa view menu handler
int menu_view_sasa() { int menu_view_sasa(const char *arg) {
char input[16]; if (arg == NULL) {
printf(HIGHLIGHT("Enter sasa ID: ")); return 1;
fgets(input, 16, stdin); }
if (strcmp(arg, ".") == 0) {
print_sasa_all();
return 0;
}
char *endptr; char *endptr;
uint64_t sasa_id = strtoull(input, &endptr, 16); uint64_t sasa_id = strtoull(arg, &endptr, 16);
if (*input != '\n' && *endptr == '\n') { if (*endptr == 0) {
Sasa current_sasa = tanabata_sasa_get_by_id(&tanabata, sasa_id); Sasa current_sasa = tanabata_sasa_get_by_id(&tanabata, sasa_id);
if (current_sasa.id != HOLE_ID) { if (current_sasa.id != HOLE_ID) {
char datetime[20]; char datetime[20];
strftime(datetime, 20, DT_FORMAT, strftime(datetime, 20, DT_FORMAT,
localtime((const time_t *) &current_sasa.created_ts)); localtime((const time_t *) &current_sasa.created_ts));
printf(HIGHLIGHT("File path")" %s\n" printf(HIGHLIGHT("Sasa ID")" %lx\n"
HIGHLIGHT("File path")" %s\n"
HIGHLIGHT("Added datetime")" %s\n", HIGHLIGHT("Added datetime")" %s\n",
current_sasa.path, datetime); sasa_id, current_sasa.path, datetime);
Tanzaku *related_tanzaku = tanabata_tanzaku_get_by_sasa(&tanabata, current_sasa.id); Tanzaku *related_tanzaku = tanabata_tanzaku_get_by_sasa(&tanabata, current_sasa.id);
if (related_tanzaku != NULL) { if (related_tanzaku != NULL) {
printf(HIGHLIGHT("\n↓ Related tanzaku ↓\n")); printf(HIGHLIGHT("\n↓ Related tanzaku ↓\n"));
@ -83,24 +88,33 @@ int menu_view_sasa() {
} }
// Tanzaku view menu handler // Tanzaku view menu handler
int menu_view_tanzaku() { int menu_view_tanzaku(const char *arg) {
char input[16]; if (arg == NULL) {
printf(HIGHLIGHT("Enter tanzaku ID: ")); return 1;
fgets(input, 16, stdin); }
if (strcmp(arg, ".") == 0) {
print_tanzaku_all();
return 0;
}
char *endptr; char *endptr;
uint64_t tanzaku_id = strtoull(input, &endptr, 16); uint64_t tanzaku_id = strtoull(arg, &endptr, 16);
if (*input != '\n' && *endptr == '\n') { if (*endptr == 0) {
Tanzaku current_tanzaku = tanabata_tanzaku_get_by_id(&tanabata, tanzaku_id); Tanzaku current_tanzaku = tanabata_tanzaku_get_by_id(&tanabata, tanzaku_id);
if (current_tanzaku.id != HOLE_ID) { if (current_tanzaku.id != HOLE_ID) {
char datetime[20]; char datetime[20];
strftime(datetime, 20, DT_FORMAT, strftime(datetime, 20, DT_FORMAT,
localtime((const time_t *) &current_tanzaku.created_ts)); localtime((const time_t *) &current_tanzaku.created_ts));
printf(HIGHLIGHT("Name")" %s\n" printf(HIGHLIGHT("Tanzaku ID")" %lx\n"
HIGHLIGHT("Created datetime")" %s\n" HIGHLIGHT("Name")" %s\n"
HIGHLIGHT("\n↓ Description ↓\n") HIGHLIGHT("Created datetime")" %s\n\n",
"%s\n" tanzaku_id, current_tanzaku.name, datetime);
HIGHLIGHT("↑ Description ↑\n"), if (*current_tanzaku.description != 0) {
current_tanzaku.name, datetime, current_tanzaku.description); printf(HIGHLIGHT("↓ Description ↓\n")
"%s\n"
HIGHLIGHT("↑ Description ↑\n"), current_tanzaku.description);
} else {
printf(HIGHLIGHT("No description\n"));
}
Sasa *related_sasa = tanabata_sasa_get_by_tanzaku(&tanabata, tanzaku_id); Sasa *related_sasa = tanabata_sasa_get_by_tanzaku(&tanabata, tanzaku_id);
if (related_sasa != NULL) { if (related_sasa != NULL) {
printf(HIGHLIGHT("\n↓ Related sasa ↓\n")); printf(HIGHLIGHT("\n↓ Related sasa ↓\n"));
@ -122,95 +136,95 @@ int menu_view_tanzaku() {
} }
// Sasa add menu handler // Sasa add menu handler
int menu_add_sasa() { int menu_add_sasa(const char *arg) {
if (arg == NULL) {
return 1;
}
if (tanabata.sasahyou.size == -1 && tanabata.sasahyou.hole_cnt == 0) { if (tanabata.sasahyou.size == -1 && tanabata.sasahyou.hole_cnt == 0) {
fprintf(stderr, ERROR("Failed to add file to database: sasahyou is full\n")); fprintf(stderr, ERROR("Failed to add file to database: sasahyou is full\n"));
return 1; return 1;
} }
char path[4096]; if (tanabata_sasa_add(&tanabata, arg) == 0 &&
printf(HIGHLIGHT("Enter file path: ")); tanabata_save(&tanabata) == 0) {
fgets(path, 4096, stdin); printf(SUCCESS("Successfully added file to database\n"));
if (*path != '\n') { return 0;
path[strlen(path) - 1] = 0;
if (tanabata_sasa_add(&tanabata, path) == 0) {
if (tanabata_save(&tanabata) == 0) {
printf(SUCCESS("Successfully added file to database\n"));
return 0;
}
}
fprintf(stderr, ERROR("Failed to add file to database\n"));
return 1;
} }
fprintf(stderr, ERROR("Failed to add file to database\n"));
return 1; return 1;
} }
// Tanzaku add menu handler // Tanzaku add menu handler
int menu_add_tanzaku() { int menu_add_tanzaku(const char *arg) {
if (arg == NULL) {
return 1;
}
if (tanabata.sappyou.size == -1 && tanabata.sappyou.hole_cnt == 0) { if (tanabata.sappyou.size == -1 && tanabata.sappyou.hole_cnt == 0) {
fprintf(stderr, ERROR("Failed to add tanzaku: sappyou is full\n")); fprintf(stderr, ERROR("Failed to add tanzaku: sappyou is full\n"));
return 1; return 1;
} }
char name[4096]; if (*arg != 0) {
char description[4096]; char description[4096];
printf(HIGHLIGHT("Enter tanzaku name: ")); printf(HIGHLIGHT("Enter tanzaku description: "));
fgets(name, 4096, stdin); fgets(description, 4096, stdin);
printf(HIGHLIGHT("Enter tanzaku description: "));
fgets(description, 4096, stdin);
if (*name != '\n') {
name[strlen(name) - 1] = 0;
description[strlen(description) - 1] = 0; description[strlen(description) - 1] = 0;
if (tanabata_tanzaku_add(&tanabata, name, description) == 0) { if (tanabata_tanzaku_add(&tanabata, arg, description) == 0 &&
if (tanabata_save(&tanabata) == 0) { tanabata_save(&tanabata) == 0) {
printf(SUCCESS("Successfully added tanzaku to database\n")); printf(SUCCESS("Successfully added tanzaku to database\n"));
return 0; return 0;
}
} }
fprintf(stderr, ERROR("Failed to add tanzaku to database\n"));
return 1;
} }
fprintf(stderr, ERROR("Failed to add tanzaku to database\n"));
return 1; return 1;
} }
// Kazari add menu handler // Kazari add menu handler
int menu_add_kazari() { int menu_add_kazari(char *arg) {
if (arg == NULL) {
return 1;
}
if (tanabata.shoppyou.size == -1 && tanabata.shoppyou.hole_cnt == 0) { if (tanabata.shoppyou.size == -1 && tanabata.shoppyou.hole_cnt == 0) {
fprintf(stderr, ERROR("Failed to add kazari: shoppyou is full\n")); fprintf(stderr, ERROR("Failed to add kazari: shoppyou is full\n"));
return 1; return 1;
} }
char input[16]; char *left = arg, *right = "\0", *endptr;
printf(HIGHLIGHT("Enter sasa ID: ")); for (size_t i = 0; i < strlen(arg); i++) {
fgets(input, 16, stdin); if (arg[i] == '-') {
char *endptr; arg[i] = 0;
uint64_t sasa_id = strtoull(input, &endptr, 16); right = arg + i + 1;
if (*input == '\n' || *endptr != '\n') { break;
fprintf(stderr, ERROR("Invalid ID\n"));
return 1;
}
printf(HIGHLIGHT("Enter tanzaku ID: "));
fgets(input, 16, stdin);
uint64_t tanzaku_id = strtoull(input, &endptr, 16);
if (*input == '\n' || *endptr != '\n') {
fprintf(stderr, ERROR("Invalid ID\n"));
return 1;
}
if (tanabata_kazari_add(&tanabata, sasa_id, tanzaku_id) == 0) {
if (tanabata_save(&tanabata) == 0) {
printf(SUCCESS("Successfully added kazari\n"));
return 0;
} }
} }
if (*left == 0 || *right == 0) {
fprintf(stderr, ERROR("Failed to add kazari: invalid argument\n"));
return 1;
}
uint64_t sasa_id = strtoull(left, &endptr, 16);
if (*endptr != 0) {
fprintf(stderr, ERROR("Failed to add kazari: invalid sasa ID\n"));
return 1;
}
uint64_t tanzaku_id = strtoull(right, &endptr, 16);
if (*endptr != 0) {
fprintf(stderr, ERROR("Failed to add kazari: invalid tanzaku ID\n"));
return 1;
}
if (tanabata_kazari_add(&tanabata, sasa_id, tanzaku_id) == 0 &&
tanabata_save(&tanabata) == 0) {
printf(SUCCESS("Successfully added kazari\n"));
return 0;
}
fprintf(stderr, ERROR("Failed to add kazari\n")); fprintf(stderr, ERROR("Failed to add kazari\n"));
return 1; return 1;
} }
// Sasa remove menu handler // Sasa remove menu handler
int menu_rem_sasa() { int menu_rem_sasa(const char *arg) {
char input[16]; if (arg == NULL) {
printf(HIGHLIGHT("Enter sasa ID: ")); return 1;
fgets(input, 16, stdin); }
char *endptr; char *endptr;
uint64_t sasa_id = strtoull(input, &endptr, 16); uint64_t sasa_id = strtoull(arg, &endptr, 16);
if (*input != '\n' && *endptr == '\n') { if (*endptr == 0) {
if (tanabata_sasa_rem_by_id(&tanabata, sasa_id) == 0 && if (tanabata_sasa_rem_by_id(&tanabata, sasa_id) == 0 &&
tanabata_save(&tanabata) == 0) { tanabata_save(&tanabata) == 0) {
printf(SUCCESS("Successfully removed sasa\n")); printf(SUCCESS("Successfully removed sasa\n"));
@ -224,13 +238,13 @@ int menu_rem_sasa() {
} }
// Tanzaku remove menu handler // Tanzaku remove menu handler
int menu_rem_tanzaku() { int menu_rem_tanzaku(const char *arg) {
char input[16]; if (arg == NULL) {
printf(HIGHLIGHT("Enter tanzaku ID: ")); return 1;
fgets(input, 16, stdin); }
char *endptr; char *endptr;
uint64_t tanzaku_id = strtoull(input, &endptr, 16); uint64_t tanzaku_id = strtoull(arg, &endptr, 16);
if (*input != '\n' && *endptr == '\n') { if (*endptr == 0) {
if (tanabata_tanzaku_rem_by_id(&tanabata, tanzaku_id) == 0 && if (tanabata_tanzaku_rem_by_id(&tanabata, tanzaku_id) == 0 &&
tanabata_save(&tanabata) == 0) { tanabata_save(&tanabata) == 0) {
printf(SUCCESS("Successfully removed tanzaku\n")); printf(SUCCESS("Successfully removed tanzaku\n"));
@ -244,21 +258,30 @@ int menu_rem_tanzaku() {
} }
// Kazari remove menu handler // Kazari remove menu handler
int menu_rem_kazari() { int menu_rem_kazari(char *arg) {
char input[16]; if (arg == NULL) {
printf(HIGHLIGHT("Enter sasa ID: "));
fgets(input, 16, stdin);
char *endptr;
uint64_t sasa_id = strtoull(input, &endptr, 16);
if (*input == '\n' || *endptr != '\n') {
fprintf(stderr, "Invalid ID\n");
return 1; return 1;
} }
printf(HIGHLIGHT("Enter tanzaku ID: ")); char *left = arg, *right = "\0", *endptr;
fgets(input, 16, stdin); for (size_t i = 0; i < strlen(arg); i++) {
uint64_t tanzaku_id = strtoull(input, &endptr, 16); if (arg[i] == '-') {
if (*input == '\n' || *endptr != '\n') { arg[i] = 0;
fprintf(stderr, "Invalid ID\n"); right = arg + i + 1;
break;
}
}
if (*left == 0 || *right == 0) {
fprintf(stderr, ERROR("Failed to remove kazari: invalid argument\n"));
return 1;
}
uint64_t sasa_id = strtoull(left, &endptr, 16);
if (*endptr != 0) {
fprintf(stderr, ERROR("Failed to remove kazari: invalid sasa ID\n"));
return 1;
}
uint64_t tanzaku_id = strtoull(right, &endptr, 16);
if (*endptr != 0) {
fprintf(stderr, ERROR("Failed to remove kazari: invalid tanzaku ID\n"));
return 1; return 1;
} }
if (tanabata_kazari_rem(&tanabata, sasa_id, tanzaku_id) == 0 && if (tanabata_kazari_rem(&tanabata, sasa_id, tanzaku_id) == 0 &&
@ -275,17 +298,6 @@ int main(int argc, char **argv) {
fprintf(stderr, ERROR("No options provided\n")); fprintf(stderr, ERROR("No options provided\n"));
return 1; return 1;
} }
const char *shortopts = "hI:O:isuaftkwV";
char *abspath = NULL;
int opt;
_Bool opt_i = 0;
_Bool opt_a = 0;
_Bool opt_s = 0;
_Bool opt_u = 0;
_Bool opt_f = 0;
_Bool opt_t = 0;
_Bool opt_k = 0;
_Bool opt_w = 0;
char *tanabata_path; char *tanabata_path;
FILE *config = fopen("/etc/tfm/config", "r"); FILE *config = fopen("/etc/tfm/config", "r");
if (config == NULL) { if (config == NULL) {
@ -318,6 +330,19 @@ int main(int argc, char **argv) {
} }
} }
} }
const char *shortopts = "hI:O:isuf:t:c:wV";
char *abspath = NULL;
int opt;
_Bool opt_i = 0;
_Bool opt_s = 0;
_Bool opt_u = 0;
_Bool opt_f = 0;
_Bool opt_t = 0;
_Bool opt_c = 0;
_Bool opt_w = 0;
char *opt_f_arg;
char *opt_t_arg;
char *opt_c_arg;
while ((opt = getopt(argc, argv, shortopts)) != -1) { while ((opt = getopt(argc, argv, shortopts)) != -1) {
switch (opt) { switch (opt) {
case 'h': case 'h':
@ -326,18 +351,18 @@ int main(int argc, char **argv) {
HIGHLIGHT("Usage:\n") HIGHLIGHT("Usage:\n")
"tfm <options>\n\n" "tfm <options>\n\n"
HIGHLIGHT("Options:\n") HIGHLIGHT("Options:\n")
HIGHLIGHT("-h")" Print this help and exit\n" HIGHLIGHT("-h")" Print this help and exit\n"
HIGHLIGHT("-I <dir>")" Initialize new Tanabata database in directory <dir>\n" HIGHLIGHT("-I <dir>")" Initialize new Tanabata database in directory <dir>\n"
HIGHLIGHT("-O <dir>")" Open existing Tanabata database from directory <dir>\n" HIGHLIGHT("-O <dir>")" Open existing Tanabata database from directory <dir>\n"
HIGHLIGHT("-i")" View database info\n" HIGHLIGHT("-i")" View database info\n"
HIGHLIGHT("-a")" View all\n" HIGHLIGHT("-s")" Set or add\n"
HIGHLIGHT("-s")" Set or add\n" HIGHLIGHT("-u")" Unset or remove\n"
HIGHLIGHT("-u")" Unset or remove\n" HIGHLIGHT("-f <sasa_id or path>")" File-sasa menu\n"
HIGHLIGHT("-f")" File-sasa menu\n" HIGHLIGHT("-t <tanzaku_id or name>")" Tanzaku menu\n"
HIGHLIGHT("-t")" Tanzaku menu\n" HIGHLIGHT(
HIGHLIGHT("-k")" Kazari menu (can only be used with the '-s' or '-u' option)\n" "-c <sasa_id>-<tanzaku_id>")" Kazari menu (can only be used with the '-s' or '-u' option)\n"
HIGHLIGHT("-w")" Weed (defragment) database\n" HIGHLIGHT("-w")" Weed (defragment) database\n"
HIGHLIGHT("-V")" Print version and exit\n\n" HIGHLIGHT("-V")" Print version and exit\n\n"
); );
if (tanabata_path != NULL) { if (tanabata_path != NULL) {
printf(HIGHLIGHT("Current database location: %s\n"), tanabata_path); printf(HIGHLIGHT("Current database location: %s\n"), tanabata_path);
@ -392,23 +417,23 @@ int main(int argc, char **argv) {
case 'i': case 'i':
opt_i = 1; opt_i = 1;
break; break;
case 'a':
opt_a = 1;
break;
case 's': case 's':
opt_s = 1; opt_s = 1;
break; break;
case 'u': case 'u':
opt_u = -1; opt_u = 1;
break; break;
case 'f': case 'f':
opt_f = 1; opt_f = 1;
opt_f_arg = optarg;
break; break;
case 't': case 't':
opt_t = 1; opt_t = 1;
opt_t_arg = optarg;
break; break;
case 'k': case 'c':
opt_k = 1; opt_c = 1;
opt_c_arg = optarg;
break; break;
case 'w': case 'w':
opt_w = 1; opt_w = 1;
@ -427,10 +452,6 @@ int main(int argc, char **argv) {
fprintf(stderr, ERROR("Failed to load database\n")); fprintf(stderr, ERROR("Failed to load database\n"));
return 1; return 1;
} }
if (opt_s && opt_u) {
opt_s = 0;
opt_u = 0;
}
fclose(config); fclose(config);
if (opt_i) { if (opt_i) {
char datetime[20]; char datetime[20];
@ -475,41 +496,36 @@ int main(int argc, char **argv) {
fprintf(stderr, ERROR("Failed to weed database\n")); fprintf(stderr, ERROR("Failed to weed database\n"));
return 1; return 1;
} }
if (opt_a) { if (opt_s && opt_u) {
opt_s = 0;
opt_u = 0;
}
if (opt_s) {
if (opt_f) { if (opt_f) {
print_sasa_all(); return menu_add_sasa(opt_f_arg);
return 0;
} }
if (opt_t) { if (opt_t) {
print_tanzaku_all(); return menu_add_tanzaku(opt_t_arg);
return 0;
} }
} else if (opt_s) { if (opt_c) {
if (opt_f) { return menu_add_kazari(opt_c_arg);
return menu_add_sasa();
}
if (opt_t) {
return menu_add_tanzaku();
}
if (opt_k) {
return menu_add_kazari();
} }
} else if (opt_u) { } else if (opt_u) {
if (opt_f) { if (opt_f) {
return menu_rem_sasa(); return menu_rem_sasa(opt_f_arg);
} }
if (opt_t) { if (opt_t) {
return menu_rem_tanzaku(); return menu_rem_tanzaku(opt_t_arg);
} }
if (opt_k) { if (opt_c) {
return menu_rem_kazari(); return menu_rem_kazari(opt_c_arg);
} }
} else { } else {
if (opt_f) { if (opt_f) {
return menu_view_sasa(); return menu_view_sasa(opt_f_arg);
} }
if (opt_t) { if (opt_t) {
return menu_view_tanzaku(); return menu_view_tanzaku(opt_t_arg);
} }
} }
return 0; return 0;