[Feature] Support Subsonic Servers

README.md

@@ -2,15 +2,17 @@
 
 ![project blue](./design/project-blue-logo-circular.png)
 
-### An alternative, open source streaming music client for [JRiver Media Center](http://jriver.com/).
+### An alternative, open source streaming music client
 
-project blue is a streaming audio client for JRiver Media Center (http://jriver.com/). Stream your favorite music and audio from your JRiver Media Center wherever you are!
+project blue is a streaming audio client for various servers. Stream your favorite music and audio from your server wherever you are!
 
 Its features include:
 
-* Reliable streaming from your home server running JRiver Media Center via an intuitive layout.
+* Reliable streaming from your home server via an intuitive layout.
+  * [JRiver Media Center](http://jriver.com/)
+  * Subsonic (alpha - tested with [Navidrome](https://www.navidrome.org/) only)
 * Caching of audio files during playback.
-* Synchronize audio from JRMC server to device.
+* Synchronize audio from server to device.
 * Play local files when present and metadata match.
 * Updates server with playback statistics.
 * Edit and update playlists through Now Playing.
@@ -21,8 +23,6 @@ Its features include:
 
 Download on the [Google Play Store](https://play.google.com/store/apps/details?id=com.lasthopesoftware.bluewater)
 
-*Requires [JRiver Media Center](http://jriver.com/) running on your home server*
-
 # Development
 
 ![](https://github.com/actions/namehillsoftware/projectBlue/workflows/.github/workflows/build.yml/badge.svg)
@@ -106,6 +106,7 @@ file for details.
 ## Acknowledgments
 
 - [JRiver Media Center](https://jriver.com/)
+- [Navidrome](https://www.navidrome.org/)
 - [ExoPlayer](https://github.com/google/ExoPlayer)
 - [Lightweight Stream API](https://github.com/aNNiMON/Lightweight-Stream-API)
 - [RxJava](https://github.com/ReactiveX/RxJava)

projectBlueWater/build.gradle

@@ -206,7 +206,7 @@ dependencies {
 	implementation "androidx.compose.runtime:runtime-rxjava3:$compose_version"
 	implementation 'androidx.activity:activity-compose:1.10.1'
 	implementation 'dev.olshevski.navigation:reimagined:1.5.0'
-	implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0"
+	implementation 'com.google.code.gson:gson:2.12.1'
 	debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
 	debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
 	testImplementation 'commons-codec:commons-codec:1.18.0'

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/ApplicationDependenciesContainer.kt

@@ -56,6 +56,7 @@ import com.lasthopesoftware.resources.bitmaps.DefaultAwareCachingBitmapProducer
 import com.lasthopesoftware.resources.bitmaps.QueuedBitmapProducer
 import com.lasthopesoftware.resources.network.ActiveNetworkFinder
 import com.lasthopesoftware.resources.strings.Base64Encoder
+import com.lasthopesoftware.resources.strings.JsonEncoderDecoder
 import com.lasthopesoftware.resources.strings.StringResources
 
 object ApplicationDependenciesContainer {
@@ -157,7 +158,7 @@ object ApplicationDependenciesContainer {
 			get() = libraryRepository
 
 		override val librarySettingsProvider by lazy {
-			val access = LibrarySettingsAccess(libraryStorage)
+			val access = LibrarySettingsAccess(libraryStorage, JsonEncoderDecoder)
 			CachedLibrarySettingsAccess(access, access)
 		}
 
@@ -202,7 +203,9 @@ object ApplicationDependenciesContainer {
 							serverLookup,
 							connectionSettingsLookup,
 							okHttpClients,
-							okHttpClients
+							okHttpClients,
+							JsonEncoderDecoder,
+							stringResources,
 						),
 						audioCacheStreamSupplier,
 					),

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/access/RemoteLibraryAccess.kt

@@ -1,8 +1,10 @@
 package com.lasthopesoftware.bluewater.client.access
 
 import com.lasthopesoftware.bluewater.client.browsing.files.ServiceFile
-import com.lasthopesoftware.bluewater.client.browsing.items.Item
+import com.lasthopesoftware.bluewater.client.browsing.files.properties.EditableFilePropertyDefinition
+import com.lasthopesoftware.bluewater.client.browsing.items.IItem
 import com.lasthopesoftware.bluewater.client.browsing.items.ItemId
+import com.lasthopesoftware.bluewater.client.browsing.items.KeyedIdentifier
 import com.lasthopesoftware.bluewater.client.browsing.items.playlists.PlaylistId
 import com.lasthopesoftware.bluewater.client.servers.version.SemanticVersion
 import com.namehillsoftware.handoff.promises.Promise
@@ -17,20 +19,23 @@ interface RemoteLibraryAccess {
 		isFormatted: Boolean
 	): Promise<Unit>
 
-	fun promiseItems(itemId: ItemId?): Promise<List<Item>>
+	fun promiseItems(itemId: KeyedIdentifier?): Promise<List<IItem>>
 	fun promiseAudioPlaylistPaths(): Promise<List<String>>
 	fun promiseStoredPlaylist(playlistPath: String, playlist: List<ServiceFile>): Promise<*>
 	fun promiseIsReadOnly(): Promise<Boolean>
 	fun promiseServerVersion(): Promise<SemanticVersion?>
-	fun promiseRevision(): Promise<Int?>
+	fun promiseRevision(): Promise<Long?>
 	fun promiseFile(serviceFile: ServiceFile): Promise<InputStream>
 	fun promisePlaystatsUpdate(serviceFile: ServiceFile): Promise<*>
 	fun promiseFiles(): Promise<List<ServiceFile>>
 	fun promiseFiles(query: String): Promise<List<ServiceFile>>
 	fun promiseFiles(itemId: ItemId): Promise<List<ServiceFile>>
 	fun promiseFiles(playlistId: PlaylistId): Promise<List<ServiceFile>>
 	fun promiseFileStringList(itemId: ItemId? = null): Promise<String>
+	fun promiseFileStringList(playlistId: PlaylistId): Promise<String>
 	fun promiseShuffledFileStringList(itemId: ItemId? = null): Promise<String>
+	fun promiseShuffledFileStringList(playlistId: PlaylistId): Promise<String>
 	fun promiseImageBytes(serviceFile: ServiceFile): Promise<ByteArray>
 	fun promiseImageBytes(itemId: ItemId): Promise<ByteArray>
+	fun promiseEditableFilePropertyDefinitions(): Promise<Set<EditableFilePropertyDefinition>>
 }

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/browsing/ScopedViewModelRegistry.kt

@@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelStoreOwner
 import com.lasthopesoftware.bluewater.client.browsing.files.details.FileDetailsViewModel
 import com.lasthopesoftware.bluewater.client.browsing.files.list.FileListViewModel
 import com.lasthopesoftware.bluewater.client.browsing.files.list.SearchFilesViewModel
+import com.lasthopesoftware.bluewater.client.browsing.files.properties.EditableFilePropertyDefinitionProvider
 import com.lasthopesoftware.bluewater.client.browsing.files.properties.EditableLibraryFilePropertiesProvider
 import com.lasthopesoftware.bluewater.client.browsing.items.list.ItemListViewModel
 import com.lasthopesoftware.bluewater.client.settings.LibrarySettingsViewModel
@@ -30,7 +31,7 @@ class ScopedViewModelRegistry(
 
 	override val fileListViewModel by viewModelStoreOwner.buildViewModelLazily {
         FileListViewModel(
-            itemFileProvider,
+            libraryFilesProvider,
             storedItemAccess,
         )
 	}
@@ -49,17 +50,22 @@ class ScopedViewModelRegistry(
 
 	override val librarySettingsViewModel by viewModelStoreOwner.buildViewModelLazily {
 		LibrarySettingsViewModel(
+			libraryNameLookup = libraryNameLookup,
 			librarySettingsProvider = librarySettingsProvider,
 			librarySettingsStorage = librarySettingsStorage,
 			libraryRemoval = libraryRemoval,
 			applicationPermissions = permissionsDependencies.applicationPermissions,
+			stringResources = stringResources,
 		)
 	}
 
 	override val fileDetailsViewModel by viewModelStoreOwner.buildViewModelLazily {
 		FileDetailsViewModel(
 			connectionPermissions = connectionAuthenticationChecker,
-			filePropertiesProvider = EditableLibraryFilePropertiesProvider(freshLibraryFileProperties),
+			filePropertiesProvider = EditableLibraryFilePropertiesProvider(
+				freshLibraryFileProperties,
+				EditableFilePropertyDefinitionProvider(libraryConnectionProvider),
+			),
 			updateFileProperties = filePropertiesStorage,
 			defaultImageProvider = defaultImageProvider,
 			imageProvider = imageBytesProvider,

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

@@ -0,0 +1,26 @@
+package com.lasthopesoftware.bluewater.client.browsing.files.access
+
+import com.lasthopesoftware.bluewater.client.browsing.files.ServiceFile
+import com.lasthopesoftware.bluewater.client.browsing.items.ItemId
+import com.lasthopesoftware.bluewater.client.browsing.items.playlists.PlaylistId
+import com.lasthopesoftware.bluewater.client.browsing.library.repository.LibraryId
+import com.lasthopesoftware.policies.ExecutionPolicies
+import com.namehillsoftware.handoff.promises.Promise
+
+class DelegatingLibraryFileProvider(inner: ProvideLibraryFiles, policies: ExecutionPolicies) : ProvideLibraryFiles {
+	private val promiseLibraryFiles by lazy { policies.applyPolicy<LibraryId, List<ServiceFile>>(inner::promiseFiles) }
+	private val promiseItemFiles by lazy { policies.applyPolicy<LibraryId, ItemId, List<ServiceFile>>(inner::promiseFiles) }
+	private val promisePlaylistFiles by lazy { policies.applyPolicy<LibraryId, PlaylistId, List<ServiceFile>>(inner::promiseFiles) }
+	private val promiseAudioFilesPolicy by lazy { policies.applyPolicy<LibraryId, String, List<ServiceFile>>(inner::promiseAudioFiles) }
+
+	override fun promiseFiles(libraryId: LibraryId): Promise<List<ServiceFile>> = promiseLibraryFiles(libraryId)
+
+	override fun promiseFiles(libraryId: LibraryId, itemId: ItemId): Promise<List<ServiceFile>> =
+		promiseItemFiles(libraryId, itemId)
+
+	override fun promiseFiles(libraryId: LibraryId, playlistId: PlaylistId): Promise<List<ServiceFile>> =
+		promisePlaylistFiles(libraryId, playlistId)
+
+	override fun promiseAudioFiles(libraryId: LibraryId, query: String): Promise<List<ServiceFile>> =
+		promiseAudioFilesPolicy(libraryId, query)
+}

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

@@ -42,6 +42,9 @@ object FileStringListUtilities {
 	fun promiseSerializedFileStringList(serviceFiles: Collection<ServiceFile>): Promise<String> =
 		ThreadPools.compute.preparePromise { serializeFileStringList(serviceFiles, it) }
 
+	fun promiseShuffledSerializedFileStringList(serviceFiles: Collection<ServiceFile>): Promise<String> =
+		ThreadPools.compute.preparePromise { serializeFileStringList(serviceFiles.shuffled(), it) }
+
 	private fun serializeFileStringList(serviceFiles: Collection<ServiceFile>, cancellationSignal: CancellationSignal): String {
 		if (cancellationSignal.isCancelled) throw serializingCancelledException()
 

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

@@ -1,7 +1,7 @@
 package com.lasthopesoftware.bluewater.client.browsing.files.access.stringlist
 
-import com.lasthopesoftware.bluewater.client.browsing.files.access.parameters.FileListParameters
 import com.lasthopesoftware.bluewater.client.browsing.items.ItemId
+import com.lasthopesoftware.bluewater.client.browsing.items.playlists.PlaylistId
 import com.lasthopesoftware.bluewater.client.browsing.library.repository.LibraryId
 import com.lasthopesoftware.bluewater.client.connection.libraries.ProvideLibraryConnections
 import com.lasthopesoftware.bluewater.client.connection.live.eventuallyFromDataAccess
@@ -11,10 +11,23 @@ import com.namehillsoftware.handoff.promises.Promise
 class ItemStringListProvider(
 	private val libraryConnections: ProvideLibraryConnections
 ) : ProvideFileStringListForItem {
-	override fun promiseFileStringList(libraryId: LibraryId, itemId: ItemId?, options: FileListParameters.Options): Promise<String> {
-		// Put any crazy workarounds to get a fresh file list in here
-		return libraryConnections
+	override fun promiseFileStringList(libraryId: LibraryId, itemId: ItemId?): Promise<String> =
+		libraryConnections
 			.promiseLibraryConnection(libraryId)
 			.eventuallyFromDataAccess { a -> a?.promiseFileStringList(itemId).keepPromise("") }
-	}
+
+	override fun promiseFileStringList(libraryId: LibraryId, playlistId: PlaylistId): Promise<String> =
+		libraryConnections
+			.promiseLibraryConnection(libraryId)
+			.eventuallyFromDataAccess { a -> a?.promiseFileStringList(playlistId).keepPromise("") }
+
+	override fun promiseShuffledFileStringList(libraryId: LibraryId, itemId: ItemId?): Promise<String> =
+		libraryConnections
+			.promiseLibraryConnection(libraryId)
+			.eventuallyFromDataAccess { a -> a?.promiseShuffledFileStringList(itemId).keepPromise("") }
+
+	override fun promiseShuffledFileStringList(libraryId: LibraryId, playlistId: PlaylistId): Promise<String> =
+		libraryConnections
+			.promiseLibraryConnection(libraryId)
+			.eventuallyFromDataAccess { a -> a?.promiseShuffledFileStringList(playlistId).keepPromise("") }
 }

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

@@ -1,10 +1,13 @@
 package com.lasthopesoftware.bluewater.client.browsing.files.access.stringlist
 
-import com.lasthopesoftware.bluewater.client.browsing.files.access.parameters.FileListParameters
 import com.lasthopesoftware.bluewater.client.browsing.items.ItemId
+import com.lasthopesoftware.bluewater.client.browsing.items.playlists.PlaylistId
 import com.lasthopesoftware.bluewater.client.browsing.library.repository.LibraryId
 import com.namehillsoftware.handoff.promises.Promise
 
 interface ProvideFileStringListForItem {
-	fun promiseFileStringList(libraryId: LibraryId, itemId: ItemId? = null, options: FileListParameters.Options = FileListParameters.Options.None): Promise<String>
+	fun promiseFileStringList(libraryId: LibraryId, itemId: ItemId? = null): Promise<String>
+	fun promiseShuffledFileStringList(libraryId: LibraryId, itemId: ItemId? = null): Promise<String>
+	fun promiseFileStringList(libraryId: LibraryId, playlistId: PlaylistId): Promise<String>
+	fun promiseShuffledFileStringList(libraryId: LibraryId, playlistId: PlaylistId): Promise<String>
 }

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/browsing/files/details/FileDetailsActivity.kt

@@ -14,6 +14,7 @@ import com.lasthopesoftware.bluewater.ActivityApplicationNavigation
 import com.lasthopesoftware.bluewater.ApplicationDependenciesContainer.applicationDependencies
 import com.lasthopesoftware.bluewater.android.intents.safelyGetParcelableExtra
 import com.lasthopesoftware.bluewater.client.browsing.files.ServiceFile
+import com.lasthopesoftware.bluewater.client.browsing.files.properties.EditableFilePropertyDefinitionProvider
 import com.lasthopesoftware.bluewater.client.browsing.files.properties.EditableLibraryFilePropertiesProvider
 import com.lasthopesoftware.bluewater.client.browsing.files.properties.LibraryFilePropertiesDependentsRegistry
 import com.lasthopesoftware.bluewater.client.browsing.items.list.ConnectionLostView
@@ -47,7 +48,10 @@ import java.io.IOException
 	}
 
 	private val filePropertiesProvider by lazy {
-		EditableLibraryFilePropertiesProvider(libraryConnectedDependencies.freshLibraryFileProperties)
+		EditableLibraryFilePropertiesProvider(
+			libraryConnectedDependencies.freshLibraryFileProperties,
+			EditableFilePropertyDefinitionProvider(localApplicationDependencies.libraryConnectionProvider),
+		)
 	}
 
 	private val libraryFilePropertiesDependents by lazy {

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/browsing/files/details/FileDetailsView.kt

@@ -73,9 +73,9 @@ import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import com.lasthopesoftware.bluewater.NavigateApplication
 import com.lasthopesoftware.bluewater.R
-import com.lasthopesoftware.bluewater.client.browsing.files.properties.FileProperty
 import com.lasthopesoftware.bluewater.client.browsing.files.properties.FilePropertyType
-import com.lasthopesoftware.bluewater.client.browsing.files.properties.KnownFileProperties
+import com.lasthopesoftware.bluewater.client.browsing.files.properties.NormalizedFileProperties
+import com.lasthopesoftware.bluewater.client.browsing.files.properties.ReadOnlyFileProperty
 import com.lasthopesoftware.bluewater.shared.NullBox
 import com.lasthopesoftware.bluewater.shared.android.colors.MediaStylePalette
 import com.lasthopesoftware.bluewater.shared.android.colors.MediaStylePaletteProvider
@@ -261,7 +261,7 @@ fun FilePropertyRow(
 		val propertyValue by property.committedValue.subscribeAsState()
 
 		when (property.property) {
-			KnownFileProperties.Rating -> {
+			NormalizedFileProperties.Rating -> {
 				Box(
 					modifier = Modifier
 						.weight(2f)
@@ -360,7 +360,7 @@ private fun FileDetailsEditor(
 						contentAlignment = Alignment.Center
 					) {
 						when {
-							fileProperty.property == KnownFileProperties.Rating -> {
+							fileProperty.property == NormalizedFileProperties.Rating -> {
 								val ratingValue by remember { derivedStateOf { propertyValue.toInt() } }
 								RatingBar(
 									rating = ratingValue,
@@ -425,7 +425,7 @@ private fun FileDetailsEditor(
 								.navigable(
 									onClick = {
 										viewModel.activeLibraryId?.also {
-											navigateApplication.search(it, FileProperty(property, propertyValue))
+											navigateApplication.search(it, ReadOnlyFileProperty(property, propertyValue))
 										}
 									},
 									enabled = !isEditing