Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

E-Hentai set gallery id as hidden scanlator

Browse Source
This commit is contained in:
Jobobby04 2022-08-28 12:06:20 -04:00
parent 82dd0a0243
commit a0f2094c51
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
View File

@ -811,7 +811,7 @@ private fun LazyListScope.sharedChapterItems(
title = chapterItem.chapterTitleString, title = chapterItem.chapterTitleString,
date = chapterItem.dateUploadString, date = chapterItem.dateUploadString,
readProgress = chapterItem.readProgressString, 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, read = chapterItem.chapter.read,
bookmark = chapterItem.chapter.bookmark, bookmark = chapterItem.chapter.bookmark,
selected = chapterItem.selected, selected = chapterItem.selected,

5
app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
View File

@ -344,8 +344,9 @@ class EHentai(
} }
val newDisplay = doc.select("#gnd a") val newDisplay = doc.select("#gnd a")
// Build chapter for root gallery // Build chapter for root gallery
val location = doc.location()
val self = SChapter( val self = SChapter(
url = EHentaiSearchMetadata.normalizeUrl(doc.location()), url = EHentaiSearchMetadata.normalizeUrl(location),
name = "v1: " + doc.selectFirst("#gn")!!.text(), name = "v1: " + doc.selectFirst("#gn")!!.text(),
chapter_number = 1f, chapter_number = 1f,
date_upload = MetadataUtil.EX_DATE_FORMAT.parse( date_upload = MetadataUtil.EX_DATE_FORMAT.parse(
@ -353,6 +354,7 @@ class EHentai(
el.text().lowercase() == "posted:" el.text().lowercase() == "posted:"
}!!.nextElementSibling()!!.text(), }!!.nextElementSibling()!!.text(),
)!!.time, )!!.time,
scanlator = EHentaiSearchMetadata.galleryId(location),
) )
// Build and append the rest of the galleries // Build and append the rest of the galleries
return if (DebugToggles.INCLUDE_ONLY_ROOT_WHEN_LOADING_EXH_VERSIONS.enabled) { return if (DebugToggles.INCLUDE_ONLY_ROOT_WHEN_LOADING_EXH_VERSIONS.enabled) {
@ -367,6 +369,7 @@ class EHentai(
name = "v${index + 2}: $name", name = "v${index + 2}: $name",
chapter_number = index + 2f, chapter_number = index + 2f,
date_upload = MetadataUtil.EX_DATE_FORMAT.parse(posted)!!.time, date_upload = MetadataUtil.EX_DATE_FORMAT.parse(posted)!!.time,
scanlator = EHentaiSearchMetadata.galleryId(link),
) )
}.reversed() + self }.reversed() + self
} }

15
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
View File

@ -320,7 +320,10 @@ class MangaPresenter(
} }
}.launchIn(presenterScope) }.launchIn(presenterScope)
} }
allChapterScanlators = chapters.flatMap { MdUtil.getScanlators(it.scanlator) }.distinct() if (!manga.isEhBasedManga()) {
allChapterScanlators = chapters.flatMap { MdUtil.getScanlators(it.scanlator) }
.distinct()
}
} }
.combine( .combine(
getFlatMetadata.subscribe(mangaId) getFlatMetadata.subscribe(mangaId)
@ -913,6 +916,9 @@ class MangaPresenter(
mergedData: MergedMangaData?, mergedData: MergedMangaData?,
alwaysShowReadingProgress: Boolean, alwaysShowReadingProgress: Boolean,
): List<ChapterItem> { ): List<ChapterItem> {
// SY -->
val isExhManga = manga.isEhBasedManga()
// SY <--
return map { chapter -> return map { chapter ->
val activeDownload = downloadManager.queue.find { chapter.id == it.chapter.id } val activeDownload = downloadManager.queue.find { chapter.id == it.chapter.id }
val chapter = chapter.let { if (mergedData != null) it.toMergedDownloadedChapter() else it } val chapter = chapter.let { if (mergedData != null) it.toMergedDownloadedChapter() else it }
@ -957,6 +963,9 @@ class MangaPresenter(
it + 1, it + 1,
) )
}, },
// SY -->
showScanlator = !isExhManga,
// SY <--
) )
} }
} }
@ -1670,6 +1679,10 @@ data class ChapterItem(
val readProgressString: String?, val readProgressString: String?,
val selected: Boolean = false, val selected: Boolean = false,
// SY -->
val showScanlator: Boolean = true,
// SY <--
) { ) {
val isDownloaded = downloadState == Download.State.DOWNLOADED val isDownloaded = downloadState == Download.State.DOWNLOADED
} }

3
app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterItem.kt
View File

@ -15,6 +15,7 @@ import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.databinding.ReaderChapterItemBinding import eu.kanade.tachiyomi.databinding.ReaderChapterItemBinding
import eu.kanade.tachiyomi.util.system.getResourceColor import eu.kanade.tachiyomi.util.system.getResourceColor
import eu.kanade.tachiyomi.util.view.setVectorCompat import eu.kanade.tachiyomi.util.view.setVectorCompat
import exh.source.isEhBasedManga
import java.text.DateFormat import java.text.DateFormat
import java.text.DecimalFormat import java.text.DecimalFormat
import java.util.Date import java.util.Date
@ -90,7 +91,7 @@ class ReaderChapterItem(val chapter: Chapter, val manga: Manga, val isCurrent: B
if (chapter.dateUpload > 0) { if (chapter.dateUpload > 0) {
descriptions.add(item.dateFormat.format(Date(chapter.dateUpload))) descriptions.add(item.dateFormat.format(Date(chapter.dateUpload)))
} }
if (!chapter.scanlator.isNullOrBlank()) { if (!chapter.scanlator.isNullOrBlank() && !manga.isEhBasedManga()) {
descriptions.add(chapter.scanlator) descriptions.add(chapter.scanlator)
} }