Fix certain HBrowse manga

This commit is contained in:
Jobobby04 2020-08-02 15:06:49 -04:00
parent 7f416bda7c
commit b344a3944e
2 changed files with 8 additions and 8 deletions

View File

@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.source.online.english
import android.content.Context import android.content.Context
import android.net.Uri import android.net.Uri
import androidx.core.net.toUri
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
import eu.kanade.tachiyomi.source.model.MangasPage import eu.kanade.tachiyomi.source.model.MangasPage
@ -45,10 +44,9 @@ class HBrowse(delegate: HttpSource, val context: Context) :
override fun parseIntoMetadata(metadata: HBrowseSearchMetadata, input: Document) { override fun parseIntoMetadata(metadata: HBrowseSearchMetadata, input: Document) {
val tables = parseIntoTables(input) val tables = parseIntoTables(input)
with(metadata) { with(metadata) {
val uri = input.location().toUri() hbUrl = input.location().removePrefix("$baseUrl/thumbnails")
hbId = uri.pathSegments[1].toLong()
hbUrlExtra = uri.pathSegments[2] hbId = hbUrl!!.removePrefix("/").substringBefore("/").toLong()
tags.clear() tags.clear()
((tables[""] ?: error("")) + (tables["categories"] ?: error(""))).forEach { (k, v) -> ((tables[""] ?: error("")) + (tables["categories"] ?: error(""))).forEach { (k, v) ->

View File

@ -9,7 +9,7 @@ import exh.metadata.metadata.base.RaisedSearchMetadata
class HBrowseSearchMetadata : RaisedSearchMetadata() { class HBrowseSearchMetadata : RaisedSearchMetadata() {
var hbId: Long? = null var hbId: Long? = null
var hbUrlExtra: String? = null var hbUrl: String? = null
var thumbnail: String? = null var thumbnail: String? = null
@ -19,7 +19,9 @@ class HBrowseSearchMetadata : RaisedSearchMetadata() {
var length: Int? = null var length: Int? = null
override fun copyTo(manga: SManga) { override fun copyTo(manga: SManga) {
manga.url = "/$hbId/$hbUrlExtra" hbUrl?.let {
manga.url = it
}
title?.let { title?.let {
manga.title = it manga.title = it
@ -48,8 +50,8 @@ class HBrowseSearchMetadata : RaisedSearchMetadata() {
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> { override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
val pairs = mutableListOf<Pair<String, String>>() val pairs = mutableListOf<Pair<String, String>>()
hbId?.let { pairs += Pair(context.getString(R.string.id), it.toString()) } hbId?.let { pairs += Pair(context.getString(R.string.id), it.toString()) }
hbUrlExtra?.let { pairs += Pair(context.getString(R.string.id), it.toString()) } hbUrl?.let { pairs += Pair(context.getString(R.string.url), it) }
thumbnail?.let { pairs += Pair(context.getString(R.string.thumbnail_url), it.toString()) } thumbnail?.let { pairs += Pair(context.getString(R.string.thumbnail_url), it) }
title?.let { pairs += Pair(context.getString(R.string.title), it) } title?.let { pairs += Pair(context.getString(R.string.title), it) }
length?.let { pairs += Pair(context.getString(R.string.page_count), it.toString()) } length?.let { pairs += Pair(context.getString(R.string.page_count), it.toString()) }
return pairs return pairs