Merge pull request #329 from Shikkanime/dev

Dev
Shikkanime · Apr 1, 2024 · 37e940d · 37e940d
2 parents 25a00eb + 857837b
commit 37e940d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 val ktorVersion = "2.3.9"
-val ktorSwaggerUiVersion = "2.7.5"
+val ktorSwaggerUiVersion = "2.8.0"
 val hibernateCoreVersion = "6.4.4.Final"
 val ehcacheVersion = "3.10.8"
 val glassfishJaxbVersion = "4.0.5"

diff --git a/src/main/kotlin/fr/shikkanime/utils/StringUtils.kt b/src/main/kotlin/fr/shikkanime/utils/StringUtils.kt
@@ -13,7 +13,7 @@ object StringUtils {
 
     fun getShortName(fullName: String): String {
         val regexs = listOf("[-|!].*[-|!]".toRegex(), "Saison \\d*".toRegex(), "\\(\\d*\\)".toRegex())
-        val separators = listOf(":", ",", "!")
+        val separators = listOf(":", ",", "!", " so ")
         var shortName = fullName
 
         regexs.forEach { regex ->
@@ -26,8 +26,7 @@ object StringUtils {
                 val firstPart = split[0].trim()
                 val lastPart = split.subList(1, split.size).joinToString(" ").trim()
 
-                if (lastPart.count { it == ' ' } >= 2 &&
-                    (firstPart.split(" ").size > 1 || firstPart.length > 5)) {
+                if (lastPart.count { it == ' ' } >= 2 && firstPart.length > 5) {
                     shortName = firstPart
                 }
             }

diff --git a/src/test/kotlin/fr/shikkanime/utils/StringUtilsTest.kt b/src/test/kotlin/fr/shikkanime/utils/StringUtilsTest.kt
@@ -35,6 +35,8 @@ class StringUtilsTest {
             "KONOSUBA" to "KONOSUBA -God's blessing on this wonderful world!",
             "Moi, quand je me réincarne en Slime" to "Moi, quand je me réincarne en Slime",
             "Studio Apartment" to "Studio Apartment, Good Lighting, Angel Included",
+            "I Was Reincarnated as the 7th Prince" to "I Was Reincarnated as the 7th Prince so I Can Take My Time Perfecting My Magical Ability",
+            "Mushoku Tensei: Jobless Reincarnation" to "Mushoku Tensei: Jobless Reincarnation",
         )
 
         list.forEach { (expected, input) ->
@@ -47,10 +49,11 @@ class StringUtilsTest {
         val list = listOf(
             "Gloutons & Dragons" to "gloutons-dragons",
             "Moi, quand je me réincarne en Slime" to "moi-quand-je-me-reincarne-en-slime",
+            "I Was Reincarnated as the 7th Prince so I Can Take My Time Perfecting My Magical Ability" to "i-was-reincarnated-as-the-7th-prince",
         )
 
         list.forEach { (input, expected) ->
-            assertEquals(expected, StringUtils.toSlug(input))
+            assertEquals(expected, StringUtils.toSlug(StringUtils.getShortName(input)))
         }
     }
 }