Add path args

esp8266 · Bmooij · Oct 6, 2018 · Oct 6, 2018 · Oct 6, 2018 · Oct 6, 2018
commit b80ea9021b59583469499573aed564b3ce80ea1c
diff --git a/libraries/ESP8266WebServer/src/ESP8266WebServer-impl.h b/libraries/ESP8266WebServer/src/ESP8266WebServer-impl.h
@@ -542,6 +542,11 @@ void ESP8266WebServerTemplate<ServerType>::_streamFileCore(const size_t fileSize
   send(200, contentType, emptyString);
 }
 
+String ESP8266WebServer::pathArg(int i) { 
+  if (_currentHandler != nullptr)
+    return _currentHandler->pathArg(i);
+  return "";
+}
 
 template <typename ServerType>
 const String& ESP8266WebServerTemplate<ServerType>::arg(const String& name) const {

diff --git a/libraries/ESP8266WebServer/src/ESP8266WebServer.h b/libraries/ESP8266WebServer/src/ESP8266WebServer.h
@@ -107,6 +107,7 @@ class ESP8266WebServerTemplate
   // Allows setting server options (i.e. SSL keys) by the instantiator
   ServerType &getServer() { return _server; }
 
+  String pathArg(int i);          // get request path argument by number
   const String& arg(const String& name) const;    // get request argument value by name
   const String& arg(int i) const;          // get request argument value by number
   const String& argName(int i) const;      // get request argument name by number

diff --git a/libraries/ESP8266WebServer/src/detail/RequestHandler.h b/libraries/ESP8266WebServer/src/detail/RequestHandler.h
@@ -18,6 +18,16 @@ class RequestHandler {
 
 private:
     RequestHandler<ServerType>* _next = nullptr;
+
+protected:
+    std::vector<String> pathArgs;
+
+public:
+    String pathArg(int i) { 
+        if (i < pathArgs.size())
+            return pathArgs[i];
+        return "";
+    }
 };
 
 #endif //REQUESTHANDLER_H
diff --git a/libraries/ESP8266WebServer/src/detail/RequestHandlersImpl.h b/libraries/ESP8266WebServer/src/detail/RequestHandlersImpl.h
@@ -18,16 +18,60 @@ class FunctionRequestHandler : public RequestHandler<ServerType> {
     , _uri(uri)
     , _method(method)
     {
+		int numParams = 0, start = 0;
+        do
+        {
+            start = _uri.indexOf("{}", start);
+            if (start > 0)
+            {
+                numParams++;
+                start += 2;
+            }
+        } while (start > 0);
+        pathArgs = std::vector<String>(numParams);
     }
 
     bool canHandle(HTTPMethod requestMethod, String requestUri) override  {
         if (_method != HTTP_ANY && _method != requestMethod)
             return false;
 
-        if (requestUri != _uri)
-            return false;
+        if (_uri == requestUri)
+            return true;
+
+        int listIndex = 0;
+        int length = _uri.length();
+        int j = 0;
+        for (int i = 0; i < length; i++, j++)
+        {
+            char uriChar = _uri[i];
+            char requestUriChar = requestUri[j];
+
+            if (uriChar == requestUriChar)
+                continue;
+
+            if (uriChar != '{')
+                return false;
+
+            i += 2; // index of char after '}'
+            if (i >= length)
+            {
+                // there is no char after '}'
+                pathArgs[listIndex] = requestUri.substring(j);
+                return true;
+            }
+            else
+            {
+                char charEnd = _uri[i];
+                int uriIndex = requestUri.indexOf(charEnd, j);
+                if (uriIndex < 0)
+                    return false;
+                pathArgs[listIndex] = requestUri.substring(j, uriIndex);
+                j = uriIndex;
+            }
+            listIndex++;
+        }
 
-        return true;
+        return j >= requestUri.length();
     }
 
     bool canUpload(String requestUri) override  {