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 e8ca560e..470f9e46 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 @@ -5,18 +5,17 @@ class Naming(val fileName: String) { private set init { - cleanedFileName = fileName.apply { - removeBracketedText(this) - removeParenthesizedText(this) - removeResolutionAndTags(this) - removeInBetweenCharacters(this) + cleanedFileName = fileName + .let { removeBracketedText(it) } + .let { removeParenthesizedText(it) } + .let { removeResolutionAndTags(it) } + .let { removeInBetweenCharacters(it) } + .let { removeExtraWhiteSpace(it) } - removeExtraWhiteSpace(this) - } } fun guessDesiredFileName(): String { - val parts = fileName.split(" - ") + val parts = cleanedFileName.split(" - ") return when { parts.size == 2 && parts[1].matches(Regex("\\d{4}")) -> { val title = parts[0] @@ -36,7 +35,7 @@ class Naming(val fileName: String) { "$title - $seasonEpisode - $episodeTitle" } - else -> fileName + else -> cleanedFileName } } 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 877b3553..6ecfd1fe 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 @@ -7,6 +7,15 @@ import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.MethodSource class NamingTest { + + @Test + fun checkThatBracketsGetsRemoved() { + val input = "[AAA] Sir fancy - 13 [1080p HEVC][000000]" + val name = Naming(input) + assertThat(name.guessDesiredTitle()).doesNotContain("[") + + } + /* @ParameterizedTest @MethodSource("serieOnlyTest") diff --git a/Reader/src/main/resources/application.properties b/Reader/src/main/resources/application.properties index ea098386..f0fe28f8 100644 --- a/Reader/src/main/resources/application.properties +++ b/Reader/src/main/resources/application.properties @@ -1,3 +1,3 @@ spring.output.ansi.enabled=always logging.level.org.apache.kafka=WARN -logging.level.root=DEBUG +#logging.level.root=DEBUG diff --git a/pyMetadata/app.py b/pyMetadata/app.py index 46cfa9d4..9cdcad0d 100644 --- a/pyMetadata/app.py +++ b/pyMetadata/app.py @@ -76,13 +76,16 @@ class KafkaConsumerThread(threading.Thread): if self.shutdown.is_set(): break - logger.info("Received message: key=%s, value=%s", message.key, message.value) + # Sjekk om meldingen har målnøkkelen if message.key == "request:metadata:obtain" or message.key == "event:reader:received-file": + logger.info("Received message: key=%s, value=%s", message.key, message.value) # Opprett en ny tråd for å håndtere meldingen handler_thread = MessageHandlerThread(message) handler_thread.start() + else: + logger.info("Ignorert message: key=%s, value=%s", message.key, message.value) consumer.close() logger.info("Kafka Consumer stopped")