Adjust index for log (#5)

* Adjust index for log * Strip ascii with regex * Style * format
home-assistant · Sep 12, 2020 · 5ba9b1f · 5ba9b1f
1 parent f922125
commit 5ba9b1f
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 21 deletions.
diff --git a/http.go b/http.go
@@ -6,6 +6,7 @@ import (
 	"log"
 	"net"
 	"net/http"
+	"regexp"
 	"strings"
 )
 
@@ -84,10 +85,15 @@ func statusIndex(w http.ResponseWriter, r *http.Request) {
 	// Set logs
 	if !data.On {
 		var buf bytes.Buffer
+		var re = regexp.MustCompile(`\[\d+m`)
 		logWriter := bufio.NewWriter(&buf)
 
-		supervisorLogs(logWriter)
-		data.Logs = buf.String()
+		err := supervisorLogs(logWriter)
+		if err != nil {
+			data.Logs = err.Error()
+		} else {
+			data.Logs = re.ReplaceAllLiteralString(buf.String(), "")
+		}
 	}
 
 	// Render Website

diff --git a/main.go b/main.go
@@ -45,7 +45,6 @@ func main() {
 	// Serve static help files
 	staticFiles := http.FileServer(http.Dir(wwwRoot))
 	http.Handle("/observer.css", staticFiles)
-	http.Handle("/observer.js", staticFiles)
 
 	log.Print("Start webserver on http://0.0.0.0:80")
 	http.ListenAndServe(":80", nil)

diff --git a/rootfs/usr/share/www/index.html b/rootfs/usr/share/www/index.html
@@ -5,18 +5,19 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Home Assistant observer</title>
     <link rel="stylesheet" href="/observer.css">
-    <script src="/observer.js"></script>
   </head>
   <body>
       <div class="container">
         <h1>Home Assistant observer</h1>
         <div class="info">
           <span class="title">Supervisor:</span>
-          <span id="connection" class="description {{if .On}}connected{{else}}disconnected{{end}}">
+          <span class="description {{if .On}}connected{{else}}disconnected{{end}}">
             {{if .On}}Connected{{else}}Disconnected{{end}}
           </span>
         </div>
-        <pre id="log" class="log">{{.Logs}}</pre>
+        {{ if not .On }}
+          <pre class="log">{{.Logs}}</pre>
+        {{ end }}
       </div>
   </body>
 </html>
diff --git a/rootfs/usr/share/www/observer.css b/rootfs/usr/share/www/observer.css
@@ -41,7 +41,11 @@ h1 {
     white-space: pre-wrap;
     overflow-wrap: break-word;
     font-size: 12px;
+    line-height: 18px;
     font-family: monospace;
+    padding: 4px;
+    border-radius: 8px;
+    background-color: #fafafa;
 }
 
 @media only screen and (max-width: 600px) {

diff --git a/rootfs/usr/share/www/observer.js b/rootfs/usr/share/www/observer.js