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

Fix page order not following site's default content specific ordering (#5532)

This commit is contained in:
vaginadesolator 2021-01-24 22:27:50 +08:00 committed by GitHub
parent fcbab38aa1
commit aacf56d0c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ ext {
extName = 'Luscious'
pkgNameSuffix = 'all.luscious'
extClass = '.LusciousFactory'
extVersionCode = 1
extVersionCode = 2
libVersion = '1.2'
containsNsfw = true
}

37
src/all/luscious/src/eu/kanade/tachiyomi/extension/all/luscious/Luscious.kt
View File

@ -153,7 +153,7 @@ class Luscious(override val lang: String, private val lusLang: String) : HttpSou
// Pages
private fun buildAlbumPicturesRequestInput(id: String, page: Int): JsonObject {
private fun buildAlbumPicturesRequestInput(id: String, page: Int, sortPagesByOption: String): JsonObject {
return JsonObject().apply {
addProperty(
"input",
@ -169,14 +169,15 @@ class Luscious(override val lang: String, private val lusLang: String) : HttpSou
)
}
)
addProperty("display", sortPagesByOption)
addProperty("page", page)
}
)
}
}
private fun buildAlbumPicturesPageUrl(id: String, page: Int): String {
val input = buildAlbumPicturesRequestInput(id, page)
private fun buildAlbumPicturesPageUrl(id: String, page: Int, sortPagesByOption: String): String {
val input = buildAlbumPicturesRequestInput(id, page, sortPagesByOption)
return HttpUrl.parse(apiBaseUrl)!!.newBuilder()
.addQueryParameter("operationName", "AlbumListOwnPictures")
.addQueryParameter("query", ALBUM_PICTURES_REQUEST_GQL)
@ -184,7 +185,7 @@ class Luscious(override val lang: String, private val lusLang: String) : HttpSou
.toString()
}
private fun parseAlbumPicturesResponse(response: Response): List<Page> {
private fun parseAlbumPicturesResponse(response: Response, sortPagesByOption: String): List<Page> {
val id = response.request().url().queryParameter("variables").toString()
.let { gson.fromJson<JsonObject>(it)["input"]["filters"].asJsonArray }
@ -198,16 +199,29 @@ class Luscious(override val lang: String, private val lusLang: String) : HttpSou
Page(index, imageUrl = it["url_to_original"].asString)
} + if (data["info"]["total_pages"].asInt > 1) { // get 2nd page onwards
(ITEMS_PER_PAGE until data["info"]["total_items"].asInt).chunked(ITEMS_PER_PAGE).mapIndexed { page, indices ->
indices.map { Page(it, url = buildAlbumPicturesPageUrl(id, page + 2)) }
indices.map { Page(it, url = buildAlbumPicturesPageUrl(id, page + 2, sortPagesByOption)) }
}.flatten()
} else emptyList()
}
private fun getAlbumSortPagesOption(chapter: SChapter): Observable<String> {
return client.newCall(GET(chapter.url))
.asObservableSuccess()
.map {
val sortByKey = it.asJsoup().select(".o-input-select:contains(Sorted By) .o-select-value")?.text() ?: ""
ALBUM_PICTURES_SORT_OPTIONS.getValue(sortByKey)
}
}
override fun fetchPageList(chapter: SChapter): Observable<List<Page>> {
val id = chapter.url.substringAfterLast("_").removeSuffix("/")
return client.newCall(GET(buildAlbumPicturesPageUrl(id, 1)))
return getAlbumSortPagesOption(chapter)
.concatMap { sortPagesByOption ->
client.newCall(GET(buildAlbumPicturesPageUrl(id, 1, sortPagesByOption)))
.asObservableSuccess()
.map { parseAlbumPicturesResponse(it) }
.map { parseAlbumPicturesResponse(it, sortPagesByOption) }
}
}
override fun pageListParse(response: Response): List<Page> = throw UnsupportedOperationException("Not used")
@ -509,6 +523,11 @@ class Luscious(override val lang: String, private val lusLang: String) : HttpSou
companion object {
private val ALBUM_PICTURES_SORT_OPTIONS = hashMapOf(
Pair("Sort By Newest", "date_newest"),
Pair("Sort By Rating", "rating_all_time")
).withDefault { "position" }
private const val ITEMS_PER_PAGE = 50
private val ORDINAL_SUFFIXES = listOf("st", "nd", "rd", "th")
@ -528,9 +547,9 @@ class Luscious(override val lang: String, private val lusLang: String) : HttpSou
const val PORTUGESE_LUS_LANG_VAL = "100"
const val THAI_LUS_LANG_VAL = "101"
private const val POPULAR_DEFAULT_SORT_STATE = 18
private const val POPULAR_DEFAULT_SORT_STATE = 0
private const val LATEST_DEFAULT_SORT_STATE = 7
private const val SEARCH_DEFAULT_SORT_STATE = 18
private const val SEARCH_DEFAULT_SORT_STATE = 0
private const val FILTER_VALUE_IGNORE = "<ignore>"