Refactor StaticFileHandler: update getNextLink method to use boolean …

…for directory type and improve path handling
smatsuodev · Jan 10, 2025 · 31f5c6c · 31f5c6c
1 parent df68497
commit 31f5c6c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/lib/http/handler/static_file_handler.cpp b/src/lib/http/handler/static_file_handler.cpp
@@ -33,16 +33,15 @@ namespace http {
         return result;
     }
 
-    std::string
-    StaticFileHandler::getNextLink(const std::string &newPath, const std::string &dName, const unsigned char dType) {
-        const std::string isDir = (dType == DT_DIR) ? "/" : "";
+    std::string StaticFileHandler::getNextLink(const std::string &newPath, const std::string &dName, const bool dir) {
+        const std::string dirSlash = dir ? "/" : "";
         if (dName == "." || dName == "..") {
             if (dName == ".") {
-                return newPath + isDir;
+                return newPath + dirSlash;
             }
-            return newPath.substr(0, newPath.find_last_of('/')) + isDir;
+            return newPath.substr(0, newPath.find_last_of('/')) + dirSlash;
         }
-        return newPath + "/" + dName + isDir;
+        return newPath + "/" + dName + dirSlash;
     }
 
     Result<std::string, HttpStatusCode> StaticFileHandler::makeDirectoryListingHtml(const std::string &path) {
@@ -64,7 +63,7 @@ namespace http {
         while ((dp = readdir(dir)) != NULL) {
             const std::string dName = dp->d_name;
             const unsigned char dType = dp->d_type;
-            const std::string dNameLink = getNextLink(normalizedPath, dName, dType);
+            const std::string dNameLink = getNextLink(normalizedPath, dName, dType == DT_DIR);
             if (dName == ".") {
                 continue;
             }

diff --git a/src/lib/http/handler/static_file_handler.hpp b/src/lib/http/handler/static_file_handler.hpp
@@ -11,7 +11,7 @@ namespace http {
         virtual Response serve(const Request &req);
 
     private:
-        static std::string getNextLink(const std::string &path, const std::string &dName, unsigned char dType);
+        static std::string getNextLink(const std::string &newPath, const std::string &dName, bool isDir);
         static Result<std::string, HttpStatusCode> makeDirectoryListingHtml(const std::string &path);
         static Response directoryListing(const std::string &path);
         config::LocationContext::DocumentRootConfig docRootConfig_;