From 64f2bfba7629b0f7ad34a7ed5604dec16774b5aa Mon Sep 17 00:00:00 2001 From: Brage Date: Wed, 26 Jul 2023 18:42:21 +0200 Subject: [PATCH] Fixes to db and new names --- Reader/build.gradle.kts | 2 +- .../content/reader/collector/SubtitleConsumer.kt | 10 ++++++---- .../streamit/content/reader/collector/VideoConsumer.kt | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Reader/build.gradle.kts b/Reader/build.gradle.kts index 98fe4c02..d8265305 100644 --- a/Reader/build.gradle.kts +++ b/Reader/build.gradle.kts @@ -27,7 +27,7 @@ dependencies { implementation("no.iktdev.streamit.library:streamit-library-kafka:0.0.2-alpha75") implementation("no.iktdev:exfl:0.0.12-SNAPSHOT") - implementation("no.iktdev.streamit.library:streamit-library-db:0.0.6-alpha12") + implementation("no.iktdev.streamit.library:streamit-library-db:0.0.6-alpha13") implementation("org.jetbrains.exposed:exposed-core:$exposedVersion") implementation("org.jetbrains.exposed:exposed-dao:$exposedVersion") diff --git a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/collector/SubtitleConsumer.kt b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/collector/SubtitleConsumer.kt index db3ab1f2..0626fd5c 100644 --- a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/collector/SubtitleConsumer.kt +++ b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/collector/SubtitleConsumer.kt @@ -75,10 +75,11 @@ class SubtitleConsumer : DefaultKafkaReader("collectorConsumerExtractedSubtitle" val of = File(work.outFile) val status = transaction { SubtitleQuery( - title = of.nameWithoutExtension, + associatedWithVideo = of.nameWithoutExtension, language = work.language, collection = work.collection, - format = of.extension.uppercase() + format = of.extension.uppercase(), + file = File(work.outFile).name ) .insertAndGetStatus() } @@ -89,10 +90,11 @@ class SubtitleConsumer : DefaultKafkaReader("collectorConsumerExtractedSubtitle" val of = File(work.outFile) val status = transaction { SubtitleQuery( - title = of.nameWithoutExtension, + associatedWithVideo = of.nameWithoutExtension, language = work.language, collection = work.collection, - format = of.extension.uppercase() + format = of.extension.uppercase(), + file = File(work.outFile).name ) .insertAndGetStatus() } diff --git a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/collector/VideoConsumer.kt b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/collector/VideoConsumer.kt index da7194b3..2579c46b 100644 --- a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/collector/VideoConsumer.kt +++ b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/collector/VideoConsumer.kt @@ -142,7 +142,7 @@ class VideoConsumer: DefaultKafkaReader("collectorConsumerEncodedVideo"), IColle fun getSerieQueryInstance(data: EpisodeInfo?, baseName: String?): SerieQuery? { if (data == null || baseName == null) return null - return SerieQuery(data.title, data.episode, data.season, data.title, baseName) + return SerieQuery(data.episodeTitle, data.episode, data.season, data.title, baseName) } } \ No newline at end of file