Anchira - Apply API changes (#191)
* Anchira - Apply API changes * Anchira - Update version code
This commit is contained in:
parent
f612bc1c3f
commit
c2555b3e44
src/en/anchira
@ -6,7 +6,7 @@ ext {
|
|||||||
extName = 'Anchira'
|
extName = 'Anchira'
|
||||||
pkgNameSuffix = 'en.anchira'
|
pkgNameSuffix = 'en.anchira'
|
||||||
extClass = '.Anchira'
|
extClass = '.Anchira'
|
||||||
extVersionCode = 2
|
extVersionCode = 3
|
||||||
isNsfw = true
|
isNsfw = true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -70,7 +70,7 @@ class Anchira : HttpSource(), ConfigurableSource {
|
|||||||
SManga.create().apply {
|
SManga.create().apply {
|
||||||
url = "/g/${it.id}/${it.key}"
|
url = "/g/${it.id}/${it.key}"
|
||||||
title = it.title
|
title = it.title
|
||||||
thumbnail_url = "$cdnUrl/${it.id}/${it.key}/m/${it.cover.name}"
|
thumbnail_url = "$cdnUrl/${it.id}/${it.key}/m/${it.thumbnailIndex + 1}"
|
||||||
artist = it.tags.filter { it.namespace == 1 }.joinToString(", ") { it.name }
|
artist = it.tags.filter { it.namespace == 1 }.joinToString(", ") { it.name }
|
||||||
author = it.tags.filter { it.namespace == 2 }.joinToString(", ") { it.name }
|
author = it.tags.filter { it.namespace == 2 }.joinToString(", ") { it.name }
|
||||||
genre = prepareTags(it.tags)
|
genre = prepareTags(it.tags)
|
||||||
@ -160,7 +160,7 @@ class Anchira : HttpSource(), ConfigurableSource {
|
|||||||
url = "/g/${data.id}/${data.key}"
|
url = "/g/${data.id}/${data.key}"
|
||||||
title = data.title
|
title = data.title
|
||||||
thumbnail_url =
|
thumbnail_url =
|
||||||
"$cdnUrl/${data.id}/${data.key}/b/${data.data[data.thumbnailIndex].name}"
|
"$cdnUrl/${data.id}/${data.key}/b/${data.thumbnailIndex + 1}"
|
||||||
artist = data.tags.filter { it.namespace == 1 }.joinToString(", ") { it.name }
|
artist = data.tags.filter { it.namespace == 1 }.joinToString(", ") { it.name }
|
||||||
author = data.tags.filter { it.namespace == 2 }.joinToString(", ") { it.name }
|
author = data.tags.filter { it.namespace == 2 }.joinToString(", ") { it.name }
|
||||||
genre = prepareTags(data.tags)
|
genre = prepareTags(data.tags)
|
||||||
@ -205,10 +205,10 @@ class Anchira : HttpSource(), ConfigurableSource {
|
|||||||
val data = decodeBytes<Entry>(response.body, anchiraData.key)
|
val data = decodeBytes<Entry>(response.body, anchiraData.key)
|
||||||
val imageData = getImageData(data)
|
val imageData = getImageData(data)
|
||||||
|
|
||||||
return data.data.mapIndexed { i, img ->
|
return imageData.names.mapIndexed { i, name ->
|
||||||
Page(
|
Page(
|
||||||
i,
|
i,
|
||||||
imageUrl = "$cdnUrl/${data.id}/${imageData.key}/${imageData.hash}/b/${img.name}",
|
imageUrl = "$cdnUrl/${imageData.id}/${imageData.key}/${imageData.hash}/b/$name",
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -217,7 +217,7 @@ class Anchira : HttpSource(), ConfigurableSource {
|
|||||||
val keys = anchiraData.galleries.find { it.id == entry.id }
|
val keys = anchiraData.galleries.find { it.id == entry.id }
|
||||||
|
|
||||||
if (keys != null) {
|
if (keys != null) {
|
||||||
return ImageData(keys.id, keys.key, keys.hash)
|
return ImageData(keys.id, keys.key, keys.hash, keys.names)
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
@ -8,15 +8,10 @@ data class ListEntry(
|
|||||||
val id: Int,
|
val id: Int,
|
||||||
val key: String,
|
val key: String,
|
||||||
val title: String,
|
val title: String,
|
||||||
val cover: Image,
|
@SerialName("thumb_index") val thumbnailIndex: Int,
|
||||||
val tags: List<Tag> = emptyList(),
|
val tags: List<Tag> = emptyList(),
|
||||||
)
|
)
|
||||||
|
|
||||||
@Serializable
|
|
||||||
data class Image(
|
|
||||||
@SerialName("n") val name: String,
|
|
||||||
)
|
|
||||||
|
|
||||||
@Serializable
|
@Serializable
|
||||||
data class Tag(
|
data class Tag(
|
||||||
var name: String,
|
var name: String,
|
||||||
@ -38,7 +33,6 @@ data class Entry(
|
|||||||
@SerialName("published_at") val publishedAt: Long,
|
@SerialName("published_at") val publishedAt: Long,
|
||||||
val title: String,
|
val title: String,
|
||||||
@SerialName("thumb_index") val thumbnailIndex: Int,
|
@SerialName("thumb_index") val thumbnailIndex: Int,
|
||||||
val data: List<Image>,
|
|
||||||
val tags: List<Tag> = emptyList(),
|
val tags: List<Tag> = emptyList(),
|
||||||
val url: String? = null,
|
val url: String? = null,
|
||||||
)
|
)
|
||||||
@ -48,6 +42,7 @@ data class ImageData(
|
|||||||
val id: Int,
|
val id: Int,
|
||||||
val key: String,
|
val key: String,
|
||||||
val hash: String,
|
val hash: String,
|
||||||
|
val names: List<String>,
|
||||||
)
|
)
|
||||||
|
|
||||||
@Serializable
|
@Serializable
|
||||||
@ -56,6 +51,7 @@ data class EntryKey(
|
|||||||
val key: String,
|
val key: String,
|
||||||
val hash: String,
|
val hash: String,
|
||||||
val url: String?,
|
val url: String?,
|
||||||
|
val names: List<String> = emptyList(),
|
||||||
)
|
)
|
||||||
|
|
||||||
@Serializable
|
@Serializable
|
||||||
|
Loading…
x
Reference in New Issue
Block a user