Fixed subfolders

Author: sea5kg

src/main.cpp

@@ -29,8 +29,10 @@ int main(int argc, const char* argv[]) {
     httpServer.setPort(1234);
     httpServer.setMaxWorkers(1);
     if (sType == "folder") {
+        httpServer.addHandler((WSJCppLightWebHttpHandlerBase *)new WSJCppLightWebHttpHandlerWebFolder("/app/", sDir));
         httpServer.addHandler((WSJCppLightWebHttpHandlerBase *)new WSJCppLightWebHttpHandlerWebFolder("/", sDir));
     } else if (sType == "rewrite") {
+        httpServer.addHandler((WSJCppLightWebHttpHandlerBase *)new WSJCppLightWebHttpHandlerRewriteFolder("/app/", sDir));
         httpServer.addHandler((WSJCppLightWebHttpHandlerBase *)new WSJCppLightWebHttpHandlerRewriteFolder("/", sDir));
     }
     httpServer.startSync();

src/wsjcpp_light_web_http_handler_rewrite_folder.cpp

@@ -7,8 +7,8 @@ WSJCppLightWebHttpHandlerRewriteFolder::WSJCppLightWebHttpHandlerRewriteFolder(c
 : WSJCppLightWebHttpHandlerBase("rewrite-folder") {
 
     TAG = "WSJCppLightWebHttpHandlerRewriteFolder";
-    m_sPrefixPath = sPrefixPath;
-    m_sWebFolder = sWebFolder;
+    m_sPrefixPath = WSJCppCore::doNormalizePath(sPrefixPath + "/");
+    m_sWebFolder = WSJCppCore::doNormalizePath(sWebFolder + "/");
 }
 
 // ----------------------------------------------------------------------
@@ -39,9 +39,9 @@ bool WSJCppLightWebHttpHandlerRewriteFolder::handle(const std::string &sWorkerId
     std::string _tag = TAG + "-" + sWorkerId;
     std::string sRequestPath = pRequest->getRequestPath();
     // WSJCppLog::warn(_tag, pRequest->requestPath());
+
+    // cat subfolder
     std::string sRequestPath2 = sRequestPath.substr(m_sPrefixPath.length(), sRequestPath.length() - m_sPrefixPath.length());
-    std::string sFilePath = m_sWebFolder + sRequestPath2;
-    
     std::string sFilePath = m_sWebFolder + sRequestPath2;
     if (WSJCppCore::fileExists(sFilePath)) {
         WSJCppLightWebHttpResponse resp(pRequest->getSockFd());

src/wsjcpp_light_web_http_handler_web_folder.cpp

@@ -7,8 +7,8 @@ WSJCppLightWebHttpHandlerWebFolder::WSJCppLightWebHttpHandlerWebFolder(const std
 : WSJCppLightWebHttpHandlerBase("web-folder") {
 
     TAG = "WSJCppLightWebHttpHandlerWebFolder";
-    m_sPrefixPath = sPrefixPath;
-    m_sWebFolder = sWebFolder;
+    m_sPrefixPath = WSJCppCore::doNormalizePath(sPrefixPath + "/");
+    m_sWebFolder = WSJCppCore::doNormalizePath(sWebFolder + "/");
 }
 
 // ----------------------------------------------------------------------
@@ -38,11 +38,15 @@ bool WSJCppLightWebHttpHandlerWebFolder::canHandle(const std::string &sWorkerId,
 bool WSJCppLightWebHttpHandlerWebFolder::handle(const std::string &sWorkerId, WSJCppLightWebHttpRequest *pRequest) {
     std::string _tag = TAG + "-" + sWorkerId;
     std::string sRequestPath = pRequest->getRequestPath();
-    // WSJCppLog::warn(_tag, pRequest->requestPath());
-    if (sRequestPath == "/") {
-        sRequestPath = "/index.html";
+    // WSJCppLog::warn(_tag, sRequestPath);
+    std::string sRequestPath2 = sRequestPath.substr(m_sPrefixPath.length(), sRequestPath.length() - m_sPrefixPath.length());
+    // WSJCppLog::warn(_tag, sRequestPath2);
+    if (sRequestPath2 == "") {
+        sRequestPath2 = "index.html";
     }
-    std::string sFilePath = m_sWebFolder + sRequestPath;
+    std::string sFilePath = m_sWebFolder + sRequestPath2;
+    // WSJCppLog::warn(_tag, sFilePath);
+    
     if (WSJCppCore::fileExists(sFilePath)) {
         WSJCppLightWebHttpResponse resp(pRequest->getSockFd());
         resp.cacheSec(60).ok().sendFile(sFilePath);