Adjusted field name
This commit is contained in:
parent
7206224cfa
commit
8aeae926fb
@ -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
|
||||
)
|
||||
}
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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<SearchResult> = 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(
|
||||
|
||||
@ -71,16 +71,16 @@ class CollectProjection(val events: List<Event>) {
|
||||
val coverDownloadResultEvents = events.filterIsInstance<CoverDownloadResultEvent>()
|
||||
.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
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@ -32,7 +32,7 @@ open class MigrateContentProject(val events: List<Event>, val storageArea: File)
|
||||
}
|
||||
|
||||
internal fun getMetadataTitles(): List<String> {
|
||||
val metadataEvent = events.filterIsInstance<MetadataSearchResultEvent>().lastOrNull()?.recommended?.data
|
||||
val metadataEvent = events.filterIsInstance<MetadataSearchResultEvent>().lastOrNull()?.recommended?.metadata
|
||||
?: return emptyList()
|
||||
return (metadataEvent.alternateTitles + listOf(metadataEvent.title))
|
||||
}
|
||||
|
||||
@ -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),
|
||||
|
||||
Loading…
Reference in New Issue
Block a user