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

Support the short title setting in NHentai

Browse Source
This commit is contained in:
Jobobby04 2020-10-19 15:24:50 -04:00
parent 05c2b43ffb
commit 9945752667
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/eu/kanade/tachiyomi/source/online/all/NHentai.kt
View File

@ -1,6 +1,7 @@
package eu.kanade.tachiyomi.source.online.all package eu.kanade.tachiyomi.source.online.all
import android.content.Context import android.content.Context
import android.content.SharedPreferences
import android.net.Uri import android.net.Uri
import eu.kanade.tachiyomi.network.asObservableSuccess import eu.kanade.tachiyomi.network.asObservableSuccess
import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.FilterList
@ -32,6 +33,16 @@ class NHentai(delegate: HttpSource, val context: Context) :
override val metaClass = NHentaiSearchMetadata::class override val metaClass = NHentaiSearchMetadata::class
override val lang = if (id == otherId) "all" else delegate.lang override val lang = if (id == otherId) "all" else delegate.lang
private val sourcePreferences: SharedPreferences by lazy {
context.getSharedPreferences("source_$id", 0x0000)
}
private val preferredTitle: Int
get() = when (sourcePreferences.getString(TITLE_PREF, "full")) {
"full" -> NHentaiSearchMetadata.TITLE_TYPE_ENGLISH
else -> NHentaiSearchMetadata.TITLE_TYPE_SHORT
}
// Support direct URL importing // Support direct URL importing
override fun fetchSearchManga(page: Int, query: String, filters: FilterList): Observable<MangasPage> = override fun fetchSearchManga(page: Int, query: String, filters: FilterList): Observable<MangasPage> =
urlImportFetchSearchManga(context, query) { urlImportFetchSearchManga(context, query) {
@ -73,6 +84,8 @@ class NHentai(delegate: HttpSource, val context: Context) :
englishTitle = title.english englishTitle = title.english
} }
preferredTitle = this@NHentai.preferredTitle
jsonResponse.images?.let { images -> jsonResponse.images?.let { images ->
coverImageType = NHentaiSearchMetadata.typeToExtension(images.cover?.type) coverImageType = NHentaiSearchMetadata.typeToExtension(images.cover?.type)
images.pages.mapNotNull { images.pages.mapNotNull {
@ -173,5 +186,6 @@ class NHentai(delegate: HttpSource, val context: Context) :
private val GALLERY_JSON_REGEX = Regex(".parse\\(\"(.*)\"\\);") private val GALLERY_JSON_REGEX = Regex(".parse\\(\"(.*)\"\\);")
private val UNICODE_ESCAPE_REGEX = Regex("\\\\u([0-9a-fA-F]{4})") private val UNICODE_ESCAPE_REGEX = Regex("\\\\u([0-9a-fA-F]{4})")
private const val TITLE_PREF = "Display manga title as:"
} }
} }

13
app/src/main/java/exh/metadata/metadata/NHentaiSearchMetadata.kt
View File

@ -7,7 +7,6 @@ import exh.metadata.EX_DATE_FORMAT
import exh.metadata.ONGOING_SUFFIX import exh.metadata.ONGOING_SUFFIX
import exh.metadata.metadata.base.RaisedSearchMetadata import exh.metadata.metadata.base.RaisedSearchMetadata
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import uy.kohesive.injekt.api.get
import java.util.Date import java.util.Date
@Serializable @Serializable
@ -37,6 +36,8 @@ class NHentaiSearchMetadata : RaisedSearchMetadata() {
var scanlator: String? = null var scanlator: String? = null
var preferredTitle: Int? = null
override fun copyTo(manga: SManga) { override fun copyTo(manga: SManga) {
nhId?.let { manga.url = nhIdToPath(it) } nhId?.let { manga.url = nhIdToPath(it) }
@ -46,7 +47,11 @@ class NHentaiSearchMetadata : RaisedSearchMetadata() {
} }
} }
manga.title = englishTitle ?: japaneseTitle ?: shortTitle!! manga.title = when (preferredTitle) {
TITLE_TYPE_SHORT -> shortTitle ?: englishTitle ?: japaneseTitle!!
0, TITLE_TYPE_ENGLISH -> englishTitle ?: japaneseTitle ?: shortTitle!!
else -> englishTitle ?: japaneseTitle ?: shortTitle!!
}
// Set artist (if we can find one) // Set artist (if we can find one)
tags.filter { it.namespace == NHENTAI_ARTIST_NAMESPACE }.let { tags.filter { it.namespace == NHENTAI_ARTIST_NAMESPACE }.let {
@ -88,8 +93,8 @@ class NHentaiSearchMetadata : RaisedSearchMetadata() {
companion object { companion object {
private const val TITLE_TYPE_JAPANESE = 0 private const val TITLE_TYPE_JAPANESE = 0
private const val TITLE_TYPE_ENGLISH = 1 const val TITLE_TYPE_ENGLISH = 1
private const val TITLE_TYPE_SHORT = 2 const val TITLE_TYPE_SHORT = 2
const val TAG_TYPE_DEFAULT = 0 const val TAG_TYPE_DEFAULT = 0