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

Luscious: Added date and filter (#7146) 

* Update Luscious.kt

* Update LusciousGenerator.kt
This commit is contained in:
Johannes Joens 2021-05-21 22:13:21 +12:00 committed by GitHub
parent 9ff1129a39
commit f0caf41d32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/Luscious.kt
View File

@ -71,6 +71,7 @@ abstract class Luscious(
private fun buildAlbumListRequestInput(page: Int, filters: FilterList, query: String = ""): JsonObject {
val sortByFilter = filters.findInstance<SortBySelectFilter>()!!
val albumTypeFilter = filters.findInstance<AlbumTypeSelectFilter>()!!
val selectionFilter = filters.findInstance<SelectionSelectFilter>()!!
val interestsFilter = filters.findInstance<InterestGroupFilter>()!!
val languagesFilter = filters.findInstance<LanguageGroupFilter>()!!
val tagsFilter = filters.findInstance<TagTextFilters>()!!
@ -80,7 +81,6 @@ abstract class Luscious(
val contentTypeFilter = filters.findInstance<ContentTypeSelectFilter>()!!
val albumSizeFilter = filters.findInstance<AlbumSizeSelectFilter>()!!
val restrictGenresFilter = filters.findInstance<RestrictGenresSelectFilter>()!!
return JsonObject().apply {
add(
"input",
@ -97,6 +97,9 @@ abstract class Luscious(
if (albumTypeFilter.selected != FILTER_VALUE_IGNORE)
add(albumTypeFilter.toJsonObject("album_type"))
if (selectionFilter.selected != FILTER_VALUE_IGNORE)
add(selectionFilter.toJsonObject("selection"))
if (albumSizeFilter.selected != FILTER_VALUE_IGNORE)
add(albumSizeFilter.toJsonObject("picture_count_rank"))
@ -254,7 +257,7 @@ abstract class Luscious(
else -> it["thumbnails"][getResolutionPref()?.toInt()!!]["url"].asString
}
chapter.name = it["title"].asString
//chapter.date_upload = it["created"].asLong // not parsing correctly for some reason
chapter.date_upload = "${it["created"].asLong}000".toLong()
chapter.chapter_number = it["position"].asInt.toFloat()
chapters.add(chapter)
}
@ -447,6 +450,17 @@ abstract class Luscious(
query
)
override fun fetchSearchManga(page: Int, query: String, filters: FilterList): Observable<MangasPage> {
return if (query.startsWith("ID:")){
val id = query.substringAfterLast("ID:")
client.newCall(buildAlbumInfoRequest(id))
.asObservableSuccess()
.map { MangasPage(listOf(detailsParse(it)), false) }
} else {
super.fetchSearchManga(page, query, filters)
}
}
class TriStateFilterOption(name: String, val value: String) : Filter.TriState(name)
abstract class TriStateGroupFilter(name: String, options: List<TriStateFilterOption>) : Filter.Group<TriStateFilterOption>(name, options) {
val included: List<String>
@ -495,6 +509,7 @@ abstract class Luscious(
class AlbumTypeSelectFilter(options: List<SelectFilterOption>) : SelectFilter("Album Type", options)
class ContentTypeSelectFilter(options: List<SelectFilterOption>) : SelectFilter("Content Type", options)
class RestrictGenresSelectFilter(options: List<SelectFilterOption>) : SelectFilter("Restrict Genres", options)
class SelectionSelectFilter(options: List<SelectFilterOption>) : SelectFilter("Selection", options)
class AlbumSizeSelectFilter(options: List<SelectFilterOption>) : SelectFilter("Album Size", options)
class TagTextFilters : TextFilter("Tags")
class CreatorTextFilters : TextFilter("Uploader")
@ -506,6 +521,7 @@ abstract class Luscious(
AlbumTypeSelectFilter(getAlbumTypeFilters()),
ContentTypeSelectFilter(getContentTypeFilters()),
AlbumSizeSelectFilter(getAlbumSizeFilters()),
SelectionSelectFilter(getSelectionFilters()),
RestrictGenresSelectFilter(getRestrictGenresFilters()),
InterestGroupFilter(getInterestFilters()),
LanguageGroupFilter(getLanguageFilters()),
@ -586,6 +602,17 @@ abstract class Luscious(
SelectFilterOption("Strict", "strict")
)
private fun getSelectionFilters() = listOf(
SelectFilterOption("All", "all"),
SelectFilterOption("No Votes", "not_voted"),
SelectFilterOption("Downvoted", "downvoted"),
SelectFilterOption("Animated", "animated"),
SelectFilterOption("Banned", "banned"),
SelectFilterOption("Made by People You Follow", "made_by_following"),
SelectFilterOption("Faved by People You Follow", "faved_by_following"),
)
private fun getContentTypeFilters() = listOf(
SelectFilterOption("All", FILTER_VALUE_IGNORE),
SelectFilterOption("Hentai", "0"),

2
multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/LusciousGenerator.kt
View File

@ -10,7 +10,7 @@ class LusciousGenerator : ThemeSourceGenerator {
override val themeClass = "Luscious"
override val baseVersionCode: Int = 9
override val baseVersionCode: Int = 10
override val sources = listOf(
MultiLang("Luscious", "https://www.luscious.net", listOf("en","ja", "es", "it", "de", "fr", "zh", "ko", "other", "pt", "th", "all"), isNsfw = true, className = "LusciousFactory", overrideVersionCode = 2),