added some helper functions and a nice enum for annotation handling, as well as an more complex reply example (multi annotaion, link annotation

2 files changed, 90 insertions, 51 deletions

diff --git a/src/Enum2String.cpp b/src/Enum2String.cpp
new file mode 100644
index 0000000..e64b6ea
--- /dev/null
+++ b/src/Enum2String.cpp
@@ -0,0 +1,9 @@
+/// The strings associated with the enums are generated here
+/////////////////////////////////////////////////////////////////////
+#include <string>
+
+#include "AnnotationTypes.hpp"
+
+#define GENERATE_ENUM_STRINGS  // Start string generation
+#include "AnnotationTypes.hpp"
+#undef GENERATE_ENUM_STRINGS   // Stop string generation
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index 627d3d0..c704f39 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4,15 +4,17 @@
 
 #include "crow.h"
 
+#include "AnnotationTypes.hpp"
+
 #define NULL_STRING std::string("null")
 #define EMPTY_STRING std::string("")
 #define NO_SUCH_COMMAND std::string("no_such_command")
 
-typedef std::function<crow::json::wvalue(std::string const &arguments, std::string const &session,
-                                  void *payload)> handler_func;
+typedef crow::json::wvalue json;
+typedef std::function<json(std::string const &arguments, std::string const &session, void *payload)> handler_func;
 
 struct CommandHandler {
-    [[nodiscard]] crow::json::wvalue exec(std::string const &arguments, std::string const &session) const {
+    [[nodiscard]] json exec(std::string const &arguments, std::string const &session) const {
         return func(arguments, session, payload);
     }
 
@@ -20,18 +22,36 @@ struct CommandHandler {
     void *payload{nullptr};
 };
 
-crow::json::wvalue stopHandler(std::string const &arguments, std::string const &session, void *payload);
-crow::json::wvalue klingerHandler(std::string const &arguments, std::string const &session, void *payload);
+/* ------------------------------------------------------------------------------------------------------------------ */
+
+json stopHandler(std::string const &arguments, std::string const &session, void *payload);
+
+json wikiHandler(std::string const &arguments, std::string const &session, void *payload);
+
+json klingerHandler(std::string const &arguments, std::string const &session, void *payload);
+
+/* ------------------------------------------------------------------------------------------------------------------ */
+
+json simple_response(std::string const &text, std::string const &session = NULL_STRING, bool success = true);
 
-[[maybe_unused]] void decl_me_daddy(int not_an_int) { (void) not_an_int; }
+json create_annotation(Reply::AnnotationType annotation = Reply::AnnotationType::none,
+                       std::string const &extra = EMPTY_STRING);
+
+json create_text(std::string const &text);
+json create_text(std::string const &text, std::vector<json> &&annotations);
+
+json create_response(std::vector<json> &&reply, std::string const &session = NULL_STRING, bool success = true);
+
+/* ------------------------------------------------------------------------------------------------------------------ */
 
 int main() {
     crow::SimpleApp app;
 
     // command --> handler
     static std::unordered_map<std::string, CommandHandler> const commands{
-            {"stop", {stopHandler, &app}},
-            {"klinger", {klingerHandler}}
+            {"stop",    {stopHandler, &app}},
+            {"wiki",    {wikiHandler}},
+            {"klinger", {klingerHandler}},
     };
 
     CROW_ROUTE(app, "/")
@@ -54,9 +74,7 @@ int main() {
                             return crow::response{handler.exec(arguments, session)};
                         }
 
-                        crow::json::wvalue response;
-
-                        return crow::response{"no such command!\n"};
+                        return crow::response{simple_response("No such command!", NULL_STRING, false)};
                     });
 
     app.port(18080).multithreaded().run();
@@ -64,63 +82,75 @@ int main() {
     std::cout << "Stopped successfully" << std::endl;
 }
 
-crow::json::wvalue klingerHandler(std::string const &arguments, std::string const &session, void *payload) {
-    (void)payload;
-
-    using namespace crow::json;
-
-    crow::json::wvalue response(type::Object);
+/* ------------------------------------------------------------------------------------------------------------------ */
 
-    std::vector<wvalue> reply_vec;
-
-    std::vector<wvalue> annotation_vec;
-
-    wvalue annotation(type::Object);
-    annotation["type"] = "none";
-    annotation["extra"] = "";
-
-    annotation_vec.push_back(std::move(annotation));
+json klingerHandler(std::string const &arguments, std::string const &session, void *payload) {
+    (void) payload;
+    return simple_response("Bonjour!");
+}
 
-    wvalue reply(type::Object);
-    reply["text"] = "Bonjour!";
-    reply["annotations"] = std::move(annotation_vec);
+json wikiHandler(std::string const &arguments, std::string const &session, void *payload) {
+    (void) payload;
 
-    reply_vec.push_back(std::move(reply));
+    std::vector<json> linkAnnotations;
+    linkAnnotations.push_back(std::move(create_annotation(Reply::AnnotationType::link, "Wikipedia")));
+    linkAnnotations.push_back(std::move(create_annotation(Reply::AnnotationType::underline)));
 
-    response["success"] = true;
-    response["session"] = NULL_STRING;
-    response["reply"] = std::move(reply_vec);
+    std::vector<json> reply_vec;
+    reply_vec.push_back(std::move(create_text("Visit ")));
+    reply_vec.push_back(std::move(create_text("https://eo.wikipedia.org/", std::move(linkAnnotations))));
+    reply_vec.push_back(std::move(create_text(" today!")));
 
-    return response;
+    return create_response(std::move(reply_vec), session, true);
 }
 
-crow::json::wvalue stopHandler(std::string const &arguments, std::string const &session, void *payload) {
-    auto app = (crow::SimpleApp*) payload;
+json stopHandler(std::string const &arguments, std::string const &session, void *payload) {
+    auto app = (crow::SimpleApp *) payload;
     app->stop();
-    using namespace crow::json;
 
-    crow::json::wvalue response(type::Object);
+    std::vector<json> annotations;
+    annotations.push_back(std::move(create_annotation(Reply::AnnotationType::bold)));
 
-    std::vector<wvalue> reply_vec;
+    std::vector<json> reply_vec;
+    reply_vec.push_back(std::move(create_text("stopped", std::move(annotations))));
 
-    std::vector<wvalue> annotation_vec;
+    return create_response(std::move(reply_vec), session, true);
+}
 
-    wvalue annotation(type::Object);
-    annotation["type"] = "bold";
-    annotation["extra"] = "";
+/* ------------------------------------------------------------------------------------------------------------------ */
 
-    annotation_vec.push_back(std::move(annotation));
+json simple_response(std::string const &text, std::string const &session, bool success) {
+    std::vector<json> reply_vec;
+    reply_vec.push_back(std::move(create_text(text)));
 
-    wvalue reply(type::Object);
-    reply["text"] = "stopped.";
-    reply["annotations"] = std::move(annotation_vec);
+    return create_response(std::move(reply_vec), session, success);
+}
 
-    reply_vec.push_back(std::move(reply));
+json create_annotation(Reply::AnnotationType annotationType, std::string const &extra) {
+    json annotation(crow::json::type::Object);
+    annotation["type"] = Reply::GetStringAnnotationType(annotationType);
+    annotation["extra"] = extra;
+    return annotation;
+}
 
-    response["success"] = true;
-    response["session"] = NULL_STRING;
-    response["reply"] = std::move(reply_vec);
+json create_text(std::string const &text) {
+    std::vector<json> annotations;
+    annotations.push_back(std::move(create_annotation()));
+    return create_text(text, std::move(annotations));
+}
+
+json create_text(std::string const &text, std::vector<json> &&annotations) {
+    json reply(crow::json::type::Object);
+    reply["text"] = text;
+    reply["annotations"] = std::move(annotations);
+    return reply;
+}
 
+json create_response(std::vector<json> &&reply, std::string const &session, bool success) {
+    json response(crow::json::type::Object);
+    response["success"] = success;
+    response["session"] = session;
+    response["reply"] = std::move(reply);
     return response;
 }