PsychichHTTP v2-dev

lib/PsychicHttp/src/PsychicUploadHandler.h

@@ -1,68 +1,32 @@
 #ifndef PsychicUploadHandler_h
 #define PsychicUploadHandler_h
 
+#include "MultipartProcessor.h"
 #include "PsychicCore.h"
 #include "PsychicHttpServer.h"
 #include "PsychicRequest.h"
 #include "PsychicWebHandler.h"
-#include "PsychicWebParameter.h"
-
-//callback definitions
-typedef std::function<esp_err_t(PsychicRequest *request, const String& filename, uint64_t index, uint8_t *data, size_t len, bool final)> PsychicUploadCallback;
 
 /*
-* HANDLER :: Can be attached to any endpoint or as a generic request handler.
-*/
+ * HANDLER :: Can be attached to any endpoint or as a generic request handler.
+ */
 
-class PsychicUploadHandler : public PsychicWebHandler {
+class PsychicUploadHandler : public PsychicWebHandler
+{
   protected:
+    esp_err_t _basicUploadHandler(PsychicRequest* request);
+    esp_err_t _multipartUploadHandler(PsychicRequest* request);
+
     PsychicUploadCallback _uploadCallback;
 
-    PsychicRequest *_request;
-
-    String _temp;
-    size_t _parsedLength;
-    uint8_t _multiParseState;
-    String _boundary;
-    uint8_t _boundaryPosition;
-    size_t _itemStartIndex;
-    size_t _itemSize;
-    String _itemName;
-    String _itemFilename;
-    String _itemType;
-    String _itemValue;
-    uint8_t *_itemBuffer;
-    size_t _itemBufferIndex;
-    bool _itemIsFile;
-
-    esp_err_t _basicUploadHandler(PsychicRequest *request);
-    esp_err_t _multipartUploadHandler(PsychicRequest *request);
-
-    void _handleUploadByte(uint8_t data, bool last);
-    void _parseMultipartPostByte(uint8_t data, bool last);
-
   public:
     PsychicUploadHandler();
     ~PsychicUploadHandler();
 
-    bool canHandle(PsychicRequest *request) override;
-    esp_err_t handleRequest(PsychicRequest *request) override;
+    bool canHandle(PsychicRequest* request) override;
+    esp_err_t handleRequest(PsychicRequest* request, PsychicResponse* response) override;
 
-    PsychicUploadHandler * onUpload(PsychicUploadCallback fn);
-};
-
-enum {
-  EXPECT_BOUNDARY,
-  PARSE_HEADERS,
-  WAIT_FOR_RETURN1,
-  EXPECT_FEED1,
-  EXPECT_DASH1,
-  EXPECT_DASH2,
-  BOUNDARY_OR_DATA,
-  DASH3_OR_RETURN2,
-  EXPECT_FEED2,
-  PARSING_FINISHED,
-  PARSE_ERROR
+    PsychicUploadHandler* onUpload(PsychicUploadCallback fn);
 };
 
 #endif // PsychicUploadHandler_h