diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml new file mode 100644 index 0000000..2f9e96c --- /dev/null +++ b/.github/workflows/c-cpp.yml @@ -0,0 +1,23 @@ +name: C/C++ CI + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: install dependencies + run: | + sudo apt update + sudo apt install -y g++ catch2 libmd4c-dev libmd4c-html0-dev libtomlplusplus-dev + - name: make + run: make -C src + - name: make check + run: make check -C src diff --git a/README.md b/README.md index 4b8ec1f..5fd57a1 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ As this is still a WIP, here is a short list of what works and what still needs - [ ] generating html documents - [ ] some nicer css styles - [ ] more sensible templates -- [ ] change yaml style metadata to toml? +- [x] change yaml style metadata to toml # What is this? This is a small blog app. Basically a static site generator. @@ -33,10 +33,11 @@ Every blog post needs to be in a different file in `/posts` directory. An example from `/examples/post.md` ```md --- -author: "joseph" -date: "2026-01-01" -title: "Example of a blog post" -tags: ["blog", "test", "lalilulelo"] +[metadata] +author = "joseph" +date = 2026-01-01 +title = "Example of a blog post" +tags = ["blog", "test", "lalilulelo"] --- # This is an example post @@ -116,20 +117,22 @@ signal = "signal url" # Metadata explanation Metadata is everything at the beginning of the markdown file between `---`. -It's written in a format similar to yaml. +It's also written in toml. Why toml? I already use it's parser so it's easy to implement. +Besides it's readable and easy to write. ## Fields - author – the author of particular blog entry | string -- date – date of writing an entry | string YYYY-MM-DD +- date – date of writing an entry | date - title – title of blog entry | string -- tags – tags for blog entry. | json like list +- tags – tags for blog entry. | array ## Example ``` -author: "joseph" -date: "2026-01-01" -title: "Example of a blog post" -tags: ["blog", "test", "lalilulelo"] +[metadata] +author = "joseph" +date = 2026-01-01 +title = "Example of a blog post" +tags = ["blog", "test", "lalilulelo"] ``` # Why did you do this? diff --git a/src/markdown.cpp b/src/markdown.cpp index 3049ba3..93484ac 100644 --- a/src/markdown.cpp +++ b/src/markdown.cpp @@ -1,18 +1,22 @@ #include "markdown.hpp" #include "utils.hpp" -#include +#include #include #include #include #include #include +#include +#include std::optional get_metadata(const std::string &FILE_PATH) { std::fstream file(FILE_PATH); + std::stringstream metadata_s; std::string buffer; + /* if there's no ---, then no metadata in file there is */ if (!getline(file, buffer) || buffer != "---") { - std::cerr << "File " << FILE_PATH << "does not contain metadata." + std::cerr << "File " << FILE_PATH << " does not contain metadata. " << std::endl; return std::nullopt; } @@ -23,24 +27,42 @@ std::optional get_metadata(const std::string &FILE_PATH) { if (buffer == "---") { break; } - size_t colon_pos = buffer.find(":"); - - if (colon_pos == std::string::npos) { - std::cerr << "The line: \n" - << buffer << " does not contain a colon" << std::endl; - } - - std::string key = buffer.substr(0, colon_pos); - trim(key); - - std::string value = buffer.substr(colon_pos + 1); - trim(value); - metadata_map[key] = value; + metadata_s << buffer << '\n'; } - return std::optional(Metadata{metadata_map["author"], metadata_map["date"], - metadata_map["title"], - convert_string_to_set(metadata_map["tags"])}); + toml::table toml_table = toml::parse(metadata_s); + std::vector tags; + const auto &toml_tags = toml_table["metadata"]["tags"]; + + // translate toml into normal vector of strings + if (toml_tags.is_array()) { + for (auto iter = toml_tags.as_array()->begin(); + iter < toml_tags.as_array()->end(); iter++) { + tags.emplace_back(static_cast(iter->as_string()->get())); + } + } + + // time + auto toml_time = toml_table["metadata"]["date"]; + + struct tm t = {}; + time_t timestamp = time(NULL); + + if (toml_time.is_date()) { + toml::date d = toml_time.as_date()->get(); + + t.tm_year = d.year - 1900; + t.tm_mon = d.month - 1; + t.tm_mday = d.day; + t.tm_isdst = 0; + + timestamp = mktime(&t); + } + + Metadata metadata = {toml_table["metadata"]["author"].value_or(""), timestamp, + toml_table["metadata"]["title"].value_or(""), tags}; + + return std::optional(metadata); } static void html_callback(const MD_CHAR *data, MD_SIZE size, void *userdata) { diff --git a/src/markdown.hpp b/src/markdown.hpp index 3bea590..cff04b1 100644 --- a/src/markdown.hpp +++ b/src/markdown.hpp @@ -1,12 +1,14 @@ +#include #include -#include #include +#include +#include struct Metadata { std::string author; - std::string date; + time_t date; std::string title; - std::set tags; + std::vector tags; }; // Reads the metadata of the markdown file diff --git a/src/tests/post.md b/src/tests/post.md index dfeaa5f..308c92e 100644 --- a/src/tests/post.md +++ b/src/tests/post.md @@ -1,8 +1,9 @@ --- -author: "joseph" -date: "2026-01-01" -title: "Example of a blog post" -tags: ["blog", "test", "lalilulelo"] +[metadata] +author = "joseph" +date = 2026-01-01 +title = "Example of a blog post" +tags = ["blog", "test", "lalilulelo"] --- # This is an example post diff --git a/src/tests/tests.cpp b/src/tests/tests.cpp index 214e5d8..9c2f20f 100644 --- a/src/tests/tests.cpp +++ b/src/tests/tests.cpp @@ -3,6 +3,7 @@ #include "../utils.hpp" #include #include +#include #include #include @@ -25,21 +26,24 @@ TEST_CASE("convert_string_to_set parses inline YAML string list") { } TEST_CASE("get_metadata function data correctness test") { - const std::string FILE_NAME = "./tests//post.md"; + const std::string FILE_NAME = "./tests/post.md"; Metadata result = get_metadata(FILE_NAME).value(); std::string expected_author = "joseph"; - std::string expected_date = "2026-01-01"; + struct tm datetime = {0}; + datetime.tm_year = 2026 - 1900; + datetime.tm_mon = 1 - 1; + datetime.tm_mday = 1; + datetime.tm_isdst = 0; + + time_t expected_date = mktime(&datetime); std::string expected_title = "Example of a blog post"; - std::set expected_tags = {"blog", "test", "lalilulelo"}; + std::vector expected_tags = {"blog", "test", "lalilulelo"}; REQUIRE(result.author == expected_author); REQUIRE(result.date == expected_date); REQUIRE(result.title == expected_title); - - for (const auto &tag : expected_tags) { - REQUIRE(result.tags.count(tag)); - } + REQUIRE(result.tags == expected_tags); } TEST_CASE("get_metadata function test with a file that doesn't have metadata") { diff --git a/src/utils.cpp b/src/utils.cpp index f34551d..d685c7b 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -8,32 +8,3 @@ void trim(std::string &str) { str.erase(str.find_last_not_of('"') + 1); str.erase(0, str.find_first_not_of('"')); } - -std::set convert_string_to_set(std::string input) { - std::set result; - std::string buffer; - size_t left, right; - left = input.find_first_of('['); - right = input.find_last_of(']'); - - if (left == std::string::npos || right == std::string::npos || - right <= left) { - return result; - } - - input = input.substr(left + 1, right - left - 1); - - std::stringstream ss(input); - - while (getline(ss, buffer, ',')) { - buffer.erase(0, buffer.find_first_not_of(" \t")); - buffer.erase(buffer.find_last_not_of(" \t") + 1); - - if (buffer.size() >= 2 && buffer.front() == '"' && buffer.back() == '"') { - buffer = buffer.substr(1, buffer.size() - 2); - result.insert(buffer); - } - } - - return result; -}