diff --git a/.idea/workspace.xml b/.idea/workspace.xml index eb377d6e..8de80e91 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,36 +5,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - + + - + - + - - - + + + - - - - + + + + @@ -308,6 +284,71 @@ 23 diff --git a/apps/coordinator/build.gradle.kts b/apps/coordinator/build.gradle.kts index d4352d8b..5966f70e 100644 --- a/apps/coordinator/build.gradle.kts +++ b/apps/coordinator/build.gradle.kts @@ -37,7 +37,7 @@ dependencies { implementation("org.json:json:20210307") implementation("no.iktdev:exfl:0.0.16-SNAPSHOT") - implementation("no.iktdev.streamit.library:streamit-library-db:0.0.6-alpha27") + implementation("no.iktdev.streamit.library:streamit-library-db:1.0.0-alpha11") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1") diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/CompletedTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/CompletedTaskListener.kt index 47223269..b0950af1 100644 --- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/CompletedTaskListener.kt +++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/CompletedTaskListener.kt @@ -310,18 +310,16 @@ class CompletedTaskListener: CoordinatorEventListener() { withTransaction(getStoreDatabase()) { titles.insertIgnore { it[masterTitle] = metadata.collection - it[title] = NameHelper.normalize(usedTitle) - it[type] = 1 + it[alternativeTitle] = NameHelper.normalize(usedTitle) } titles.insertIgnore { it[masterTitle] = usedTitle - it[title] = NameHelper.normalize(usedTitle) - it[type] = 2 + it[alternativeTitle] = NameHelper.normalize(usedTitle) } metadata.titles.forEach { title -> titles.insertIgnore { it[masterTitle] = usedTitle - it[titles.title] = title + it[alternativeTitle] = title } } } diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/MediaOutInformationTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/MediaOutInformationTaskListener.kt index 2225b22d..ac5e506c 100644 --- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/MediaOutInformationTaskListener.kt +++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/MediaOutInformationTaskListener.kt @@ -1,13 +1,13 @@ package no.iktdev.mediaprocessing.coordinator.tasksV2.listeners import com.google.gson.JsonObject +import mu.KotlinLogging import no.iktdev.eventi.core.ConsumableEvent import no.iktdev.eventi.core.WGson import no.iktdev.eventi.data.EventStatus import no.iktdev.exfl.using import no.iktdev.mediaprocessing.coordinator.Coordinator import no.iktdev.mediaprocessing.coordinator.CoordinatorEventListener -import no.iktdev.mediaprocessing.coordinator.utils.log import no.iktdev.mediaprocessing.shared.common.SharedConfig import no.iktdev.mediaprocessing.shared.common.parsing.FileNameDeterminate import no.iktdev.mediaprocessing.shared.common.parsing.NameHelper @@ -26,6 +26,7 @@ import javax.naming.Name @Service class MediaOutInformationTaskListener: CoordinatorEventListener() { + private val logger = KotlinLogging.logger {} override fun getProducerName(): String { return this::class.java.simpleName @@ -46,7 +47,7 @@ class MediaOutInformationTaskListener: CoordinatorEventListener() { override fun onEventsReceived(incomingEvent: ConsumableEvent, events: List) { val event = incomingEvent.consume() if (event == null) { - log.error { "Event is null and should not be available! ${WGson.gson.toJson(incomingEvent.metadata())}" } + logger.error { "Event is null and should not be available! ${WGson.gson.toJson(incomingEvent.metadata())}" } return } active = true @@ -54,7 +55,7 @@ class MediaOutInformationTaskListener: CoordinatorEventListener() { val metadataResult = event.az() val mediaBaseInfo = events.findLast { it.eventType == Events.EventMediaReadBaseInfoPerformed }?.az()?.data if (mediaBaseInfo == null) { - log.error { "Required event ${Events.EventMediaReadBaseInfoPerformed} is not present" } + logger.error { "Required event ${Events.EventMediaReadBaseInfoPerformed} is not present" } coordinator?.produceNewEvent( MediaOutInformationConstructedEvent( metadata = event.makeDerivedEventInfo(EventStatus.Failed, getProducerName()) diff --git a/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/MockEventManager.kt b/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/MockEventManager.kt index 77e7f0f7..9d4908a0 100644 --- a/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/MockEventManager.kt +++ b/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/MockEventManager.kt @@ -7,6 +7,10 @@ import org.springframework.stereotype.Component @Component class MockEventManager(dataSource: MockDataSource = MockDataSource()) : EventsManagerImpl(dataSource) { val events: MutableList = mutableListOf() + override fun getAvailableReferenceIds(): List { + TODO("Not yet implemented") + } + override fun readAvailableEvents(): List> { return listOf(events) }