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

DeviantArt: Support multi-image posts (#7305) 

* Support multi-image posts

* Get substring before "/v1/" for better reliability

* Minor tweaks
This commit is contained in:
DokterKaj 2025-01-26 20:44:54 +08:00 committed by Draff
parent bc6e37008b
commit b0eda7b44d
No known key found for this signature in database
GPG Key ID: E8A89F3211677653
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
ext { ext {
extName = 'DeviantArt' extName = 'DeviantArt'
extClass = '.DeviantArt' extClass = '.DeviantArt'
extVersionCode = 3 extVersionCode = 4
isNsfw = true isNsfw = true
} }

33
src/all/deviantart/src/eu/kanade/tachiyomi/extension/all/deviantart/DeviantArt.kt
View File

@ -123,15 +123,14 @@ class DeviantArt : HttpSource() {
nextUrl = newDocument.selectFirst("[rel=next]")?.absUrl("href") nextUrl = newDocument.selectFirst("[rel=next]")?.absUrl("href")
} }
return indexChapterList(chapterList.toList()) return chapterList.toList().also(::indexChapterList)
} }
private fun parseToChapterList(document: Document): List<SChapter> { private fun parseToChapterList(document: Document): List<SChapter> {
val items = document.select("item") val items = document.select("item")
return items.map { return items.map {
val chapter = SChapter.create() SChapter.create().apply {
chapter.setUrlWithoutDomain(it.selectFirst("link")!!.text()) setUrlWithoutDomain(it.selectFirst("link")!!.text())
chapter.apply {
name = it.selectFirst("title")!!.text() name = it.selectFirst("title")!!.text()
date_upload = parseDate(it.selectFirst("pubDate")?.text()) date_upload = parseDate(it.selectFirst("pubDate")?.text())
scanlator = it.selectFirst("media|credit")?.text() scanlator = it.selectFirst("media|credit")?.text()
@ -139,24 +138,34 @@ class DeviantArt : HttpSource() {
} }
} }
private fun indexChapterList(chapterList: List<SChapter>): List<SChapter> { private fun indexChapterList(chapterList: List<SChapter>) {
// DeviantArt allows users to arrange galleries arbitrarily so we will // DeviantArt allows users to arrange galleries arbitrarily so we will
// primitively index the list by checking the first and last dates // primitively index the list by checking the first and last dates
return if (chapterList.first().date_upload > chapterList.last().date_upload) { if (chapterList.first().date_upload > chapterList.last().date_upload) {
chapterList.mapIndexed { i, chapter -> chapterList.forEachIndexed { i, chapter ->
chapter.apply { chapter_number = chapterList.size - i.toFloat() } chapter.chapter_number = chapterList.size - i.toFloat()
} }
} else { } else {
chapterList.mapIndexed { i, chapter -> chapterList.forEachIndexed { i, chapter ->
chapter.apply { chapter_number = i.toFloat() + 1 } chapter.chapter_number = i.toFloat() + 1
} }
} }
} }
override fun pageListParse(response: Response): List<Page> { override fun pageListParse(response: Response): List<Page> {
val document = response.asJsoup() val document = response.asJsoup()
val imageUrl = document.selectFirst("img[fetchpriority=high]")?.absUrl("src") val firstImageUrl = document.selectFirst("img[fetchpriority=high]")?.absUrl("src")
return listOf(Page(0, imageUrl = imageUrl)) val buttons = document.selectFirst("[draggable=false]")?.children()
return buttons?.mapIndexed { i, button ->
// Remove everything past "/v1/" to get original instead of thumbnail
val imageUrl = button.selectFirst("img")?.absUrl("src")?.substringBefore("/v1/")
Page(i, imageUrl = imageUrl)
}?.also {
// First image needs token to get original, which is included in firstImageUrl
it[0].imageUrl = firstImageUrl
}
// If there are no buttons then chapter only has one page
?: listOf(Page(0, imageUrl = firstImageUrl))
} }
override fun imageUrlParse(response: Response): String { override fun imageUrlParse(response: Response): String {