From dc8c77e51c615a07f53ff3a5226a3f6636fa58a7 Mon Sep 17 00:00:00 2001 From: Rosia E Evans Date: Thu, 22 May 2025 15:58:32 +0100 Subject: [PATCH 1/4] moves nav bar into template now its removevd from code --- Resources/Templates/BlogPageTemplate.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Templates/BlogPageTemplate.html b/Resources/Templates/BlogPageTemplate.html index dd6136f..15c24a2 100644 --- a/Resources/Templates/BlogPageTemplate.html +++ b/Resources/Templates/BlogPageTemplate.html @@ -14,6 +14,8 @@
+ +
From 214f2ae235149ba99ea1da4608e207b1d9e01693 Mon Sep 17 00:00:00 2001 From: rosia Date: Fri, 30 May 2025 00:34:28 +0100 Subject: [PATCH 2/4] minor cleanup --- Src/blog.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Src/blog.cpp b/Src/blog.cpp index b9e02c4..3b2482d 100644 --- a/Src/blog.cpp +++ b/Src/blog.cpp @@ -34,7 +34,7 @@ std::string getArgValue(int argc, char* argv[], std::string argIdString) if (strncmp(argId, argv[i], idValSplit) == 0) return std::string(argv[i]).substr(idValSplit+1, strlen(argv[i])-(idValSplit+1)); } - printf("Missing argument! %s", argIdString); //the program exists if the value is 0 + printf("Missing argument! %s", argIdString); return std::string("") } @@ -58,7 +58,12 @@ void copyFolderAndContents(std::string inUrl, std::string outUrl) void checkForEmptyArguments() { // I hate doing it like this - if (source.empty() || output.empty() || stat.empty() || siteWebUrl.empty() || blogTemplate.empty() || atomTemplate.empty()) + if (source.empty() || + output.empty() || + stat.empty() || + siteWebUrl.empty() || + blogTemplate.empty() || + atomTemplate.empty()) { exit(0); } From c2d478f4c0d409bab60f54bcd7dc056d63b9ca63 Mon Sep 17 00:00:00 2001 From: DressOrc Date: Thu, 5 Jun 2025 08:52:16 +0000 Subject: [PATCH 3/4] bug fix after merge --- Src/blog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Src/blog.cpp b/Src/blog.cpp index 3b2482d..cf81006 100644 --- a/Src/blog.cpp +++ b/Src/blog.cpp @@ -35,7 +35,7 @@ std::string getArgValue(int argc, char* argv[], std::string argIdString) return std::string(argv[i]).substr(idValSplit+1, strlen(argv[i])-(idValSplit+1)); } printf("Missing argument! %s", argIdString); - return std::string("") + return std::string(""); } bool doesArgExist(int argc, char* argv[], std::string argIdString) @@ -84,7 +84,7 @@ int main(int argc, char* argv[]) std::string blogTemplate = getArgValue(argc, argv, "-blogTemplate="); std::string atomTemplate = getArgValue(argc, argv, "-atomTemplate="); - checkForEmptyArguments() + checkForEmptyArguments(); int flags = OptionFlags::NONE; if (doesArgExist(argc, argv, "-hide")) From 4ec19688b23f082476ad6954b6e1e3af9a6a4374 Mon Sep 17 00:00:00 2001 From: rosia Date: Tue, 10 Jun 2025 22:09:51 +0100 Subject: [PATCH 4/4] bug fix --- Src/blog.cpp | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/Src/blog.cpp b/Src/blog.cpp index cf81006..9471d4a 100644 --- a/Src/blog.cpp +++ b/Src/blog.cpp @@ -55,20 +55,6 @@ void copyFolderAndContents(std::string inUrl, std::string outUrl) std::filesystem::copy(inUrl, outUrl, opts); } -void checkForEmptyArguments() -{ - // I hate doing it like this - if (source.empty() || - output.empty() || - stat.empty() || - siteWebUrl.empty() || - blogTemplate.empty() || - atomTemplate.empty()) - { - exit(0); - } -} - /* * -in="" // give source folder * -out="" // give output folder @@ -84,7 +70,16 @@ int main(int argc, char* argv[]) std::string blogTemplate = getArgValue(argc, argv, "-blogTemplate="); std::string atomTemplate = getArgValue(argc, argv, "-atomTemplate="); - checkForEmptyArguments(); + // I hate doing it like this + if (source.empty() || + output.empty() || + stat.empty() || + siteWebUrl.empty() || + blogTemplate.empty() || + atomTemplate.empty()) + { + exit(0); + } int flags = OptionFlags::NONE; if (doesArgExist(argc, argv, "-hide"))