Add libmanga module (#519)

Add libmanga module

src/ru/libmanga/build.gradle

@@ -2,9 +2,9 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 ext {
-    appName = 'Tachiyomi: Yaoilib'
+    appName = 'Tachiyomi: LibManga'
-    pkgNameSuffix = 'ru.yaoilib'
+    pkgNameSuffix = 'ru.libmanga'
-    extClass = '.Yaoilib'
+    extClass = '.LibMangaFactory'
     extVersionCode = 1
     extVersionSuffix = 1
     libVersion = '1.2'

src/ru/libmanga/src/eu/kanade/tachiyomi/extension/ru/libmanga/LibManga.kt

@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.extension.ru.mangalib
+package eu.kanade.tachiyomi.extension.ru.libmanga
 
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.source.model.*
@@ -11,11 +11,7 @@ import java.text.SimpleDateFormat
 import java.util.*
 import org.json.JSONObject
 
-class Mangalib : ParsedHttpSource() {
+open class LibManga(override val name: String, override val baseUrl: String, private val staticUrl: String) : ParsedHttpSource() {
-
-    override val name = "Mangalib"
-
-    override val baseUrl = "https://mangalib.me"
 
     override val lang = "ru"
 
@@ -76,13 +72,13 @@ class Mangalib : ParsedHttpSource() {
     override fun pageListParse(document: Document): List<Page> {
         val pages = mutableListOf<Page>()
         // Parse script
-        val script = document.select("script").first().html()
+        val script = document.select("script:containsData(window.__info)").first().html()
         val json: String = script.replace("window.__info = ", "")
         val chapterInfo = JSONObject(json)
         val pagesJson = chapterInfo.getJSONArray("pages")
         for (i in 0..(pagesJson.length() - 1)) {
             val page = pagesJson.getJSONObject(i)
-            pages.add(Page(page.getInt("page_slug"), "", "https://img1.mangalib.me" + chapterInfo.getString("imgUrl") + page.getString("page_image")))
+            pages.add(Page(page.getInt("page_slug"), "", staticUrl + chapterInfo.getString("imgUrl") + page.getString("page_image")))
         }
         return pages
     }
@@ -162,7 +158,7 @@ class Mangalib : ParsedHttpSource() {
     /*
     * Use console
     * Object.entries(__FILTER_ITEMS__.types).map(([k, v]) => `SearchFilter("${v.label}", "${v.id}")`).join(',\n')
-    * on https://mangalib.me/manga-list
+    * on /manga-list
     */
     private fun getCategoryList() = listOf(
             SearchFilter("Манга", "1"),
@@ -177,7 +173,7 @@ class Mangalib : ParsedHttpSource() {
     /*
     * Use console
     * Object.entries(__FILTER_ITEMS__.status).map(([k, v]) => `SearchFilter("${v.label}", "${v.id}")`).join(',\n')
-    * on https://mangalib.me/manga-list
+    * on /manga-list
     */
     private fun getStatusList() = listOf(
             SearchFilter("продолжается", "1"),
@@ -188,7 +184,7 @@ class Mangalib : ParsedHttpSource() {
     /*
     * Use console
     * __FILTER_ITEMS__.genres.map(it => `SearchFilter("${it.name}", "${it.id}")`).join(',\n')
-    * on https://mangalib.me/manga-list
+    * on /manga-list
     */
     private fun getGenreList() = listOf(
             SearchFilter("арт", "32"),

src/ru/libmanga/src/eu/kanade/tachiyomi/extension/ru/libmanga/LibMangaFactory.kt

@@ -0,0 +1,19 @@
+package eu.kanade.tachiyomi.extension.ru.libmanga
+
+import eu.kanade.tachiyomi.source.Source
+import eu.kanade.tachiyomi.source.SourceFactory
+
+class LibMangaFactory : SourceFactory {
+    override fun createSources(): List<Source> = getAllLibManga()
+}
+
+fun getAllLibManga(): List<Source> {
+    return listOf(
+            Mangalib(),
+            Yaoilib()
+    )
+}
+
+class Mangalib : LibManga("Mangalib", "https://mangalib.me", "https://img1.mangalib.me")
+
+class Yaoilib : LibManga("Yaoilib", "https://yaoilib.me", "https://img1.yaoilib.me")

src/ru/mangalib/build.gradle

@@ -1,13 +0,0 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-
-ext {
-    appName = 'Tachiyomi: Mangalib'
-    pkgNameSuffix = 'ru.mangalib'
-    extClass = '.Mangalib'
-    extVersionCode = 2
-    extVersionSuffix = 2
-    libVersion = '1.2'
-}
-
-apply from: "$rootDir/common.gradle"

src/ru/yaoilib/src/eu/kanade/tachiyomi/extension/ru/yaoilib/Yaoilib.kt

@@ -1,241 +0,0 @@
-package eu.kanade.tachiyomi.extension.ru.yaoilib
-
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.source.model.*
-import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.HttpUrl
-import okhttp3.Request
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-import java.text.SimpleDateFormat
-import java.util.*
-import org.json.JSONObject
-
-class Yaoilib : ParsedHttpSource() {
-
-    override val name = "Yaoilib"
-
-    override val baseUrl = "https://yaoilib.me"
-
-    override val lang = "ru"
-
-    override val supportsLatest = true
-
-    override fun popularMangaRequest(page: Int): Request =
-            GET("$baseUrl/manga-list?dir=desc&page=$page&sort=views", headers)
-
-    override fun popularMangaSelector() = "div.manga-list-item"
-
-    override fun popularMangaFromElement(element: Element): SManga {
-        val item = element.select("a.manga-list-item__content").first()
-        val manga = SManga.create()
-        manga.thumbnail_url = item.attr("data-src")
-        manga.setUrlWithoutDomain(item.attr("href"))
-        manga.title = item.select("h3.manga-list-item__name").first().text()
-        return manga
-    }
-
-    override fun popularMangaNextPageSelector() = "a[rel=\"next\"]"
-
-    override fun mangaDetailsParse(document: Document): SManga {
-        val body = document.select("div.section__body").first()
-        val manga = SManga.create()
-        manga.title = body.select(".manga__title").text()
-        manga.thumbnail_url = body.select(".manga__cover").attr("src")
-        manga.author = body.select(".info-list__row:nth-child(2) > a").text()
-        manga.artist = body.select(".info-list__row:nth-child(3) > a").text()
-        manga.status = when (body.select(".info-list__row:nth-child(4) > span").text()) {
-            "продолжается" -> SManga.ONGOING
-            "завершен" -> SManga.COMPLETED
-            else -> SManga.UNKNOWN
-        }
-        manga.genre = body.select(".info-list__row:has(strong:contains(Жанры)) > a").joinToString { it.text() }
-        manga.description = body.select(".info-desc__content").text()
-        return manga
-    }
-
-    override fun chapterListSelector() = "div.chapter-item"
-
-    override fun chapterFromElement(element: Element): SChapter {
-        val chapterLink = element.select("div.chapter-item__name > a").first()
-        val chapter = SChapter.create()
-        chapter.setUrlWithoutDomain(chapterLink.attr("href"))
-        chapter.name = chapterLink.text()
-        chapter.date_upload = SimpleDateFormat("dd.MM.yyyy", Locale.US)
-                .parse(element.select("div.chapter-item__date").text()).time
-        return chapter
-    }
-
-    override fun prepareNewChapter(chapter: SChapter, manga: SManga) {
-        """Глава\s(\d+)""".toRegex().find(chapter.name)?.let {
-            val number = it.groups[1]?.value!!
-            chapter.chapter_number = number.toFloat()
-        }
-    }
-
-    override fun pageListParse(document: Document): List<Page> {
-        val pages = mutableListOf<Page>()
-        // Parse script
-        val script = document.select("script:not([src])").first().html()
-        val json: String = script.replace("window.__info = ", "")
-        val chapterInfo = JSONObject(json)
-        val pagesJson = chapterInfo.getJSONArray("pages")
-        for (i in 0..(pagesJson.length() - 1)) {
-            val page = pagesJson.getJSONObject(i)
-            pages.add(Page(page.getInt("page_slug"), "", "https://img1.yaoilib.me" + chapterInfo.getString("imgUrl") + page.getString("page_image")))
-        }
-        return pages
-    }
-
-    override fun imageUrlParse(document: Document) = ""
-
-    override fun latestUpdatesRequest(page: Int): Request = GET(baseUrl, headers)
-
-    override fun latestUpdatesSelector() = "div.updates__left"
-
-    override fun latestUpdatesFromElement(element: Element): SManga {
-        val link = element.select("a").first()
-        val img = link.select("img").first()
-        val manga = SManga.create()
-        manga.thumbnail_url = img.attr("data-src")
-        manga.setUrlWithoutDomain(link.attr("href"))
-        manga.title = img.attr("alt")
-        return manga
-    }
-
-    override fun latestUpdatesNextPageSelector(): String? = null
-
-    override fun searchMangaSelector() = popularMangaSelector()
-
-    override fun searchMangaFromElement(element: Element): SManga = popularMangaFromElement(element)
-
-    override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/manga-list?page=$page")!!.newBuilder()
-        if (query.isNotEmpty()) {
-            url.addQueryParameter("name", query)
-        }
-        (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
-            when (filter) {
-                is CategoryList -> filter.state.forEach { category ->
-                    if (category.state != Filter.TriState.STATE_IGNORE) {
-                        url.addQueryParameter("types[]", category.id)
-                    }
-                }
-                is StatusList -> filter.state.forEach { status ->
-                    if (status.state != Filter.TriState.STATE_IGNORE) {
-                        url.addQueryParameter("status[]", status.id)
-                    }
-                }
-                is GenreList -> filter.state.forEach { genre ->
-                    if (genre.state != Filter.TriState.STATE_IGNORE) {
-                        url.addQueryParameter(if (genre.isIncluded()) "includeGenres[]" else "excludeGenres[]", genre.id)
-                    }
-                }
-                is OrderBy -> {
-                    url.addQueryParameter("dir", if (filter.state!!.ascending) "asc" else "desc")
-                    url.addQueryParameter("sort", arrayOf("rate", "name", "views", "created_at")[filter.state!!.index])
-                }
-            }
-        }
-        return GET(url.toString(), headers)
-    }
-
-    override fun searchMangaNextPageSelector() = popularMangaNextPageSelector()
-
-    private class SearchFilter(name: String, val id: String) : Filter.TriState(name)
-
-    private class CategoryList(categories: List<SearchFilter>) : Filter.Group<SearchFilter>("Категории", categories)
-    private class StatusList(statuses: List<SearchFilter>) : Filter.Group<SearchFilter>("Статус", statuses)
-    private class GenreList(genres: List<SearchFilter>) : Filter.Group<SearchFilter>("Жанры", genres)
-
-    override fun getFilterList() = FilterList(
-            CategoryList(getCategoryList()),
-            StatusList(getStatusList()),
-            GenreList(getGenreList()),
-            OrderBy()
-    )
-
-    private class OrderBy : Filter.Sort("Сортировка",
-            arrayOf("Рейтинг", "Имя", "Просмотры", "Дата"),
-            Filter.Sort.Selection(1, false))
-
-    /*
-    * Use console
-    * Object.entries(__FILTER_ITEMS__.types).map(([k, v]) => `SearchFilter("${v.label}", "${v.id}")`).join(',\n')
-    * on https:/yaoilib.me/manga-list
-    */
-    private fun getCategoryList() = listOf(
-            SearchFilter("Манга", "1"),
-            SearchFilter("OEL-манга", "4"),
-            SearchFilter("Манхва", "5"),
-            SearchFilter("Маньхуа", "6"),
-            SearchFilter("Сингл", "7"),
-            SearchFilter("Руманга", "8"),
-            SearchFilter("Комикс западный", "9")
-    )
-
-    /*
-    * Use console
-    * Object.entries(__FILTER_ITEMS__.status).map(([k, v]) => `SearchFilter("${v.label}", "${v.id}")`).join(',\n')
-    * on https://yaoilib.me/manga-list
-    */
-    private fun getStatusList() = listOf(
-            SearchFilter("продолжается", "1"),
-            SearchFilter("завершен", "2"),
-            SearchFilter("заморожен", "3")
-    )
-
-    /*
-    * Use console
-    * __FILTER_ITEMS__.genres.map(it => `SearchFilter("${it.name}", "${it.id}")`).join(',\n')
-    * on https://yaoilib.me/manga-list
-    */
-    private fun getGenreList() = listOf(
-            SearchFilter("арт", "32"),
-            SearchFilter("бара", "33"),
-            SearchFilter("боевик", "34"),
-            SearchFilter("боевые искусства", "35"),
-            SearchFilter("вампиры", "36"),
-            SearchFilter("гарем", "37"),
-            SearchFilter("гендерная интрига", "38"),
-            SearchFilter("героическое фэнтези", "39"),
-            SearchFilter("детектив", "40"),
-            SearchFilter("дзёсэй", "41"),
-            SearchFilter("додзинси", "42"),
-            SearchFilter("драма", "43"),
-            SearchFilter("игра", "44"),
-            SearchFilter("история", "45"),
-            SearchFilter("киберпанк", "46"),
-            SearchFilter("комедия", "47"),
-            SearchFilter("махо-сёдзё", "48"),
-            SearchFilter("меха", "49"),
-            SearchFilter("мистика", "50"),
-            SearchFilter("научная фантастика", "51"),
-            SearchFilter("повседневность", "52"),
-            SearchFilter("постапокалиптика", "53"),
-            SearchFilter("приключения", "54"),
-            SearchFilter("психология", "55"),
-            SearchFilter("романтика", "56"),
-            SearchFilter("самурайский боевик", "57"),
-            SearchFilter("сверхъестественное", "58"),
-            SearchFilter("сёдзё", "59"),
-            SearchFilter("сёдзё-ай", "60"),
-            SearchFilter("сёнэн", "61"),
-            SearchFilter("сёнэн-ай", "62"),
-            SearchFilter("спорт", "63"),
-            SearchFilter("сэйнэн", "64"),
-            SearchFilter("трагедия", "65"),
-            SearchFilter("триллер", "66"),
-            SearchFilter("ужасы", "67"),
-            SearchFilter("фантастика", "68"),
-            SearchFilter("фэнтези", "69"),
-            SearchFilter("школа", "70"),
-            SearchFilter("эротика", "71"),
-            SearchFilter("этти", "72"),
-            SearchFilter("юри", "73"),
-            SearchFilter("яой", "74"),
-            SearchFilter("ёнкома", "75"),
-            SearchFilter("кодомо", "76"),
-            SearchFilter("омегаверс", "77")
-    )
-}