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

Remanga: Faster loading paid chapter (#3496) 

Co-authored-by: pavkazzz <me@pavkazzz.ru>
This commit is contained in:
Pavka 2020-06-12 00:39:45 +03:00 committed by GitHub
parent 46e83a1f76
commit d6c6c65f01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ru/remanga/build.gradle
View File

@ -5,7 +5,7 @@ ext {
appName = 'Tachiyomi: Remanga' appName = 'Tachiyomi: Remanga'
pkgNameSuffix = 'ru.remanga' pkgNameSuffix = 'ru.remanga'
extClass = '.Remanga' extClass = '.Remanga'
extVersionCode = 4 extVersionCode = 5
libVersion = '1.2' libVersion = '1.2'
} }

34
src/ru/remanga/src/eu/kanade/tachiyomi/extension/ru/remanga/Remanga.kt
View File

@ -8,7 +8,6 @@ import MangaDetDto
import PageDto import PageDto
import PageWrapperDto import PageWrapperDto
import PaidPageDto import PaidPageDto
import PaidPagesDto
import SeriesWrapperDto import SeriesWrapperDto
import UserDto import UserDto
import android.annotation.TargetApi import android.annotation.TargetApi
@ -43,7 +42,6 @@ import java.io.IOException
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.Date import java.util.Date
import java.util.Locale import java.util.Locale
import java.util.stream.Collectors
import okhttp3.Call import okhttp3.Call
import okhttp3.Callback import okhttp3.Callback
import okhttp3.Headers import okhttp3.Headers
@ -287,8 +285,6 @@ class Remanga : ConfigurableSource, HttpSource() {
} }
} }
override fun imageUrlParse(response: Response): String = ""
@TargetApi(Build.VERSION_CODES.N) @TargetApi(Build.VERSION_CODES.N)
override fun pageListParse(response: Response): List<Page> { override fun pageListParse(response: Response): List<Page> {
val body = response.body()?.string()!! val body = response.body()?.string()!!
@ -300,28 +296,36 @@ class Remanga : ConfigurableSource, HttpSource() {
} }
} catch (e: JsonSyntaxException) { } catch (e: JsonSyntaxException) {
val page = gson.fromJson<SeriesWrapperDto<PaidPageDto>>(body) val page = gson.fromJson<SeriesWrapperDto<PaidPageDto>>(body)
page.content.pages.parallelStream().map { page.content.pages.mapIndexed { i, element ->
val res = this.combineImage(it) Page(i, element.joinToString { it.link })
Page(it.size, "", "https://127.0.0.1/?imagebase64,$res") }
}.collect(Collectors.toList())
} }
} }
private fun combineImage(it: List<PaidPagesDto>): String { override fun fetchImageUrl(page: Page): Observable<String> {
val urls = page.url.split(", ")
val res = this.combineImage(urls)
return Observable.just("https://127.0.0.1/?imagebase64,$res")
}
override fun imageUrlRequest(page: Page): Request = throw NotImplementedError("Unused")
override fun imageUrlParse(response: Response): String = throw NotImplementedError("Unused")
private fun combineImage(pages: List<String>): String {
val refererHeaders = Headers.Builder().apply { val refererHeaders = Headers.Builder().apply {
add("User-Agent", "Tachiyomi") add("User-Agent", "Tachiyomi")
add("Referer", "https://img.remanga.org") add("Referer", "https://img.remanga.org")
}.build() }.build()
val s = client.newCall(GET(pages[0], refererHeaders)).execute().body()!!.bytes()
val s = client.newCall(GET(it[0].link, refererHeaders)).execute().body()!!.bytes()
val b = BitmapFactory.decodeByteArray(s, 0, s.size) val b = BitmapFactory.decodeByteArray(s, 0, s.size)
val cs = Bitmap.createBitmap(b.width, b.height * it.size, Bitmap.Config.ARGB_8888) val cs = Bitmap.createBitmap(b.width, b.height * pages.size, Bitmap.Config.ARGB_8888)
val comboImage = Canvas(cs) val comboImage = Canvas(cs)
comboImage.drawBitmap(b, 0f, 0f, null) comboImage.drawBitmap(b, 0f, 0f, null)
var completeSize = it.size - 2 var completeSize = pages.size - 2
for (i in 1 until it.size) { for (i in 1 until pages.size) {
client.newCall(GET(it[i].link, refererHeaders)).enqueue( client.newCall(GET(pages[i], refererHeaders)).enqueue(
object : Callback { object : Callback {
override fun onResponse(call: Call, response: Response) { override fun onResponse(call: Call, response: Response) {
val bytes = response.body()!!.bytes() val bytes = response.body()!!.bytes()