diff --git a/src/ru/libmanga/build.gradle b/src/ru/libmanga/build.gradle index fd931e240..e1d1e3310 100644 --- a/src/ru/libmanga/build.gradle +++ b/src/ru/libmanga/build.gradle @@ -5,7 +5,7 @@ ext { appName = 'Tachiyomi: LibManga' pkgNameSuffix = 'ru.libmanga' extClass = '.LibMangaFactory' - extVersionCode = 5 + extVersionCode = 6 libVersion = '1.2' } diff --git a/src/ru/libmanga/src/eu/kanade/tachiyomi/extension/ru/libmanga/LibManga.kt b/src/ru/libmanga/src/eu/kanade/tachiyomi/extension/ru/libmanga/LibManga.kt index 5b1c254ca..9390724de 100644 --- a/src/ru/libmanga/src/eu/kanade/tachiyomi/extension/ru/libmanga/LibManga.kt +++ b/src/ru/libmanga/src/eu/kanade/tachiyomi/extension/ru/libmanga/LibManga.kt @@ -11,10 +11,10 @@ import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.util.asJsoup import okhttp3.* import org.jsoup.nodes.Element +import rx.Observable import java.text.SimpleDateFormat import java.util.* import android.util.Base64.decode as base64Decode -import rx.Observable open class LibManga(override val name: String, override val baseUrl: String, private val staticUrl: String) : HttpSource() { @@ -186,6 +186,11 @@ open class LibManga(override val name: String, override val baseUrl: String, pri override fun imageUrlParse(response: Response): String = "" override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { + if (csrfToken.isEmpty()) { + val tokenResponse = client.newCall(popularMangaRequest(page)).execute() + val resBody = tokenResponse.body()!!.string() + csrfToken = "_token\" content=\"(.*)\"".toRegex().find(resBody)!!.groups[1]!!.value + } val url = HttpUrl.parse("$baseUrl/filterlist?page=$page")!!.newBuilder() if (query.isNotEmpty()) { url.addQueryParameter("name", query) @@ -263,7 +268,7 @@ open class LibManga(override val name: String, override val baseUrl: String, pri private class OrderBy : Filter.Sort("Сортировка", arrayOf("Рейтинг", "Имя", "Просмотры", "Дата", "Кол-во глав"), - Filter.Sort.Selection(0, false)) + Selection(0, false)) /* * Use console diff --git a/src/ru/libmanga/src/eu/kanade/tachiyomi/extension/ru/libmanga/LibMangaFactory.kt b/src/ru/libmanga/src/eu/kanade/tachiyomi/extension/ru/libmanga/LibMangaFactory.kt index 9aa615ab6..668cd1752 100644 --- a/src/ru/libmanga/src/eu/kanade/tachiyomi/extension/ru/libmanga/LibMangaFactory.kt +++ b/src/ru/libmanga/src/eu/kanade/tachiyomi/extension/ru/libmanga/LibMangaFactory.kt @@ -13,4 +13,4 @@ fun getAllLibManga(): List { ) } -class Mangalib : LibManga("Mangalib", "https://mangalib.me", "https://img1.mangalib.me") \ No newline at end of file +class Mangalib : LibManga("Mangalib", "https://mangalib.me", "https://img3.mangalib.me")