From 6cea71e839365e1f1992cf5b7eee1a1b16e9833e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 09:29:25 +0000 Subject: [PATCH 1/2] Bump io.github.smiley4:ktor-swagger-ui from 2.7.4 to 2.7.5 Bumps [io.github.smiley4:ktor-swagger-ui](https://github.com/SMILEY4/ktor-swagger-ui) from 2.7.4 to 2.7.5. - [Release notes](https://github.com/SMILEY4/ktor-swagger-ui/releases) - [Changelog](https://github.com/SMILEY4/ktor-swagger-ui/blob/develop/HowToRelease.md) - [Commits](https://github.com/SMILEY4/ktor-swagger-ui/compare/2.7.4...2.7.5) --- updated-dependencies: - dependency-name: io.github.smiley4:ktor-swagger-ui dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index f7b8ab04..ea9168ec 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ val ktorVersion = "2.3.9" -val ktorSwaggerUiVersion = "2.7.4" +val ktorSwaggerUiVersion = "2.7.5" val hibernateCoreVersion = "6.4.4.Final" val ehcacheVersion = "3.10.8" val glassfishJaxbVersion = "4.0.5" From 716e67fcf36b7838b0479ce2436d4289f5e05e4b Mon Sep 17 00:00:00 2001 From: Ziedelth Date: Wed, 20 Mar 2024 11:32:59 +0100 Subject: [PATCH 2/2] Refactor SiteController.kt to fetch anime from previous simulcast if current simulcast has less than 6 animes and update corresponding templates --- .../controllers/site/SiteController.kt | 37 +++++++++++++++---- .../resources/templates/site/_navigation.ftl | 4 +- src/main/resources/templates/site/anime.ftl | 6 +-- .../templates/site/components/episode.ftl | 5 ++- src/main/resources/templates/site/home.ftl | 2 +- 5 files changed, 39 insertions(+), 15 deletions(-) diff --git a/src/main/kotlin/fr/shikkanime/controllers/site/SiteController.kt b/src/main/kotlin/fr/shikkanime/controllers/site/SiteController.kt index dbefdd9a..b188c155 100644 --- a/src/main/kotlin/fr/shikkanime/controllers/site/SiteController.kt +++ b/src/main/kotlin/fr/shikkanime/controllers/site/SiteController.kt @@ -1,6 +1,7 @@ package fr.shikkanime.controllers.site import com.google.inject.Inject +import fr.shikkanime.dtos.AnimeDto import fr.shikkanime.entities.SortParameter import fr.shikkanime.entities.enums.CountryCode import fr.shikkanime.entities.enums.Link @@ -36,19 +37,41 @@ class SiteController { ) } + private fun getFullAnimesSimulcast(): MutableList { + val animeSimulcastLimit = 6 + + val animes = animeCacheService.findAllBy( + CountryCode.FR, + simulcastCacheService.currentSimulcast?.uuid, + listOf(SortParameter("name", SortParameter.Order.ASC)), + 1, + animeSimulcastLimit + )!!.data.toMutableList() + + val simulcasts = simulcastCacheService.findAll() + + if (animes.size in 1.. 1) { + val previousSimulcastAnimes = animeCacheService.findAllBy( + CountryCode.FR, + simulcasts[1].uuid, + listOf(SortParameter("name", SortParameter.Order.ASC)), + 1, + animeSimulcastLimit - animes.size + )!!.data + + animes.addAll(previousSimulcastAnimes) + } + + return animes + } + @Path @Get private fun home(): Response { return Response.template( Link.HOME, mutableMapOf( - "animes" to animeCacheService.findAllBy( - CountryCode.FR, - simulcastCacheService.currentSimulcast?.uuid, - listOf(SortParameter("name", SortParameter.Order.ASC)), - 1, - 6 - )!!.data, + "animes" to getFullAnimesSimulcast(), "episodes" to episodeCacheService.findAllBy( CountryCode.FR, null, diff --git a/src/main/resources/templates/site/_navigation.ftl b/src/main/resources/templates/site/_navigation.ftl index 8f9862f8..9481bb10 100644 --- a/src/main/resources/templates/site/_navigation.ftl +++ b/src/main/resources/templates/site/_navigation.ftl @@ -38,7 +38,7 @@ -
+