From f0ec3e668429fd7b0dbcf85bff7614a690906462 Mon Sep 17 00:00:00 2001
From: Mario Lukas <info@fabscan.org>
Date: Fri, 4 Dec 2020 00:10:06 +0100
Subject: [PATCH] fix (FileBrowser): fixed JavaScript Errors

---
 html/website.html | 10 ++++------
 src/main.cpp      | 42 +++++++++++++++++++++++++++++++++++++++---
 src/websiteMgmt.h |  4 ++--
 3 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/html/website.html b/html/website.html
index 1a1f442..e2e7818 100644
--- a/html/website.html
+++ b/html/website.html
@@ -55,9 +55,7 @@
             text-align: right;
             font-size: 0.8em;
         }
-        .refreshAction:hover{
-            color: gray;
-        }
+
         .overlay {
             z-index: 9;
             opacity: 0.8;
@@ -142,7 +140,7 @@
                 <div id="filebrowser">
                     <div class="filetree demo" id="filetree"></div>
                     <div class="refreshAction">
-                        <span id="refreshAction" style="cursor: pointer;" data-toggle="tooltip" data-placement="top" title="Datei Liste aktualisieren."><i class="fas fa-sync fa-1x"></i> Dateien suchen</span>
+                        <span id="refreshAction" data-toggle="tooltip" data-placement="top" title="Datei Liste aktualisieren."><i class="fas fa-sync fa-1x"></i> Dateien suchen</span>
                     </div>
                 </div>
                 <div id="indexing-progress" class="indexing-progress overlay">
@@ -309,7 +307,7 @@
     <div class="messages col-md-6 my-2"></div>
 </div>
 <script type="text/javascript">
-    var DEBUG = true;
+    var DEBUG = false;
     var lastIdclicked = '';
     var host = $(location).attr('hostname');
 
@@ -475,7 +473,7 @@
               }
           } if (socketMsg.pong != null) {
               if (socketMsg.pong == 'pong') {
-                 // pong();
+                  pong();
               }
           } if ("refreshFileList" in socketMsg){
               toastr.info("Die Datei Liste wurde neu erzeugt!");
diff --git a/src/main.cpp b/src/main.cpp
index 05dc830..525d184 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -367,6 +367,7 @@ static const char restartWebsite[] PROGMEM = "<p>Der Tonuino wird neu gestartet.
 SPIClass spiSD(HSPI);
 TaskHandle_t mp3Play;
 TaskHandle_t rfid;
+TaskHandle_t fileTaskHandle;
 #ifdef NEOPIXEL_ENABLE
     TaskHandle_t LED;
 #endif
@@ -711,8 +712,8 @@ void parseSDFileList(fs::FS &fs, const char * dirname, const char * parent, uint
 }
 
 // TODO: maybe this is not save with asyncWebserver
-bool indexingIsRunning = false;
-
+uint8_t runFileIndexing = 0;
+uint8_t fileIndexingDone = 0;
 /**
  *  Public function for creating file index json on SD-Card.
  *  It notifies the user client via websockets when the indexing
@@ -724,7 +725,21 @@ void createJSONFileList(){
     appendToFile(SD, DIRECTORY_INDEX_FILE, "]");
     isFirstJSONtNode  =  true;
     sendWebsocketData(0, 30);
-    indexingIsRunning = false;
+}
+
+void fileHandlingTask(void *arguments){
+
+    while(true) {
+
+        if(runFileIndexing){
+            runFileIndexing = 0;
+            //createJSONFileList();
+            fileIndexingDone = 1;
+        }
+
+        esp_task_wdt_reset();
+        vTaskDelay(portTICK_PERIOD_MS*150);
+    }
 }
 
 // Measures voltage of a battery as per interval or after bootup (after allowing a few seconds to settle down)
@@ -3300,6 +3315,8 @@ bool processJsonRequest(char *_serialJson) {
         sendWebsocketData(0, 20);
         return false;
     } else if (doc.containsKey("refreshFileList")) {
+        //createJSONFileList();
+        runFileIndexing = 1;
         createJSONFileList();
     }
 
@@ -3912,6 +3929,18 @@ void setup() {
         1 /* Core where the task should run */
     );
 
+    /**
+     * SD Card File Indexing Task
+     */
+    xTaskCreatePinnedToCore(
+        fileHandlingTask, /* Function to implement the task */
+        "fileHandlingTask", /* Name of the task */
+        2000,  /* Stack size in words */
+        NULL,  /* Task input parameter */
+        3,  /* Priority of the task */
+        &fileTaskHandle,  /* Task handle. */
+        1 /* Core where the task should run */
+    );
 
     //esp_sleep_enable_ext0_wakeup((gpio_num_t) DREHENCODER_BUTTON, 0);
 
@@ -3968,6 +3997,13 @@ void loop() {
     sleepHandler();
     deepSleepManager();
     rfidPreferenceLookupHandler();
+
+    /*
+    if(fileIndexingDone){
+        fileIndexingDone = 0;
+        sendWebsocketData(0,30);
+    }*/
+
     if (wifiManager() == WL_CONNECTED) {
         #ifdef MQTT_ENABLE
             if (enableMqtt) {
diff --git a/src/websiteMgmt.h b/src/websiteMgmt.h
index 139f350..1d9e557 100644
--- a/src/websiteMgmt.h
+++ b/src/websiteMgmt.h
@@ -55,6 +55,7 @@ static const char mgtWebsite[] PROGMEM = "<!DOCTYPE html>\
             text-align: right;\
             font-size: 0.8em;\
         }\
+\
         .overlay {\
             z-index: 9;\
             opacity: 0.8;\
@@ -139,7 +140,7 @@ static const char mgtWebsite[] PROGMEM = "<!DOCTYPE html>\
                 <div id=\"filebrowser\">\
                     <div class=\"filetree demo\" id=\"filetree\"></div>\
                     <div class=\"refreshAction\">\
-                        <span id=\"refreshAction\" style=\"cursor: pointer;\" data-toggle=\"tooltip\" data-placement=\"top\" title=\"Datei Liste aktualisieren.\"><i class=\"fas fa-sync fa-1x\"></i> Dateien suchen</span>\
+                        <span id=\"refreshAction\" data-toggle=\"tooltip\" data-placement=\"top\" title=\"Datei Liste aktualisieren.\"><i class=\"fas fa-sync fa-1x\"></i> Dateien suchen</span>\
                     </div>\
                 </div>\
                 <div id=\"indexing-progress\" class=\"indexing-progress overlay\">\
@@ -467,7 +468,6 @@ static const char mgtWebsite[] PROGMEM = "<!DOCTYPE html>\
           } if (socketMsg.status != null) {\
               if (socketMsg.status == 'ok') {\
                   toastr.success(\"Aktion erfolgreich ausgeführt.\" );\
-                  $('#overlay').style.display = \"none\";\
               } else {\
                   toastr.error(\"Es ist ein Fehler aufgetreten.\" );\
               }\