atridad/Discodrome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity

Use Cover Art Archive for albums with MusicBrainz IDs #12

Closed
sproutsberry wants to merge 11 commits from cover-art-archive into main
pull from: cover-art-archive
merge into: atridad:main
Conversation 14 Commits 11 Files Changed 6
+23 -22
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fe11087f7d - Show all commits
coverart.go
+23 -22
View File
@@ -11,17 +11,9 @@ import (
) )
// ============================================================================ // ============================================================================
// uguu.se // Direct
// ============================================================================ // ============================================================================
// uguu.se API response
type uguuResponse struct {
Success bool `json:"success"`
Files []struct {
URL string `json:"url"`
} `json:"files"`
}
// getImageDirect returns the artwork URL directly from Navidrome (current behavior). // getImageDirect returns the artwork URL directly from Navidrome (current behavior).
func getImageDirect(trackID string) string { func getImageDirect(trackID string) string {
artworkURL, err := host.ArtworkGetTrackUrl(trackID, 300) artworkURL, err := host.ArtworkGetTrackUrl(trackID, 300)
@@ -37,6 +29,18 @@ func getImageDirect(trackID string) string {
return artworkURL return artworkURL
} }
// ============================================================================
// uguu.se
// ============================================================================
// uguu.se API response
type uguuResponse struct {
Success bool `json:"success"`
Files []struct {
URL string `json:"url"`
} `json:"files"`
}
// getImageViaUguu fetches artwork and uploads it to uguu.se. // getImageViaUguu fetches artwork and uploads it to uguu.se.
func getImageViaUguu(username, trackID string) string { func getImageViaUguu(username, trackID string) string {
// Check cache first // Check cache first
11
 @@ -106,6 +110,7 @@ func uploadToUguu(imageData []byte, contentType string) (string, error) {
// Cover Art Archive // Cover Art Archive
// ============================================================================ // ============================================================================
// caaResponse only includes relevant parameters; see API for full response
// https://musicbrainz.org/doc/Cover_Art_Archive/API // https://musicbrainz.org/doc/Cover_Art_Archive/API
type caaResponse struct { type caaResponse struct {
Images []struct { Images []struct {
@@ -116,19 +121,16 @@ type caaResponse struct {
Size250 string `json:"250"` Size250 string `json:"250"`
Size500 string `json:"500"` Size500 string `json:"500"`
Size1200 string `json:"1200"` Size1200 string `json:"1200"`
Small string `json:"small"` // deprecated; use 250
Large string `json:"large"` // deprecated; use 500
} `json:"thumbnails"` } `json:"thumbnails"`
} `json:"images"` } `json:"images"`
ReleaseURL string `json:"release"`
} }
func getImageURLFromMusicBrainzID(musicBrainzID string) (string, error) { func getThumbnailForMBZAlbumID(mbzAlbumID string) (string, error) {
req := pdk.NewHTTPRequest(pdk.MethodGet, fmt.Sprintf("https://coverartarchive.org/release/%s", musicBrainzID)) req := pdk.NewHTTPRequest(pdk.MethodGet, fmt.Sprintf("https://coverartarchive.org/release/%s", mbzAlbumID))
resp := req.Send() resp := req.Send()
if status := resp.Status(); status == 404 { if status := resp.Status(); status == 404 {
pdk.Log(pdk.LogDebug, fmt.Sprintf("No cover art for MusicBrainz ID %s", musicBrainzID)) pdk.Log(pdk.LogDebug, fmt.Sprintf("No cover art for MusicBrainz Album ID: %s", mbzAlbumID))
return "", nil return "", nil
} else if status >= 400 { } else if status >= 400 {
return "", fmt.Errorf("HTTP %d", resp.Status()) return "", fmt.Errorf("HTTP %d", resp.Status())
@@ -145,22 +147,21 @@ func getImageURLFromMusicBrainzID(musicBrainzID string) (string, error) {
} }
} }
pdk.Log(pdk.LogDebug, fmt.Sprintf("No front cover art for MusicBrainz ID %s (%d images)", musicBrainzID, len(result.Images))) pdk.Log(pdk.LogDebug, fmt.Sprintf("No front cover art for MusicBrainz Album ID: %s (%d images)", mbzAlbumID, len(result.Images)))
return "", nil return "", nil
} }
func getImageViaCAA(username, musicBrainzID string) string { func getImageViaCAA(username, mbzAlbumID string) string {
// Check cache first cacheKey := fmt.Sprintf("caa.artwork.%s", mbzAlbumID)
cacheKey := fmt.Sprintf("caa.artwork.%s", musicBrainzID)
cachedURL, exists, err := host.CacheGetString(cacheKey) cachedURL, exists, err := host.CacheGetString(cacheKey)
if err == nil && exists { if err == nil && exists {
pdk.Log(pdk.LogDebug, fmt.Sprintf("Cache hit for Cover Art Archive artwork: %s", musicBrainzID)) pdk.Log(pdk.LogDebug, fmt.Sprintf("Cache hit for Cover Art Archive artwork: %s", mbzAlbumID))
return cachedURL return cachedURL
} }
url, err := getImageURLFromMusicBrainzID(musicBrainzID) url, err := getThumbnailForMBZAlbumID(mbzAlbumID)
if err != nil { if err != nil {
pdk.Log(pdk.LogWarn, fmt.Sprintf("Cover Art Archive request failed for %s: %s", musicBrainzID, err)) pdk.Log(pdk.LogWarn, fmt.Sprintf("Cover Art Archive request failed for %s: %v", mbzAlbumID, err))
return "" return ""
} }