Merge pull request #159 from Shikkanime/dev

Fix bugs
Shikkanime · Feb 8, 2024 · 23a59c0 · 23a59c0
2 parents 02a84cc + 8e47387
commit 23a59c0
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/src/main/kotlin/fr/shikkanime/Application.kt b/src/main/kotlin/fr/shikkanime/Application.kt
@@ -33,7 +33,7 @@ fun main() {
     animeService.preIndex()
 
     animeService.findAll()
-        .filter { it.slug.isNullOrBlank() }
+        .filter { it.slug.isNullOrBlank() || it.slug != StringUtils.toSlug(StringUtils.getShortName(it.name!!)) }
         .forEach {
             val name = StringUtils.getShortName(it.name!!)
             val slug = StringUtils.toSlug(name)

diff --git a/src/main/kotlin/fr/shikkanime/platforms/NetflixPlatform.kt b/src/main/kotlin/fr/shikkanime/platforms/NetflixPlatform.kt
@@ -47,6 +47,7 @@ class NetflixPlatform : AbstractPlatform<NetflixConfiguration, CountryCodeNetfli
                 val durationInSeconds = duration?.substringBefore(" ")?.trim()?.toLongOrNull()?.times(60) ?: -1
                 val image = episode.selectFirst(".episode-thumbnail-image")?.attr("src") ?: return@mapNotNull null
                 val imageWithoutParams = image.substringBefore("?")
+                val episodeDescription = episode.selectFirst(".epsiode-synopsis")?.text()
 
                 Episode(
                     platform = getPlatform(),
@@ -70,6 +71,7 @@ class NetflixPlatform : AbstractPlatform<NetflixConfiguration, CountryCodeNetfli
                     url = "https://www.netflix.com/${key.countryCode.name.lowercase()}/title/$id",
                     image = imageWithoutParams,
                     duration = durationInSeconds,
+                    description = episodeDescription,
                 ).also { add(it) }
             }
         }

diff --git a/src/main/kotlin/fr/shikkanime/utils/StringUtils.kt b/src/main/kotlin/fr/shikkanime/utils/StringUtils.kt
@@ -68,7 +68,7 @@ object StringUtils {
     fun toSlug(input: String): String {
         val nowhitespace: String = WHITESPACE.matcher(input).replaceAll("-")
         val normalized: String = Normalizer.normalize(nowhitespace, Normalizer.Form.NFD)
-        val slug: String = NONLATIN.matcher(normalized).replaceAll("")
+        val slug: String = NONLATIN.matcher(normalized).replaceAll("").replace("-+".toRegex(), "-")
         return slug.lowercase()
     }
 }
diff --git a/src/main/resources/templates/site/anime.ftl b/src/main/resources/templates/site/anime.ftl
@@ -5,7 +5,7 @@
     <div class="container">
         <div class="row g-3 mt-3">
             <div class="col-md-4 col-12 mt-0 text-center">
-                <img loading="lazy" src="https://api.shikkanime.fr/v1/attachments?uuid=${anime.uuid}&type=image"
+                <img loading="lazy" data-src="https://api.shikkanime.fr/v1/attachments?uuid=${anime.uuid}&type=image"
                      alt="${anime.shortName?replace("\"", "'")} anime image" class="w-50">
             </div>
 

diff --git a/src/test/kotlin/fr/shikkanime/utils/StringUtilsTest.kt b/src/test/kotlin/fr/shikkanime/utils/StringUtilsTest.kt
@@ -38,4 +38,15 @@ class StringUtilsTest {
             assertEquals(expected, StringUtils.getShortName(input))
         }
     }
+
+    @Test
+    fun toSlug() {
+        val list = listOf(
+            "Gloutons & Dragons" to "gloutons-dragons",
+        )
+
+        list.forEach { (input, expected) ->
+            assertEquals(expected, StringUtils.toSlug(input))
+        }
+    }
 }