From db60f8e60b6b946f6e528eb9f0e4e9e2a6292223 Mon Sep 17 00:00:00 2001 From: Carl Kittelberger Date: Sun, 28 Feb 2021 18:41:20 +0100 Subject: [PATCH] Fix cover URL. --- icedreammusic/foobar2000/main.go | 9 ++++++--- icedreammusic/prime4/main.go | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/icedreammusic/foobar2000/main.go b/icedreammusic/foobar2000/main.go index 69c90eb..7a72416 100644 --- a/icedreammusic/foobar2000/main.go +++ b/icedreammusic/foobar2000/main.go @@ -75,11 +75,12 @@ func main() { lastCoverCheckResult := false lastCoverCheckTime := time.Now() - metacollectorClient := metacollector.NewMetaCollectorClient(&url.URL{ + metaCollectorAPIURL := &url.URL{ Scheme: "http", Host: "192.168.188.69:8080", // TODO - make configurable Path: "/", - }) + } + metacollectorClient := metacollector.NewMetaCollectorClient(metaCollectorAPIURL) for metadata := range c { // log.Printf("New metadata: %+v", metadata) @@ -148,7 +149,9 @@ func main() { if err == nil { log.Println("Enriching metadata:", resp) if resp.CoverURL != nil { - tunaMetadata.CoverURL = *resp.CoverURL + tunaMetadata.CoverURL = metaCollectorAPIURL.ResolveReference(&url.URL{ + Path: *resp.CoverURL, + }).String() } tunaMetadata.Label = resp.Publisher } else { diff --git a/icedreammusic/prime4/main.go b/icedreammusic/prime4/main.go index aac3003..da0289b 100644 --- a/icedreammusic/prime4/main.go +++ b/icedreammusic/prime4/main.go @@ -223,11 +223,12 @@ func main() { metadata := map[*stagelinq.Device]map[int]*DeviceMeta{} output := tuna.NewTunaOutput() - metacollectorClient := metacollector.NewMetaCollectorClient(&url.URL{ + metaCollectorAPIURL := &url.URL{ Scheme: "http", Host: "192.168.188.69:8080", // TODO - make configurable Path: "/", - }) + } + metacollectorClient := metacollector.NewMetaCollectorClient(metaCollectorAPIURL) sendMetadata := func() { tunaData := &tuna.TunaData{ @@ -245,7 +246,9 @@ func main() { }) if err == nil { if resp.CoverURL != nil { - tunaData.CoverURL = *resp.CoverURL + tunaMetadata.CoverURL = metaCollectorAPIURL.ResolveReference(&url.URL{ + Path: *resp.CoverURL, + }).String() } tunaData.Label = resp.Publisher }