diff --git a/CommonCode/src/main/java/no/iktdev/streamit/content/common/Naming.kt b/CommonCode/src/main/java/no/iktdev/streamit/content/common/Naming.kt index f09f3054..d28f406a 100644 --- a/CommonCode/src/main/java/no/iktdev/streamit/content/common/Naming.kt +++ b/CommonCode/src/main/java/no/iktdev/streamit/content/common/Naming.kt @@ -42,15 +42,12 @@ class Naming(val fileName: String) { fun guessDesiredTitle(): String { val desiredFileName = guessDesiredFileName() val seasonRegex = Regex("\\sS[0-9]+(\\s- [0-9]+|\\s[0-9]+)", RegexOption.IGNORE_CASE) - if (seasonRegex.matches(desiredFileName)) { + if (seasonRegex.containsMatchIn(desiredFileName)) { return seasonRegex.replace(desiredFileName, "").trim() } else { val result = if (desiredFileName.contains(" - ")) { return desiredFileName.split(" - ").firstOrNull() ?: desiredFileName } else desiredFileName - - - return result.trim() } } diff --git a/CommonCode/src/test/java/no/iktdev/streamit/content/common/NamingTest.kt b/CommonCode/src/test/java/no/iktdev/streamit/content/common/NamingTest.kt index 6ecfd1fe..5870942e 100644 --- a/CommonCode/src/test/java/no/iktdev/streamit/content/common/NamingTest.kt +++ b/CommonCode/src/test/java/no/iktdev/streamit/content/common/NamingTest.kt @@ -1,5 +1,9 @@ package no.iktdev.streamit.content.common +import no.iktdev.streamit.content.common.dto.reader.FileResult +import no.iktdev.streamit.library.kafka.dto.Message +import no.iktdev.streamit.library.kafka.dto.Status +import no.iktdev.streamit.library.kafka.dto.StatusType import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Named import org.junit.jupiter.api.Test @@ -16,6 +20,14 @@ class NamingTest { } + @Test + fun checkThatSeasonIsStripped() { + val input = "[AAA] Kafka Topic S2 - 01" + val naming = Naming(input) + val result = naming.guessDesiredTitle() + assertThat(result).isEqualTo("Kafka Topic") + } + /* @ParameterizedTest @MethodSource("serieOnlyTest")