Split up GUI code some and modularize it

cmd/gui/README.md

@@ -1,3 +1,3 @@
-# ui
+# gui
 
 This is the main source code for the custom UI used by PiFrame. This is responsible for things like restart, WiFi config, ensuring the slide show is running and more.

cmd/gui/gui.go

@@ -0,0 +1,10 @@
+package main
+
+import (
+	"git.kemonine.info/PiFrame/ui"
+)
+
+func main() {
+	ui.Slideshow()
+	ui.ConfigGui()
+}

ui/README.md

@@ -0,0 +1,3 @@
+# ui
+
+This is the main implementation for various aspects of the main PiFrame [G]UI

ui/config.go

@@ -1,4 +1,4 @@
-package main
+package ui
 
 import (
 	"fmt"
@@ -35,7 +35,7 @@ const (
 	PAGE_POWEROFF = "PAGE_POWEROFF"
 )
 
-func main() {
+func ConfigGui() {
 	// Memory info for status panel
 	meminfo := &procmeminfo.MemInfo{}
 	err := meminfo.Update()

ui/slideshow.go

@@ -100,13 +100,13 @@ func Slideshow() {
 	}(keyboardCtx)
 
 	// Run fim
-	// if err := fim.Run(); err != nil {
+	if err := fim.Run(); err != nil {
-	// 	// Unwrap the error a bit so we can find out if a signal killed fim or something else
+		// Unwrap the error a bit so we can find out if a signal killed fim or something else
-	// 	// An exit code of -1 means the program didn't exit in time or was terminated by a signal (per the docs)
+		// An exit code of -1 means the program didn't exit in time or was terminated by a signal (per the docs)
-	// 	if exitError, ok := err.(*exec.ExitError); ok && exitError.ExitCode() != -1 {
+		if exitError, ok := err.(*exec.ExitError); ok && exitError.ExitCode() != -1 {
-	// 		log.Fatalf("Error running fim : %s", err)
+			log.Fatalf("Error running fim : %s", err)
-	// 	}
+		}
-	// }
+	}
 
 	// Stop fim slideshow advancing go routine
 	close(stop_ticker)