changed yaml to toml

This commit is contained in:
2026-01-07 11:52:17 +01:00
parent f3a13fbfd6
commit 671bfc0a35
4 changed files with 60 additions and 32 deletions

View File

@@ -1,18 +1,22 @@
#include "markdown.hpp" #include "markdown.hpp"
#include "utils.hpp" #include "utils.hpp"
#include <cmath> #include <ctime>
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
#include <map> #include <map>
#include <md4c-html.h> #include <md4c-html.h>
#include <optional> #include <optional>
#include <sstream>
#include <toml++/toml.hpp>
std::optional<Metadata> get_metadata(const std::string &FILE_PATH) { std::optional<Metadata> get_metadata(const std::string &FILE_PATH) {
std::fstream file(FILE_PATH); std::fstream file(FILE_PATH);
std::stringstream metadata_s;
std::string buffer; std::string buffer;
/* if there's no ---, then no metadata in file there is */
if (!getline(file, buffer) || buffer != "---") { 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; << std::endl;
return std::nullopt; return std::nullopt;
} }
@@ -23,24 +27,43 @@ std::optional<Metadata> get_metadata(const std::string &FILE_PATH) {
if (buffer == "---") { if (buffer == "---") {
break; break;
} }
size_t colon_pos = buffer.find(":"); metadata_s << buffer << '\n';
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;
} }
return std::optional(Metadata{metadata_map["author"], metadata_map["date"], toml::table toml_table = toml::parse(metadata_s);
metadata_map["title"], std::vector<std::string> tags;
convert_string_to_set(metadata_map["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<std::string>(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();
// To convert to a Unix timestamp (time_t):
t.tm_year = d.year - 1900; // tm_year is years since 1900
t.tm_mon = d.month - 1; // tm_mon is 0-11
t.tm_mday = d.day;
t.tm_isdst = -1;
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) { static void html_callback(const MD_CHAR *data, MD_SIZE size, void *userdata) {

View File

@@ -1,12 +1,14 @@
#include <ctime>
#include <optional> #include <optional>
#include <set>
#include <string> #include <string>
#include <toml++/toml.hpp>
#include <vector>
struct Metadata { struct Metadata {
std::string author; std::string author;
std::string date; time_t date;
std::string title; std::string title;
std::set<std::string> tags; std::vector<std::string> tags;
}; };
// Reads the metadata of the markdown file // Reads the metadata of the markdown file

View File

@@ -1,8 +1,9 @@
--- ---
author: "joseph" [metadata]
date: "2026-01-01" author = "joseph"
title: "Example of a blog post" date = 2026-01-01
tags: ["blog", "test", "lalilulelo"] title = "Example of a blog post"
tags = ["blog", "test", "lalilulelo"]
--- ---
# This is an example post # This is an example post

View File

@@ -3,6 +3,7 @@
#include "../utils.hpp" #include "../utils.hpp"
#include <catch2/catch_all.hpp> #include <catch2/catch_all.hpp>
#include <catch2/catch_test_macros.hpp> #include <catch2/catch_test_macros.hpp>
#include <ctime>
#include <optional> #include <optional>
#include <string> #include <string>
@@ -25,21 +26,22 @@ TEST_CASE("convert_string_to_set parses inline YAML string list") {
} }
TEST_CASE("get_metadata function data correctness test") { 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(); Metadata result = get_metadata(FILE_NAME).value();
std::string expected_author = "joseph"; 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;
time_t expected_date = mktime(&datetime);
std::string expected_title = "Example of a blog post"; std::string expected_title = "Example of a blog post";
std::set<std::string> expected_tags = {"blog", "test", "lalilulelo"}; std::vector<std::string> expected_tags = {"blog", "test", "lalilulelo"};
REQUIRE(result.author == expected_author); REQUIRE(result.author == expected_author);
REQUIRE(result.date == expected_date); REQUIRE(result.date == expected_date);
REQUIRE(result.title == expected_title); REQUIRE(result.title == expected_title);
REQUIRE(result.tags == expected_tags);
for (const auto &tag : expected_tags) {
REQUIRE(result.tags.count(tag));
}
} }
TEST_CASE("get_metadata function test with a file that doesn't have metadata") { TEST_CASE("get_metadata function test with a file that doesn't have metadata") {