Compare commits
No commits in common. "a33833875c0f3006f66f99ebe7c258b2b55d56d6" and "c3ba877c0e09952de23157fb3981441377071810" have entirely different histories.
a33833875c
...
c3ba877c0e
4 changed files with 11 additions and 15 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
@ -32,6 +32,6 @@
|
||||||
*.app
|
*.app
|
||||||
|
|
||||||
#CMake
|
#CMake
|
||||||
build/*
|
build/
|
||||||
Resources/Output/*
|
Resources/Output/
|
||||||
|
|
||||||
|
|
|
@ -109,6 +109,8 @@ std::string NavBarGenerator::insertPagesIntoCategories(std::string categories, s
|
||||||
int insertLocation = 0;
|
int insertLocation = 0;
|
||||||
if (categoryStart != -1)
|
if (categoryStart != -1)
|
||||||
insertLocation = categories.find(categoryOpening, categoryStart) + categoryOpening.length();
|
insertLocation = categories.find(categoryOpening, categoryStart) + categoryOpening.length();
|
||||||
|
else
|
||||||
|
insertLocation = navHeader.length();
|
||||||
|
|
||||||
|
|
||||||
categories.insert(insertLocation, item);
|
categories.insert(insertLocation, item);
|
||||||
|
@ -121,6 +123,7 @@ std::string NavBarGenerator::generateNavSection(std::vector<Page*> pages, std::s
|
||||||
{
|
{
|
||||||
this->options = options;
|
this->options = options;
|
||||||
std::string buffer;
|
std::string buffer;
|
||||||
|
buffer.append(navHeader);
|
||||||
buffer.append(generateCategories(sourceFolderUrl));
|
buffer.append(generateCategories(sourceFolderUrl));
|
||||||
buffer = insertPagesIntoCategories(buffer, pages);
|
buffer = insertPagesIntoCategories(buffer, pages);
|
||||||
return buffer;
|
return buffer;
|
||||||
|
|
|
@ -24,6 +24,7 @@ enum OptionFlags
|
||||||
class NavBarGenerator
|
class NavBarGenerator
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
|
std::string navHeader = "\n<h1>Navigation</h1>\n\n";
|
||||||
int options;
|
int options;
|
||||||
|
|
||||||
std::string generateCategories(std::string rootFolderUrl);
|
std::string generateCategories(std::string rootFolderUrl);
|
||||||
|
|
18
Src/blog.cpp
18
Src/blog.cpp
|
@ -34,8 +34,10 @@ std::string getArgValue(int argc, char* argv[], std::string argIdString)
|
||||||
if (strncmp(argId, argv[i], idValSplit) == 0)
|
if (strncmp(argId, argv[i], idValSplit) == 0)
|
||||||
return std::string(argv[i]).substr(idValSplit+1, strlen(argv[i])-(idValSplit+1));
|
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
|
|
||||||
return std::string("")
|
std::cout << "Missing argument!"; //the program exists if the value is 0
|
||||||
|
std::cout << argIdString;
|
||||||
|
exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool doesArgExist(int argc, char* argv[], std::string argIdString)
|
bool doesArgExist(int argc, char* argv[], std::string argIdString)
|
||||||
|
@ -55,15 +57,6 @@ void copyFolderAndContents(std::string inUrl, std::string outUrl)
|
||||||
std::filesystem::copy(inUrl, outUrl, opts);
|
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
|
* -in="" // give source folder
|
||||||
* -out="" // give output folder
|
* -out="" // give output folder
|
||||||
|
@ -79,7 +72,6 @@ int main(int argc, char* argv[])
|
||||||
std::string blogTemplate = getArgValue(argc, argv, "-blogTemplate=");
|
std::string blogTemplate = getArgValue(argc, argv, "-blogTemplate=");
|
||||||
std::string atomTemplate = getArgValue(argc, argv, "-atomTemplate=");
|
std::string atomTemplate = getArgValue(argc, argv, "-atomTemplate=");
|
||||||
|
|
||||||
checkForEmptyArguments()
|
|
||||||
|
|
||||||
int flags = OptionFlags::NONE;
|
int flags = OptionFlags::NONE;
|
||||||
if (doesArgExist(argc, argv, "-hide"))
|
if (doesArgExist(argc, argv, "-hide"))
|
||||||
|
@ -90,7 +82,7 @@ int main(int argc, char* argv[])
|
||||||
|
|
||||||
// pre-written pages and resources i.e. images
|
// pre-written pages and resources i.e. images
|
||||||
copyFolderAndContents(stat, output);
|
copyFolderAndContents(stat, output);
|
||||||
printf("Enjoy your website :)");
|
std::cout << "Enjoy your website :)";
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: nav sections :eww:
|
// TODO: nav sections :eww:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue