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

Fixes

Browse Source
This commit is contained in:
Brage 2023-07-23 19:51:56 +02:00
parent 47d4a23be4
commit 129fd1f879
5 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Encode/Dockerfile
View File

@ -1,4 +1,4 @@
FROM bskjon/debian-azuljava17-ffmpeg:latest FROM bskjon/debian-azuljava17-ffmpeg:latest
EXPOSE 8080 EXPOSE 8080
COPY ./build/libs/encode.jar /usr/share/app/app.jar COPY ./build/libs/encoder.jar /usr/share/app/app.jar

15
Encode/build.gradle.kts
View File

@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.archivesName
plugins { plugins {
kotlin("jvm") version "1.8.21" kotlin("jvm") version "1.8.21"
id("org.springframework.boot") version "2.5.5" id("org.springframework.boot") version "2.5.5"
@ -42,4 +44,15 @@ dependencies {
tasks.test { tasks.test {
useJUnitPlatform() useJUnitPlatform()
} }
tasks.bootJar {
archiveFileName.set("encoder.jar")
launchScript()
}
tasks.jar {
archivesName.set("encoder.jar")
archiveBaseName.set("encoder")
}
archivesName.set("encoder.jar")

6
Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/contentDeterminator/ContentDeterminate.kt
View File

@ -62,11 +62,11 @@ class ContentDeterminate: DefaultKafkaReader("contentDeterminate"), ISequentialM
val metadata = if (metadataMessage?.status?.statusType == StatusType.SUCCESS) metadataMessage.data as Metadata? else null val metadata = if (metadataMessage?.status?.statusType == StatusType.SUCCESS) metadataMessage.data as Metadata? else null
val videoInfo = if (metadata?.type == null) { val videoInfo = if (metadata?.type == null) {
FileNameDeterminate(fileResult.title, fileResult.sanitizedName).getDeterminedFileName() FileNameDeterminate(fileResult.title, fileResult.sanitizedName).getDeterminedVideoInfo()
} else if (metadata.type.lowercase() == "movie") { } else if (metadata.type.lowercase() == "movie") {
FileNameDeterminate(fileResult.title, fileResult.sanitizedName, FileNameDeterminate.ContentType.MOVIE).getDeterminedFileName() FileNameDeterminate(fileResult.title, fileResult.sanitizedName, FileNameDeterminate.ContentType.MOVIE).getDeterminedVideoInfo()
} else { } else {
FileNameDeterminate(fileResult.title, fileResult.sanitizedName, FileNameDeterminate.ContentType.SERIE).getDeterminedFileName() FileNameDeterminate(fileResult.title, fileResult.sanitizedName, FileNameDeterminate.ContentType.SERIE).getDeterminedVideoInfo()
} }
if (videoInfo == null) { if (videoInfo == null) {

5
Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/contentDeterminator/FileNameDeterminate.kt
View File

@ -12,7 +12,7 @@ class FileNameDeterminate(val title: String, val sanitizedName: String, val ctyp
UNDEFINED UNDEFINED
} }
fun getDeterminedFileName(): VideoInfo? { fun getDeterminedVideoInfo(): VideoInfo? {
return when (ctype) { return when (ctype) {
ContentType.MOVIE -> determineMovieFileName() ContentType.MOVIE -> determineMovieFileName()
ContentType.SERIE -> determineSerieFileName() ContentType.SERIE -> determineSerieFileName()
@ -61,7 +61,8 @@ class FileNameDeterminate(val title: String, val sanitizedName: String, val ctyp
private fun determineUndefinedFileName(): VideoInfo? { private fun determineUndefinedFileName(): VideoInfo? {
val serieEx = SerieEx(title, sanitizedName) val serieEx = SerieEx(title, sanitizedName)
val (season, episode) = serieEx.findSeasonAndEpisode(sanitizedName) val (season, episode) = serieEx.findSeasonAndEpisode(sanitizedName)
return if (sanitizedName.contains(" - ") || season != null || episode != null) { val episodeNumber = serieEx.findEpisodeNumber()
return if ((sanitizedName.contains(" - ") && episodeNumber != null) || season != null || episode != null) {
determineSerieFileName() determineSerieFileName()
} else { } else {
determineMovieFileName() determineMovieFileName()

8
Reader/src/test/kotlin/no/iktdev/streamit/content/reader/analyzer/contentDeterminator/FileNameDeterminateTest.kt
View File

@ -22,7 +22,7 @@ class FileNameDeterminateTest {
FileNameDeterminate("Iseleve", namedTestData.input, FileNameDeterminate.ContentType.SERIE) FileNameDeterminate("Iseleve", namedTestData.input, FileNameDeterminate.ContentType.SERIE)
assertEquals( assertEquals(
namedTestData.expected, namedTestData.expected,
fileNameDeterminate.getDeterminedFileName(), fileNameDeterminate.getDeterminedVideoInfo()?.fullName,
"Test case: ${namedTestData.input}" "Test case: ${namedTestData.input}"
) )
} }
@ -35,7 +35,7 @@ class FileNameDeterminateTest {
) )
assertEquals( assertEquals(
namedTestData.expected, namedTestData.expected,
fileNameDeterminate.getDeterminedFileName(), fileNameDeterminate.getDeterminedVideoInfo()?.fullName,
"Test case: ${namedTestData.input}" "Test case: ${namedTestData.input}"
) )
} }
@ -46,7 +46,7 @@ class FileNameDeterminateTest {
val fileNameDeterminate = FileNameDeterminate( val fileNameDeterminate = FileNameDeterminate(
namedTestData.input, namedTestData.input, FileNameDeterminate.ContentType.UNDEFINED namedTestData.input, namedTestData.input, FileNameDeterminate.ContentType.UNDEFINED
) )
assertThat(fileNameDeterminate.getDeterminedFileName()).isEqualTo(namedTestData.expected) assertThat(fileNameDeterminate.getDeterminedVideoInfo()?.fullName).isEqualTo(namedTestData.expected)
} }
@Test @Test
@ -55,7 +55,7 @@ class FileNameDeterminateTest {
val fileNameDeterminate = FileNameDeterminate( val fileNameDeterminate = FileNameDeterminate(
namedTestData.input, namedTestData.input, FileNameDeterminate.ContentType.UNDEFINED namedTestData.input, namedTestData.input, FileNameDeterminate.ContentType.UNDEFINED
) )
assertThat(fileNameDeterminate.getDeterminedFileName()).isEqualTo(namedTestData.expected) assertThat(fileNameDeterminate.getDeterminedVideoInfo()?.fullName).isEqualTo(namedTestData.expected)
} }
companion object { companion object {