From e6ca4552541549fede5fc40ef531bc367e7b5f05 Mon Sep 17 00:00:00 2001 From: dragonx943 Date: Tue, 8 Jul 2025 17:49:08 +0000 Subject: [PATCH] [YuriGarden] Fix order / path + Remove rating --- .../site/{madara => }/vi/yurigarden/YuriGarden.kt | 0 .../vi/yurigarden/YuriGardenParser.kt | 15 +++++---------- .../{madara => }/vi/yurigarden/YuriGardenR18.kt | 0 3 files changed, 5 insertions(+), 10 deletions(-) rename src/main/kotlin/org/koitharu/kotatsu/parsers/site/{madara => }/vi/yurigarden/YuriGarden.kt (100%) rename src/main/kotlin/org/koitharu/kotatsu/parsers/site/{madara => }/vi/yurigarden/YuriGardenParser.kt (95%) rename src/main/kotlin/org/koitharu/kotatsu/parsers/site/{madara => }/vi/yurigarden/YuriGardenR18.kt (100%) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/vi/yurigarden/YuriGarden.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/yurigarden/YuriGarden.kt similarity index 100% rename from src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/vi/yurigarden/YuriGarden.kt rename to src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/yurigarden/YuriGarden.kt diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/vi/yurigarden/YuriGardenParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/yurigarden/YuriGardenParser.kt similarity index 95% rename from src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/vi/yurigarden/YuriGardenParser.kt rename to src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/yurigarden/YuriGardenParser.kt index 1f918abb..01c08a8e 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/vi/yurigarden/YuriGardenParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/yurigarden/YuriGardenParser.kt @@ -41,11 +41,8 @@ internal abstract class YuriGardenParser( .build() override val availableSortOrders: Set = EnumSet.of( - SortOrder.RELEVANCE, SortOrder.NEWEST, SortOrder.NEWEST_ASC, - SortOrder.POPULARITY, - SortOrder.RATING, ) override val filterCapabilities: MangaListFilterCapabilities @@ -81,12 +78,9 @@ internal abstract class YuriGardenParser( append("&sort=") append(when (order) { - SortOrder.RELEVANCE -> "relevance" SortOrder.NEWEST -> "newest" SortOrder.NEWEST_ASC -> "oldest" - SortOrder.RATING -> "rating" - SortOrder.POPULARITY -> "popularity" - else -> "relevance" + else -> "newest" // default }) if (!filter.query.isNullOrEmpty()) { @@ -102,11 +96,13 @@ internal abstract class YuriGardenParser( MangaState.FINISHED -> "completed" MangaState.PAUSED -> "hiatus" MangaState.ABANDONED -> "cancelled" - else -> "" + else -> "all" }) } } + append("&full=true") + if (filter.tags.isNotEmpty()) { append("&genre=") append(filter.tags.joinToString(separator = ",") { it.key }) @@ -139,7 +135,7 @@ internal abstract class YuriGardenParser( description = jo.getString("description"), contentRating = if (jo.getBooleanOrDefault("r18", false)) ContentRating.ADULT else ContentRating.SUGGESTIVE, source = source, - rating = jo.getFloatOrDefault("rating", -5f) / 5f, + rating = RATING_UNKNOWN, ) } } @@ -184,7 +180,6 @@ internal abstract class YuriGardenParser( "cancelled" -> MangaState.ABANDONED else -> null }, - rating = json.getFloatOrDefault("rating", -5f) / 5f, chapters = chaptersDeferred.await().mapChapters() { _, jo -> val chapterId = jo.getLong("id") val pageUrls = jo.getJSONArray("pages").mapJSON { page -> diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/vi/yurigarden/YuriGardenR18.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/yurigarden/YuriGardenR18.kt similarity index 100% rename from src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/vi/yurigarden/YuriGardenR18.kt rename to src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/yurigarden/YuriGardenR18.kt