#496 - fix updating transfer service

sentinelweb · sentinelweb · commit 234dd1c392e6 · 2025-07-01T18:39:04.000+02:00
diff --git a/app/src/main/java/uk/co/sentinelweb/cuer/app/ui/filebrowser/dialog/FilesDialogFragment.kt b/app/src/main/java/uk/co/sentinelweb/cuer/app/ui/filebrowser/dialog/FilesDialogFragment.kt
@@ -17,7 +17,6 @@ import uk.co.sentinelweb.cuer.app.ui.common.viewmodel.ViewModelEffects
 import uk.co.sentinelweb.cuer.app.ui.filebrowser.FilesContract
 import uk.co.sentinelweb.cuer.app.ui.filebrowser.FilesContract.Effect
 import uk.co.sentinelweb.cuer.app.ui.filebrowser.FilesViewModel
-import uk.co.sentinelweb.cuer.app.ui.filebrowser.ext.mapFilePath
 import uk.co.sentinelweb.cuer.app.ui.play_control.CompactPlayerScroll
 import uk.co.sentinelweb.cuer.app.ui.player.PlayerContract
 import uk.co.sentinelweb.cuer.app.util.extension.fragmentScopeWithSource
@@ -26,6 +25,7 @@ import uk.co.sentinelweb.cuer.core.wrapper.LogWrapper
 import uk.co.sentinelweb.cuer.domain.Domain
 import uk.co.sentinelweb.cuer.domain.NodeDomain
 import uk.co.sentinelweb.cuer.domain.PlaylistItemDomain
+import uk.co.sentinelweb.cuer.domain.ext.mapFilePath
 import uk.co.sentinelweb.cuer.remote.interact.PlayerLaunchHost
 import uk.co.sentinelweb.cuer.remote.server.player.PlayerSessionContract
 
diff --git a/domain/src/commonMain/kotlin/uk/co/sentinelweb/cuer/domain/TransferDomain.kt b/domain/src/commonMain/kotlin/uk/co/sentinelweb/cuer/domain/TransferDomain.kt
@@ -0,0 +1,25 @@
+package uk.co.sentinelweb.cuer.domain
+
+import kotlinx.serialization.Serializable
+import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract
+
+@Serializable
+data class TransferDomain(
+    val id: OrchestratorContract.Identifier<GUID>? = null,
+    val source: Address? = null,
+    val target: Address? = null,
+    val deleteSourceAfter: Boolean = false,
+    val status: Status = Status.Pending,
+) {
+    enum class Status { Pending, Error, Complete }
+
+    @Serializable
+    data class Address(
+        val node: NodeDomain,
+        val path: Domain? = null,
+    )
+
+    companion object {
+        val Default = TransferDomain()
+    }
+}
diff --git a/domain/src/commonMain/kotlin/uk/co/sentinelweb/cuer/domain/ext/DomainExt.kt b/domain/src/commonMain/kotlin/uk/co/sentinelweb/cuer/domain/ext/DomainExt.kt
@@ -0,0 +1,11 @@
+package uk.co.sentinelweb.cuer.domain.ext
+
+import uk.co.sentinelweb.cuer.domain.*
+
+fun Domain.mapFilePath(): String = when (this) {
+    is PlaylistAndChildrenDomain -> playlist.platformId ?: ""
+    is PlaylistDomain -> platformId ?: ""
+    is PlaylistItemDomain -> media.platformId
+    is MediaDomain -> platformId
+    else -> error("Not a path object : ${this::class.simpleName}")
+}
diff --git a/domain/src/commonMain/kotlin/uk/co/sentinelweb/cuer/domain/ext/TransferExt.kt b/domain/src/commonMain/kotlin/uk/co/sentinelweb/cuer/domain/ext/TransferExt.kt
@@ -0,0 +1,14 @@
+package uk.co.sentinelweb.cuer.domain.ext
+
+import uk.co.sentinelweb.cuer.domain.TransferDomain
+
+fun TransferDomain.Address.displayAddress(): String =
+    "${this.node.nameAndPort()} / ${this.path?.mapFilePath()?.ellipsizePath()}"
+
+fun String.ellipsizePath(margin: Int = 50, ellipsis: String = "..."): String {
+    if (length <= 2 * margin) {
+        return this
+    }
+
+    return substring(0, margin) + ellipsis + substring(length - margin)
+}
diff --git a/hub/src/main/kotlin/uk/co/sentinelweb/cuer/hub/service/service/EmptyTransferService.kt b/hub/src/main/kotlin/uk/co/sentinelweb/cuer/hub/service/service/EmptyTransferService.kt
@@ -0,0 +1,25 @@
+package uk.co.sentinelweb.cuer.hub.service.service
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOf
+import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract
+import uk.co.sentinelweb.cuer.app.ui.filebrowser.transfers.TransfersContract
+import uk.co.sentinelweb.cuer.domain.GUID
+import uk.co.sentinelweb.cuer.domain.TransferDomain
+import uk.co.sentinelweb.cuer.domain.TransferDomain.Companion.Default
+
+class EmptyTransferService : TransfersContract.Service {
+    override val queue: List<TransferDomain>
+        get() = listOf()
+    override val queueFlow: Flow<List<TransferDomain>>
+        get() = flowOf()
+
+    override fun addTransfer(domain: TransferDomain): TransferDomain =
+        Default
+
+    override fun removeTransfer(domain: TransferDomain): Boolean = false
+
+    override fun removeTransfer(id: OrchestratorContract.Identifier<GUID>): Boolean = false
+    override fun replaceTransfer(transfer: TransferDomain): Boolean = false
+
+}
diff --git a/hub/src/main/kotlin/uk/co/sentinelweb/cuer/hub/ui/filebrowser/FilesUiCoordinator.kt b/hub/src/main/kotlin/uk/co/sentinelweb/cuer/hub/ui/filebrowser/FilesUiCoordinator.kt
@@ -4,16 +4,13 @@ import androidx.compose.runtime.Composable
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.launch
 import org.koin.core.component.KoinComponent
 import org.koin.core.qualifier.named
 import org.koin.core.scope.Scope
 import org.koin.dsl.module
-import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract
 import uk.co.sentinelweb.cuer.app.ui.cast.CastController
 import uk.co.sentinelweb.cuer.app.ui.common.viewmodel.ViewModelEffects
 import uk.co.sentinelweb.cuer.app.ui.filebrowser.FilesComposeables.FileBrowserDesktopUi
@@ -22,12 +19,10 @@ import uk.co.sentinelweb.cuer.app.ui.filebrowser.FilesContract.Effect.ErrorMessa
 import uk.co.sentinelweb.cuer.app.ui.filebrowser.FilesContract.Model.Companion.Initial
 import uk.co.sentinelweb.cuer.app.ui.filebrowser.FilesContract.State
 import uk.co.sentinelweb.cuer.app.ui.filebrowser.FilesViewModel
-import uk.co.sentinelweb.cuer.app.ui.filebrowser.transfers.TransfersContract
-import uk.co.sentinelweb.cuer.app.ui.filebrowser.transfers.TransfersContract.TransferDomain.Companion.Default
 import uk.co.sentinelweb.cuer.app.ui.remotes.selector.NodesDialogContract
 import uk.co.sentinelweb.cuer.core.wrapper.LogWrapper
-import uk.co.sentinelweb.cuer.domain.GUID
 import uk.co.sentinelweb.cuer.domain.NodeDomain
+import uk.co.sentinelweb.cuer.hub.service.service.EmptyTransferService
 import uk.co.sentinelweb.cuer.hub.ui.home.HomeUiCoordinator
 import uk.co.sentinelweb.cuer.hub.ui.remotes.selector.RemotesDialogLauncher
 import uk.co.sentinelweb.cuer.hub.ui.remotes.selector.RemotesDialogLauncherComposeables.ShowRemotesDialogIfNecessary
@@ -105,20 +100,7 @@ class FilesUiCoordinator(
                         localRepository = get(),
                         localPlayerLaunchHost = get(),
                         localPlayerStatus = get(),
-                        transfersService = object : TransfersContract.Service {
-                            override val queue: List<TransfersContract.TransferDomain>
-                                get() = listOf()
-                            override val queueFlow: Flow<List<TransfersContract.TransferDomain>>
-                                get() = flowOf()
-
-                            override fun addTransfer(domain: TransfersContract.TransferDomain): TransfersContract.TransferDomain =
-                                Default
-
-                            override fun removeTransfer(domain: TransfersContract.TransferDomain): Boolean = false
-
-                            override fun removeTransfer(id: OrchestratorContract.Identifier<GUID>): Boolean = false
-
-                        },
+                        transfersService = EmptyTransferService(),
                         _effects = ViewModelEffects<FilesContract.Effect>()
                     )
                 }
@@ -138,5 +120,7 @@ class FilesUiCoordinator(
                 }
             }
         }
+
+
     }
 }
diff --git a/shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/FilesViewModel.kt b/shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/FilesViewModel.kt
@@ -170,8 +170,8 @@ class FilesViewModel(
         domain: Domain,
         node: NodeDomain?,
     ) {
-        val transfer = TransfersContract.TransferDomain(
-            source = node?.let { TransfersContract.TransferDomain.Address(it, domain) },
+        val transfer = TransferDomain(
+            source = node?.let { TransferDomain.Address(it, domain) },
             target = null,
         )
         transfersService.addTransfer(transfer)
@@ -183,8 +183,8 @@ class FilesViewModel(
         domain: Domain,
         node: NodeDomain?,
     ) {
-        val transfer = TransfersContract.TransferDomain(
-            source = node?.let { TransfersContract.TransferDomain.Address(it, domain) },
+        val transfer = TransferDomain(
+            source = node?.let { TransferDomain.Address(it, domain) },
             target = null,
         )
         transfersService.addTransfer(transfer)
diff --git a/shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/ext/FilesExt.kt b/shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/ext/FilesExt.kt
diff --git a/shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/transfers/MemoryTransfersService.kt b/shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/transfers/MemoryTransfersService.kt
@@ -7,6 +7,7 @@ import kotlinx.coroutines.flow.update
 import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract.Identifier
 import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract.Source.MEMORY
 import uk.co.sentinelweb.cuer.domain.GUID
+import uk.co.sentinelweb.cuer.domain.TransferDomain
 import uk.co.sentinelweb.cuer.domain.creator.GuidCreator
 
 class MemoryTransfersService(
@@ -16,12 +17,12 @@ class MemoryTransfersService(
 
     private val _stateObservable = MutableStateFlow(initialState)
 
-    override val queueFlow: Flow<List<TransfersContract.TransferDomain>>
+    override val queueFlow: Flow<List<TransferDomain>>
         get() = _stateObservable.map { it.queue }
-    override val queue: List<TransfersContract.TransferDomain>
+    override val queue: List<TransferDomain>
         get() = _stateObservable.value.queue
 
-    override fun addTransfer(domain: TransfersContract.TransferDomain): TransfersContract.TransferDomain {
+    override fun addTransfer(domain: TransferDomain): TransferDomain {
         val updated =
             _stateObservable.value.queue.let { queue ->
                 if (domain.id == null) {
@@ -38,7 +39,7 @@ class MemoryTransfersService(
         return updated.first
     }
 
-    override fun removeTransfer(domain: TransfersContract.TransferDomain): Boolean {
+    override fun removeTransfer(domain: TransferDomain): Boolean {
         return removeTransfer(domain.id ?: return false)
     }
 
@@ -53,7 +54,18 @@ class MemoryTransfersService(
         return result
     }
 
-    private fun createId(domain: TransfersContract.TransferDomain): TransfersContract.TransferDomain =
+    override fun replaceTransfer(transfer: TransferDomain): Boolean {
+        return queue.indexOfFirst { it.id == transfer.id }
+            .takeIf { it >= 0 }
+            ?.let { index ->
+                _stateObservable.update { last ->
+                    last.copy(queue = last.queue.toMutableList().apply { set(index, transfer) })
+                }
+                true
+            } ?: false
+    }
+
+    private fun createId(domain: TransferDomain): TransferDomain =
         domain.copy(
             id = Identifier(
                 guidCreator.create(),
diff --git a/shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/transfers/TransfersComposeables.kt b/shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/transfers/TransfersComposeables.kt
@@ -30,6 +30,7 @@ import uk.co.sentinelweb.cuer.app.ui.common.compose.CustomSnackbar
 import uk.co.sentinelweb.cuer.app.ui.common.compose.colorTransparentBlue
 import uk.co.sentinelweb.cuer.app.ui.common.compose.views.deleteSwipeResources
 import uk.co.sentinelweb.cuer.app.ui.common.compose.views.swipeToDismiss
+import uk.co.sentinelweb.cuer.app.ui.filebrowser.transfers.TransfersContract.Effect.ErrorMessage
 import uk.co.sentinelweb.cuer.app.ui.filebrowser.transfers.TransfersContract.Model.Companion.Initial
 import uk.co.sentinelweb.cuer.app.ui.local.LocalComposables.getKoin
 import uk.co.sentinelweb.cuer.core.wrapper.LogWrapper
@@ -52,8 +53,8 @@ object TransfersComposeables {
 
         LaunchedEffect(effects.value) {
             when (effects.value) {
-                is TransfersContract.Effect.ErrorMessage -> snackbarHostState.showSnackbar(
-                    message = (effects.value as TransfersContract.Effect.ErrorMessage).message,
+                is ErrorMessage -> snackbarHostState.showSnackbar(
+                    message = (effects.value as ErrorMessage).message,
                 )
 
                 else -> Unit
@@ -227,7 +228,7 @@ object TransfersComposeables {
     private fun LabelRow(
         label: String,
         data: String,
-        labelStayle: TextStyle = MaterialTheme.typography.titleSmall,
+        labelStyle: TextStyle = MaterialTheme.typography.titleSmall,
         textStyle: TextStyle = MaterialTheme.typography.bodySmall,
         onClick: (() -> Unit)? = null
     ) {
@@ -239,7 +240,7 @@ object TransfersComposeables {
         ) {
             Text(
                 text = label,
-                style = labelStayle,
+                style = labelStyle,
                 modifier = Modifier
                     .padding(2.dp)
                     .width(80.dp),
@@ -248,13 +249,11 @@ object TransfersComposeables {
             Text(
                 text = data,
                 style = textStyle,
-                maxLines = 2,
+                maxLines = 3,
                 modifier = Modifier
                     .weight(1f)
                     .padding(4.dp)
             )
         }
     }
-
-
 }
diff --git a/shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/transfers/TransfersContract.kt b/shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/transfers/TransfersContract.kt
@@ -1,11 +1,9 @@
 package uk.co.sentinelweb.cuer.app.ui.filebrowser.transfers
 
 import kotlinx.coroutines.flow.Flow
-import kotlinx.serialization.Serializable
 import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract.Identifier
-import uk.co.sentinelweb.cuer.domain.Domain
 import uk.co.sentinelweb.cuer.domain.GUID
-import uk.co.sentinelweb.cuer.domain.NodeDomain
+import uk.co.sentinelweb.cuer.domain.TransferDomain
 import kotlin.random.Random
 
 interface TransfersContract {
@@ -17,33 +15,13 @@ interface TransfersContract {
         fun addTransfer(domain: TransferDomain): TransferDomain
         fun removeTransfer(domain: TransferDomain): Boolean
         fun removeTransfer(id: Identifier<GUID>): Boolean
+        fun replaceTransfer(transfer: TransferDomain): Boolean
 
         data class State(
             val queue: List<TransferDomain>
         )
     }
 
-    @Serializable
-    data class TransferDomain(
-        val id: Identifier<GUID>? = null,
-        val source: Address? = null,
-        val target: Address? = null,
-        val deleteSourceAfter: Boolean = false,
-        val status: Status = Status.Pending,
-    ) {
-        enum class Status { Pending, Error, Complete }
-
-        @Serializable
-        data class Address(
-            val node: NodeDomain,
-            val path: Domain? = null,
-        )
-
-        companion object {
-            val Default = TransferDomain()
-        }
-    }
-
     interface ViewModel {
         val modelObservable: Flow<Model>
         val effects: Flow<Effect>
diff --git a/shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/transfers/TransfersModelMapper.kt b/shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/transfers/TransfersModelMapper.kt
@@ -1,8 +1,7 @@
 package uk.co.sentinelweb.cuer.app.ui.filebrowser.transfers
 
-import uk.co.sentinelweb.cuer.app.ui.filebrowser.ext.mapFilePath
-import uk.co.sentinelweb.cuer.app.ui.filebrowser.transfers.TransfersContract.TransferDomain.Status.Error
-import uk.co.sentinelweb.cuer.domain.ext.nameAndPort
+import uk.co.sentinelweb.cuer.domain.TransferDomain
+import uk.co.sentinelweb.cuer.domain.ext.displayAddress
 
 class TransfersModelMapper {
     fun map(state: TransfersContract.State, service: TransfersContract.Service): TransfersContract.Model =
@@ -16,20 +15,14 @@ class TransfersModelMapper {
         )
 
     private fun mapTransferDomainToModel(
-        domain: TransfersContract.TransferDomain,
+        domain: TransferDomain,
         state: TransfersContract.State
     ) = TransfersContract.Model.Transfer(
         id = domain.id,
         idText = domain.id?.id?.toString() ?: "unknown",
-        source = mapAddress(domain.source),
-        target = mapAddress(domain.target),
+        source = domain.source?.displayAddress() ?: "none",
+        target = domain.target?.displayAddress() ?: "none",
         deleteSourceAfter = false,
-        status = state.selectedTransfer?.status ?: Error
+        status = state.selectedTransfer?.status ?: TransferDomain.Status.Error
     )
-
-    private fun mapAddress(address: TransfersContract.TransferDomain.Address?): String =
-        address
-            ?.let { "${it.node.nameAndPort()} / ${it.path?.mapFilePath()}" }
-            ?: "none"
-
 }
diff --git a/shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/transfers/TransfersViewModel.kt b/shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/transfers/TransfersViewModel.kt
