diff --git a/apps/coordinator/build.gradle.kts b/apps/coordinator/build.gradle.kts index f58f8d37..5395f66a 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.13-SNAPSHOT") - implementation("no.iktdev.streamit.library:streamit-library-db:0.0.6-alpha26") + implementation("no.iktdev.streamit.library:streamit-library-db:0.0.6-alpha27") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1") diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/CoordinatorApplication.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/CoordinatorApplication.kt index ef520823..5f50faf3 100644 --- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/CoordinatorApplication.kt +++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/CoordinatorApplication.kt @@ -82,7 +82,8 @@ fun main(args: Array) { progress, data_audio, data_video, - cast_errors + cast_errors, + titles ) storeDatabase.createTables(*tables) diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CollectAndStoreTask.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CollectAndStoreTask.kt index 3a4851f7..a858ea5c 100644 --- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CollectAndStoreTask.kt +++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CollectAndStoreTask.kt @@ -74,7 +74,7 @@ class CollectAndStoreTask(@Autowired override var coordinator: Coordinator) : Ta mapped.metadata?.let { storeMetadata(catalogId = catalogId, metadata = it) - storeTitles(it.title, contentTitles = it.titles) + storeTitles(it.collection, it.title, contentTitles = it.titles) } return SimpleMessageData(Status.COMPLETED, derivedFromEventId = event.eventId) @@ -109,19 +109,28 @@ class CollectAndStoreTask(@Autowired override var coordinator: Coordinator) : Ta } } - private fun storeTitles(usedTitle: String, contentTitles: List) { - withTransaction(getStoreDatabase()) { - titles.insertIgnore { - it[titles.masterTitle] = usedTitle - it[titles.title] = NameHelper.normalize(usedTitle) - it[titles.type] = 1 - } - contentTitles.forEach { title -> + private fun storeTitles(collection: String, usedTitle: String, contentTitles: List) { + try { + withTransaction(getStoreDatabase()) { + titles.insertIgnore { + it[titles.masterTitle] = collection + it[titles.title] = NameHelper.normalize(usedTitle) + it[titles.type] = 1 + } titles.insertIgnore { it[titles.masterTitle] = usedTitle - it[titles.title] = title + it[titles.title] = NameHelper.normalize(usedTitle) + it[titles.type] = 2 + } + contentTitles.forEach { title -> + titles.insertIgnore { + it[titles.masterTitle] = usedTitle + it[titles.title] = title + } } } + } catch (e: Exception) { + e.printStackTrace() } }