Merge branch 'feat/slog' into dev

Author: LumePart

src/client/client.go

@@ -2,7 +2,7 @@ package client
 
 import (
 	"fmt"
-	"log"
+	"log/slog"
 	"time"
 
 	"explo/src/config"
@@ -54,7 +54,7 @@ func NewClient(cfg *config.Config, httpClient *util.HttpClient) (*Client, error)
 		c.API = NewSubsonic(cfg.ClientCfg, httpClient)
 
 	default:
-		log.Fatalf("unknown system: %s. Use a supported system (emby, jellyfin, mpd, plex, or subsonic).", c.System)
+		return nil, fmt.Errorf("unknown system: %s. Use a supported system (emby, jellyfin, mpd, plex, or subsonic)", c.System)
 	}
 
 	if err := c.systemSetup(); err != nil { // Run setup automatically
@@ -122,25 +122,26 @@ func (c *Client) systemSetup() error {
 	}
 }
 
-func (c *Client) CheckTracks(tracks []*models.Track) {
+func (c *Client) CheckTracks(tracks []*models.Track) error {
 	if err := c.API.SearchSongs(tracks); err != nil {
-		log.Printf("warning: SearchSongs failed: %v", err)
+		return fmt.Errorf("SearchSongs failed: %s", err.Error())
 	}
+	return nil
 }
 
 func (c *Client) CreatePlaylist(tracks []*models.Track) error {
 	if c.System == "" {
-		log.Fatal("could not get music system")
+		return fmt.Errorf("could not get music system")
 	}
 
 	if err := c.API.RefreshLibrary(); err != nil {
 		return fmt.Errorf("[%s] failed to schedule a library scan: %s", c.System, err.Error())
 	}
 
-	log.Printf("[%s] Refreshing library...", c.System)
+	slog.Info("Refreshing library...", "system", c.System)
 	time.Sleep(time.Duration(c.Cfg.Sleep) * time.Minute)
 	if err := c.API.SearchSongs(tracks); err != nil { // search newly added songs
-		log.Printf("warning: SearchSongs failed: %v", err)
+		slog.Warn("SearchSongs failed", "context", err)
 	}
 	if err := c.API.CreatePlaylist(tracks); err != nil {
 		return fmt.Errorf("[%s] failed to create playlist: %s", c.System, err.Error())
@@ -154,7 +155,7 @@ func (c *Client) CreatePlaylist(tracks []*models.Track) error {
 
 func (c *Client) DeletePlaylist() error {
 	if err := c.API.SearchPlaylist(); err != nil {
-		return fmt.Errorf("warning: SearchSongs failed: %v", err)
+		return fmt.Errorf("SearchPlaylist failed: %v", err)
 	}
 	if err := c.API.DeletePlaylist(); err != nil {
 		return fmt.Errorf("[%s] failed to delete playlist: %s", c.System, err.Error())

src/client/emby.go

@@ -3,13 +3,12 @@ package client
 import (
 	"bytes"
 	"fmt"
-	"log"
+	"log/slog"
 	"strings"
 	"time"
 	"net/url"
 
 	"explo/src/config"
-	"explo/src/debug"
 	"explo/src/models"
 	"explo/src/util"
 )
@@ -107,7 +106,7 @@ func (c *Emby) AddLibrary() error {
 	  }`, c.Cfg.LibraryName, c.Cfg.DownloadDir)
 
 	if _, err := c.HttpClient.MakeRequest("POST", c.Cfg.URL+reqParam, bytes.NewReader(payload), c.Cfg.Creds.Headers); err != nil {
-		log.Fatalf("failed to add library to Emby using the download path, please define a library name using LIBRARY_NAME in .env: %s", err.Error())
+		return fmt.Errorf("failed to add library to Emby using the download path, please define a library name using LIBRARY_NAME in .env: %s", err.Error())
 	}
 	return nil
 }
@@ -152,7 +151,7 @@ func (c *Emby) SearchSongs(tracks []*models.Track) error {
 		}
 
 		if !track.Present {
-			debug.Debug(fmt.Sprintf("[emby] failed to find '%s' by '%s' in album '%s'", track.Title, track.Artist, track.Album))
+			slog.Debug(fmt.Sprintf("[emby] failed to find '%s' by '%s' in album '%s'", track.Title, track.Artist, track.Album))
 		}
 	}
 	return nil

src/client/jellyfin.go

@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"net/url"
 	"strings"
+	"log/slog"
 
 	"explo/src/config"
-	"explo/src/debug"
 	"explo/src/models"
 	"explo/src/util"
 )
@@ -161,7 +161,7 @@ func (c *Jellyfin) SearchSongs(tracks []*models.Track) error {
 		}
 
 		if !track.Present {
-			debug.Debug(fmt.Sprintf("[jellyfin] failed to find '%s' by '%s' in album '%s'", track.Title, track.Artist, track.Album))
+			slog.Debug(fmt.Sprintf("[jellyfin] failed to find '%s' by '%s' in album '%s'", track.Title, track.Artist, track.Album))
 		}
 	}
 	return nil

src/client/mpd.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"log/slog"
 
 	"explo/src/config"
-	"explo/src/debug"
 	"explo/src/models"
 )
 
@@ -69,7 +69,7 @@ func (c *MPD) CreatePlaylist(tracks []*models.Track) error {
 		if track.Present {
 			_, err := f.Write([]byte(track.File+"\n"))
 			if err != nil {
-				debug.Debug(fmt.Sprintf("failed to write song to file: %s", err.Error()))
+				slog.Warn(fmt.Sprintf("failed to write song to file: %s", err.Error()))
 			}
 		}
 	}

src/client/plex.go

@@ -4,12 +4,11 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"log"
+	"log/slog"
 	"net/url"
 	"strings"
 
 	"explo/src/config"
-	"explo/src/debug"
 	"explo/src/models"
 	"explo/src/util"
 )
@@ -193,8 +192,8 @@ func (c *Plex) GetLibrary() error {
 		}
 	}
 	if err = c.AddLibrary(); err != nil {
-		debug.Debug(err.Error())
-		log.Fatalf("library named %s not found and cannot be added, please create it manually and ensure 'Prefer local metadata' is checked", c.Cfg.LibraryName)
+		slog.Debug(err.Error())
+		return fmt.Errorf("library named %s not found and cannot be added, please create it manually and ensure 'Prefer local metadata' is checked", c.Cfg.LibraryName)
 	}
 	return fmt.Errorf("library '%s' not found", c.Cfg.LibraryName)
 }
@@ -230,18 +229,18 @@ func (c *Plex) SearchSongs(tracks []*models.Track) error {
 
 		body, err := c.HttpClient.MakeRequest("GET", c.Cfg.URL+params, nil, c.Cfg.Creds.Headers)
 		if err != nil {
-			log.Printf("search request failed for '%s': %s", track.Title, err.Error())
+			slog.Warn("search request failed for '%s': %s", track.Title, err.Error())
 			continue
 		}
 
 		var searchResults PlexSearch
 		if err = util.ParseResp(body, &searchResults); err != nil {
-			log.Printf("failed to parse response for '%s': %s", track.Title, err.Error())
+			slog.Warn("failed to parse response for '%s': %s", track.Title, err.Error())
 			continue
 		}
 		key, err := getPlexSong(track, searchResults)
 		if err != nil {
-			debug.Debug(err.Error())
+			slog.Debug(err.Error())
 			continue
 		}
 		if key != "" {
@@ -345,7 +344,7 @@ func getPlexSong(track *models.Track, searchResults PlexSearch) (string, error)
 		artistMatch := strings.Contains(strings.ToLower(md.OriginalTitle), loweredArtist) || strings.Contains(strings.ToLower(md.GrandparentTitle), loweredArtist)
 
 		if titleMatch && (albumMatch || artistMatch) {
-			debug.Debug(fmt.Sprintf("matched track via metadata: %s by %s Plex Key: %s", track.Title, track.Artist, md.Key))
+			slog.Debug(fmt.Sprintf("matched track via metadata: %s by %s", track.Title, track.Artist))
 			return md.Key, nil
 		}
 
@@ -358,12 +357,12 @@ func getPlexSong(track *models.Track, searchResults PlexSearch) (string, error)
 		durationMatch := util.Abs(media.Duration - track.Duration) < 10000 // duration within 10s
 
 		if durationMatch && pathMatch {
-			debug.Debug(fmt.Sprintf("matched track via path: %s by %s Plex Key: %s", track.Title, track.Artist, md.Key))
+			slog.Debug(fmt.Sprintf("matched track via path: %s by %s", track.Title, track.Artist))
 			return md.Key, nil
 		}
 	}
 
-	debug.Debug(fmt.Sprintf("full search result: %v", searchResults.MediaContainer.SearchResult))
+	slog.Debug(fmt.Sprintf("full search result: %v", searchResults.MediaContainer.SearchResult))
 	return "", fmt.Errorf("failed to find '%s' by '%s' in '%s'", track.Title, track.Artist, track.Album)
 }
 
@@ -373,7 +372,7 @@ func (c *Plex) addtoPlaylist(tracks []*models.Track) {
 			params := fmt.Sprintf("/playlists/%s/items?uri=server://%s/com.plexapp.plugins.library%s", c.Cfg.PlaylistID, c.machineID, track.ID)
 
 			if _, err := c.HttpClient.MakeRequest("PUT", c.Cfg.URL+params, nil, c.Cfg.Creds.Headers); err != nil {
-				log.Printf("failed to add %s to playlist: %s", track.Title, err.Error())
+				slog.Warn("failed to add %s to playlist: %s", track.Title, err.Error())
 			}
 		}
 	}

src/client/subsonic.go

@@ -4,14 +4,14 @@ import (
 	"fmt"
 	"strings"
 	"time"
+	"log/slog"
 
 	"crypto/md5"
 	"crypto/rand"
 	"encoding/base64"
 	"net/url"
 
 	"explo/src/config"
-	"explo/src/debug"
 	"explo/src/models"
 	"explo/src/util"
 )
@@ -121,7 +121,7 @@ func (c *Subsonic) SearchSongs(tracks []*models.Track) error {
 
 		songs := resp.SubsonicResponse.SearchResult3.Song
 		if len(songs) == 0 {
-			debug.Debug(fmt.Sprintf("[subsonic] no results found for %s", searchQuery))
+			slog.Debug(fmt.Sprintf("[subsonic] no results found for %s", searchQuery))
 			continue
 		}
 
@@ -151,7 +151,7 @@ func (c *Subsonic) SearchSongs(tracks []*models.Track) error {
 		}
 
 		if !track.Present {
-			debug.Debug(fmt.Sprintf("[subsonic] multiple results for %s but none matched criteria", searchQuery))
+			slog.Debug(fmt.Sprintf("[subsonic] multiple results for %s but none matched criteria", searchQuery))
 		}
 	}
 	return nil

src/config/config.go

@@ -3,10 +3,10 @@ package config
 import (
 	"errors"
 	"fmt"
-	"log"
 	"os"
 	"strings"
 	"time"
+	"log/slog"
 
 	"github.com/ilyakaznacheev/cleanenv"
 	"golang.org/x/text/cases"
@@ -21,6 +21,7 @@ type Config struct {
 	Persist bool `env:"PERSIST" env-default:"true"`
 	System string `env:"EXPLO_SYSTEM"`
 	Debug bool `env:"DEBUG" env-default:"false"`
+	LogLevel string `env:"LOG_LEVEL" env-default:"WARN"`
 }
 
 type Flags struct {
@@ -128,10 +129,12 @@ func (cfg *Config) ReadEnv() {
 		// If the error is because the file doesn't exist, fallback to env vars
 		if errors.Is(err, os.ErrNotExist) {
 			if err := cleanenv.ReadEnv(&cfg); err != nil {
-				log.Fatalf("failed to load config from env vars: %s", err)
+				slog.Error("failed to load config from env vars", "context", err.Error())
+				os.Exit(1)
 			}
 		} else {
-			log.Fatalf("failed to load config file %s: %s", cfg.Flags.CfgPath, err)
+			slog.Error("failed to load config file", "path", cfg.Flags.CfgPath, "context", err.Error())
+			os.Exit(1)
 		}
 	}
 
@@ -153,24 +156,13 @@ func fixDir(dir string) string {
 	return dir
 }
 
-/* func (cfg *Config) HandleDeprecation() { // no deprecations at the moment (keeping this for reference)
-	switch cfg.System {
-	case "subsonic":
-		if cfg.Subsonic.User != "" && cfg.Creds.User == "" {
-			log.Println("Warning: 'SUBSONIC_USER' is deprecated. Please use 'SYSTEM_USERNAME'.")
-			cfg.Creds.User = cfg.Subsonic.User
-		}
-		if cfg.Subsonic.Password != "" && cfg.Creds.Password == "" {
-			log.Println("Warning: 'SUBSONIC_PASSWORD' is deprecated. Please use 'SYSTEM_PASSWORD'.")
-			cfg.Creds.Password = cfg.Subsonic.Password
-		}
-		if cfg.Subsonic.URL != "" && cfg.URL == "" {
-			log.Println("Warning: 'SUBSONIC_URL' is deprecated. Please use 'SYSTEM_URL'.")
-			cfg.URL = cfg.Subsonic.URL
-		}
+func (cfg *Config) HandleDeprecation() { // 
+	if cfg.Debug {
+		slog.Warn("'DEBUG' variable is deprecated, please use LOG_LEVEL=DEBUG instead")
+		cfg.LogLevel = "DEBUG"
 	}
 }
- */
+
 func (cfg *Config) GetPlaylistName() { // Generate playlist name and description
 
 	toTitle := cases.Title(language.Und)

src/debug/debug.go

@@ -1,23 +1,41 @@
 package debug
 
 import (
-	"log"
+	//"log"
 	"runtime"
+	"log/slog"
 )
 
-var debugMode bool
 
-func Init(mode bool) {
-	debugMode = mode
+func Init(level string) {
+	slog.SetLogLoggerLevel(getLogLevel(level))
 }
 
-func Debug(ctx string) {
-	if debugMode {
+func RuntimeAttr(ctx string) slog.Attr {
 		_, file, line, ok := runtime.Caller(1)
         if ok {
-            log.Printf("DEBUG: %s:%d %s", file, line, ctx)
+			return slog.Group("runtime",
+            	slog.String("file", file), 
+				slog.Int("line", line),
+				slog.String("ctx", ctx),
+		)
         } else {
-            log.Printf("DEBUG: %s", ctx)
+            return slog.String("msg", "failed getting runtime")
         }
+}
+
+func getLogLevel(level string) slog.Level {
+
+	switch level {
+	case "DEBUG":
+		return slog.LevelDebug
+	case "INFO":
+		return slog.LevelInfo
+	case "WARN":
+		return slog.LevelWarn
+	case "ERROR":
+		return slog.LevelError
+	default:
+		return slog.LevelWarn
 	}
 }

src/discovery/listenbrainz.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"
 	"time"
+	"log/slog"
 
 	cfg "explo/src/config"
-	"explo/src/debug"
 	"explo/src/models"
 	"explo/src/util"
 )
@@ -263,7 +263,7 @@ func (c *ListenBrainz) getImportPlaylist(user string) (string, error) { // Get u
 			return id[len(id)-1], nil
 		}
 	}
-	debug.Debug(fmt.Sprintf("playlist output: %v", playlists))
+	slog.Debug(fmt.Sprintf("playlist output: %v", playlists))
 	return "", fmt.Errorf("failed to get %s playlist, check if ListenBrainz has generated one this week", c.cfg.ImportPlaylist)
 }