From 9b6600d31f67742a9cb053af51cc36735b8d9a66 Mon Sep 17 00:00:00 2001 From: spicemace <139136633+spicemace@users.noreply.github.com> Date: Tue, 21 Jan 2025 14:12:11 -0800 Subject: [PATCH] Mangadex fix alt title being removed by cleanDescription (#1378) * Update MdUtil.kt * Update ApiMangaParser.kt * Update MdUtil.kt --- app/src/main/java/exh/md/handlers/ApiMangaParser.kt | 6 +++--- app/src/main/java/exh/md/utils/MdUtil.kt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/exh/md/handlers/ApiMangaParser.kt b/app/src/main/java/exh/md/handlers/ApiMangaParser.kt index 1eebb1a53..770abb387 100644 --- a/app/src/main/java/exh/md/handlers/ApiMangaParser.kt +++ b/app/src/main/java/exh/md/handlers/ApiMangaParser.kt @@ -96,9 +96,9 @@ class ApiMangaParser( originalLanguage = mangaAttributesDto.originalLanguage, ).orEmpty() - description = MdUtil.cleanDescription( - if (altTitlesInDesc) MdUtil.addAltTitleToDesc(rawDesc, altTitles) else rawDesc, - ) + val cleanDesc = MdUtil.cleanDescription(rawDesc) + + description = if (altTitlesInDesc) MdUtil.addAltTitleToDesc(cleanDesc, altTitles) else cleanDesc authors = mangaRelationshipsDto.filter { relationshipDto -> relationshipDto.type.equals(MdConstants.Types.author, true) diff --git a/app/src/main/java/exh/md/utils/MdUtil.kt b/app/src/main/java/exh/md/utils/MdUtil.kt index dfc0e8b68..a3ce3021c 100644 --- a/app/src/main/java/exh/md/utils/MdUtil.kt +++ b/app/src/main/java/exh/md/utils/MdUtil.kt @@ -89,7 +89,7 @@ class MdUtil { fun cleanDescription(string: String): String { return Parser.unescapeEntities(string, false) - .substringBefore("---") + .substringBefore("\n---") .replace(markdownLinksRegex, "$1") .replace(markdownItalicBoldRegex, "$1") .replace(markdownItalicRegex, "$1") @@ -265,7 +265,7 @@ class MdUtil { } else { val altTitlesDesc = altTitles .joinToString("\n", "${Injekt.get().getString(R.string.alt_titles)}:\n") { "• $it" } - description + (if (description.isBlank()) "" else "\n\n") + altTitlesDesc + description + (if (description.isBlank()) "" else "\n\n") + Parser.unescapeEntities(altTitlesDesc, false) } } }