diff --git a/src/en/readcomiconline/build.gradle b/src/en/readcomiconline/build.gradle index f3864a149..3aeb23827 100644 --- a/src/en/readcomiconline/build.gradle +++ b/src/en/readcomiconline/build.gradle @@ -5,7 +5,7 @@ ext { appName = 'Tachiyomi: ReadComicOnline' pkgNameSuffix = 'en.readcomiconline' extClass = '.Readcomiconline' - extVersionCode = 7 + extVersionCode = 8 libVersion = '1.2' } diff --git a/src/en/readcomiconline/src/eu/kanade/tachiyomi/extension/en/readcomiconline/Readcomiconline.kt b/src/en/readcomiconline/src/eu/kanade/tachiyomi/extension/en/readcomiconline/Readcomiconline.kt index 0861cacc7..e2f75fe2c 100644 --- a/src/en/readcomiconline/src/eu/kanade/tachiyomi/extension/en/readcomiconline/Readcomiconline.kt +++ b/src/en/readcomiconline/src/eu/kanade/tachiyomi/extension/en/readcomiconline/Readcomiconline.kt @@ -15,7 +15,6 @@ import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.online.ParsedHttpSource import java.text.SimpleDateFormat import java.util.Locale -import java.util.regex.Pattern import okhttp3.FormBody import okhttp3.OkHttpClient import okhttp3.Request @@ -74,7 +73,6 @@ class Readcomiconline : ConfigurableSource, ParsedHttpSource() { for (filter in if (filters.isEmpty()) getFilterList() else filters) { when (filter) { - is Author -> add("authorArtist", filter.state) is Status -> add("status", arrayOf("", "Completed", "Ongoing")[filter.state]) is GenreList -> filter.state.forEach { genre -> add("genres", genre.state.toString()) } } @@ -127,33 +125,20 @@ class Readcomiconline : ConfigurableSource, ParsedHttpSource() { override fun pageListRequest(chapter: SChapter) = GET(baseUrl + chapter.url + "&quality=${qualitypref()}", headers) override fun pageListParse(response: Response): List { - val pages = mutableListOf() - //language=RegExp - val p = Pattern.compile("""lstImages.push\("(.+?)"""") - val m = p.matcher(response.body()!!.string()) - - var i = 0 - while (m.find()) { - pages.add(Page(i++, "", m.group(1))) - } - return pages + return Regex("""lstImages\.push\("(http.*)"\)""").findAll(response.body()!!.string()) + .toList() + .mapIndexed { i, mr -> Page(i, "", mr.groupValues[1]) } } - override fun pageListParse(document: Document): List { - throw Exception("Not used") - } + override fun pageListParse(document: Document): List = throw UnsupportedOperationException("Not used") - override fun imageUrlRequest(page: Page) = GET(page.url) - - override fun imageUrlParse(document: Document) = "" + override fun imageUrlParse(document: Document) = throw UnsupportedOperationException("Not used") private class Status : Filter.TriState("Completed") - private class Author : Filter.Text("Author") private class Genre(name: String) : Filter.TriState(name) private class GenreList(genres: List) : Filter.Group("Genres", genres) override fun getFilterList() = FilterList( - Author(), Status(), GenreList(getGenreList()) )