gabehf/Koito
1
0
Fork 0
mirror of https://github.com/gabehf/Koito.git synced 2026-03-17 03:06:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: move useragent to cfg

Browse source
This commit is contained in:
Gabe Farrell 2025-06-12 22:03:54 -04:00
parent 7b18ebb294
commit 63517c0a03
5 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engine/engine.go
View file

@ -96,7 +96,7 @@ func Run(
} }
images.Initialize(images.ImageSourceOpts{ images.Initialize(images.ImageSourceOpts{
UserAgent: "Koito v0.0.1 (contact@koito.app)", UserAgent: cfg.UserAgent(),
EnableCAA: !cfg.CoverArtArchiveDisabled(), EnableCAA: !cfg.CoverArtArchiveDisabled(),
EnableDeezer: !cfg.DeezerDisabled(), EnableDeezer: !cfg.DeezerDisabled(),
}) })

9
internal/cfg/cfg.go
View file

@ -63,6 +63,7 @@ type config struct {
allowAllHosts bool allowAllHosts bool
disableRateLimit bool disableRateLimit bool
importThrottleMs int importThrottleMs int
userAgent string
} }
var ( var (
@ -123,6 +124,8 @@ func loadConfig(getenv func(string) string) (*config, error) {
cfg.disableMusicBrainz = parseBool(getenv(DISABLE_MUSICBRAINZ_ENV)) cfg.disableMusicBrainz = parseBool(getenv(DISABLE_MUSICBRAINZ_ENV))
cfg.skipImport = parseBool(getenv(SKIP_IMPORT_ENV)) cfg.skipImport = parseBool(getenv(SKIP_IMPORT_ENV))
cfg.userAgent = "Koito v0.0.1 (contact@koito.io)"
if getenv(DEFAULT_USERNAME_ENV) == "" { if getenv(DEFAULT_USERNAME_ENV) == "" {
cfg.defaultUsername = "admin" cfg.defaultUsername = "admin"
} else { } else {
@ -168,6 +171,12 @@ func parseBool(s string) bool {
// Global accessors for configuration values // Global accessors for configuration values
func UserAgent() string {
lock.RLock()
defer lock.RUnlock()
return globalConfig.userAgent
}
func ListenAddr() string { func ListenAddr() string {
lock.RLock() lock.RLock()
defer lock.RUnlock() defer lock.RUnlock()

5
internal/images/deezer.go
View file

@ -10,6 +10,7 @@ import (
"net/url" "net/url"
"strings" "strings"
"github.com/gabehf/koito/internal/cfg"
"github.com/gabehf/koito/internal/logger" "github.com/gabehf/koito/internal/logger"
"github.com/gabehf/koito/internal/utils" "github.com/gabehf/koito/internal/utils"
"github.com/gabehf/koito/queue" "github.com/gabehf/koito/queue"
@ -48,10 +49,10 @@ const (
artistImageEndpoint = "/search/artist?q=%s" artistImageEndpoint = "/search/artist?q=%s"
) )
func NewDeezerClient(useragent string) *DeezerClient { func NewDeezerClient() *DeezerClient {
ret := new(DeezerClient) ret := new(DeezerClient)
ret.url = deezerBaseUrl ret.url = deezerBaseUrl
ret.userAgent = useragent ret.userAgent = cfg.UserAgent()
ret.requestQueue = queue.NewRequestQueue(1, 1) ret.requestQueue = queue.NewRequestQueue(1, 1)
return ret return ret
} }

2
internal/images/imagesrc.go
View file

@ -46,7 +46,7 @@ func Initialize(opts ImageSourceOpts) {
} }
if opts.EnableDeezer { if opts.EnableDeezer {
imgsrc.deezerEnabled = true imgsrc.deezerEnabled = true
imgsrc.deezerC = NewDeezerClient(opts.UserAgent) imgsrc.deezerC = NewDeezerClient()
} }
}) })
} }

2
internal/mbz/mbz.go
View file

@ -37,7 +37,7 @@ type MusicBrainzCaller interface {
func NewMusicBrainzClient() *MusicBrainzClient { func NewMusicBrainzClient() *MusicBrainzClient {
ret := new(MusicBrainzClient) ret := new(MusicBrainzClient)
ret.url = cfg.MusicBrainzUrl() ret.url = cfg.MusicBrainzUrl()
ret.userAgent = "Koito/0.0.1 (contact@koito.app)" ret.userAgent = cfg.UserAgent()
ret.requestQueue = queue.NewRequestQueue(cfg.MusicBrainzRateLimit(), cfg.MusicBrainzRateLimit()) ret.requestQueue = queue.NewRequestQueue(cfg.MusicBrainzRateLimit(), cfg.MusicBrainzRateLimit())
return ret return ret
} }