Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions src/config/config.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package config

import (
"log"
"errors"
"fmt"
"log"
"os"
"time"
"strings"
"github.com/ilyakaznacheev/cleanenv"
Expand Down Expand Up @@ -76,9 +78,20 @@ type Listenbrainz struct {

func ReadEnv() Config {
var cfg Config
if err := cleanenv.ReadConfig("./.env", &cfg); err != nil {
log.Fatalf("Failed to load config: %s", err)

// Try to read from .env file first
err := cleanenv.ReadConfig(".env", &cfg)
if err != nil {
// 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)
}
} else {
log.Fatalf("Failed to load config: %s", err)
}
}

cfg.VerifyDir()
return cfg
}
Expand Down Expand Up @@ -122,4 +135,4 @@ func (cfg *Config) GetPlaylistName() { // Generate playlist name depending if us
playlistName = fmt.Sprintf("%s-%d-Week%d", playlistName, year, week)
}
cfg.ClientCfg.PlaylistName = playlistName
}
}