New source: Pixiv (#15387)
* New source: Pixiv * I screwed up again (this is going to be squashed right?) * Requested changes
This commit is contained in:
parent
8cf3472578
commit
00cddedd16
|
@ -0,0 +1,2 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest package="eu.kanade.tachiyomi.extension" />
|
|
@ -0,0 +1,13 @@
|
|||
apply plugin: 'com.android.application'
|
||||
apply plugin: 'kotlin-android'
|
||||
apply plugin: 'kotlinx-serialization'
|
||||
|
||||
ext {
|
||||
extName = 'Pixiv'
|
||||
pkgNameSuffix = 'all.pixiv'
|
||||
extClass = '.PixivFactory'
|
||||
extVersionCode = 1
|
||||
isNsfw = true
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
Binary file not shown.
After Width: | Height: | Size: 3.4 KiB |
Binary file not shown.
After Width: | Height: | Size: 2.0 KiB |
Binary file not shown.
After Width: | Height: | Size: 4.5 KiB |
Binary file not shown.
After Width: | Height: | Size: 8.0 KiB |
Binary file not shown.
After Width: | Height: | Size: 11 KiB |
Binary file not shown.
After Width: | Height: | Size: 37 KiB |
|
@ -0,0 +1,204 @@
|
|||
package eu.kanade.tachiyomi.extension.all.pixiv
|
||||
|
||||
import android.util.LruCache
|
||||
import eu.kanade.tachiyomi.network.asObservable
|
||||
import eu.kanade.tachiyomi.source.model.Filter
|
||||
import eu.kanade.tachiyomi.source.model.FilterList
|
||||
import eu.kanade.tachiyomi.source.model.MangasPage
|
||||
import eu.kanade.tachiyomi.source.model.Page
|
||||
import eu.kanade.tachiyomi.source.model.SChapter
|
||||
import eu.kanade.tachiyomi.source.model.SManga
|
||||
import eu.kanade.tachiyomi.source.model.UpdateStrategy
|
||||
import eu.kanade.tachiyomi.source.online.HttpSource
|
||||
import kotlinx.serialization.decodeFromString
|
||||
import kotlinx.serialization.json.Json
|
||||
import okhttp3.HttpUrl.Companion.toHttpUrl
|
||||
import okhttp3.Request
|
||||
import okhttp3.Response
|
||||
import org.jsoup.Jsoup
|
||||
import rx.Observable
|
||||
import uy.kohesive.injekt.injectLazy
|
||||
import java.net.URLEncoder
|
||||
import java.text.SimpleDateFormat
|
||||
import java.util.Locale
|
||||
|
||||
class Pixiv(override val lang: String) : HttpSource() {
|
||||
override val name = "Pixiv"
|
||||
override val baseUrl = "https://www.pixiv.net"
|
||||
override val supportsLatest = true
|
||||
|
||||
private val siteLang: String = if (lang == "all") "ja" else lang
|
||||
private val illustCache = LruCache<String, PixivIllust>(50)
|
||||
|
||||
private val json: Json by injectLazy()
|
||||
private val dateFormat by lazy { SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.ENGLISH) }
|
||||
|
||||
override fun headersBuilder() = super.headersBuilder()
|
||||
.add("Referer", "$baseUrl/")
|
||||
|
||||
class SortFilter : Filter.Sort("Sort", arrayOf("Date Uploaded"), Selection(0, false))
|
||||
class NonMangaFilter : Filter.CheckBox("Include non-manga posts", false)
|
||||
|
||||
private fun apiRequest(method: String, path: String, params: Map<String, String> = emptyMap()): Request {
|
||||
val url = baseUrl.toHttpUrl().newBuilder()
|
||||
.addEncodedPathSegments("ajax$path")
|
||||
.addEncodedQueryParameter("lang", siteLang)
|
||||
.apply { params.forEach { (k, v) -> addEncodedQueryParameter(k, v) } }
|
||||
.build()
|
||||
|
||||
val headers = headersBuilder()
|
||||
.add("Accept", "application/json")
|
||||
.build()
|
||||
|
||||
return Request(url, headers, method)
|
||||
}
|
||||
|
||||
private inline fun <reified T> apiResponseParse(response: Response): T {
|
||||
if (!response.isSuccessful) {
|
||||
throw Exception(response.message)
|
||||
}
|
||||
|
||||
return response.body.string()
|
||||
.let { json.decodeFromString<PixivApiResponse<T>>(it) }
|
||||
.apply { if (error) throw Exception(message ?: response.message) }
|
||||
.let { it.body!! }
|
||||
}
|
||||
|
||||
private fun illustUrlToId(url: String): String =
|
||||
url.substringAfterLast("/")
|
||||
|
||||
private fun parseTimestamp(string: String) =
|
||||
runCatching { dateFormat.parse(string)?.time!! }.getOrDefault(0)
|
||||
|
||||
private fun fetchIllust(url: String): Observable<PixivIllust> =
|
||||
Observable.fromCallable { illustCache.get(url) }
|
||||
.filter { it != null }
|
||||
.switchIfEmpty(
|
||||
Observable.defer {
|
||||
client.newCall(illustRequest(url)).asObservable()
|
||||
.map { illustParse(it) }
|
||||
.doOnNext { illustCache.put(url, it) }
|
||||
},
|
||||
)
|
||||
|
||||
private fun illustRequest(url: String): Request =
|
||||
apiRequest("GET", "/illust/${illustUrlToId(url)}")
|
||||
|
||||
private fun illustParse(response: Response): PixivIllust =
|
||||
apiResponseParse(response)
|
||||
|
||||
override fun popularMangaRequest(page: Int): Request =
|
||||
searchMangaRequest(page, "漫画", FilterList())
|
||||
|
||||
override fun popularMangaParse(response: Response) = MangasPage(
|
||||
mangas = apiResponseParse<PixivSearchResults>(response)
|
||||
.popular?.run { recent.orEmpty() + permanent.orEmpty() }
|
||||
?.map(::searchResultParse)
|
||||
.orEmpty(),
|
||||
|
||||
hasNextPage = false,
|
||||
)
|
||||
|
||||
override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
|
||||
var includeNonManga = false
|
||||
var ascendingSort = false
|
||||
|
||||
filters.forEach {
|
||||
when (it) {
|
||||
is NonMangaFilter -> includeNonManga = it.state
|
||||
is SortFilter -> ascendingSort = it.state!!.ascending
|
||||
else -> throw IllegalStateException("Filter unrecognized")
|
||||
}
|
||||
}
|
||||
|
||||
val word = URLEncoder.encode(query, "UTF-8")
|
||||
val type = if (includeNonManga) "artworks" else "manga"
|
||||
|
||||
val parameters = mapOf(
|
||||
"mode" to "all",
|
||||
"order" to if (ascendingSort) "date" else "date_d",
|
||||
"p" to page.toString(),
|
||||
"type" to if (includeNonManga) "all" else "manga",
|
||||
"word" to query,
|
||||
)
|
||||
|
||||
return apiRequest("GET", "/search/$type/$word", parameters)
|
||||
}
|
||||
|
||||
override fun searchMangaParse(response: Response): MangasPage {
|
||||
val mangas = apiResponseParse<PixivSearchResults>(response)
|
||||
.run { manga ?: illustManga }?.data
|
||||
?.filter { it.isAdContainer != true }
|
||||
?.map(::searchResultParse)
|
||||
.orEmpty()
|
||||
|
||||
return MangasPage(mangas, hasNextPage = mangas.isNotEmpty())
|
||||
}
|
||||
|
||||
private fun searchResultParse(result: PixivSearchResult) = SManga.create().apply {
|
||||
url = "/artworks/${result.id!!}"
|
||||
title = result.title ?: ""
|
||||
thumbnail_url = result.url
|
||||
}
|
||||
|
||||
override fun latestUpdatesRequest(page: Int): Request =
|
||||
searchMangaRequest(page, "漫画", FilterList())
|
||||
|
||||
override fun latestUpdatesParse(response: Response): MangasPage =
|
||||
searchMangaParse(response)
|
||||
|
||||
override fun mangaDetailsRequest(manga: SManga): Request =
|
||||
illustRequest(manga.url)
|
||||
|
||||
override fun mangaDetailsParse(response: Response) = SManga.create().apply {
|
||||
val illust = apiResponseParse<PixivIllust>(response)
|
||||
|
||||
url = "/artworks/${illust.id!!}"
|
||||
title = illust.title ?: ""
|
||||
artist = illust.userName
|
||||
author = illust.userName
|
||||
description = illust.description?.let { Jsoup.parseBodyFragment(it).wholeText() }
|
||||
genre = illust.tags?.tags?.mapNotNull { it.tag }?.joinToString()
|
||||
thumbnail_url = illust.urls?.thumb
|
||||
update_strategy = UpdateStrategy.ONLY_FETCH_ONCE
|
||||
}
|
||||
|
||||
override fun fetchChapterList(manga: SManga): Observable<List<SChapter>> =
|
||||
fetchIllust(manga.url).map { illust ->
|
||||
listOf(
|
||||
SChapter.create().apply {
|
||||
url = manga.url
|
||||
name = "Oneshot"
|
||||
date_upload = illust.uploadDate?.let(::parseTimestamp) ?: 0
|
||||
chapter_number = 0F
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
override fun chapterListRequest(manga: SManga): Request =
|
||||
throw IllegalStateException("Not used")
|
||||
|
||||
override fun chapterListParse(response: Response): List<SChapter> =
|
||||
throw IllegalStateException("Not used")
|
||||
|
||||
override fun pageListRequest(chapter: SChapter): Request =
|
||||
apiRequest("GET", "/illust/${illustUrlToId(chapter.url)}/pages")
|
||||
|
||||
override fun pageListParse(response: Response): List<Page> =
|
||||
apiResponseParse<List<PixivPage>>(response)
|
||||
.mapIndexed { i, it -> Page(index = i, imageUrl = it.urls?.original) }
|
||||
|
||||
override fun imageUrlRequest(page: Page): Request =
|
||||
throw IllegalStateException("Not used")
|
||||
|
||||
override fun imageUrlParse(response: Response): String =
|
||||
throw IllegalStateException("Not used")
|
||||
|
||||
override fun getMangaUrl(manga: SManga): String =
|
||||
baseUrl + manga.url
|
||||
|
||||
override fun getChapterUrl(chapter: SChapter): String =
|
||||
baseUrl + chapter.url
|
||||
|
||||
override fun getFilterList() = FilterList(listOf(SortFilter(), NonMangaFilter()))
|
||||
}
|
|
@ -0,0 +1,9 @@
|
|||
package eu.kanade.tachiyomi.extension.all.pixiv
|
||||
|
||||
import eu.kanade.tachiyomi.source.Source
|
||||
import eu.kanade.tachiyomi.source.SourceFactory
|
||||
|
||||
class PixivFactory : SourceFactory {
|
||||
override fun createSources(): List<Source> =
|
||||
listOf("all", "ja", "en", "ko", "zh").map { lang -> Pixiv(lang) }
|
||||
}
|
|
@ -0,0 +1,68 @@
|
|||
package eu.kanade.tachiyomi.extension.all.pixiv
|
||||
|
||||
import kotlinx.serialization.Serializable
|
||||
|
||||
@Serializable
|
||||
internal data class PixivApiResponse<T>(
|
||||
val error: Boolean,
|
||||
val body: T? = null,
|
||||
val message: String? = null,
|
||||
)
|
||||
|
||||
@Serializable
|
||||
internal data class PixivIllust(
|
||||
val id: Int? = null,
|
||||
val title: String? = null,
|
||||
val userName: String? = null,
|
||||
val description: String? = null,
|
||||
val tags: PixivTags? = null,
|
||||
val urls: PixivImageUrls? = null,
|
||||
val uploadDate: String? = null,
|
||||
)
|
||||
|
||||
@Serializable
|
||||
internal data class PixivSearchResult(
|
||||
val id: Int? = null,
|
||||
val title: String? = null,
|
||||
val url: String? = null,
|
||||
val isAdContainer: Boolean? = null,
|
||||
)
|
||||
|
||||
@Serializable
|
||||
internal data class PixivTag(
|
||||
val tag: String? = null,
|
||||
)
|
||||
|
||||
@Serializable
|
||||
internal data class PixivTags(
|
||||
val tags: List<PixivTag>? = null,
|
||||
)
|
||||
|
||||
@Serializable
|
||||
internal data class PixivSearchResults(
|
||||
val manga: PixivSearchResultsIllusts? = null,
|
||||
val illustManga: PixivSearchResultsIllusts? = null,
|
||||
val popular: PixivSearchResultsPopular? = null,
|
||||
)
|
||||
|
||||
@Serializable
|
||||
internal data class PixivSearchResultsIllusts(
|
||||
val data: List<PixivSearchResult>? = null,
|
||||
)
|
||||
|
||||
@Serializable
|
||||
internal data class PixivSearchResultsPopular(
|
||||
val permanent: List<PixivSearchResult>? = null,
|
||||
val recent: List<PixivSearchResult>? = null,
|
||||
)
|
||||
|
||||
@Serializable
|
||||
internal data class PixivPage(
|
||||
val urls: PixivImageUrls? = null,
|
||||
)
|
||||
|
||||
@Serializable
|
||||
internal data class PixivImageUrls(
|
||||
val original: String? = null,
|
||||
val thumb: String? = null,
|
||||
)
|
Loading…
Reference in New Issue