From 8aeae926fbd768bf3583aa19d999e3271884eaea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brage=20Skj=C3=B8nborg?= Date: Thu, 22 Jan 2026 00:53:41 +0100 Subject: [PATCH] Adjusted field name --- .../events/MediaCreateCoverDownloadTaskListener.kt | 6 +++--- .../kotlin/no/iktdev/mediaprocessing/MockData.kt | 2 +- .../events/MetadataSearchResultEvent.kt | 4 ++-- .../shared/common/projection/CollectProjection.kt | 12 ++++++------ .../common/projection/MigrateContentProject.kt | 2 +- .../common/projection/ProjectContentStoreTest.kt | 10 +++++----- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaCreateCoverDownloadTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaCreateCoverDownloadTaskListener.kt index 41fc9c0a..78d417f6 100644 --- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaCreateCoverDownloadTaskListener.kt +++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaCreateCoverDownloadTaskListener.kt @@ -26,11 +26,11 @@ class MediaCreateCoverDownloadTaskListener: EventListener() { } val downloadData = useEvent.results.map { - val data = it.data + val data = it.metadata val outputFileName = "${data.title}-${data.source}" CoverDownloadTask.CoverDownloadData( - url = it.data.cover, - source = it.data.source, + url = it.metadata.cover, + source = it.metadata.source, outputFileName = outputFileName ) } diff --git a/apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/MockData.kt b/apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/MockData.kt index 5b025250..68e8d6d6 100644 --- a/apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/MockData.kt +++ b/apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/MockData.kt @@ -33,7 +33,7 @@ object MockData { prefixScore = 10, advancedScore = 10, sourceWeight = 1f, - data = MetadataSearchResultEvent.SearchResult.MetadataResult( + metadata = MetadataSearchResultEvent.SearchResult.MetadataResult( source = source, title = "MyCollection", cover = coverUrl, diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/event_task_contract/events/MetadataSearchResultEvent.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/event_task_contract/events/MetadataSearchResultEvent.kt index 1f2c6f0f..60a2c6e7 100644 --- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/event_task_contract/events/MetadataSearchResultEvent.kt +++ b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/event_task_contract/events/MetadataSearchResultEvent.kt @@ -4,7 +4,7 @@ import no.iktdev.eventi.models.Event import no.iktdev.eventi.models.Metadata import no.iktdev.eventi.models.store.TaskStatus import no.iktdev.mediaprocessing.shared.common.model.MediaType -import java.util.UUID +import java.util.* data class MetadataSearchResultEvent( val results: List = emptyList(), @@ -16,7 +16,7 @@ data class MetadataSearchResultEvent( val prefixScore: Int, val advancedScore: Int, val sourceWeight: Float, - val data: MetadataResult + val metadata: MetadataResult ) { data class MetadataResult( diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/projection/CollectProjection.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/projection/CollectProjection.kt index 1beceba2..41115e00 100644 --- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/projection/CollectProjection.kt +++ b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/projection/CollectProjection.kt @@ -71,16 +71,16 @@ class CollectProjection(val events: List) { val coverDownloadResultEvents = events.filterIsInstance() .filter { it.status == no.iktdev.eventi.models.store.TaskStatus.Completed } val coverFile = - coverDownloadResultEvents.find { it -> it.data?.source == metadataEvent.recommended?.data?.source }?.data?.outputFile + coverDownloadResultEvents.find { it -> it.data?.source == metadataEvent.recommended?.metadata?.source }?.data?.outputFile ?.let { File(it) } val result = metadataEvent.recommended ?: return null return MetadataProjection( - title = result.data.title, - summary = result.data.summary, - mediaType = result.data.type, - genres = result.data.genres, + title = result.metadata.title, + summary = result.metadata.summary, + mediaType = result.metadata.type, + genres = result.metadata.genres, cover = coverFile, - source = result.data.source + source = result.metadata.source ) } diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/projection/MigrateContentProject.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/projection/MigrateContentProject.kt index 944fced3..47315729 100644 --- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/projection/MigrateContentProject.kt +++ b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/projection/MigrateContentProject.kt @@ -32,7 +32,7 @@ open class MigrateContentProject(val events: List, val storageArea: File) } internal fun getMetadataTitles(): List { - val metadataEvent = events.filterIsInstance().lastOrNull()?.recommended?.data + val metadataEvent = events.filterIsInstance().lastOrNull()?.recommended?.metadata ?: return emptyList() return (metadataEvent.alternateTitles + listOf(metadataEvent.title)) } diff --git a/shared/common/src/test/kotlin/no/iktdev/mediaprocessing/shared/common/projection/ProjectContentStoreTest.kt b/shared/common/src/test/kotlin/no/iktdev/mediaprocessing/shared/common/projection/ProjectContentStoreTest.kt index e1491140..c5004063 100644 --- a/shared/common/src/test/kotlin/no/iktdev/mediaprocessing/shared/common/projection/ProjectContentStoreTest.kt +++ b/shared/common/src/test/kotlin/no/iktdev/mediaprocessing/shared/common/projection/ProjectContentStoreTest.kt @@ -268,7 +268,7 @@ class ProjectContentStoreTest { prefixScore = 0, advancedScore = 0, sourceWeight = 1f, - data = MetadataSearchResultEvent.SearchResult.MetadataResult( + metadata = MetadataSearchResultEvent.SearchResult.MetadataResult( source = "test", title = "MainTitle", alternateTitles = listOf("Alt1", "Alt2"), @@ -375,7 +375,7 @@ class ProjectContentStoreTest { prefixScore = 0, advancedScore = 0, sourceWeight = 1f, - data = MetadataSearchResultEvent.SearchResult.MetadataResult( + metadata = MetadataSearchResultEvent.SearchResult.MetadataResult( source = "test", title = "MatchMe", alternateTitles = listOf("Alt1"), @@ -431,7 +431,7 @@ class ProjectContentStoreTest { prefixScore = 0, advancedScore = 0, sourceWeight = 1f, - data = MetadataSearchResultEvent.SearchResult.MetadataResult( + metadata = MetadataSearchResultEvent.SearchResult.MetadataResult( source = "test", title = "Unrelated", alternateTitles = listOf("Alt1"), @@ -513,7 +513,7 @@ class ProjectContentStoreTest { prefixScore = 0, advancedScore = 0, sourceWeight = 1f, - data = MetadataSearchResultEvent.SearchResult.MetadataResult( + metadata = MetadataSearchResultEvent.SearchResult.MetadataResult( source = "test", title = case.metadataTitles.last(), alternateTitles = case.metadataTitles.dropLast(1), @@ -565,7 +565,7 @@ class ProjectContentStoreTest { prefixScore = 0, advancedScore = 0, sourceWeight = 1f, - data = MetadataSearchResultEvent.SearchResult.MetadataResult( + metadata = MetadataSearchResultEvent.SearchResult.MetadataResult( source = "test", title = case.metadataTitles.last(), alternateTitles = case.metadataTitles.dropLast(1),