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

Comicake - show webpage on open in webview (#3091)

This commit is contained in:
Mike 2020-05-10 06:10:49 -04:00 committed by GitHub
parent 806227b5bb
commit 830dfb9fc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/all/comicake/build.gradle
View File

@ -5,7 +5,7 @@ ext {
appName = 'Tachiyomi: ComiCake' appName = 'Tachiyomi: ComiCake'
pkgNameSuffix = 'all.comicake' pkgNameSuffix = 'all.comicake'
extClass = '.ComiCakeFactory' extClass = '.ComiCakeFactory'
extVersionCode = 7 extVersionCode = 8
libVersion = '1.2' libVersion = '1.2'
} }

25
src/all/comicake/src/eu/kanade/tachiyomi/extension/all/comicake/ComiCake.kt
View File

@ -3,6 +3,7 @@ package eu.kanade.tachiyomi.extension.all.comicake
import android.os.Build import android.os.Build
import eu.kanade.tachiyomi.extensions.BuildConfig import eu.kanade.tachiyomi.extensions.BuildConfig
import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.GET
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
import eu.kanade.tachiyomi.source.model.Page import eu.kanade.tachiyomi.source.model.Page
@ -10,11 +11,13 @@ import eu.kanade.tachiyomi.source.model.SChapter
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.source.online.HttpSource
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.Locale
import okhttp3.Headers import okhttp3.Headers
import okhttp3.Request import okhttp3.Request
import okhttp3.Response import okhttp3.Response
import org.json.JSONArray import org.json.JSONArray
import org.json.JSONObject import org.json.JSONObject
import rx.Observable
abstract class ComiCake( abstract class ComiCake(
override val name: String, override val name: String,
@ -76,10 +79,23 @@ abstract class ComiCake(
return MangasPage(mangas, !(response.getString("next").isNullOrEmpty() || response.getString("next") == "null")) return MangasPage(mangas, !(response.getString("next").isNullOrEmpty() || response.getString("next") == "null"))
} }
override fun mangaDetailsRequest(manga: SManga): Request { // Shenanigans to allow "open in webview" to show a webpage instead of JSON
override fun fetchMangaDetails(manga: SManga): Observable<SManga> {
return client.newCall(apiMangaDetailsRequest(manga))
.asObservableSuccess()
.map { response ->
mangaDetailsParse(response).apply { initialized = true }
}
}
private fun apiMangaDetailsRequest(manga: SManga): Request {
return GET("$apiBase/comics/${manga.url}.json") return GET("$apiBase/comics/${manga.url}.json")
} }
override fun mangaDetailsRequest(manga: SManga): Request {
return GET(manga.description!!.substringAfterLast("\n"))
}
override fun mangaDetailsParse(response: Response): SManga { override fun mangaDetailsParse(response: Response): SManga {
val comicJson = JSONObject(response.body()!!.string()) val comicJson = JSONObject(response.body()!!.string())
return parseComicJson(comicJson, true) return parseComicJson(comicJson, true)
@ -95,7 +111,8 @@ abstract class ComiCake(
thumbnail_url = obj.getString("cover") thumbnail_url = obj.getString("cover")
author = parseListNames(obj.getJSONArray("author")) author = parseListNames(obj.getJSONArray("author"))
artist = parseListNames(obj.getJSONArray("artist")) artist = parseListNames(obj.getJSONArray("artist"))
description = obj.getString("description") description = obj.getString("description") +
"\n\n${readerBase}series/${obj.getString("slug")}/" // webpage for "open in webview"
genre = parseListNames(obj.getJSONArray("tags")) genre = parseListNames(obj.getJSONArray("tags"))
status = SManga.UNKNOWN status = SManga.UNKNOWN
} }
@ -129,7 +146,7 @@ abstract class ComiCake(
private fun parseChapterJson(obj: JSONObject) = SChapter.create().apply { private fun parseChapterJson(obj: JSONObject) = SChapter.create().apply {
name = obj.getString("title") // title will always have content, vs. name that's an optional field name = obj.getString("title") // title will always have content, vs. name that's an optional field
chapter_number = (obj.getInt("chapter") + (obj.getInt("subchapter") / 10.0)).toFloat() chapter_number = (obj.getInt("chapter") + (obj.getInt("subchapter") / 10.0)).toFloat()
date_upload = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZZZ").parse(obj.getString("published_at")).time date_upload = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZZZ", Locale.getDefault()).parse(obj.getString("published_at")).time
// TODO scanlator field by adding team to expandable in CC (low priority given the use case of CC) // TODO scanlator field by adding team to expandable in CC (low priority given the use case of CC)
url = obj.getString("manifest") url = obj.getString("manifest")
} }
@ -163,6 +180,6 @@ abstract class ComiCake(
companion object { companion object {
private const val COMICAKE_DEFAULT_API_ENDPOINT = "/api" // Highly unlikely to change private const val COMICAKE_DEFAULT_API_ENDPOINT = "/api" // Highly unlikely to change
private const val COMICAKE_DEFAULT_READER_ENDPOINT = "/r" // Can change based on CC config private const val COMICAKE_DEFAULT_READER_ENDPOINT = "/r/" // Can change based on CC config
} }
} }