Dot stripping
This commit is contained in:
parent
9ecdcd88fe
commit
01df7ef239
@ -1,32 +0,0 @@
|
||||
package no.iktdev.mediaprocessing.coordinator.reader
|
||||
/*
|
||||
import no.iktdev.mediaprocessing.shared.kafka.core.DefaultConsumer
|
||||
import no.iktdev.mediaprocessing.shared.kafka.core.DefaultMessageListener
|
||||
import no.iktdev.mediaprocessing.shared.kafka.core.DefaultProducer
|
||||
import org.apache.kafka.clients.admin.AdminClient
|
||||
import org.junit.jupiter.api.extension.ExtendWith
|
||||
import org.mockito.InjectMocks
|
||||
import org.mockito.Mock
|
||||
import org.mockito.junit.jupiter.MockitoExtension
|
||||
import org.springframework.kafka.core.KafkaTemplate
|
||||
import org.springframework.kafka.core.ProducerFactory
|
||||
|
||||
@ExtendWith(MockitoExtension::class)
|
||||
class KafkaTestBase {
|
||||
|
||||
@Mock
|
||||
lateinit var kafkaTemplate: KafkaTemplate<String, String>
|
||||
|
||||
@Mock
|
||||
lateinit var adminClient: AdminClient
|
||||
|
||||
@InjectMocks
|
||||
lateinit var defaultProducer: DefaultProducer
|
||||
|
||||
@InjectMocks
|
||||
lateinit var defaultConsumer: DefaultConsumer
|
||||
|
||||
@InjectMocks
|
||||
lateinit var defaultListener: DefaultMessageListener
|
||||
|
||||
}*/
|
||||
@ -1,6 +1,5 @@
|
||||
package no.iktdev.mediaprocessing.shared.common.parsing
|
||||
|
||||
import org.apache.kafka.common.protocol.types.Field.Str
|
||||
|
||||
class FileNameParser(val fileName: String) {
|
||||
var cleanedFileName: String
|
||||
@ -122,7 +121,7 @@ class FileNameParser(val fileName: String) {
|
||||
fun removeDot(input: String): String {
|
||||
//var text = Regex("(?<=\\s)\\.|\\.(?=\\s)").replace(input, "")
|
||||
//return Regex("\\.(?<!(Dr|Mr|Ms|Mrs|Lt|Capt|Prof|St|Ave)\\.)\\b").replace(text, " ")
|
||||
return Regex("(?<!\\b(?:Dr|Mr|Ms|Mrs|Lt|Capt|Prof|St|Ave))\\.+(?=\\s|\\w)").replace(input, " ")
|
||||
return Regex("(?<!\\b(?:Dr|Mr|Ms|Mrs|Lt|Capt|Prof|St|Ave))\\.").replace(input, " ")
|
||||
}
|
||||
|
||||
fun removeInBetweenCharacters(text: String): String {
|
||||
|
||||
@ -8,14 +8,14 @@ object NameHelper {
|
||||
val normalized = Normalizer.normalize(text, Normalizer.Form.NFC)
|
||||
val result = normalized.replace("\\p{M}".toRegex(), "")
|
||||
val cleaned = "[^A-Za-z0-9 -]".toRegex().replace(result, "")
|
||||
return StringUtils.stripAccents(cleaned)
|
||||
return StringUtils.stripAccents(cleaned).trim()
|
||||
}
|
||||
|
||||
fun cleanup(input: String): String {
|
||||
var cleaned = Regex("(?<=\\w)[_.](?=\\w)").replace(input, " ")
|
||||
cleaned = Regexes.illegalCharacters.replace(cleaned, " - ")
|
||||
cleaned = Regexes.trimWhiteSpaces.replace(cleaned, " ")
|
||||
return NameHelper.normalize(cleaned)
|
||||
return NameHelper.normalize(cleaned).trim()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -36,6 +36,15 @@ class FileNameParserTest {
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
fun assertDotRemoval() {
|
||||
val input = "Like.a.Potato.Chef.S01E01.Departure.\\u0026.Skills.1080p.Potato"
|
||||
val parser = FileNameParser(input)
|
||||
val result = parser.guessDesiredTitle()
|
||||
assertThat(result).isEqualTo("Like a Potato Chef")
|
||||
assertThat(parser.guessDesiredFileName()).isEqualTo("Like a Potato Chef S01E01 Departure \\u0026 Skills")
|
||||
}
|
||||
|
||||
@Test
|
||||
fun movieName() {
|
||||
val inName = "Wicket.Wicker.Potato.4.2023.UHD.BluRay.2160p"
|
||||
@ -89,5 +98,4 @@ class FileNameParserTest {
|
||||
val result = FileNameParser(input).guessDesiredTitle()
|
||||
assertThat(result).isEmpty()
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user