mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-11-13 12:38:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused metadata objects and misc code cleanup

Browse Source
This commit is contained in:
NerdNumber9
2019-04-12 04:18:57 -04:00
parent 6f36331818
commit cadd389658
24 changed files with 27 additions and 1218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,6 @@ import exh.metadata.metadata.EHentaiSearchMetadata.Companion.EH_GENRE_NAMESPACE
import exh.metadata.metadata.EHentaiSearchMetadata.Companion.TAG_TYPE_LIGHT
import exh.metadata.metadata.EHentaiSearchMetadata.Companion.TAG_TYPE_NORMAL
import exh.metadata.metadata.base.RaisedSearchMetadata.Companion.TAG_TYPE_VIRTUAL
import exh.metadata.models.ExGalleryMetadata
import exh.metadata.nullIfBlank
import exh.metadata.parseHumanReadableByteCount
import exh.ui.login.LoginController
@@ -253,9 +252,9 @@ class EHentai(override val id: Long,
override fun parseIntoMetadata(metadata: EHentaiSearchMetadata, input: Response) {
with(metadata) {
with(input.asJsoup()) {
val url = input.request().url().encodedPath()!!
gId = ExGalleryMetadata.galleryId(url)
gToken = ExGalleryMetadata.galleryToken(url)
val url = input.request().url().encodedPath()
gId = EHentaiSearchMetadata.galleryId(url)
gToken = EHentaiSearchMetadata.galleryToken(url)
exh = this@EHentai.exh
title = select("#gn").text().nullIfBlank()?.trim()

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

@@ -18,7 +18,6 @@ import exh.NHENTAI_SOURCE_ID
import exh.metadata.metadata.NHentaiSearchMetadata
import exh.metadata.metadata.NHentaiSearchMetadata.Companion.TAG_TYPE_DEFAULT
import exh.metadata.metadata.base.RaisedTag
import exh.metadata.models.NHentaiMetadata
import exh.util.*
import okhttp3.Request
import okhttp3.Response
@@ -226,7 +225,7 @@ class NHentai(context: Context) : HttpSource(), LewdSource<NHentaiSearchMetadata
override fun fetchImageUrl(page: Page) = Observable.just(page.imageUrl!!)!!
fun imageUrlFromType(mediaId: String, page: Int, t: String) = NHentaiMetadata.typeToExtension(t)?.let {
fun imageUrlFromType(mediaId: String, page: Int, t: String) = NHentaiSearchMetadata.typeToExtension(t)?.let {
"https://i.nhentai.net/galleries/$mediaId/$page.$it"
}

3
app/src/main/java/eu/kanade/tachiyomi/source/online/all/PervEden.kt
View File

@@ -13,7 +13,6 @@ import exh.metadata.metadata.PervEdenSearchMetadata
import exh.metadata.metadata.PervEdenSearchMetadata.Companion.TAG_TYPE_DEFAULT
import exh.metadata.metadata.base.RaisedSearchMetadata.Companion.TAG_TYPE_VIRTUAL
import exh.metadata.metadata.base.RaisedTag
import exh.metadata.models.PervEdenGalleryMetadata
import exh.util.UriFilter
import exh.util.UriGroup
import exh.util.urlImportFetchSearchManga
@@ -138,7 +137,7 @@ class PervEden(override val id: Long, val pvLang: PervEdenLang) : ParsedHttpSour
with(metadata) {
url = Uri.parse(input.location()).path
pvId = PervEdenGalleryMetadata.pvIdFromUrl(url!!)
pvId = PervEdenSearchMetadata.pvIdFromUrl(url!!)
lang = this@PervEden.lang