[all] Add the generated files

cong1920 · Dec 30, 2024 · 6731846 · 6731846
1 parent 0996346
commit 6731846
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/single_headers/lithium.hh b/single_headers/lithium.hh
@@ -1821,7 +1821,9 @@ struct sqlite_database {
 
 #ifndef LITHIUM_SINGLE_HEADER_GUARD_LI_HTTP_CLIENT_HTTP_CLIENT_HH
 #define LITHIUM_SINGLE_HEADER_GUARD_LI_HTTP_CLIENT_HTTP_CLIENT_HH
+#ifndef CURL_STATICLIB
 #define CURL_STATICLIB
+#endif  // CURL_STATICLIB
 #pragma comment(lib, "crypt32")
 #pragma comment(lib, "ws2_32.lib")
 #pragma comment(lib, "Wldap32.lib")
@@ -6834,7 +6836,7 @@ template <typename Req, typename Resp> struct api {
 
   typedef api<Req, Resp> self;
 
-  api(): is_global_handler(false), global_handler_(nullptr) { }
+  api() : is_global_handler(false), global_handler_(nullptr) {}
 
   using H = std::function<void(Req&, Resp&)>;
   struct VH {
@@ -6875,7 +6877,9 @@ template <typename Req, typename Resp> struct api {
 
   void add_subapi(std::string prefix, const self& subapi) {
     subapi.routes_map_.for_all_routes([this, prefix](auto r, VH h) {
-      if (!r.empty() && r.back() == '/')
+      if (r.empty() || r == "/")
+        h.url_spec = prefix;
+      else if (r.back() == '/')
         h.url_spec = prefix + r;
       else
         h.url_spec = prefix + '/' + r;
@@ -6893,13 +6897,11 @@ template <typename Req, typename Resp> struct api {
     std::cout << std::endl;
   }
   auto call(std::string_view method, std::string_view route, Req& request, Resp& response) const {
-    if(is_global_handler)
-    {
-        global_handler_(request, response);
-        return;
+    if (is_global_handler) {
+      global_handler_(request, response);
+      return;
     }
-    if (route == last_called_route_)
-    {
+    if (route == last_called_route_) {
       if (last_handler_.verb == ANY or parse_verb(method) == last_handler_.verb) {
         request.url_spec = last_handler_.url_spec;
         last_handler_.handler(request, response);
@@ -6910,7 +6912,8 @@ template <typename Req, typename Resp> struct api {
 
     // skip the last / of the url and trim spaces.
     std::string_view route2(route);
-    while (route2.size() > 1 and (route2[route2.size() - 1] == '/' || route2[route2.size() - 1] == ' '))
+    while (route2.size() > 1 and
+           (route2[route2.size() - 1] == '/' || route2[route2.size() - 1] == ' '))
       route2 = route2.substr(0, route2.size() - 1);
 
     auto it = routes_map_.find(route2);

diff --git a/single_headers/lithium_http_client.hh b/single_headers/lithium_http_client.hh
@@ -32,7 +32,9 @@
 
 #ifndef LITHIUM_SINGLE_HEADER_GUARD_LI_HTTP_CLIENT_HTTP_CLIENT_HH
 #define LITHIUM_SINGLE_HEADER_GUARD_LI_HTTP_CLIENT_HTTP_CLIENT_HH
+#ifndef CURL_STATICLIB
 #define CURL_STATICLIB
+#endif  // CURL_STATICLIB
 #pragma comment(lib, "crypt32")
 #pragma comment(lib, "ws2_32.lib")
 #pragma comment(lib, "Wldap32.lib")

diff --git a/single_headers/lithium_http_server.hh b/single_headers/lithium_http_server.hh
@@ -3654,7 +3654,7 @@ template <typename Req, typename Resp> struct api {
 
   typedef api<Req, Resp> self;
 
-  api(): is_global_handler(false), global_handler_(nullptr) { }
+  api() : is_global_handler(false), global_handler_(nullptr) {}
 
   using H = std::function<void(Req&, Resp&)>;
   struct VH {
@@ -3695,7 +3695,9 @@ template <typename Req, typename Resp> struct api {
 
   void add_subapi(std::string prefix, const self& subapi) {
     subapi.routes_map_.for_all_routes([this, prefix](auto r, VH h) {
-      if (!r.empty() && r.back() == '/')
+      if (r.empty() || r == "/")
+        h.url_spec = prefix;
+      else if (r.back() == '/')
         h.url_spec = prefix + r;
       else
         h.url_spec = prefix + '/' + r;
@@ -3713,13 +3715,11 @@ template <typename Req, typename Resp> struct api {
     std::cout << std::endl;
   }
   auto call(std::string_view method, std::string_view route, Req& request, Resp& response) const {
-    if(is_global_handler)
-    {
-        global_handler_(request, response);
-        return;
+    if (is_global_handler) {
+      global_handler_(request, response);
+      return;
     }
-    if (route == last_called_route_)
-    {
+    if (route == last_called_route_) {
       if (last_handler_.verb == ANY or parse_verb(method) == last_handler_.verb) {
         request.url_spec = last_handler_.url_spec;
         last_handler_.handler(request, response);
@@ -3730,7 +3730,8 @@ template <typename Req, typename Resp> struct api {
 
     // skip the last / of the url and trim spaces.
     std::string_view route2(route);
-    while (route2.size() > 1 and (route2[route2.size() - 1] == '/' || route2[route2.size() - 1] == ' '))
+    while (route2.size() > 1 and
+           (route2[route2.size() - 1] == '/' || route2[route2.size() - 1] == ' '))
       route2 = route2.substr(0, route2.size() - 1);
 
     auto it = routes_map_.find(route2);