feat: specify image decoder for hash

Signed-off-by: Matt Gleich <[email protected]>
gleich · Dec 6, 2024 · 31aaf85 · 31aaf85
1 parent 623334e
commit 31aaf85
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/internal/apis/applemusic/song.go b/internal/apis/applemusic/song.go
@@ -3,6 +3,7 @@ package applemusic
 import (
 	"bytes"
 	"fmt"
+	"image/jpeg"
 	"net/http"
 	"net/url"
 	"regexp"
@@ -92,7 +93,7 @@ func songFromSongResponse(s songResponse) song {
 		ReleaseDate:      s.Attributes.ReleaseDate,
 		DurationInMillis: s.Attributes.DurationInMillis,
 		AlbumArtURL:      albumArtURL,
-		AlbumArtBlur:     images.BlurDataURI(images.BlurImage(b.Bytes())),
+		AlbumArtBlur:     images.BlurDataURI(images.BlurImage(b.Bytes(), jpeg.Decode)),
 		URL:              s.Attributes.URL,
 		ID:               s.ID,
 	}

diff --git a/internal/apis/strava/activities.go b/internal/apis/strava/activities.go
@@ -2,6 +2,7 @@ package strava
 
 import (
 	"fmt"
+	"image/png"
 	"net/url"
 	"time"
 
@@ -107,7 +108,7 @@ func fetchActivities(minioClient minio.Client, tokens tokens) ([]activity, error
 		if a.HasMap {
 			mapData := fetchMap(stravaActivity.Map.SummaryPolyline)
 			uploadMap(minioClient, stravaActivity.ID, mapData)
-			mapBlurURI := images.BlurDataURI(images.BlurImage(mapData))
+			mapBlurURI := images.BlurDataURI(images.BlurImage(mapData, png.Decode))
 			a.MapBlurImage = &mapBlurURI
 			imgurl := fmt.Sprintf(
 				"https://minio-api.dev.mattglei.ch/mapbox-maps/%d.png",

diff --git a/internal/images/hash.go b/internal/images/hash.go
@@ -4,25 +4,27 @@ import (
 	"bytes"
 	"encoding/base64"
 	"fmt"
+	"image"
 	"image/png"
+	"io"
 
 	"github.com/buckket/go-blurhash"
 	"github.com/gleich/lumber/v3"
 )
 
-func BlurImage(data []byte) []byte {
+func BlurImage(data []byte, decoder func(r io.Reader) (image.Image, error)) []byte {
 	reader := bytes.NewReader(data)
-	parsedPNG, err := png.Decode(reader)
+	parsedImage, err := decoder(reader)
 	if err != nil {
 		lumber.Error(err, "decoding PNG failed")
 		return nil
 	}
 
-	width := parsedPNG.Bounds().Dx()
-	height := parsedPNG.Bounds().Dy()
-	blurData, err := blurhash.Encode(4, 3, parsedPNG)
+	width := parsedImage.Bounds().Dx()
+	height := parsedImage.Bounds().Dy()
+	blurData, err := blurhash.Encode(4, 3, parsedImage)
 	if err != nil {
-		lumber.Error(err, "encoding png into blurhash failed")
+		lumber.Error(err, "encoding image into blurhash failed")
 		return nil
 	}