#482 rewrite ids -> LOCAL_NETWORK when serving files out

Author: sentinelweb

hub/src/main/kotlin/uk/co/sentinelweb/cuer/hub/ui/player/vlc/VlcPlayerSwingWindow.kt

@@ -15,7 +15,7 @@ import uk.co.caprica.vlcj.player.base.MediaPlayer
 import uk.co.caprica.vlcj.player.base.MediaPlayerEventAdapter
 import uk.co.caprica.vlcj.player.base.State
 import uk.co.caprica.vlcj.player.component.CallbackMediaPlayerComponent
-import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract.Source.REMOTE
+import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract.Source.LOCAL_NETWORK
 import uk.co.sentinelweb.cuer.app.ui.player.PlayerContract
 import uk.co.sentinelweb.cuer.app.ui.player.PlayerContract.PlayerCommand.*
 import uk.co.sentinelweb.cuer.app.ui.player.PlayerContract.View.Event.*
@@ -418,7 +418,7 @@ class VlcPlayerSwingWindow(
 
     private fun mapPath(item: PlaylistItemDomain) =
         item
-            .takeIf { it.id != null && it.id?.source == REMOTE && it.id?.locator != null }
+            .takeIf { it.id != null && it.id?.source == LOCAL_NETWORK && it.id?.locator != null }
             ?.takeIf { localRepository.localNode.locator() != it.id?.locator }
             ?.takeIf { it.media.mediaType == FILE }
             ?.let { it.copy(media = it.media.copy(platformId = "${it.id?.locator?.http()}/video-stream/${it.media.platformId}")) }

remote/src/jvmAndAndroid/kotlin/uk/co/sentinelweb/cuer/remote/server/JvmRemoteWebServer.kt

@@ -20,8 +20,7 @@ import kotlinx.coroutines.withContext
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract.Source
-import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract.Source.LOCAL
-import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract.Source.REMOTE
+import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract.Source.*
 import uk.co.sentinelweb.cuer.app.orchestrator.toGuidIdentifier
 import uk.co.sentinelweb.cuer.app.service.remote.RemoteServerContract
 import uk.co.sentinelweb.cuer.app.usecase.GetFolderListUseCase
@@ -387,23 +386,23 @@ class JvmRemoteWebServer(
     private fun rewriteIdsToRemote(it: PlaylistAndChildrenDomain) = it.copy(
         playlist = it.playlist.copy(
             id = it.playlist.id?.copy(
-                source = REMOTE,
+                source = LOCAL_NETWORK,
                 locator = localRepository.localNode.locator()
             ),
             items = it.playlist.items.map {
                 it.copy(
                     id = it.id?.copy(
-                        source = REMOTE,
+                        source = LOCAL_NETWORK,
                         locator = localRepository.localNode.locator()
                     ),
                     media = it.media.copy(
                         id = it.media.id?.copy(
-                            source = REMOTE,
+                            source = LOCAL_NETWORK,
                             locator = localRepository.localNode.locator()
                         ),
                         channelData = it.media.channelData.copy(
                             id = it.media.channelData.id?.copy(
-                                source = REMOTE,
+                                source = LOCAL_NETWORK,
                                 locator = localRepository.localNode.locator()
                             )
                         )

shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/di/SharedAppModule.kt

@@ -157,7 +157,7 @@ object SharedAppModule {
                 coProvider = get()
             )
         }
-        factory { PlaylistMediaUpdateUsecase(get()) }
+        factory { PlaylistMediaUpdateUsecase(get(), get()) }
         factory {
             PlaylistOrDefaultUsecase(
                 playlistDatabaseRepository = get(),

shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/queue/QueueMediator.kt

@@ -9,6 +9,8 @@ import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract
 import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract.Companion.NO_PLAYLIST
 import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract.Identifier
 import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract.Operation.*
+import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract.Source.LOCAL
+import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract.Source.MEMORY
 import uk.co.sentinelweb.cuer.app.orchestrator.deepOptions
 import uk.co.sentinelweb.cuer.app.orchestrator.flatOptions
 import uk.co.sentinelweb.cuer.app.usecase.PlaylistMediaUpdateUsecase
@@ -236,6 +238,8 @@ class QueueMediator constructor(
 
     private suspend fun updateCurrentItemFromMedia(updatedMedia: MediaDomain) {
         state.currentItem = state.currentItem
+            // todo support local netowrk
+            ?.takeIf { listOf(MEMORY, LOCAL).contains(it.id?.source)  }
             ?.run {
                 media.let {
                     MediaPositionUpdateDomain(

shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/usecase/PlaylistMediaUpdateUsecase.kt

@@ -2,22 +2,28 @@ package uk.co.sentinelweb.cuer.app.usecase
 
 import uk.co.sentinelweb.cuer.app.orchestrator.MediaOrchestrator
 import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract
-import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract.Source.LOCAL
-import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract.Source.MEMORY
+import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract.Source.*
+import uk.co.sentinelweb.cuer.core.wrapper.LogWrapper
 import uk.co.sentinelweb.cuer.domain.MediaDomain
 import uk.co.sentinelweb.cuer.domain.PlaylistDomain
 import uk.co.sentinelweb.cuer.domain.update.UpdateDomain
 
 class PlaylistMediaUpdateUsecase(
-    private val mediaOrchestrator: MediaOrchestrator
+    private val mediaOrchestrator: MediaOrchestrator,
+    private val log:LogWrapper
 ) {
+    init {
+        log.tag(this)
+    }
+
     suspend fun updateMedia(
         playlist: PlaylistDomain,
         update: UpdateDomain<MediaDomain>,
         options: OrchestratorContract.Options
     ): MediaDomain =
         when (options.source) {
             LOCAL, MEMORY -> mediaOrchestrator.update(update, options)
+            //LOCAL_NETWORK -> // todo update remote
             else -> throw UnsupportedOperationException("Media update not supported for ${options.source}")
         }
-}
+}