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

My Reading Manga Updates (#13147) 

* MyReadingManga Updates

* Adds New Filter: Sort By
* Fixes "lateinit property title has not been initialized"
* Replaces deprecated capitalize

* Update Sort Order

Updates sort order. Matches default popular sort (random) on open.
This commit is contained in:
happywillow0 2022-08-23 08:56:44 -04:00 committed by GitHub
parent 74ef6efa7b
commit 2bc1ec5a77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ ext {
extName = 'MyReadingManga' extName = 'MyReadingManga'
pkgNameSuffix = 'all.myreadingmanga' pkgNameSuffix = 'all.myreadingmanga'
extClass = '.MyReadingMangaFactory' extClass = '.MyReadingMangaFactory'
extVersionCode = 43 extVersionCode = 44
isNsfw = true isNsfw = true
} }

17
src/all/myreadingmanga/src/eu/kanade/tachiyomi/extension/all/myreadingmanga/MyReadingManga.kt
View File

@ -76,6 +76,9 @@ open class MyReadingManga(override val lang: String, private val siteLang: Strin
if (filter is UriFilter) { if (filter is UriFilter) {
filter.addToUri(uri, "wpsolr_fq[${i - indexModifier}]") filter.addToUri(uri, "wpsolr_fq[${i - indexModifier}]")
} }
if (filter is SearchSortTypeList) {
uri.appendQueryParameter("wpsolr_sort", listOf("sort_by_random", "sort_by_date_desc", "sort_by_date_asc", "sort_by_relevancy_desc")[filter.state])
}
} }
uri.appendQueryParameter("wpsolr_page", page.toString()) uri.appendQueryParameter("wpsolr_page", page.toString())
@ -97,9 +100,10 @@ open class MyReadingManga(override val lang: String, private val siteLang: Strin
// Build Manga From Element // Build Manga From Element
private fun buildManga(titleElement: Element, thumbnailElement: Element?): SManga { private fun buildManga(titleElement: Element, thumbnailElement: Element?): SManga {
val manga = SManga.create() val manga = SManga.create().apply {
manga.setUrlWithoutDomain(titleElement.attr("href")) setUrlWithoutDomain(titleElement.attr("href"))
manga.title = cleanTitle(titleElement.text()) title = cleanTitle(titleElement.text())
}
if (thumbnailElement != null) manga.thumbnail_url = getThumbnail(getImage(thumbnailElement)) if (thumbnailElement != null) manga.thumbnail_url = getThumbnail(getImage(thumbnailElement))
return manga return manga
} }
@ -140,6 +144,7 @@ open class MyReadingManga(override val lang: String, private val siteLang: Strin
private fun mangaDetailsParse(document: Document, needCover: Boolean = true): SManga { private fun mangaDetailsParse(document: Document, needCover: Boolean = true): SManga {
return SManga.create().apply { return SManga.create().apply {
title = cleanTitle(document.select("h1").text())
author = cleanAuthor(document.select("h1").text()) author = cleanAuthor(document.select("h1").text())
artist = author artist = author
genre = document.select(".entry-header p a[href*=genre]").joinToString { it.text() } genre = document.select(".entry-header p a[href*=genre]").joinToString { it.text() }
@ -178,7 +183,7 @@ open class MyReadingManga(override val lang: String, private val siteLang: Strin
val date = parseDate(document.select(".entry-time").text()) val date = parseDate(document.select(".entry-time").text())
val mangaUrl = document.baseUri() val mangaUrl = document.baseUri()
val chfirstname = document.select(".chapter-class a[href*=$mangaUrl]")?.first()?.text()?.ifEmpty { "Ch. 1" }?.capitalize() val chfirstname = document.select(".chapter-class a[href*=$mangaUrl]")?.first()?.text()?.ifEmpty { "Ch. 1" }?.replaceFirstChar { it.titlecase() }
?: "Ch. 1" ?: "Ch. 1"
// create first chapter since its on main manga page // create first chapter since its on main manga page
chapters.add(createChapter("1", document.baseUri(), date, chfirstname)) chapters.add(createChapter("1", document.baseUri(), date, chfirstname))
@ -187,7 +192,7 @@ open class MyReadingManga(override val lang: String, private val siteLang: Strin
it.forEach { it.forEach {
if (!it.text().contains("Next »", true)) { if (!it.text().contains("Next »", true)) {
val pageNumber = it.text() val pageNumber = it.text()
val chname = document.select(".chapter-class a[href$=/$pageNumber/]")?.text()?.ifEmpty { "Ch. $pageNumber" }?.capitalize() val chname = document.select(".chapter-class a[href$=/$pageNumber/]")?.text()?.ifEmpty { "Ch. $pageNumber" }?.replaceFirstChar { it.titlecase() }
?: "Ch. $pageNumber" ?: "Ch. $pageNumber"
chapters.add(createChapter(it.text(), document.baseUri(), date, chname)) chapters.add(createChapter(it.text(), document.baseUri(), date, chname))
} }
@ -262,6 +267,7 @@ open class MyReadingManga(override val lang: String, private val siteLang: Strin
override fun getFilterList(): FilterList { override fun getFilterList(): FilterList {
return FilterList( return FilterList(
EnforceLanguageFilter(siteLang), EnforceLanguageFilter(siteLang),
SearchSortTypeList(),
GenreFilter(returnFilter(getCache(cachedPagesUrls["genres"]!!), ".tagcloud a[href*=/genre/]")), GenreFilter(returnFilter(getCache(cachedPagesUrls["genres"]!!), ".tagcloud a[href*=/genre/]")),
TagFilter(returnFilter(getCache(cachedPagesUrls["tags"]!!), ".tagcloud a[href*=/tag/]")), TagFilter(returnFilter(getCache(cachedPagesUrls["tags"]!!), ".tagcloud a[href*=/tag/]")),
CatFilter(returnFilter(getCache(cachedPagesUrls["categories"]!!), ".links a")), CatFilter(returnFilter(getCache(cachedPagesUrls["categories"]!!), ".links a")),
@ -282,6 +288,7 @@ open class MyReadingManga(override val lang: String, private val siteLang: Strin
private class CatFilter(CATID: Array<String>) : UriSelectFilter("Categories", "categories", arrayOf("Any", *CATID)) private class CatFilter(CATID: Array<String>) : UriSelectFilter("Categories", "categories", arrayOf("Any", *CATID))
private class PairingFilter(PAIR: Array<String>) : UriSelectFilter("Pairing", "pairing_str", arrayOf("Any", *PAIR)) private class PairingFilter(PAIR: Array<String>) : UriSelectFilter("Pairing", "pairing_str", arrayOf("Any", *PAIR))
private class ScanGroupFilter(GROUP: Array<String>) : UriSelectFilter("Scanlation Group", "group_str", arrayOf("Any", *GROUP)) private class ScanGroupFilter(GROUP: Array<String>) : UriSelectFilter("Scanlation Group", "group_str", arrayOf("Any", *GROUP))
private class SearchSortTypeList : Filter.Select<String>("Sort by", arrayOf("Random", "Newest", "Oldest", "More relevant"))
/** /**
* Class that creates a select filter. Each entry in the dropdown has a name and a display name. * Class that creates a select filter. Each entry in the dropdown has a name and a display name.