diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f1a9586a..75d97685 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ stages: - build variables: - VERSION: 0.1.6 + VERSION: 0.1.7 build-go: image: golang:1.17 diff --git a/docs/changelog.md b/docs/changelog.md index a75f214b..73d5267e 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,3 +1,6 @@ +# 0.1.7 +- Fix navidrome logging 2x scrobbles if second player is paused + # 0.1.6 - Allow UUID of 0 in artists/{uuid}/top to return site-wide stats - Set images as failed if cannot find in spotify to prevent oversearching diff --git a/internal/goscrobble/ingress_navidrome.go b/internal/goscrobble/ingress_navidrome.go index 651f0f30..e0c97a9d 100644 --- a/internal/goscrobble/ingress_navidrome.go +++ b/internal/goscrobble/ingress_navidrome.go @@ -139,7 +139,7 @@ func validateNavidromeConnection(url string, username string, hash string, salt // ParseNavidromeInput - Transform API data func ParseNavidromeInput(userUUID string, data NavidromeNowPlaying, ip net.IP, tx *sql.Tx) error { // Custom cache key - never log the same song twice in a row for now... (: - lastPlayedTitle := getUserLastPlayed(userUUID) + lastPlayedTitle := getUserLastPlayed(userUUID + fmt.Sprintf("%s", data.PlayerName)) if lastPlayedTitle == data.Title+":"+data.Album { // If it matches last played song, skip it return nil diff --git a/internal/goscrobble/server.go b/internal/goscrobble/server.go index 7daa1882..f5cd09dc 100644 --- a/internal/goscrobble/server.go +++ b/internal/goscrobble/server.go @@ -825,7 +825,7 @@ func getServerInfo(w http.ResponseWriter, r *http.Request) { } info := ServerInfo{ - Version: "0.1.6", + Version: "0.1.7", RegistrationEnabled: registrationEnabled, }