From ed8ff0db97d93ad0e1d5309a3bddea339b2d27a5 Mon Sep 17 00:00:00 2001
From: Christian Herzog <daduke@daduke.org>
Date: Thu, 12 Mar 2020 19:24:51 +0100
Subject: [PATCH] add favicon

---
 components/wifi-manager/CMakeLists.txt        |   2 +-
 components/wifi-manager/component.mk          |   2 +-
 components/wifi-manager/favicon.ico           | Bin 0 -> 4286 bytes
 .../wifi-manager/http_server_handlers.c       |  20 ++++++++++--------
 components/wifi-manager/index.html            |   1 +
 5 files changed, 14 insertions(+), 11 deletions(-)
 create mode 100644 components/wifi-manager/favicon.ico

diff --git a/components/wifi-manager/CMakeLists.txt b/components/wifi-manager/CMakeLists.txt
index 1ffcd350..103276b7 100644
--- a/components/wifi-manager/CMakeLists.txt
+++ b/components/wifi-manager/CMakeLists.txt
@@ -2,7 +2,7 @@ idf_component_register( SRC_DIRS .
 						INCLUDE_DIRS . ${IDF_PATH}/components/esp_http_server/src ${IDF_PATH}/components/esp_http_server/src/port/esp32  ${IDF_PATH}/components/esp_http_server/src/util ${IDF_PATH}/components/esp_http_server/src/
 						REQUIRES squeezelite-ota json mdns 
 						PRIV_REQUIRES tools services platform_config esp_common json newlib freertos  spi_flash nvs_flash mdns pthread wpa_supplicant platform_console esp_http_server   
-						EMBED_FILES style.css code.js index.html bootstrap.min.css.gz jquery.min.js.gz popper.min.js.gz bootstrap.min.js.gz
+						EMBED_FILES style.css code.js index.html bootstrap.min.css.gz jquery.min.js.gz popper.min.js.gz bootstrap.min.js.gz favicon.ico
 						
 )
  
diff --git a/components/wifi-manager/component.mk b/components/wifi-manager/component.mk
index 491db5eb..d2d213f3 100644
--- a/components/wifi-manager/component.mk
+++ b/components/wifi-manager/component.mk
@@ -6,7 +6,7 @@
 # lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable,
 # please read the SDK documents if you need to do this.
 #
-COMPONENT_EMBED_FILES := style.css code.js index.html bootstrap.min.css.gz jquery.min.js.gz popper.min.js.gz bootstrap.min.js.gz
+COMPONENT_EMBED_FILES := style.css code.js index.html bootstrap.min.css.gz jquery.min.js.gz popper.min.js.gz bootstrap.min.js.gz favicon.ico
 COMPONENT_ADD_INCLUDEDIRS := . 
 COMPONENT_EXTRA_INCLUDES += $(IDF_PATH)/components/esp_http_server/src $(IDF_PATH)/components/esp_http_server/src/port/esp32  $(IDF_PATH)/components/esp_http_server/src/util $(IDF_PATH)/components/esp_http_server/src/
 CFLAGS += -D LOG_LOCAL_LEVEL=ESP_LOG_INFO
diff --git a/components/wifi-manager/favicon.ico b/components/wifi-manager/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..1af989355e151c1d0d62389b13b9f9787ed97102
GIT binary patch
literal 4286
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
UyH%lZi{Sqv_&<M`vz56236sqHFaQ7m

literal 0
HcmV?d00001

diff --git a/components/wifi-manager/http_server_handlers.c b/components/wifi-manager/http_server_handlers.c
index d16e4be4..a11603ec 100644
--- a/components/wifi-manager/http_server_handlers.c
+++ b/components/wifi-manager/http_server_handlers.c
@@ -101,6 +101,8 @@ extern const uint8_t code_js_start[] asm("_binary_code_js_start");
 extern const uint8_t code_js_end[] asm("_binary_code_js_end");
 extern const uint8_t index_html_start[] asm("_binary_index_html_start");
 extern const uint8_t index_html_end[] asm("_binary_index_html_end");
+extern const uint8_t favicon_ico_start[] asm("_binary_favicon_ico_start");
+extern const uint8_t favicon_ico_end[] asm("_binary_favicon_ico_end");
 esp_err_t redirect_processor(httpd_req_t *req, httpd_err_code_t error);
 
 
@@ -407,35 +409,35 @@ esp_err_t resource_filehandler(httpd_req_t *req){
 	    const size_t file_size = (code_js_end - code_js_start);
 	    set_content_type_from_file(req, filename);
 	    httpd_resp_send(req, (const char *)code_js_start, file_size);
-	}
-	else if(strstr(filename, "style.css")) {
+	} else if(strstr(filename, "style.css")) {
 		set_content_type_from_file(req, filename);
 	    const size_t file_size = (style_css_end - style_css_start);
 	    httpd_resp_send(req, (const char *)style_css_start, file_size);
+    } else if(strstr(filename, "favicon.ico")) {
+		set_content_type_from_file(req, filename);
+	    const size_t file_size = (favicon_ico_end - favicon_ico_start);
+	    httpd_resp_send(req, (const char *)favicon_ico_start, file_size);
 	} else if(strstr(filename, "jquery.js")) {
 		set_content_type_from_file(req, filename);
 		httpd_resp_set_hdr(req, "Content-Encoding", "gzip");
 	    const size_t file_size = (jquery_gz_end - jquery_gz_start);
 	    httpd_resp_send(req, (const char *)jquery_gz_start, file_size);
-	}else if(strstr(filename, "popper.js")) {
+	} else if(strstr(filename, "popper.js")) {
 		set_content_type_from_file(req, filename);
 		httpd_resp_set_hdr(req, "Content-Encoding", "gzip");
 	    const size_t file_size = (popper_gz_end - popper_gz_start);
 	    httpd_resp_send(req, (const char *)popper_gz_start, file_size);
-	}
-	else if(strstr(filename, "bootstrap.js")) {
+	} else if(strstr(filename, "bootstrap.js")) {
 			set_content_type_from_file(req, filename);
 			httpd_resp_set_hdr(req, "Content-Encoding", "gzip");
 		    const size_t file_size = (bootstrap_js_gz_end - bootstrap_js_gz_start);
 		    httpd_resp_send(req, (const char *)bootstrap_js_gz_start, file_size);
-	}
-	else if(strstr(filename, "bootstrap.css")) {
+	} else if(strstr(filename, "bootstrap.css")) {
 			set_content_type_from_file(req, filename);
 			httpd_resp_set_hdr(req, "Content-Encoding", "gzip");
 		    const size_t file_size = (bootstrap_css_gz_end - bootstrap_css_gz_start);
 		    httpd_resp_send(req, (const char *)bootstrap_css_gz_start, file_size);
-    }
-	else {
+    } else {
 	   ESP_LOGE_LOC(TAG, "Unknown resource [%s] from path [%s] ", filename,filepath);
 	   /* Respond with 404 Not Found */
 	   httpd_resp_send_err(req, HTTPD_404_NOT_FOUND, "File does not exist");
diff --git a/components/wifi-manager/index.html b/components/wifi-manager/index.html
index 445bd99a..98625b79 100644
--- a/components/wifi-manager/index.html
+++ b/components/wifi-manager/index.html
@@ -4,6 +4,7 @@
         <meta charset="utf-8"/>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
         <meta name="apple-mobile-web-app-capable" content="yes" />
+        <link rel="shortcut icon" type="image/x-icon" href="/res/favicon.ico">
         <link rel="stylesheet" href="/res/bootstrap.css">
         <link rel="stylesheet" href="/res/style.css">
         <script src="/res/jquery.js"></script>