gaugendre/buzzer
1
0
Fork 0
mirror of https://github.com/Crocmagnon/buzzer.git synced 2024-11-24 00:48:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow uploading file

Browse source
This commit is contained in:
Gabriel Augendre 2023-01-04 12:41:34 +01:00
parent 028d136ac4
commit 6dde204b84
2 changed files with 56 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
data/www/index.html
View file

@ -22,6 +22,11 @@
<div id="available-files"></div> <div id="available-files"></div>
</div> </div>
<form class="w3-margin w3-center w3-card w3-padding-24" action="/upload" method="POST" enctype="multipart/form-data">
<input type="file" accept="audio/*" name="file">
<input type="submit" class="w3-button w3-blue">
</form>
<div class="w3-margin w3-center w3-card w3-padding-24"> <div class="w3-margin w3-center w3-card w3-padding-24">
<button id="volume-decrease" onclick="volume(-1)" class="w3-button w3-blue w3-xlarge w3-ripple">Vol-</button> <button id="volume-decrease" onclick="volume(-1)" class="w3-button w3-blue w3-xlarge w3-ripple">Vol-</button>
<span id="volume-current"></span> <span id="volume-current"></span>

59
src/main.cpp
View file

@ -98,8 +98,14 @@ void onStatus(AsyncWebServerRequest *request)
Serial.println("Status"); Serial.println("Status");
AsyncResponseStream *response = request->beginResponseStream("application/json"); AsyncResponseStream *response = request->beginResponseStream("application/json");
DynamicJsonDocument root(256); DynamicJsonDocument root(1024);
root["selectedFile"] = selectedFile; root["selectedFile"] = selectedFile;
JsonObject volume = root.createNestedObject("volume");
volume["current"] = currentVolume;
volume["canDecrease"] = currentVolume > 0;
volume["canIncrease"] = currentVolume < 21;
JsonArray files = root.createNestedArray("files"); JsonArray files = root.createNestedArray("files");
File music = SD.open("/"); File music = SD.open("/");
File file = music.openNextFile(); File file = music.openNextFile();
@ -111,11 +117,7 @@ void onStatus(AsyncWebServerRequest *request)
file.close(); file.close();
file = music.openNextFile(); file = music.openNextFile();
} }
root.shrinkToFit();
JsonObject volume = root.createNestedObject("volume");
volume["current"] = currentVolume;
volume["canDecrease"] = currentVolume > 0;
volume["canIncrease"] = currentVolume < 21;
serializeJson(root, *response); serializeJson(root, *response);
@ -159,6 +161,47 @@ void onChangeVolume(AsyncWebServerRequest *request)
onStatus(request); onStatus(request);
} }
void onUpload(AsyncWebServerRequest *request)
{
Serial.println("onUpload");
request->send(200);
}
void onUploadFile(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final)
{
Serial.println("onUploadFile");
if (!index)
{
Serial.printf("UploadStart: %s\n", filename.c_str());
String filePath = "/" + filename;
request->_tempFile = SD.open(filePath, FILE_WRITE);
}
if (!request->_tempFile)
{
Serial.println("Couldn't open file.");
request->redirect("/");
return;
}
if (len)
{
Serial.printf("Write to: %s\n", filename.c_str());
request->_tempFile.write(data, len);
}
if (final)
{
Serial.printf("UploadEnd: %s, %u B\n", filename.c_str(), index + len);
request->_tempFile.close();
request->redirect("/");
}
}
void onNotFound(AsyncWebServerRequest *request)
{
Serial.println("not found");
request->send(400);
}
void setup() void setup()
{ {
// Setup serial // Setup serial
@ -263,8 +306,8 @@ void setup()
server.on("/status", HTTP_GET, onStatus); server.on("/status", HTTP_GET, onStatus);
server.on("/select-file", HTTP_POST, onSelectFile); server.on("/select-file", HTTP_POST, onSelectFile);
server.on("/change-volume", HTTP_POST, onChangeVolume); server.on("/change-volume", HTTP_POST, onChangeVolume);
server.onNotFound([](AsyncWebServerRequest *request) server.on("/upload", HTTP_POST, onUpload, onUploadFile);
{ request->send(404); }); server.onNotFound(onNotFound);
server.serveStatic("/", SPIFFS, "/www/").setDefaultFile("index.html"); server.serveStatic("/", SPIFFS, "/www/").setDefaultFile("index.html");
server.begin(); server.begin();