#496 - fix queing for local

Author: sentinelweb

shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/service/transfers/MemoryTransfersService.kt

@@ -14,8 +14,7 @@ import uk.co.sentinelweb.cuer.core.wrapper.LogWrapper
 import uk.co.sentinelweb.cuer.domain.GUID
 import uk.co.sentinelweb.cuer.domain.PlaylistDomain
 import uk.co.sentinelweb.cuer.domain.TransferDomain
-import uk.co.sentinelweb.cuer.domain.TransferDomain.Status.Confirmed
-import uk.co.sentinelweb.cuer.domain.TransferDomain.Status.Pending
+import uk.co.sentinelweb.cuer.domain.TransferDomain.Status.*
 import uk.co.sentinelweb.cuer.domain.creator.GuidCreator
 import uk.co.sentinelweb.cuer.net.remote.RemoteFilesInteractor
 import uk.co.sentinelweb.cuer.remote.server.LocalRepository
@@ -133,13 +132,24 @@ class MemoryTransfersService(
 
     private fun checkConfirmedTransfers() {
         scope.launch {
+            // send remote transfers to parget
             queue
                 .filter { it.status == Confirmed }
-                .also { log.d("checkConfirmedTransfers: ${it.size}") }
+                .filter { it.target?.node?.ipport() != localRepository.localNode.ipport() }
+                .also { log.d("checkConfirmedTransfers.remote: ${it.size}") }
                 .forEach {
                     startTransfersUsecase.execute(it)
                         ?.also { addReplaceTransfer(it) }
                 }
+
+            // set local confirmed to Pending
+            queue
+                .filter { it.status == Confirmed }
+                .filter { it.target?.node?.ipport() == localRepository.localNode.ipport() }
+                .also { log.d("checkConfirmedTransfers.local: ${it.size}") }
+                .forEach {
+                    addReplaceTransfer(it.copy(status = Pending))
+                }
         }
     }
 
@@ -151,14 +161,15 @@ class MemoryTransfersService(
                 .filter { it.target?.node?.ipport() == localRepository.localNode.ipport() }
                 .also { log.d("checkPendingTransfers.local: ${it.size}") }
                 .forEach {
+                    addReplaceTransfer(it.copy(status = InProgress))
                     executeTransferUseCase.execute(it)
                 }
         }
     }
 
     private fun update(state: TransfersContract.Service.State) {
         val remoteItemsToUpdate = queue
-            .filter { it.status == Pending || it.status == TransferDomain.Status.InProgress }
+            .filter { it.status == Pending || it.status == InProgress }
             .takeIf { it.isNotEmpty() }
             ?.also { log.d("update items: ${it.map { it.id to it.status }}") }
             ?: return