iktdev/MediaProcessing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjusted field name

Browse Source
This commit is contained in:
Brage Skjønborg 2026-01-22 00:53:41 +01:00
parent 7206224cfa
commit 8aeae926fb
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaCreateCoverDownloadTaskListener.kt
View File

@ -26,11 +26,11 @@ class MediaCreateCoverDownloadTaskListener: EventListener() {
} }
val downloadData = useEvent.results.map { val downloadData = useEvent.results.map {
val data = it.data val data = it.metadata
val outputFileName = "${data.title}-${data.source}" val outputFileName = "${data.title}-${data.source}"
CoverDownloadTask.CoverDownloadData( CoverDownloadTask.CoverDownloadData(
url = it.data.cover, url = it.metadata.cover,
source = it.data.source, source = it.metadata.source,
outputFileName = outputFileName outputFileName = outputFileName
) )
} }

2
apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/MockData.kt
View File

@ -33,7 +33,7 @@ object MockData {
prefixScore = 10, prefixScore = 10,
advancedScore = 10, advancedScore = 10,
sourceWeight = 1f, sourceWeight = 1f,
data = MetadataSearchResultEvent.SearchResult.MetadataResult( metadata = MetadataSearchResultEvent.SearchResult.MetadataResult(
source = source, source = source,
title = "MyCollection", title = "MyCollection",
cover = coverUrl, cover = coverUrl,

4
shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/event_task_contract/events/MetadataSearchResultEvent.kt
View File

@ -4,7 +4,7 @@ import no.iktdev.eventi.models.Event
import no.iktdev.eventi.models.Metadata import no.iktdev.eventi.models.Metadata
import no.iktdev.eventi.models.store.TaskStatus import no.iktdev.eventi.models.store.TaskStatus
import no.iktdev.mediaprocessing.shared.common.model.MediaType import no.iktdev.mediaprocessing.shared.common.model.MediaType
import java.util.UUID import java.util.*
data class MetadataSearchResultEvent( data class MetadataSearchResultEvent(
val results: List<SearchResult> = emptyList(), val results: List<SearchResult> = emptyList(),
@ -16,7 +16,7 @@ data class MetadataSearchResultEvent(
val prefixScore: Int, val prefixScore: Int,
val advancedScore: Int, val advancedScore: Int,
val sourceWeight: Float, val sourceWeight: Float,
val data: MetadataResult val metadata: MetadataResult
) { ) {
data class MetadataResult( data class MetadataResult(

12
shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/projection/CollectProjection.kt
View File

@ -71,16 +71,16 @@ class CollectProjection(val events: List<Event>) {
val coverDownloadResultEvents = events.filterIsInstance<CoverDownloadResultEvent>() val coverDownloadResultEvents = events.filterIsInstance<CoverDownloadResultEvent>()
.filter { it.status == no.iktdev.eventi.models.store.TaskStatus.Completed } .filter { it.status == no.iktdev.eventi.models.store.TaskStatus.Completed }
val coverFile = 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) } ?.let { File(it) }
val result = metadataEvent.recommended ?: return null val result = metadataEvent.recommended ?: return null
return MetadataProjection( return MetadataProjection(
title = result.data.title, title = result.metadata.title,
summary = result.data.summary, summary = result.metadata.summary,
mediaType = result.data.type, mediaType = result.metadata.type,
genres = result.data.genres, genres = result.metadata.genres,
cover = coverFile, cover = coverFile,
source = result.data.source source = result.metadata.source
) )
} }

2
shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/projection/MigrateContentProject.kt
View File

@ -32,7 +32,7 @@ open class MigrateContentProject(val events: List<Event>, val storageArea: File)
} }
internal fun getMetadataTitles(): List<String> { internal fun getMetadataTitles(): List<String> {
val metadataEvent = events.filterIsInstance<MetadataSearchResultEvent>().lastOrNull()?.recommended?.data val metadataEvent = events.filterIsInstance<MetadataSearchResultEvent>().lastOrNull()?.recommended?.metadata
?: return emptyList() ?: return emptyList()
return (metadataEvent.alternateTitles + listOf(metadataEvent.title)) return (metadataEvent.alternateTitles + listOf(metadataEvent.title))
} }

10
shared/common/src/test/kotlin/no/iktdev/mediaprocessing/shared/common/projection/ProjectContentStoreTest.kt
View File

@ -268,7 +268,7 @@ class ProjectContentStoreTest {
prefixScore = 0, prefixScore = 0,
advancedScore = 0, advancedScore = 0,
sourceWeight = 1f, sourceWeight = 1f,
data = MetadataSearchResultEvent.SearchResult.MetadataResult( metadata = MetadataSearchResultEvent.SearchResult.MetadataResult(
source = "test", source = "test",
title = "MainTitle", title = "MainTitle",
alternateTitles = listOf("Alt1", "Alt2"), alternateTitles = listOf("Alt1", "Alt2"),
@ -375,7 +375,7 @@ class ProjectContentStoreTest {
prefixScore = 0, prefixScore = 0,
advancedScore = 0, advancedScore = 0,
sourceWeight = 1f, sourceWeight = 1f,
data = MetadataSearchResultEvent.SearchResult.MetadataResult( metadata = MetadataSearchResultEvent.SearchResult.MetadataResult(
source = "test", source = "test",
title = "MatchMe", title = "MatchMe",
alternateTitles = listOf("Alt1"), alternateTitles = listOf("Alt1"),
@ -431,7 +431,7 @@ class ProjectContentStoreTest {
prefixScore = 0, prefixScore = 0,
advancedScore = 0, advancedScore = 0,
sourceWeight = 1f, sourceWeight = 1f,
data = MetadataSearchResultEvent.SearchResult.MetadataResult( metadata = MetadataSearchResultEvent.SearchResult.MetadataResult(
source = "test", source = "test",
title = "Unrelated", title = "Unrelated",
alternateTitles = listOf("Alt1"), alternateTitles = listOf("Alt1"),
@ -513,7 +513,7 @@ class ProjectContentStoreTest {
prefixScore = 0, prefixScore = 0,
advancedScore = 0, advancedScore = 0,
sourceWeight = 1f, sourceWeight = 1f,
data = MetadataSearchResultEvent.SearchResult.MetadataResult( metadata = MetadataSearchResultEvent.SearchResult.MetadataResult(
source = "test", source = "test",
title = case.metadataTitles.last(), title = case.metadataTitles.last(),
alternateTitles = case.metadataTitles.dropLast(1), alternateTitles = case.metadataTitles.dropLast(1),
@ -565,7 +565,7 @@ class ProjectContentStoreTest {
prefixScore = 0, prefixScore = 0,
advancedScore = 0, advancedScore = 0,
sourceWeight = 1f, sourceWeight = 1f,
data = MetadataSearchResultEvent.SearchResult.MetadataResult( metadata = MetadataSearchResultEvent.SearchResult.MetadataResult(
source = "test", source = "test",
title = case.metadataTitles.last(), title = case.metadataTitles.last(),
alternateTitles = case.metadataTitles.dropLast(1), alternateTitles = case.metadataTitles.dropLast(1),