INSANEMODE/aniyomi-extensions-backup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Kotlin, coroutines, kolinter (#4363)

Browse Source 
* Update kolinter, address some build warnings

* Update to Kotlin 1.4.10, coroutines 1.3.9
This commit is contained in:
arkon
2020-09-13 18:33:59 -04:00
committed by GitHub
parent 19a3cd2367
commit 016653bdc0
229 changed files with 9702 additions and 8853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/all/fmreader/src/eu/kanade/tachiyomi/extension/all/fmreader/FMReader.kt
View File

@ -10,8 +10,6 @@ import eu.kanade.tachiyomi.source.model.SChapter
import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.online.ParsedHttpSource
import eu.kanade.tachiyomi.util.asJsoup
import java.nio.charset.Charset
import java.util.Calendar
import okhttp3.Headers
import okhttp3.HttpUrl
import okhttp3.OkHttpClient
@ -20,6 +18,8 @@ import okhttp3.Response
import org.jsoup.nodes.Document
import org.jsoup.nodes.Element
import org.jsoup.select.Elements
import java.nio.charset.Charset
import java.util.Calendar
/**
* For sites based on the Flat-Manga CMS
@ -81,11 +81,14 @@ abstract class FMReader(
url.addQueryParameter("ungenre", ungenre)
}
is SortBy -> {
url.addQueryParameter("sort", when (filter.state?.index) {
0 -> "name"
1 -> "views"
else -> "last_update"
})
url.addQueryParameter(
"sort",
when (filter.state?.index) {
0 -> "name"
1 -> "views"
else -> "last_update"
}
)
if (filter.state?.ascending == true)
url.addQueryParameter("sort_type", "ASC")
}

10
src/all/fmreader/src/eu/kanade/tachiyomi/extension/all/fmreader/FMReaderFactory.kt
View File

@ -11,7 +11,6 @@ import eu.kanade.tachiyomi.source.model.Page
import eu.kanade.tachiyomi.source.model.SChapter
import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.util.asJsoup
import java.net.URLEncoder
import okhttp3.FormBody
import okhttp3.Interceptor
import okhttp3.OkHttpClient
@ -20,6 +19,7 @@ import okhttp3.Response
import org.jsoup.nodes.Document
import org.jsoup.nodes.Element
import rx.Observable
import java.net.URLEncoder
class FMReaderFactory : SourceFactory {
override fun createSources(): List<Source> = listOf(
@ -242,9 +242,11 @@ class SayTruyen : FMReader("Say Truyen", "https://saytruyen.com", "vi") {
}
override fun chapterListParse(response: Response): List<SChapter> {
return response.asJsoup().let { document ->
document.select(chapterListSelector()).map { chapterFromElement(it).apply {
scanlator = document.select("div.row li:has(b:contains(Nhóm dịch)) small").text()
} }
document.select(chapterListSelector()).map {
chapterFromElement(it).apply {
scanlator = document.select("div.row li:has(b:contains(Nhóm dịch)) small").text()
}
}
}
}
override fun pageListParse(document: Document): List<Page> = super.pageListParse(document).onEach { it.imageUrl!!.trim() }