Merge pull request #609 from namehillsoftware/bugfix/navidrome-subsonic-fields

[Bugfix] Subsonic Field Mappings

Author: davidvedvick

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/connection/live/LiveSubsonicConnection.kt

@@ -80,6 +80,9 @@ class LiveSubsonicConnection(
 		const val replayGain = "replayGain"
 		const val trackGain = "trackGain"
 		const val peakGain = "trackPeak"
+		const val userRating = "userRating"
+		const val playCount = "playCount"
+		const val duration = "duration"
 	}
 
 	private val promisedRootItem by lazy {
@@ -217,7 +220,7 @@ class LiveSubsonicConnection(
 				logger.debug("rest/scrobble responded with a response code of {}", responseCode)
 			}
 
-			if (responseCode < 200 || responseCode >= 300) throw HttpResponseException(responseCode)
+			if (responseCode !in 200..<300) throw HttpResponseException(responseCode)
 		}
 	}
 
@@ -249,7 +252,7 @@ class LiveSubsonicConnection(
 					throw SubsonicServerException(jsonTranslator.parseJson<ErrorResponse>(json))
 				}
 
-				jsonTranslator.parseJson<T>(json)
+				if (!cs.isCancelled) jsonTranslator.parseJson<T>(json) else null
 			}
 		}
 
@@ -265,6 +268,9 @@ class LiveSubsonicConnection(
 					NormalizedFileProperties.Name to KnownFileProperties.title,
 					NormalizedFileProperties.VolumeLevelReplayGain to KnownFileProperties.trackGain,
 					NormalizedFileProperties.PeakLevel to KnownFileProperties.peakGain,
+					NormalizedFileProperties.Rating to KnownFileProperties.userRating,
+					NormalizedFileProperties.NumberPlays to KnownFileProperties.playCount,
+					NormalizedFileProperties.Duration to KnownFileProperties.duration,
 				)
 			}
 

projectBlueWater/src/test/java/com/lasthopesoftware/bluewater/client/access/GivenASubsonicConnection/AndNoStoredFileProperties/WhenGettingFileProperties.kt

@@ -33,7 +33,7 @@ class WhenGettingFileProperties {
 							PassThroughHttpResponse(
 								200,
 								"Alright",
-								"""{"subsonic-response":{"status":"ok","version":"1.16.1","type":"navidrome","serverVersion":"0.53.3 (13af8ed4)","openSubsonic":true,"song":{"id":"3c00a4d5a48b0790d8e2288faf6fc93c","parent":"9022600b4f57592edd8e8bfc9048fe38","isDir":false,"title":"How Will You Meet Your End","album":"American Hearts","artist":"A.A. Bondy","track":1,"year":2007,"genre":"Americana","coverArt":"mf-3c00a4d5a48b0790d8e2288faf6fc93c_6728cffb","size":25331533,"contentType":"audio/flac","suffix":"flac","duration":242,"bitRate":827,"path":"A.A. Bondy/American Hearts/01 - How Will You Meet Your End.flac","discNumber":1,"created":"2025-02-10T04:25:55.814140973Z","albumId":"9022600b4f57592edd8e8bfc9048fe38","artistId":"563727e73731392260da4a787f534387","type":"music","isVideo":false,"bpm":128,"comment":"Visit http://aabondy.bandcamp.com","sortName":"","mediaType":"song","musicBrainzId":"4fefe475-a23e-44e5-a46a-ce2d4167e108","genres":[{"name":"Americana"}],"replayGain":{"trackGain":-2.34,"trackPeak":0.933,"albumPeak":1},"channelCount":2,"samplingRate":44100}}}""".toByteArray()
+								"""{"subsonic-response":{"status":"ok","version":"1.16.1","type":"navidrome","serverVersion":"0.53.3 (13af8ed4)","openSubsonic":true,"song":{"id":"3c00a4d5a48b0790d8e2288faf6fc93c","parent":"9022600b4f57592edd8e8bfc9048fe38","isDir":false,"title":"How Will You Meet Your End","album":"American Hearts","artist":"A.A. Bondy","track":1,"year":2007,"genre":"Americana","coverArt":"mf-3c00a4d5a48b0790d8e2288faf6fc93c_6728cffb","size":25331533,"playCount":364,"contentType":"audio/flac","suffix":"flac","duration":242,"bitRate":827,"path":"A.A. Bondy/American Hearts/01 - How Will You Meet Your End.flac","discNumber":1,"created":"2025-02-10T04:25:55.814140973Z","albumId":"9022600b4f57592edd8e8bfc9048fe38","artistId":"563727e73731392260da4a787f534387","type":"music","isVideo":false,"bpm":128,"comment":"Visit http://aabondy.bandcamp.com","userRating":3,"sortName":"","mediaType":"song","musicBrainzId":"4fefe475-a23e-44e5-a46a-ce2d4167e108","genres":[{"name":"Americana"}],"replayGain":{"trackGain":-2.34,"trackPeak":0.933,"albumPeak":1},"channelCount":2,"samplingRate":44100}}}""".toByteArray()
 									.inputStream()
 							)
 						}
@@ -108,12 +108,32 @@ class WhenGettingFileProperties {
 		)
 	}
 
+	@Test
+	fun `then the number of plays is correct`() {
+		assertThat(fileProperties?.get(NormalizedFileProperties.NumberPlays)).isEqualTo(
+			ReadOnlyFileProperty(
+				NormalizedFileProperties.NumberPlays,
+				"364"
+			)
+		)
+	}
+
+	@Test
+	fun `then the date is correct`() {
+		assertThat(fileProperties?.get(NormalizedFileProperties.Duration)).isEqualTo(
+			ReadOnlyFileProperty(
+				NormalizedFileProperties.Duration,
+				"242",
+			)
+		)
+	}
+
 	@Test
 	fun `then the rating is editable`() {
 		assertThat(fileProperties?.rating).isEqualTo(
 			EditableFileProperty(
 				NormalizedFileProperties.Rating,
-				"0",
+				"3",
 				FilePropertyType.Integer,
 			)
 		)