Added ResetCache=1 parameter to file list requests

Author: davidvedvick

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/browsing/files/access/LibraryFileProvider.kt

@@ -29,5 +29,5 @@ class LibraryFileProvider(private val libraryConnections: ProvideLibraryConnecti
 	override fun promiseAudioFiles(libraryId: LibraryId, query: String): Promise<List<ServiceFile>> =
 		libraryConnections
 			.promiseLibraryConnection(libraryId)
-			.eventuallyFromDataAccess { it?.promiseFiles("[Media Type]=[Audio] $query").keepPromise(emptyList()) }
+			.eventuallyFromDataAccess { it?.promiseFiles(query).keepPromise(emptyList()) }
 }

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/browsing/files/access/parameters/FileListParameters.kt

@@ -5,7 +5,6 @@ import androidx.media3.datasource.okhttp.OkHttpDataSource
 import com.lasthopesoftware.bluewater.BuildConfig
 import com.lasthopesoftware.bluewater.client.access.RemoteLibraryAccess
 import com.lasthopesoftware.bluewater.client.browsing.files.ServiceFile
-import com.lasthopesoftware.bluewater.client.browsing.files.access.parameters.FileListParameters
 import com.lasthopesoftware.bluewater.client.browsing.files.access.stringlist.FileStringListUtilities
 import com.lasthopesoftware.bluewater.client.browsing.files.properties.EditableFilePropertyDefinition
 import com.lasthopesoftware.bluewater.client.browsing.files.properties.FilePropertyHelpers.durationInMs
@@ -68,8 +67,11 @@ class LiveMediaCenterConnection(
 		private const val browseFilesPath = "Browse/Files"
 		private const val playlistFilesPath = "Playlist/Files"
 		private const val searchFilesPath = "Files/Search"
-		private const val browseLibraryParameter = "Browse/Children"
+		private const val browseLibraryPath = "Browse/Children"
 		private const val imageFormat = "jpg"
+		private const val serializedFileListParameter = "Action=Serialize"
+		private const val shuffleFileListParameter = "Shuffle=1"
+		private const val resetCacheParameter = "ResetCache=1"
 
 		private val editableFilePropertyDefinitions by lazy { EditableFilePropertyDefinition.entries.toSet().toPromise() }
 	}
@@ -258,29 +260,30 @@ class LiveMediaCenterConnection(
 	override fun promiseFileStringList(itemId: ItemId?): Promise<String> =
 		itemId
 			?.run {
-				promiseFileStringList(FileListParameters.Options.None, browseFilesPath, "ID=$id", "Version=2")
+				promiseFileStringList(browseFilesPath, "ID=$id")
 			}
-			?: promiseFileStringList(FileListParameters.Options.None, browseFilesPath, "Version=2")
+			?: promiseFileStringList(browseFilesPath)
 
-	override fun promiseFileStringList(playlistId: PlaylistId): Promise<String> = "".toPromise()
+	override fun promiseFileStringList(playlistId: PlaylistId): Promise<String> =
+		promiseFileStringList(playlistFilesPath, "Playlist=${playlistId.id}")
 
 	override fun promiseShuffledFileStringList(itemId: ItemId?): Promise<String> =
 		itemId
 			?.run {
-				promiseFileStringList(FileListParameters.Options.Shuffled, browseFilesPath, "ID=$id", "Version=2")
+				promiseFileStringList(browseFilesPath, "ID=$id", shuffleFileListParameter)
 			}
-			?: promiseFileStringList(FileListParameters.Options.Shuffled, browseFilesPath, "Version=2")
+			?: promiseFileStringList(browseFilesPath, shuffleFileListParameter)
 
 	override fun promiseShuffledFileStringList(playlistId: PlaylistId): Promise<String> = "".toPromise()
 
 	override fun promiseFiles(): Promise<List<ServiceFile>> =
-		promiseFilesAtPath(browseFilesPath, "Version=2")
+		promiseFilesAtPath(browseFilesPath)
 
 	override fun promiseFiles(query: String): Promise<List<ServiceFile>> =
-		promiseFilesAtPath(searchFilesPath, "Query=$query")
+		promiseFilesAtPath(searchFilesPath, "Query=[Media Type]=[Audio] $query")
 
 	override fun promiseFiles(itemId: ItemId): Promise<List<ServiceFile>> =
-		promiseFilesAtPath(browseFilesPath, "ID=${itemId.id}", "Version=2")
+		promiseFilesAtPath(browseFilesPath, "ID=${itemId.id}")
 
 	override fun promiseFiles(playlistId: PlaylistId): Promise<List<ServiceFile>> =
 		promiseFilesAtPath(playlistFilesPath, "Playlist=${playlistId.id}")
@@ -316,21 +319,20 @@ class LiveMediaCenterConnection(
 
 	private fun promiseFilesAtPath(path: String, vararg params: String): Promise<List<ServiceFile>> =
 		Promise.Proxy { cp ->
-			promiseFileStringList(FileListParameters.Options.None, path, *params)
+			promiseFileStringList(path, *params)
 				.also(cp::doCancel)
 				.eventually(FileResponses)
 				.also(cp::doCancel)
 				.then(FileResponses)
 		}
 
-	private fun promiseFileStringList(option: FileListParameters.Options, path: String, vararg params: String): Promise<String> =
+	private fun promiseFileStringList(path: String, vararg params: String): Promise<String> =
 		Promise.Proxy { cp ->
 			promiseResponse(
 				path,
-				*FileListParameters.Helpers.processParams(
-					option,
-					*params
-				)
+				*params,
+				serializedFileListParameter,
+				resetCacheParameter,
 			).also(cp::doCancel).promiseStringBody()
 		}
 
@@ -418,13 +420,13 @@ class LiveMediaCenterConnection(
 			val promisedResponse = itemId
 				?.run {
 					promiseResponse(
-						browseLibraryParameter,
+						browseLibraryPath,
 						"ID=$id",
 						"Version=2",
 						"ErrorOnMissing=1"
 					)
 				}
-				?: promiseResponse(browseLibraryParameter, "Version=2", "ErrorOnMissing=1")
+				?: promiseResponse(browseLibraryPath, "Version=2", "ErrorOnMissing=1")
 
 			proxy(
 				promisedResponse

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/browsing/files/access/parameters/IFileListParameterProvider.kt

@@ -0,0 +1,72 @@
+package com.lasthopesoftware.bluewater.client.access.GivenAJRiverConnection.AndAPlaylistId
+
+import com.lasthopesoftware.TestUrl
+import com.lasthopesoftware.bluewater.client.browsing.files.ServiceFile
+import com.lasthopesoftware.bluewater.client.browsing.items.playlists.PlaylistId
+import com.lasthopesoftware.bluewater.client.connection.MediaCenterConnectionDetails
+import com.lasthopesoftware.bluewater.client.connection.live.LiveMediaCenterConnection
+import com.lasthopesoftware.bluewater.client.connection.requests.FakeHttpConnection
+import com.lasthopesoftware.bluewater.client.connection.requests.FakeHttpConnectionProvider
+import com.lasthopesoftware.bluewater.client.connection.url.UrlBuilder.addParams
+import com.lasthopesoftware.bluewater.client.connection.url.UrlBuilder.addPath
+import com.lasthopesoftware.bluewater.client.connection.url.UrlBuilder.withMcApi
+import com.lasthopesoftware.bluewater.shared.promises.extensions.toExpiringFuture
+import com.lasthopesoftware.resources.PassThroughHttpResponse
+import io.mockk.mockk
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.Test
+
+class `When getting files` {
+
+	private val mut by lazy {
+		val httpConnection = FakeHttpConnection().apply {
+			mapResponse(TestUrl.withMcApi().addPath("Playlist/Files").addParams("Playlist=-466327", "Action=Serialize", "ResetCache=1")) {
+				PassThroughHttpResponse(
+					200,
+					"OK",
+					"2;20;-1;6830841;5772590;5667732;6385489;7477524;3685;937552;6271374;1167729;5204876;6515467;2338;6227150;937460;5691040;5729177;6271773;6241105;6628853;6082656".encodeToByteArray().inputStream()
+				)
+			}
+		}
+
+		LiveMediaCenterConnection(
+			MediaCenterConnectionDetails(TestUrl),
+			FakeHttpConnectionProvider(httpConnection),
+			mockk(),
+		)
+	}
+
+	private var items = emptyList<ServiceFile>()
+
+	@BeforeAll
+	fun act() {
+		items = mut.promiseFiles(PlaylistId("-466327")).toExpiringFuture().get()!!
+	}
+
+	@Test
+	fun `then the items are correct`() {
+		assertThat(items).containsExactly(
+			ServiceFile(key="6830841"),
+			ServiceFile(key="5772590"),
+			ServiceFile(key="5667732"),
+			ServiceFile(key="6385489"),
+			ServiceFile(key="7477524"),
+			ServiceFile(key="3685"),
+			ServiceFile(key="937552"),
+			ServiceFile(key="6271374"),
+			ServiceFile(key="1167729"),
+			ServiceFile(key="5204876"),
+			ServiceFile(key="6515467"),
+			ServiceFile(key="2338"),
+			ServiceFile(key="6227150"),
+			ServiceFile(key="937460"),
+			ServiceFile(key="5691040"),
+			ServiceFile(key="5729177"),
+			ServiceFile(key="6271773"),
+			ServiceFile(key="6241105"),
+			ServiceFile(key="6628853"),
+			ServiceFile(key="6082656"),
+		)
+	}
+}