From 96aa10bc6d481e296d0c7c25c6e33dbc99e4c4a4 Mon Sep 17 00:00:00 2001
From: e2002 <e2002@bk.ru>
Date: Fri, 3 Mar 2023 18:32:32 +0300
Subject: [PATCH] web_board_uploader_v1

---
 yoRadio/data/www/script.js.gz  | Bin 5580 -> 5593 bytes
 yoRadio/data/www/settings.html |   3 ++-
 yoRadio/src/core/config.cpp    |  43 ++++++++++++++++++++++++---------
 yoRadio/src/core/config.h      |   3 +++
 yoRadio/src/core/netserver.cpp |  31 +++++++++++++++++++++++-
 yoRadio/src/core/netserver.h   |  21 ++++++++++++++++
 6 files changed, 88 insertions(+), 13 deletions(-)

diff --git a/yoRadio/data/www/script.js.gz b/yoRadio/data/www/script.js.gz
index e12541b2e69e7c612ca6b18fc4234145fb415cd3..f1b23eddcfe53f3d465dacb212466262d8f72d4f 100644
GIT binary patch
delta 1300
zcmV+v1?&3EE7>auABzYG-Vp+1u?X1^e+vsHVIB**opnIrm^$ForMC^4CV#`Emsn{H
zO5^})g9cGqEq&f3FTIG1Q?139>J_KFj*=5M{kSP`<&H96sAF3>K*31AB%k(-3cpQJ
zg{)yxIGmQwBk#(txyxk)bS(s6p_VCN>};TGWuOBXsgOC0i@I?b%9i5Q8!db&e=7=a
z2Q_JrB}^^A^LMa+(5N=C+(cE_I2-rGJXP~^#NvMhbmyqZp-Y-3j^ttcb6y6o9Uo@^
z$G~f3{HdncSU$H;LtaW&-=5(an=JIMsK_tZ42ZV|ey+BFZGO83&{Psu)+B{`Bc6h6
z6eEYy?!vf|ggg#>M<R+Pl^Rg|e>tk*2!7zD&@sN*c-QLr!F0m6&v<}}-Gp>B_ZA=V
za$AH6cpEEJUV5}jVONJKU=|a8!+%KrWxn)&d`QXU`{Fl#97ps#AU3`~{t^Gz_#XQH
zzHe8`oEKpL+n0=|?D)|V@!X~MAV8a|50X@UI!-q7(~OZwdzOx4^m^5ce<9*@5a!lq
zCXMRHv&0z>{`o9J-G^j}my0=-GWmkwkW6IaOz1GCAX?0{rS7y@a@Qp=`VzCsp0!(3
zaPPxn$TYvg3yL%X-_N}NCa0vh4_++7$Jr~M5+(ze$fG>Q?c4&A92F4vYT|b^jW8hB
zHkUYGcq0tPfaj;eD?9mnf821rN#n#5XNg6_?T~!N%p>@f6CvS})j?%Dmw9@c6;6;!
z)#`F_HP7=m9RSU#8F^8nOo?b~&=+wSO+P?Us7lE>;8>n;_j<>H2;clIhoS9%&0&y(
z7!@J*{O11%yWA^(OFoORKxfm$Hj@}EV7#0ucq7(82W<=-2C}4+e_3~ugN!u3r6lxV
zraWc19C(_9{n2JLC5WY*zkKd1+?L+uDX^krBfi1!CF)-|E88BGhRmIxdXX<`^+Nl|
zBK9$U@PPdK=IP_hXXL?yG5?;U$P4@yu=TSvjWNl{S(@qf^Iv%e1MB-lS&MlP$&7c)
zWnK;fajU9<OF7Age|^!r$eUo+u~S~Q<>H8-l%(-0<zE}hL$b-9$lF8&HbjT66j2xC
ze=hKnXZX+jZmuMO*;vv0o+AbbQaNQHXp3+f7H10&IJ=nBo#OsMl>HuA%OKtCyc9Ob
zR+a?IWhPUT4gEk5YR<aeYHC!g-XX_Xn+~*^U5=i<e)X*Mf1!r*nbq%H>-B%?8Om05
zLEgm)S<C#=K$+}JqgNWTHp4~yQXGMmau7&00amW9L!y2@=cj8^({dw`DmKscK`;<+
z5?HPD08EO!11kUb06cGw`6aMy_-_TT^F247D&2R_O-75*yuS=>1U@B6mcJsI&~!oh
zw{PV)BgMBef5@1KM;0>=Y#{%7Wn1B=O@m%~Y(3(8CP#MHhn<e~{rza3B{T82K&QU`
z?oa&zCKYp6J1=0P(a74vOM~&N;Y1i{qMpf_i$hgQ>n_8!-W043$u7kYJgh{q6!wSQ
zG4PLGS}I88_twBkE`Txqd0Q=|A+H?1kz;AkL3A2;f8NvhM?U!cdEiceknSpfclKlc
znba<6Y%@2c-ASwrWXKQUSHkqt>NO&QrBgCD`W>A+O_V6jl5^SVu#mS>v6=}mKl-bg
z44v68@$hzgg|*2+E8Ba=kf1qv+9tZ6JWyxfGLQRf=J5ZOOoB*C<uOV?ilr2P{x7Rd
KQyA!60ssKtDUcQb

delta 1286
zcmV+h1^N2fE6ghhABzYGum7uKu?X1^e}eVt(%Xhilb2zFOQ@|ugzT`^$%{&8>2oA`
zsYG0KYAu#juO#JlkDR#acTE8)_mTNRecICZ3P$=7`Lt(L_$`SlWDS$TL9}!pc~^GL
z-76yiYasv&t4sl7T?1V!+Z@11h0I}G)Q!VXwiK_*XzsqOD7+oiq}}(MT7c)}e<0r1
zs5Y_OL{-=%8~3n0weoYs;(r8m=O|C#C9M)i@^Jh)FI(4+k28Q{;59A&R8t%*pR=bS
zFa4@-#qbPE7J64y<b!Jl#9ISDS6jd~zcmABDrqWfh(f&)PeC?{kwa;BS6oR#9^btq
z5yg_)$}9dH)o=tq@Dk@3-)y{VfA#!eI^o-0Jn+PBLOPmzi;s92Ey9GkjTI#?JzAx(
z3&WHxiwVDxKP3M$UwS`2q-64a@f$y8BYGYX8{Z%Qi2rMR4}E{%w<~4Ii!gxgM#fWY
z{3wWc?ouldpv~0+Nvb}5CL8(b!$_nlOUEaAz3N2{aheBnVKb9P^<!7!e@q7d+?Ap3
zL$bunz?@2%d_izXCNj|_bQn_xEoRzMchD@kOA;7;iCJaO+N~+L<6$vmnqRpEMH+#x
zX5N33Q&QaDE*9bA>=jSpl7UO)(HrA7Z2?J+3W$3(@iv-97?5k5OPnvf5e84d^HbrK
zo%}s+klv(m;)%1rqTzN(e?DWT5d6xCkZ{TBpt7CIygJPaCrG7gb-8Go=jEFYZ06LA
zJSI`5M6@;Ni#R-{A9yHKrQ{rNEKj(5z2iWHZ~m6U(Dtk5FvvlSija7I^M8b0?v=kK
zpG8=pvuR?RNe31%UVaq35o@4>HU<s@S%S%|JIO&t8sAb9dN5O-e==MSJgve0Xfv7;
z#8S>*KKB)FOYid3R?)E$-{AKR^)Hf@ZI4PD=FU&O$QQMGp?wq)`xrlXKz@Dm^zr30
z^5DUke}7Tz<9`d-`dOOBm=xqJ&GdTruRP;`^?0JJ#XN{)hPvhQEeC<PRn@GeoMgkk
z=w0MFFiY4ekJ@t4e?w48(s-5fuLI>F*<?@TZ6X32qC;1Ts0;Ex7kDW%{AYfbR+7N%
zspx&rkpKj#oC*-MMK}$MvxNtoUChBwasMF7bdRiMkZyKf3L9E0OM>Mxlc~gpexL_6
zXI*b0HL6wbkmILK2T;u}M^9hBdRF?dLivp8cdqsNKlO}af2+D6@8U$OWqui;Om?Qx
zD-Btj;Ua!1j;u;K2&9?-E7#T`Q9qya)3B*&xsgZ}o9E^r7>G9stX6seCPm%>mH&GH
zo;SyQ5Lh<+w}RLCUK&qr?z@*JqeW=mUp6)ZpOPfYUwuqyx}f}9welN};@cKvOvEFL
znFltIe{Hg@e^Aq=K`%YF9`QYsBfIOvPRIKGel*XLnfP0vQ(u4gr~Uwwig~G>7qHQ2
zWbNUl!T8m1A`CQ9&*aR-p{k{Im*HA(3RZ_?m*NK*R-(8G`$O&+_(v)&6{PZeX5b_j
zz!?7=t(MY|R|Mb4v9#wPIt@JUY5XG}eEvLer$0z{bd|q5`!WBlX_vIKnH$pX5LN~<
z<cH=fVR~ux8WF+LDVZDnPR*SrN|aK`x$JaU$Xlsc%><Yq>D5ez&g_?Xc)PtK+T@^>
w?Y(12(40JN6Wvc9sIzaG$MZFF`2R{KK_sQ}7$qRZQi?zS7nHITaF|>G0JLI#6951J

diff --git a/yoRadio/data/www/settings.html b/yoRadio/data/www/settings.html
index 4d6618e..d388dec 100644
--- a/yoRadio/data/www/settings.html
+++ b/yoRadio/data/www/settings.html
@@ -39,7 +39,8 @@
             </div>
           </div> 
           <div class="flex-row last">
-            <div class="button apply" data-name="fwupdate" id="fwupdate">Firmware update</div>
+            <div class="button apply" data-name="fwupdate" id="fwupdate">Firmware</div>
+            <div class="button apply" data-name="webboard" id="webboard">Board</div>
           </div> 
         </section><a name="screen"></a>
         <section class="group group_display group_oled group_nextion hidden" id="group_display">
diff --git a/yoRadio/src/core/config.cpp b/yoRadio/src/core/config.cpp
index c1495fc..b650d44 100644
--- a/yoRadio/src/core/config.cpp
+++ b/yoRadio/src/core/config.cpp
@@ -15,8 +15,20 @@ void u8fix(char *src){
   if ((uint8_t)last >= 0xC2) src[strlen(src)-1]='\0';
 }
 
+bool Config::_isFSempty() {
+  const char* reqiredFiles[] = {"dragpl.js.gz","elogo.png","elogo84.png","index.html","ir.css.gz","ir.html","ir.js.gz","script.js.gz","settings.css.gz","settings.html","style.css.gz","update.html"};
+  const uint8_t reqiredFilesSize = 12;
+  char fullpath[28];
+  for (uint8_t i=0; i<reqiredFilesSize; i++){
+    sprintf(fullpath, "/www/%s", reqiredFiles[i]);
+    if(!SPIFFS.exists(fullpath)) return true;
+  }
+  return false;
+}
+
 void Config::init() {
   EEPROM.begin(EEPROM_SIZE);
+  emptyFS = true;
 #if IR_PIN!=255
     irindex=-1;
 #endif
@@ -26,12 +38,16 @@ void Config::init() {
   if(store.play_mode==80) store.play_mode=0b100;
   sdSnuffle = bitRead(store.play_mode, 2);
   store.play_mode = store.play_mode & 0b11;
+  _initHW();
   //if (!SPIFFS.begin(false, "/spiffs", 30)) {
-  if (!SPIFFS.begin(false)) {
+  if (!SPIFFS.begin(true)) {
+    Serial.println("##[ERROR]#\tSPIFFS Mount Failed");
     return;
   }
-  
-  loadTheme();
+  BOOTLOG("SPIFFS mounted");
+  //emptyFS = !SPIFFS.exists("/www/index.html");
+  emptyFS = _isFSempty();
+  if(emptyFS) BOOTLOG("SPIFFS is empty!");
   ssidsCount = 0;
   sdResumePos = 0;
   if(SDC_CS!=255){
@@ -42,7 +58,7 @@ void Config::init() {
       if(store.play_mode==PM_SDCARD) initSDPlaylist();
     }
   }
-  if(store.play_mode==PM_WEB) initPlaylist();
+  if(store.play_mode==PM_WEB && !emptyFS) initPlaylist();
   
   if (store.lastStation == 0 && store.countStation > 0) {
     store.lastStation = 1;
@@ -50,18 +66,23 @@ void Config::init() {
   }
   
   loadStation(store.lastStation);
-#if IR_PIN!=255
+
+  bootInfo();
+}
+
+void Config::_initHW(){
+  loadTheme();
+  #if IR_PIN!=255
   eepromRead(EEPROM_START_IR, ircodes);
   if(ircodes.ir_set!=4224){
     ircodes.ir_set=4224;
     memset(ircodes.irVals, 0, sizeof(ircodes.irVals));
   }
-#endif
-#if BRIGHTNESS_PIN!=255
-  pinMode(BRIGHTNESS_PIN, OUTPUT);
-  setBrightness(false);
-#endif
-  bootInfo();
+  #endif
+  #if BRIGHTNESS_PIN!=255
+    pinMode(BRIGHTNESS_PIN, OUTPUT);
+    setBrightness(false);
+  #endif
 }
 
 uint16_t Config::color565(uint8_t r, uint8_t g, uint8_t b)
diff --git a/yoRadio/src/core/config.h b/yoRadio/src/core/config.h
index c84b861..79c526e 100644
--- a/yoRadio/src/core/config.h
+++ b/yoRadio/src/core/config.h
@@ -157,6 +157,7 @@ class Config {
     uint32_t sdResumePos;
     uint16_t backupLastStation;
     bool     sdSnuffle;
+    bool     emptyFS;
   public:
     Config() {};
     void save();
@@ -206,6 +207,8 @@ class Config {
     void initSDPlaylist();
     void indexSDPlaylist();
     bool checkNoMedia(const char* path);
+    void _initHW();
+    bool _isFSempty();
 };
 
 extern Config config;
diff --git a/yoRadio/src/core/netserver.cpp b/yoRadio/src/core/netserver.cpp
index 706e0dc..ff91ff8 100644
--- a/yoRadio/src/core/netserver.cpp
+++ b/yoRadio/src/core/netserver.cpp
@@ -25,6 +25,7 @@ AsyncUDP udp;
 
 String processor(const String& var);
 void handleUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final);
+void handleUploadWeb(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final);
 void handleUpdate(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final);
 void handleHTTPArgs(AsyncWebServerRequest * request);
 void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len);
@@ -53,12 +54,21 @@ bool NetServer::begin() {
   irRecordEnable = false;
   nsQueue = xQueueCreate( 20, sizeof( nsRequestParams_t ) );
   while(nsQueue==NULL){;}
-  webserver.on("/", HTTP_ANY, handleHTTPArgs);
+  if(config.emptyFS){
+    webserver.on("/", HTTP_GET, [](AsyncWebServerRequest * request) { request->send_P(200, "text/html", emptyfs_html, processor); });
+    webserver.on("/", HTTP_POST, [](AsyncWebServerRequest *request) { request->redirect("/"); ESP.restart(); }, handleUploadWeb);
+  }else{
+    webserver.on("/", HTTP_ANY, handleHTTPArgs);
+    webserver.on("/webboard", HTTP_GET, [](AsyncWebServerRequest * request) { request->send_P(200, "text/html", emptyfs_html, processor); });
+    webserver.on("/webboard", HTTP_POST, [](AsyncWebServerRequest *request) { request->redirect("/"); }, handleUploadWeb);
+  }
+  
   webserver.on(PLAYLIST_PATH, HTTP_GET, handleHTTPArgs);
   webserver.on(INDEX_PATH, HTTP_GET, handleHTTPArgs);
   webserver.on(PLAYLIST_SD_PATH, HTTP_GET, handleHTTPArgs);
   webserver.on(INDEX_SD_PATH, HTTP_GET, handleHTTPArgs);
   webserver.on(SSIDS_PATH, HTTP_GET, handleHTTPArgs);
+  
   webserver.on("/upload", HTTP_POST, beginUpload, handleUpload);
   webserver.on("/update", HTTP_GET, handleHTTPArgs);
   webserver.on("/update", HTTP_POST, beginUpdate, handleUpdate);
@@ -640,6 +650,7 @@ void NetServer::requestOnChange(requestType_e request, uint8_t clientId) {
 }
 
 String processor(const String& var) { // %Templates%
+  if (var == "ACTION") return network.status == CONNECTED?"webboard":"";
   if (var == "VERSION") return YOVERSION;
   if (var == "MODE") {
     if(config.store.play_mode==PM_SDCARD) {
@@ -653,6 +664,9 @@ String processor(const String& var) { // %Templates%
 
 void handleUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
   if (!index) {
+    //String spath = "/www/";
+    //if(filename=="playlist.csv" || filename=="wifi.csv") spath = "/data/";
+    //request->_tempFile = SPIFFS.open(config.emptyFS?spath + filename:TMP_PATH , "w");
     request->_tempFile = SPIFFS.open(TMP_PATH , "w");
   }
   if (len) {
@@ -664,6 +678,21 @@ void handleUpload(AsyncWebServerRequest *request, String filename, size_t index,
   }
 }
 
+void handleUploadWeb(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
+  DBGVB("File: %s, size:%u bytes, index: %u, final: %s\n", filename.c_str(), len, index, final?"true":"false");
+  if (!index) {
+    String spath = "/www/";
+    if(filename=="playlist.csv" || filename=="wifi.csv") spath = "/data/";
+    request->_tempFile = SPIFFS.open(spath + filename , "w");
+  }
+  if (len) {
+    request->_tempFile.write(data, len);
+  }
+  if (final) {
+    request->_tempFile.close();
+  }
+}
+
 void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len) {
   switch (type) {
     case WS_EVT_CONNECT: if (config.store.audioinfo) Serial.printf("[WEBSOCKET] client #%u connected from %s\n", client->id(), client->remoteIP().toString().c_str()); break;
diff --git a/yoRadio/src/core/netserver.h b/yoRadio/src/core/netserver.h
index 9a73b43..38b4055 100644
--- a/yoRadio/src/core/netserver.h
+++ b/yoRadio/src/core/netserver.h
@@ -7,6 +7,27 @@
 
 enum requestType_e : uint8_t  { PLAYLIST=1, STATION=2, STATIONNAME=3, ITEM=4, TITLE=5, VOLUME=6, NRSSI=7, BITRATE=8, MODE=9, EQUALIZER=10, BALANCE=11, PLAYLISTSAVED=12, GETMODE=13, GETINDEX=14, GETACTIVE=15, GETSYSTEM=16, GETSCREEN=17, GETTIMEZONE=18, GETWEATHER=19, GETCONTROLS=20, DSPON=21, SDPOS=22, SDLEN=23, SDSNUFFLE=24 };
 enum import_e      : uint8_t  { IMDONE=0, IMPL=1, IMWIFI=2 };
+const char emptyfs_html[] PROGMEM = R"(
+<!DOCTYPE html><html><head><meta charset="UTF-8"><title>ёRadio - WEB Board Uploader</title><style>body {background-color: #000; color: #e3d25f; font-size: 20px;}
+hr {margin: 20px 0; border: 0; border-top: #555 1px solid;} p {text-align: center;margin-bottom: 10px;} section {max-width: 500px; text-align: center;margin:0 auto;}
+input[type=file] {color: #ccc;} input[type=file]::file-selector-button, input[type=submit] {border: 2px solid #e3d25f;color: #ccc;padding: 6px 16px;border-radius: 15px;background-color: #000;margin: 0 6px;}
+span{color:#ccc}</style></head><body>
+<section>
+<h2>ёRadio - WEB Board Uploader</h2>
+<hr />
+<span>Please select <u>ALL</u> files from <i>yoRadio/data/www/</i> and upload them using the form below</span>
+<hr />
+<form action="/%ACTION%" method="post" enctype="multipart/form-data">
+<p><label for="www">www:</label> <input type="file" name="www" id="www" multiple></p>
+<hr />
+<span>Optional, you can also upload <i>playlist.csv</i> and <i>wifi.csv files</i> from backup</span>
+<p><label for="data">wifi:</label><input type="file" name="data" id="data" multiple></p>
+<hr />
+<p><input type="submit" name="submit" value="Upload"></p>
+</form>
+</section>
+</body></html>
+)";
 
 struct nsRequestParams_t
 {