From 2d1ac3c80341324176579e8528c56b7b8a8f6ab9 Mon Sep 17 00:00:00 2001
From: Justin Hawkins <justin@hawkins.id.au>
Date: Sun, 7 Feb 2021 22:06:19 +1030
Subject: [PATCH] Clean up logging and improve web interface

---
 config/config.go | 4 +++-
 data/config.html | 5 +----
 data/index.html  | 4 ++--
 dau.go           | 8 ++++----
 web/server.go    | 1 -
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/config/config.go b/config/config.go
index a256756..300e371 100644
--- a/config/config.go
+++ b/config/config.go
@@ -26,7 +26,9 @@ func LoadOrInit() {
   log.Printf("Trying to load from %s\n", configPath)
   _, err := os.Stat(configPath)
   if os.IsNotExist(err) {
-    log.Printf("Initialising empty config")
+    log.Printf("NOTE: No config file, writing out sample configuration")
+    log.Printf("You need to set the configuration via the web interface")
+
     Config.WebHookURL = ""
     Config.Path = homeDir() + string(os.PathSeparator) + "screenshots"
     Config.Watch = 10
diff --git a/data/config.html b/data/config.html
index 5cc2579..0377f50 100644
--- a/data/config.html
+++ b/data/config.html
@@ -51,7 +51,7 @@
    <form class="">
      <div class="form-row align-items-center config-item" data-key="watch">
        <div class="col-sm-5 my-1">
-         <span>Period between filesystem checks</span>
+         <span>Period between filesystem checks (seconds)</span>
        </div>
        <div class="col-sm-4 my-1">
          <label class="sr-only" for="inlineFormInputName">Seconds</label>
@@ -81,9 +81,6 @@
      </div>
    </form>
 
-   <p class="lead">
-     <a href="#" class="btn btn-lg btn-secondary">Learn more</a>
-   </p>
  </main>
 
 
diff --git a/data/index.html b/data/index.html
index 1a3cc09..fdfd082 100644
--- a/data/index.html
+++ b/data/index.html
@@ -1,8 +1,8 @@
 
  <main role="main" class="inner DAU">
    <h1 class="DAU-heading">Discord Auto Upload</h1>
-   <p class="lead">Hey look it's DAU.</p>
+   <p class="lead">Hey look, it's DAU :-)</p>
    <p class="lead">
-     <a href="#" class="btn btn-lg btn-secondary">Learn more</a>
+     <a href="https://github.com/tardisx/discord-auto-upload" class="btn btn-lg btn-secondary">Learn more</a>
    </p>
  </main>
diff --git a/dau.go b/dau.go
index 4d6fa43..b70135c 100644
--- a/dau.go
+++ b/dau.go
@@ -55,7 +55,7 @@ func main() {
 			}
 			lastCheck = newLastCheck
 		}
-		log.Print("sleeping before next check")
+		log.Printf("sleeping for %ds before next check of %s", config.Config.Watch, config.Config.Path)
 		time.Sleep(time.Duration(config.Config.Watch) * time.Second)
 	}
 }
@@ -63,11 +63,11 @@ func main() {
 func checkPath(path string) bool {
 	src, err := os.Stat(path)
 	if err != nil {
-		log.Println("path problem: ", err)
+		log.Printf("Problem with path '%s': %s", path, err)
 		return false
 	}
 	if !src.IsDir() {
-		log.Println(path, " is not a directory")
+		log.Printf("Problem with path '%s': is not a directory", path)
 		return false
 	}
 	return true
@@ -287,7 +287,7 @@ func sleepForRetries(retry int) {
 	}
 	retryTime := (6-retry)*(6-retry) + 6
 	log.Printf("Will retry in %d seconds (%d remaining attempts)", retryTime, retry)
-	// time.Sleep(time.Duration(retryTime) * time.Second)
+	time.Sleep(time.Duration(retryTime) * time.Second)
 }
 
 func newfileUploadRequest(uri string, params map[string]string, paramName, path string) (*http.Request, error) {
diff --git a/web/server.go b/web/server.go
index d67e3ca..9af4f98 100644
--- a/web/server.go
+++ b/web/server.go
@@ -206,7 +206,6 @@ func getSetNoWatermark(w http.ResponseWriter, r *http.Request) {
 }
 
 func getSetDirectory(w http.ResponseWriter, r *http.Request) {
-	log.Print("ok")
 	w.Header().Set("Content-Type", "application/json")
 
 	if r.Method == "GET" {