From a0f2094c51e897454cd0b1450970fb777fa913d3 Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Sun, 28 Aug 2022 12:06:20 -0400
Subject: [PATCH] E-Hentai set gallery id as hidden scanlator

---
 .../eu/kanade/presentation/manga/MangaScreen.kt   |  2 +-
 .../kanade/tachiyomi/source/online/all/EHentai.kt |  5 ++++-
 .../kanade/tachiyomi/ui/manga/MangaPresenter.kt   | 15 ++++++++++++++-
 .../ui/reader/chapter/ReaderChapterItem.kt        |  3 ++-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt b/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
index 7c04bf87a..4b191b5d8 100644
--- a/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
@@ -811,7 +811,7 @@ private fun LazyListScope.sharedChapterItems(
             title = chapterItem.chapterTitleString,
             date = chapterItem.dateUploadString,
             readProgress = chapterItem.readProgressString,
-            scanlator = chapterItem.chapter.scanlator.takeIf { !it.isNullOrBlank() },
+            scanlator = chapterItem.chapter.scanlator.takeIf { !it.isNullOrBlank() /* SY --> */ && chapterItem.showScanlator /* SY <-- */ },
             read = chapterItem.chapter.read,
             bookmark = chapterItem.chapter.bookmark,
             selected = chapterItem.selected,
diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
index 97d3ebc61..1cd7213ed 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
@@ -344,8 +344,9 @@ class EHentai(
         }
         val newDisplay = doc.select("#gnd a")
         // Build chapter for root gallery
+        val location = doc.location()
         val self = SChapter(
-            url = EHentaiSearchMetadata.normalizeUrl(doc.location()),
+            url = EHentaiSearchMetadata.normalizeUrl(location),
             name = "v1: " + doc.selectFirst("#gn")!!.text(),
             chapter_number = 1f,
             date_upload = MetadataUtil.EX_DATE_FORMAT.parse(
@@ -353,6 +354,7 @@ class EHentai(
                     el.text().lowercase() == "posted:"
                 }!!.nextElementSibling()!!.text(),
             )!!.time,
+            scanlator = EHentaiSearchMetadata.galleryId(location),
         )
         // Build and append the rest of the galleries
         return if (DebugToggles.INCLUDE_ONLY_ROOT_WHEN_LOADING_EXH_VERSIONS.enabled) {
@@ -367,6 +369,7 @@ class EHentai(
                     name = "v${index + 2}: $name",
                     chapter_number = index + 2f,
                     date_upload = MetadataUtil.EX_DATE_FORMAT.parse(posted)!!.time,
+                    scanlator = EHentaiSearchMetadata.galleryId(link),
                 )
             }.reversed() + self
         }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
index 4df7713c9..8bfcaa2da 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
@@ -320,7 +320,10 @@ class MangaPresenter(
                                 }
                             }.launchIn(presenterScope)
                     }
-                    allChapterScanlators = chapters.flatMap { MdUtil.getScanlators(it.scanlator) }.distinct()
+                    if (!manga.isEhBasedManga()) {
+                        allChapterScanlators = chapters.flatMap { MdUtil.getScanlators(it.scanlator) }
+                            .distinct()
+                    }
                 }
                 .combine(
                     getFlatMetadata.subscribe(mangaId)
@@ -913,6 +916,9 @@ class MangaPresenter(
         mergedData: MergedMangaData?,
         alwaysShowReadingProgress: Boolean,
     ): List<ChapterItem> {
+        // SY -->
+        val isExhManga = manga.isEhBasedManga()
+        // SY <--
         return map { chapter ->
             val activeDownload = downloadManager.queue.find { chapter.id == it.chapter.id }
             val chapter = chapter.let { if (mergedData != null) it.toMergedDownloadedChapter() else it }
@@ -957,6 +963,9 @@ class MangaPresenter(
                         it + 1,
                     )
                 },
+                // SY -->
+                showScanlator = !isExhManga,
+                // SY <--
             )
         }
     }
@@ -1670,6 +1679,10 @@ data class ChapterItem(
     val readProgressString: String?,
 
     val selected: Boolean = false,
+
+    // SY -->
+    val showScanlator: Boolean = true,
+    // SY <--
 ) {
     val isDownloaded = downloadState == Download.State.DOWNLOADED
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterItem.kt
index d6caae20c..25d0acfd9 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterItem.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterItem.kt
@@ -15,6 +15,7 @@ import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.databinding.ReaderChapterItemBinding
 import eu.kanade.tachiyomi.util.system.getResourceColor
 import eu.kanade.tachiyomi.util.view.setVectorCompat
+import exh.source.isEhBasedManga
 import java.text.DateFormat
 import java.text.DecimalFormat
 import java.util.Date
@@ -90,7 +91,7 @@ class ReaderChapterItem(val chapter: Chapter, val manga: Manga, val isCurrent: B
             if (chapter.dateUpload > 0) {
                 descriptions.add(item.dateFormat.format(Date(chapter.dateUpload)))
             }
-            if (!chapter.scanlator.isNullOrBlank()) {
+            if (!chapter.scanlator.isNullOrBlank() && !manga.isEhBasedManga()) {
                 descriptions.add(chapter.scanlator)
             }