From e76bbc7c1a0627308d85bb820300f3d413907ed6 Mon Sep 17 00:00:00 2001 From: malloc-nbytes Date: Sun, 21 Jan 2024 15:55:29 -0600 Subject: [PATCH] Reworked utils stuff. Added second puzzle. Started a portion of the third puzzle. --- src/build.sh | 2 +- src/depr-puzzles/Read.Me.zip | Bin 14536 -> 0 bytes src/depr-puzzles/colors/color-puzzle.cpp | 26 ------ src/depr-puzzles/congrats.zip | Bin 232 -> 0 bytes src/depr-puzzles/hello-world/hello-world.cpp | 27 ------ src/html-generator.cpp | 71 ---------------- src/include/utils.h | 4 +- src/main.cpp | 1 + src/puzzle.cpp | 27 ++++-- .../colors/desc.txt => puzzle1/.desc.txt} | 8 +- src/puzzle1/instructions.html | 57 +++++++++++++ src/puzzle1/instructions.txt | 1 - src/puzzle2/.desc.txt | 11 +++ src/puzzle2/instructions.html | 59 +++++++++++++ src/puzzle2/readme2.txt | 1 - src/puzzle2/subdir/more_instructions.txt | 1 - src/puzzle3/.desc.txt | 3 + src/puzzle3/instructions.html | 52 ++++++++++++ src/puzzle3/maze-demo.png | Bin 0 -> 595 bytes src/puzzle3/readme3.txt | 1 - .../resources/template-footer.txt | 0 .../resources/template-header.txt | 0 src/utils.cpp | 78 +++++++++++++++++- 23 files changed, 282 insertions(+), 148 deletions(-) delete mode 100644 src/depr-puzzles/Read.Me.zip delete mode 100644 src/depr-puzzles/colors/color-puzzle.cpp delete mode 100644 src/depr-puzzles/congrats.zip delete mode 100644 src/depr-puzzles/hello-world/hello-world.cpp delete mode 100644 src/html-generator.cpp rename src/{depr-puzzles/colors/desc.txt => puzzle1/.desc.txt} (73%) create mode 100644 src/puzzle1/instructions.html delete mode 100644 src/puzzle1/instructions.txt create mode 100644 src/puzzle2/.desc.txt create mode 100644 src/puzzle2/instructions.html delete mode 100644 src/puzzle2/readme2.txt delete mode 100644 src/puzzle2/subdir/more_instructions.txt create mode 100644 src/puzzle3/.desc.txt create mode 100644 src/puzzle3/instructions.html create mode 100644 src/puzzle3/maze-demo.png delete mode 100644 src/puzzle3/readme3.txt rename src/{depr-puzzles => }/resources/template-footer.txt (100%) rename src/{depr-puzzles => }/resources/template-header.txt (100%) diff --git a/src/build.sh b/src/build.sh index 687485d..109d311 100755 --- a/src/build.sh +++ b/src/build.sh @@ -4,7 +4,7 @@ set -xe CXXFLAGS="-ggdb -pedantic -std=c++20 -Wextra -Wall -o main" CXXLINKS="-lboost_iostreams -lzip -lboost_unit_test_framework" -CXXDEPS="html-generator.cpp ./utils.cpp ./puzzle.cpp" +CXXDEPS="./utils.cpp ./puzzle.cpp" if [ "$1" == "c" ]; then diff --git a/src/depr-puzzles/Read.Me.zip b/src/depr-puzzles/Read.Me.zip deleted file mode 100644 index 0fb332965b8b071a565de48bc553a3999ac004df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14536 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 - -class ColorPuzzle : public Puzzle { - -public: - - void set_answer() override - { - answer = "331E54F4AA00"; - } - - virtual std::vector generate_files(std::string contained_zip_path) override - { - std::ifstream desc_file = std::ifstream("Colors/desc.txt"); - std::stringstream desc_stream; - desc_stream << desc_file.rdbuf(); - std::string desc = desc_stream.str(); - - desc_file.close(); - std::string file = generate_html("Read.Me", desc, 0); - return {contained_zip_path, file}; - } -}; - diff --git a/src/depr-puzzles/congrats.zip b/src/depr-puzzles/congrats.zip deleted file mode 100644 index f3547ef2ef01db83555e2147bdaff8712e419729..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 232 zcmWIWW@Zs#W? - -#include "../../include/puzzle.h" -#include "../../include/html-generator.h" - -class HelloWorld : public Puzzle -{ - -protected: - void set_answer() override - { - answer = "4"; - } - - virtual std::vector generate_files(std::string contained_zip_path) override - { - try { - std::string file = generate_html(name, "What is 2+2?", get_seed()); - return {contained_zip_path, file}; - } - catch(std::exception e) { - std::cerr << e.what(); - return {}; - } - } -}; - diff --git a/src/html-generator.cpp b/src/html-generator.cpp deleted file mode 100644 index 826e1eb..0000000 --- a/src/html-generator.cpp +++ /dev/null @@ -1,71 +0,0 @@ -#include "./include/html-generator.h" -#include - -std::string generate_html(std::string title, std::string description, long seed) -{ - // Stores the content of template_header into a std::string. - char c; - std::string header_content; - std::string header_path = "./puzzles/resources/template-header.txt"; - - struct stat buf; - if(stat(header_path.c_str(), &buf) != 0) { - std::cerr << "Can not open " + header_path + ": No such file" << std::endl; - throw("Can not open " + header_path + ": No such file"); - } - - std::ifstream header_file(header_path); - - header_file >> std::noskipws; - while ( header_file >> c ) { - header_content += c; - } - - header_file.close(); - - // Stores the content of template_footer into a std::string. - char d; - std::string footer_content; - - std::string footer_path = "./puzzles/resources/template-footer.txt"; - - if(stat(footer_path.c_str(), &buf) != 0) { - throw("Can not open " + footer_path + ": No such file"); - } - - std::ifstream footer_file(footer_path); - footer_file >> std::noskipws; - while (footer_file >> d) { - footer_content += d; - } - footer_file.close(); - - std::string content_concatenated = header_content - + "

" - + title - + "

" - + "

" - + description - + "

" - + footer_content; - - std::string template_seed = std::to_string(seed) - + "\n" - + "\n" - + "\n" - + "\n" - + "\n"; - - return content_concatenated; - - // std::string file_name = title + ".html"; - - // Creates and inserts content into a new file with the title as name.html - // std::ofstream outfile(file_name); - // outfile << content_concatenated; - // outfile << template_seed; - // outfile.close(); - - // return file_name; -}; - diff --git a/src/include/utils.h b/src/include/utils.h index f409ee9..820268c 100644 --- a/src/include/utils.h +++ b/src/include/utils.h @@ -6,9 +6,11 @@ typedef std::vector strvec_t; -void generate_file(std::string output_filepath, std::string output_body); +std::string utils_generate_html(std::string title, std::string description, long seed); +void utils_generate_file(std::string output_filepath, std::string output_body); int utils_rng_roll(int min, int max, long seed); strvec_t utils_walkdir(const std::string& path); void utils_zip_files(std::string out_file_name, strvec_t file_names, std::string password=""); +std::string utils_file_to_str(const std::string filepath); #endif // UTILS_H diff --git a/src/main.cpp b/src/main.cpp index 90c1994..476f26f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include diff --git a/src/puzzle.cpp b/src/puzzle.cpp index e2f8a64..c0b63b1 100644 --- a/src/puzzle.cpp +++ b/src/puzzle.cpp @@ -5,27 +5,38 @@ #include "./include/utils.h" #include "./include/puzzle.h" +#define BOLD(s) "" + (s) + "" + Puzzle puzzle_create1(long seed) { - int a = utils_rng_roll(1, 50, seed); - int b = utils_rng_roll(51, 100, seed); + // TODO: Change in final version to bigger numbers. + int a = utils_rng_roll(1, 5, seed); + int b = utils_rng_roll(6, 9, seed); int s = a+b; - std::string instrs = "what is " + std::to_string(a) + "+" + std::to_string(b) + "?"; + std::string description = utils_file_to_str("./puzzle1/.desc.txt"); + std::string question = BOLD("what is " + std::to_string(a) + "+" + std::to_string(b) + "?"); + description.append(question); + + std::string html_content = utils_generate_html("Hello Pointless", description, seed); - generate_file("./puzzle1/instructions.txt", instrs); + utils_generate_file("./puzzle1/instructions.html", html_content); return Puzzle{"puzzle1", std::to_string(s)}; } Puzzle puzzle_create2(long seed) { - (void)seed; - return Puzzle{"puzzle2", "2"}; + std::string description = utils_file_to_str("./puzzle2/.desc.txt"); + std::string html_content = utils_generate_html("Color Puzzle", description, seed); + utils_generate_file("./puzzle2/instructions.html", html_content); + return Puzzle{"puzzle2", "331E54F4AA00"}; } Puzzle puzzle_create3(long seed) { - (void)seed; - return Puzzle{"puzzle3", "3"}; + std::string description = utils_file_to_str("./puzzle3/.desc.txt"); + std::string html_content = utils_generate_html("Maze Puzzle", description, seed); + utils_generate_file("./puzzle3/instructions.html", html_content); + return Puzzle{"puzzle3", "uru6r3u3ld"}; } Puzzle puzzle_create4(long seed) diff --git a/src/depr-puzzles/colors/desc.txt b/src/puzzle1/.desc.txt similarity index 73% rename from src/depr-puzzles/colors/desc.txt rename to src/puzzle1/.desc.txt index 70c918a..52ffe38 100644 --- a/src/depr-puzzles/colors/desc.txt +++ b/src/puzzle1/.desc.txt @@ -6,10 +6,4 @@ Your mission, should you choose to accept it, is a classic Fetch Quest involving https://latimesblogs.latimes.com/technology/2011/08/google-vic-gundotra-steve-jobs.html Computers are good at following instructions, but not at reading your mind. -- Donald Knuth

-As you might expect, you need a Plot Coupon to unlock the next Level. In this case you are seeking the official school colors. Here are your clues: -
    -
  • 12-character sequence,
    • -
  • hexadecimal color codes,
    • -
  • two primary colors, and
    • -
  • uppercase letters.
    • -
\ No newline at end of file +As you might expect, you need a Plot Coupon to unlock the next Level. For the first challenge... \ No newline at end of file diff --git a/src/puzzle1/instructions.html b/src/puzzle1/instructions.html new file mode 100644 index 0000000..ba6021b --- /dev/null +++ b/src/puzzle1/instructions.html @@ -0,0 +1,57 @@ + + + + + + +Document + + + +
+
+
+

Lipscomb University | College of Computing

+
+

Pointless
Challenge

+

Pointless
Challenge

+
+
+ +
+
+
+ + +

Hello Pointless

Welcome to the Pointless Computing Challenge! + +This Mission Briefing contains everything you need to complete your personal challenge, however you should feel free to use additional resources, including the whole Internet. +

+Your mission, should you choose to accept it, is a classic Fetch Quest involving several Plot Coupons and ultimately the coveted MacGuffin. While It's the Journey That Counts, you may periodically claim pointless Victory Points by recording your progress at lipscomb.challenge.edu. You can even do it right now using this Free Sample Coupon "H3fisE7jkQ0W". +https://latimesblogs.latimes.com/technology/2011/08/google-vic-gundotra-steve-jobs.html +Computers are good at following instructions, but not at reading your mind. -- Donald Knuth +

+As you might expect, you need a Plot Coupon to unlock the next Level. For the first challenge... what is 3+7?

+ +
+
+

Dr. Towell - dtowell@lipscomb.edu

+
+ diff --git a/src/puzzle1/instructions.txt b/src/puzzle1/instructions.txt deleted file mode 100644 index bf7c52a..0000000 --- a/src/puzzle1/instructions.txt +++ /dev/null @@ -1 +0,0 @@ -what is 19+69? \ No newline at end of file diff --git a/src/puzzle2/.desc.txt b/src/puzzle2/.desc.txt new file mode 100644 index 0000000..9c254a4 --- /dev/null +++ b/src/puzzle2/.desc.txt @@ -0,0 +1,11 @@ +Congratulations on completing the first puzzle! You have been 0 points. This is a major accomplishment! You are now ready to move on to the next puzzle. + +What are the hex values values for the Lipsomb Colors? + +
    +
  • 12-character sequence,
    • +
  • hexadecimal color codes,
    • +
  • two primary colors, and
    • +
  • uppercase letters.
    • +
  • darker color first.
    • +
\ No newline at end of file diff --git a/src/puzzle2/instructions.html b/src/puzzle2/instructions.html new file mode 100644 index 0000000..66c09fc --- /dev/null +++ b/src/puzzle2/instructions.html @@ -0,0 +1,59 @@ + + + + + + +Document + + + +
+
+
+

Lipscomb University | College of Computing

+
+

Pointless
Challenge

+

Pointless
Challenge

+
+
+ +
+
+
+ + +

Color Puzzle

Congratulations on completing the first puzzle! You have been 0 points. This is a major accomplishment! You are now ready to move on to the next puzzle. + +What are the hex values values for the Lipsomb Colors? + +

    +
  • 12-character sequence,
    • +
  • hexadecimal color codes,
    • +
  • two primary colors, and
    • +
  • uppercase letters.
    • +
  • darker color first.
    • +

+ +
+
+

Dr. Towell - dtowell@lipscomb.edu

+
+ diff --git a/src/puzzle2/readme2.txt b/src/puzzle2/readme2.txt deleted file mode 100644 index da9b848..0000000 --- a/src/puzzle2/readme2.txt +++ /dev/null @@ -1 +0,0 @@ -instructions for puzzle 2 diff --git a/src/puzzle2/subdir/more_instructions.txt b/src/puzzle2/subdir/more_instructions.txt deleted file mode 100644 index ec2d9ab..0000000 --- a/src/puzzle2/subdir/more_instructions.txt +++ /dev/null @@ -1 +0,0 @@ -more instructions \ No newline at end of file diff --git a/src/puzzle3/.desc.txt b/src/puzzle3/.desc.txt new file mode 100644 index 0000000..0fe9d09 --- /dev/null +++ b/src/puzzle3/.desc.txt @@ -0,0 +1,3 @@ +So you have beaten the second puzzle, good job! + +Now solve the maze that is within this directory with compression. diff --git a/src/puzzle3/instructions.html b/src/puzzle3/instructions.html new file mode 100644 index 0000000..626f998 --- /dev/null +++ b/src/puzzle3/instructions.html @@ -0,0 +1,52 @@ + + + + + + +Document + + + +
+
+
+

Lipscomb University | College of Computing

+
+

Pointless
Challenge

+

Pointless
Challenge

+
+
+ +
+
+
+ + +

Maze Puzzle

So you have beaten the second puzzle, good job! + +Now solve the maze that is within this directory with compression. +

+ +
+
+

Dr. Towell - dtowell@lipscomb.edu

+
+ diff --git a/src/puzzle3/maze-demo.png b/src/puzzle3/maze-demo.png new file mode 100644 index 0000000000000000000000000000000000000000..d99c1840246fcde6654da676022ff299e93d1de0 GIT binary patch literal 595 zcmV-Z0<8UsP)EX>4Tx04R}tkv&MmP!xqvQ>7vm2P>#JWT;LSL`5963Pq?8YK2xEOkVm2O&XFE z7e~Rh;NZ_<)xpJCR|i)?5c~mgc5qU3krMAq3N2#1;gOH??m4`7A0X7rOtU)10Zq5f zR3a{Bva4d~6#?|qH;9nTEMrcRlJKpsd+MgTi}5V~zCWu+%~=cxh{UtZFm2)u;^|G> z;Ji;9VMSRbJ|`YC>43zKTvt4P<6LlA;F%FKoth_(5Q~L2R@#^qO^tYpII3zoCuV)WNZv5=zuxQ~Cx^-JVZ$W;O( z#{w$QAiI9>H~2kUD?d5mC57Wa=ZoWfi~ylspiy(2?_(i|qi4zjeYZgOnm4!RK29HiG|eh`0~{Oz zqXo)d_qlgh``rHRY0mElFXnQL)TOuh00009a7bBm001r{001r{0eGc9b^rhX2XskI zMF;2s6%{Ko$S!ao0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJAV*0}P*;Ht7XSbN zJxN4CR0!8&U|?YQ|NlP&0|SHsXEP#8Ffua2RUok#8R04z&`dCv3xSI;ARC3Olo6{0 hx=T>Z`LYVT3IL6VI2Rf`gs}hs002ovPDHLkV1hpR?_vM| literal 0 HcmV?d00001 diff --git a/src/puzzle3/readme3.txt b/src/puzzle3/readme3.txt deleted file mode 100644 index 859d2b8..0000000 --- a/src/puzzle3/readme3.txt +++ /dev/null @@ -1 +0,0 @@ -getting closer diff --git a/src/depr-puzzles/resources/template-footer.txt b/src/resources/template-footer.txt similarity index 100% rename from src/depr-puzzles/resources/template-footer.txt rename to src/resources/template-footer.txt diff --git a/src/depr-puzzles/resources/template-header.txt b/src/resources/template-header.txt similarity index 100% rename from src/depr-puzzles/resources/template-header.txt rename to src/resources/template-header.txt diff --git a/src/utils.cpp b/src/utils.cpp index 24d1e72..502bc19 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -10,7 +10,79 @@ #include "./include/utils.h" -void generate_file(std::string output_filepath, std::string output_body) +std::string utils_generate_html(std::string title, std::string description, long seed) +{ + // Stores the content of template_header into a std::string. + char c; + std::string header_content; + std::string header_path = "./resources/template-header.txt"; + + struct stat buf; + if(stat(header_path.c_str(), &buf) != 0) { + std::cerr << "Can not open " + header_path + ": No such file" << std::endl; + throw("Can not open " + header_path + ": No such file"); + } + + std::ifstream header_file(header_path); + + header_file >> std::noskipws; + while ( header_file >> c ) { + header_content += c; + } + + header_file.close(); + + // Stores the content of template_footer into a std::string. + char d; + std::string footer_content; + + std::string footer_path = "./resources/template-footer.txt"; + + if(stat(footer_path.c_str(), &buf) != 0) { + throw("Can not open " + footer_path + ": No such file"); + } + + std::ifstream footer_file(footer_path); + footer_file >> std::noskipws; + while (footer_file >> d) { + footer_content += d; + } + footer_file.close(); + + std::string content_concatenated = header_content + + "

" + + title + + "

" + + "

" + + description + + "

" + + footer_content; + + std::string template_seed = std::to_string(seed) + + "
\n" + + "
\n" + + "
\n" + + "\n" + + "\n"; + + return content_concatenated; +} + +std::string utils_file_to_str(const std::string filepath) +{ + std::ifstream file(filepath); + if (!file.is_open()) { + std::cerr << "Error opening file: " << filepath << std::endl; + std::exit(EXIT_FAILURE); + } + std::stringstream buf; + buf << file.rdbuf(); + std::string contents = buf.str(); + file.close(); + return contents; +} + +void utils_generate_file(std::string output_filepath, std::string output_body) { std::ofstream outfp(output_filepath); outfp << output_body; @@ -85,9 +157,9 @@ strvec_t utils_walkdir(const std::string &path) } for (const auto &entry : std::filesystem::directory_iterator(path)) { - if (std::filesystem::is_regular_file(entry.path())) { + if (std::filesystem::is_regular_file(entry.path()) && entry.path().filename().string()[0] != '.') { file_paths.push_back(entry.path()); - } else if (std::filesystem::is_directory(entry.path())) { + } else if (std::filesystem::is_directory(entry.path()) && entry.path().filename().string()[0] != '.') { strvec_t sub_dir = utils_walkdir(entry.path()); file_paths.insert(file_paths.end(), sub_dir.begin(), sub_dir.end()); }