From af1dcb2bf2b62e4589b33b2ce74d9458b550ded8 Mon Sep 17 00:00:00 2001 From: Masahiko AMANO Date: Tue, 27 Dec 2022 22:47:57 +0300 Subject: [PATCH] refactor: reorganize files --- CMakeLists.txt | 26 ++++++++++++++++---------- {src => cli}/cli.c | 3 +-- {src/core => core}/sappyou.c | 2 +- {src/core => core}/sasahyou.c | 2 +- {src/core => core}/shoppyou.c | 2 +- include/cli.h | 10 ---------- {src/tanabata => lib}/database.c | 2 +- {src/tanabata => lib}/kazari.c | 2 +- {src/tanabata => lib}/sasa.c | 2 +- {src/tanabata => lib}/tanzaku.c | 3 ++- main.c | 5 ----- 11 files changed, 25 insertions(+), 34 deletions(-) rename {src => cli}/cli.c (99%) rename {src/core => core}/sappyou.c (99%) rename {src/core => core}/sasahyou.c (99%) rename {src/core => core}/shoppyou.c (99%) delete mode 100644 include/cli.h rename {src/tanabata => lib}/database.c (99%) rename {src/tanabata => lib}/kazari.c (98%) rename {src/tanabata => lib}/sasa.c (98%) rename {src/tanabata => lib}/tanzaku.c (98%) delete mode 100644 main.c diff --git a/CMakeLists.txt b/CMakeLists.txt index 3823ae3..c7b9401 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,18 +7,24 @@ project(tanabata set(CMAKE_C_STANDARD 99) set(CORE_SRC - src/core/sasahyou.c - src/core/sappyou.c - src/core/shoppyou.c) + include/core.h + core/sasahyou.c + core/sappyou.c + core/shoppyou.c) set(TANABATA_SRC - src/tanabata/database.c - src/tanabata/sasa.c - src/tanabata/tanzaku.c - src/tanabata/kazari.c) + ${CORE_SRC} + include/tanabata.h + lib/database.c + lib/sasa.c + lib/tanzaku.c + lib/kazari.c) -# Tanabata shared main lib -add_library(tanabata SHARED ${CORE_SRC} ${TANABATA_SRC}) +set(CLI_SRC + cli/cli.c) + +# Tanabata shared lib +add_library(tanabata SHARED ${TANABATA_SRC}) # Tanabata CLI app -add_executable(tfm main.c include/core.h ${CORE_SRC} include/tanabata.h ${TANABATA_SRC} include/cli.h src/cli.c) +add_executable(tfm ${TANABATA_SRC} ${CLI_SRC}) diff --git a/src/cli.c b/cli/cli.c similarity index 99% rename from src/cli.c rename to cli/cli.c index fa35211..bc6eb93 100644 --- a/src/cli.c +++ b/cli/cli.c @@ -4,7 +4,6 @@ #include #include "../include/tanabata.h" -#include "../include/cli.h" // Stylization macros #define TABLE_HEADER(s) ""s"" @@ -246,7 +245,7 @@ int menu_rem_kazari() { return 1; } -int cli(int argc, char **argv) { +int main(int argc, char **argv) { if (argc == 1) { fprintf(stderr, ERROR("No options provided\n")); return 1; diff --git a/src/core/sappyou.c b/core/sappyou.c similarity index 99% rename from src/core/sappyou.c rename to core/sappyou.c index 397896c..9dbfd4d 100644 --- a/src/core/sappyou.c +++ b/core/sappyou.c @@ -2,7 +2,7 @@ #include #include -#include "../../include/core.h" +#include "../include/core.h" const Tanzaku HOLE_TANZAKU = {HOLE_ID}; diff --git a/src/core/sasahyou.c b/core/sasahyou.c similarity index 99% rename from src/core/sasahyou.c rename to core/sasahyou.c index 513c830..1fcfb70 100644 --- a/src/core/sasahyou.c +++ b/core/sasahyou.c @@ -3,7 +3,7 @@ #include #include -#include "../../include/core.h" +#include "../include/core.h" const Sasa HOLE_SASA = {HOLE_ID}; diff --git a/src/core/shoppyou.c b/core/shoppyou.c similarity index 99% rename from src/core/shoppyou.c rename to core/shoppyou.c index 78d93ce..cabd32e 100644 --- a/src/core/shoppyou.c +++ b/core/shoppyou.c @@ -2,7 +2,7 @@ #include #include -#include "../../include/core.h" +#include "../include/core.h" const Kazari HOLE_KAZARI = {HOLE_ID}; diff --git a/include/cli.h b/include/cli.h deleted file mode 100644 index 6c93668..0000000 --- a/include/cli.h +++ /dev/null @@ -1,10 +0,0 @@ -// Tanabata file manager command line interface lib -// By Masahiko AMANO aka H1K0 - -#ifndef TANABATA_CLI_H -#define TANABATA_CLI_H - -// Command Line Interface -int cli(int argc, char **argv); - -#endif //TANABATA_CLI_H diff --git a/src/tanabata/database.c b/lib/database.c similarity index 99% rename from src/tanabata/database.c rename to lib/database.c index 57bbee0..482dfea 100644 --- a/src/tanabata/database.c +++ b/lib/database.c @@ -2,7 +2,7 @@ #include #include -#include "../../include/tanabata.h" +#include "../include/tanabata.h" int tanabata_init(Tanabata *tanabata) { if (sasahyou_init(&tanabata->sasahyou) != 0) { diff --git a/src/tanabata/kazari.c b/lib/kazari.c similarity index 98% rename from src/tanabata/kazari.c rename to lib/kazari.c index 9ee34d2..56f22ea 100644 --- a/src/tanabata/kazari.c +++ b/lib/kazari.c @@ -1,6 +1,6 @@ #include -#include "../../include/tanabata.h" +#include "../include/tanabata.h" int tanabata_kazari_add(Tanabata *tanabata, uint64_t sasa_id, uint64_t tanzaku_id) { if (sasa_id >= tanabata->sasahyou.size) { diff --git a/src/tanabata/sasa.c b/lib/sasa.c similarity index 98% rename from src/tanabata/sasa.c rename to lib/sasa.c index 2cc2017..209cf5b 100644 --- a/src/tanabata/sasa.c +++ b/lib/sasa.c @@ -1,7 +1,7 @@ #include #include -#include "../../include/tanabata.h" +#include "../include/tanabata.h" int tanabata_sasa_add(Tanabata *tanabata, const char *path) { Sasa *current_sasa = tanabata->sasahyou.database; diff --git a/src/tanabata/tanzaku.c b/lib/tanzaku.c similarity index 98% rename from src/tanabata/tanzaku.c rename to lib/tanzaku.c index 0b25562..0490e9b 100644 --- a/src/tanabata/tanzaku.c +++ b/lib/tanzaku.c @@ -1,5 +1,6 @@ #include -#include "../../include/tanabata.h" + +#include "../include/tanabata.h" int tanabata_tanzaku_add(Tanabata *tanabata, const char *name, const char *description) { Tanzaku *current_tanzaku = tanabata->sappyou.database; diff --git a/main.c b/main.c deleted file mode 100644 index cebc107..0000000 --- a/main.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "include/cli.h" - -int main(int argc, char **argv) { - return cli(argc, argv); -}