Fix settings not read from config file (thx @cizara)

emilioastarita · Sep 16, 2020 · 6d9c0a7 · martinsanchezmeli · Sep 16, 2020 · 6d9c0a7
1 parent 0032e9e
commit 6d9c0a7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/internal/lyricfier/general.go b/internal/lyricfier/general.go
@@ -130,12 +130,14 @@ func (h *Main) ReadSettings() {
 		h.AppData.Settings = defaultSettings()
 		return
 	}
-	err = json.Unmarshal(val, h.AppData.Settings)
+	var p *Settings
+	err = json.Unmarshal(val, &p)
 	if err != nil {
-		fmt.Printf("error umarshalling saved settings %v\n", err)
+		fmt.Printf("error umarshalling saved settings: %v\n", err)
 		h.AppData.Settings = defaultSettings()
 		return
 	}
+	h.AppData.Settings = p;
 }
 
 func (h *Main) Search(done chan *SearchResult, artist string, title string) {

diff --git a/internal/lyricfier/server.go b/internal/lyricfier/server.go
@@ -84,7 +84,7 @@ func (h *Server) routes(hub *Hub) {
 		}
 		settings, err := json.Marshal(s)
 		if err != nil {
-			fmt.Printf("could not marshal config json: %v\n", err)
+			fmt.Printf("Could not marshal config json: %v\n", err)
 			return c.JSON(http.StatusInternalServerError, h.appData)
 		}
 

diff --git a/internal/lyricfier/spotify_windows.go b/internal/lyricfier/spotify_windows.go
@@ -5,11 +5,11 @@ package lyricfier
 import (
 	"encoding/csv"
 	"fmt"
-	"path/filepath"
-	"os"
 	"golang.org/x/text/encoding/charmap"
 	"log"
+	"os"
 	"os/exec"
+	"path/filepath"
 	"strings"
 	"syscall"
 	"time"