Hieromon Ikasamo
6 years ago
parent
bd4ee7fe80
commit
cc6a14f529
@ -0,0 +1,38 @@ |
||||
/**
|
||||
* The upload wrapper base class definition and the default up-loader |
||||
* class declarations. |
||||
* @file AutoConnectUpload.h |
||||
* @author hieromon@gmail.com |
||||
* @version 0.9.8 |
||||
* @date 2019-03-19 |
||||
* @copyright MIT license. |
||||
*/ |
||||
|
||||
#ifndef _AUTOCONNECTUPLOAD_H_ |
||||
#define _AUTOCONNECTUPLOAD_H_ |
||||
|
||||
#if defined(ARDUINO_ARCH_ESP8266) |
||||
#include <ESP8266WiFi.h> |
||||
#include <ESP8266WebServer.h> |
||||
#elif defined(ARDUINO_ARCH_ESP32) |
||||
#include <WiFi.h> |
||||
#include <WebServer.h> |
||||
#endif |
||||
|
||||
/**
|
||||
* Uploader base class. This class is a wrapper for the AutoConnectUpload |
||||
* class, and only the upload member function is implemented. |
||||
*/ |
||||
class AutoConnectUploadHandler { |
||||
public: |
||||
explicit AutoConnectUploadHandler() {} |
||||
virtual ~AutoConnectUploadHandler() {} |
||||
virtual void upload(const String& requestUri, const HTTPUpload& upload); |
||||
|
||||
protected: |
||||
virtual bool _open(const char* filename, const char* mode) = 0; |
||||
virtual size_t _write(const uint8_t *buf, size_t size) = 0; |
||||
virtual void _close(void) = 0; |
||||
}; |
||||
|
||||
#endif // !_AUTOCONNECTUPLOAD_H_
|
||||
@ -0,0 +1,143 @@ |
||||
/**
|
||||
* The default upload handler implementation. |
||||
* @file AutoConnectUploadImpl.h |
||||
* @author hieromon@gmail.com |
||||
* @version 0.9.8 |
||||
* @date 2019-03-19 |
||||
* @copyright MIT license. |
||||
*/ |
||||
|
||||
#ifndef _AUTOCONNECTUPLOADIMPL_H_ |
||||
#define _AUTOCONNECTUPLOADIMPL_H_ |
||||
|
||||
#if defined(ARDUINO_ARCH_ESP8266) |
||||
#include <ESP8266WiFi.h> |
||||
#elif defined(ARDUINO_ARCH_ESP32) |
||||
#include <WiFi.h> |
||||
#include <SPIFFS.h> |
||||
#endif |
||||
#include <SPI.h> |
||||
#include <SD.h> |
||||
#define FS_NO_GLOBALS |
||||
#include <FS.h> |
||||
|
||||
// Types branching to be code commonly for the file system classes with
|
||||
// ESP8266 and ESP32.
|
||||
#if defined(ARDUINO_ARCH_ESP8266) |
||||
typedef fs::FS SPIFFST; // SPIFFS:File system class
|
||||
typedef fs::File SPIFileT; // SPIFFS:File class
|
||||
typedef SDClass SDClassT; // SD:File system class
|
||||
typedef File SDFileT; // SD:File class
|
||||
#elif defined(ARDUINO_ARCH_ESP32) |
||||
typedef fs::SPIFFSFS SPIFFST; |
||||
typedef fs::File SPIFileT; |
||||
typedef fs::SDFS SDClassT; |
||||
typedef SDFile SDFileT; |
||||
#endif |
||||
|
||||
#include "AutoConnectDefs.h" |
||||
#include "AutoConnectUpload.h" |
||||
|
||||
/**
|
||||
* Handles the default upload process depending on the upload status. |
||||
* This handler function supports the status of UPLOAD_FILE_START, |
||||
* UPLOAD_FILE_WRITE, UPLOAD_FILE_END and calls open, write and |
||||
* close processing respectively. |
||||
* @param requestUri A reference to the upload request uri. |
||||
* @param upload A reference of HTTPUpload entity. |
||||
*/ |
||||
void AutoConnectUploadHandler::upload(const String& requestUri, const HTTPUpload& upload) { |
||||
AC_UNUSED(requestUri); |
||||
switch (upload.status) { |
||||
case UPLOAD_FILE_START: { |
||||
String absFilename = "/" + upload.filename; |
||||
(void)_open(absFilename.c_str(), "w"); |
||||
break; |
||||
} |
||||
case UPLOAD_FILE_WRITE: |
||||
(void)_write(upload.buf, upload.currentSize); |
||||
break; |
||||
case UPLOAD_FILE_ABORTED: |
||||
case UPLOAD_FILE_END: |
||||
_close(); |
||||
break; |
||||
} |
||||
} |
||||
|
||||
// Default handler for uploading to the standard SPIFFS class embedded in the core.
|
||||
class AutoConnectUploadFS : public AutoConnectUploadHandler { |
||||
public: |
||||
explicit AutoConnectUploadFS(SPIFFST& media) : _media(&media) {} |
||||
~AutoConnectUploadFS() { _close(); } |
||||
|
||||
protected: |
||||
bool _open(const char* filename, const char* mode) override { |
||||
#if defined(ARDUINO_ARCH_ESP8266) |
||||
if (_media->begin()) { |
||||
#elif defined(ARDUINO_ARCH_ESP32) |
||||
if (_media->begin(true)) { |
||||
#endif |
||||
_file = _media->open(filename, mode); |
||||
return _file != false;
|
||||
} |
||||
return false; |
||||
} |
||||
|
||||
size_t _write(const uint8_t* buf, size_t size) override { |
||||
if (_file) |
||||
return _file.write(buf, size); |
||||
else |
||||
return -1; |
||||
} |
||||
|
||||
void _close(void) override { |
||||
if (_file) |
||||
_file.close(); |
||||
_media->end(); |
||||
} |
||||
|
||||
SPIFFST* _media; |
||||
SPIFileT _file;
|
||||
}; |
||||
|
||||
// Default handler for uploading to the standard SD class embedded in the core.
|
||||
class AutoConnectUploadSD : public AutoConnectUploadHandler { |
||||
public: |
||||
explicit AutoConnectUploadSD(SDClassT& media, const uint8_t cs = AUTOCONNECT_SD_CS, const uint32_t speed = AUTOCONNECT_SD_SPEED) : _media(&media), _cs(cs), _speed(speed) {} |
||||
~AutoConnectUploadSD() { _close(); } |
||||
|
||||
protected: |
||||
bool _open(const char* filename, const char* mode) override { |
||||
#if defined(ARDUINO_ARCH_ESP8266) |
||||
if (_media->begin(_cs, _speed)) { |
||||
uint8_t oflag = *mode == 'w' ? FILE_WRITE : FILE_READ; |
||||
#elif defined(ARDUINO_ARCH_ESP32) |
||||
if (_media->begin(_cs, SPI, _speed)) { |
||||
const char* oflag = mode; |
||||
#endif |
||||
_file = _media->open(filename, oflag); |
||||
return _file != false; |
||||
} |
||||
return false; |
||||
} |
||||
|
||||
size_t _write(const uint8_t* buf, size_t size) override { |
||||
if (_file) |
||||
return _file.write(buf, size); |
||||
else |
||||
return -1; |
||||
} |
||||
|
||||
void _close(void) override { |
||||
if (_file) |
||||
_file.close(); |
||||
_media->end(); |
||||
} |
||||
|
||||
SDClassT* _media; |
||||
SDFileT _file; |
||||
uint8_t _cs; |
||||
uint8_t _speed; |
||||
}; |
||||
|
||||
#endif // !_AUTOCONNECTUPLOADIMPL_H_
|
||||
Loading…
Reference in new issue