Fix for vi.blogtruyen extension (#124)

* Update build.gradle

* Update Blogtruyen.kt

* Update Blogtruyen.kt

Update Genre list
This commit is contained in:
lostering 2017-11-22 14:40:10 -06:00 committed by inorichi
parent 5fabca41a9
commit c6a2699d75
2 changed files with 20 additions and 13 deletions

View File

@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
ext { ext {
appName = 'Tachiyomi: BlogTruyen' appName = 'Tachiyomi: Blogtruyen'
pkgNameSuffix = "vi.blogtruyen" pkgNameSuffix = "vi.blogtruyen"
extClass = '.Blogtruyen' extClass = '.Blogtruyen'
extVersionCode = 1 extVersionCode = 1

View File

@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.source.online.vietnamese package eu.kanade.tachiyomi.extension.vi.blogtruyen
import android.util.Log import android.util.Log
import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.GET
@ -14,7 +14,7 @@ import java.text.SimpleDateFormat
class Blogtruyen : ParsedHttpSource() { class Blogtruyen : ParsedHttpSource() {
override val name = "BlogTruyen" override val name = "Blogtruyen"
override val baseUrl = "http://blogtruyen.com" override val baseUrl = "http://blogtruyen.com"
@ -26,14 +26,14 @@ class Blogtruyen : ParsedHttpSource() {
override fun popularMangaSelector() = "div.list span.tiptip.fs-12.ellipsis" override fun popularMangaSelector() = "div.list span.tiptip.fs-12.ellipsis"
override fun latestUpdatesSelector() = popularMangaSelector() override fun latestUpdatesSelector() = "section.list-mainpage.listview > div > div > div > div.fl-l"
override fun popularMangaRequest(page: Int): Request { override fun popularMangaRequest(page: Int): Request {
return GET("$baseUrl/ajax/Search/AjaxLoadListManga?key=tatca&orderBy=3&p=$page", headers) return GET("$baseUrl/ajax/Search/AjaxLoadListManga?key=tatca&orderBy=3&p=$page", headers)
} }
override fun latestUpdatesRequest(page: Int): Request { override fun latestUpdatesRequest(page: Int): Request {
return GET("$baseUrl/ajax/Search/AjaxLoadListManga?key=tatca&orderBy=5&p=$page", headers) return GET("$baseUrl/page-$page", headers)
} }
override fun popularMangaFromElement(element: Element): SManga { override fun popularMangaFromElement(element: Element): SManga {
@ -46,25 +46,31 @@ class Blogtruyen : ParsedHttpSource() {
} }
override fun latestUpdatesFromElement(element: Element): SManga { override fun latestUpdatesFromElement(element: Element): SManga {
return popularMangaFromElement(element) val manga = SManga.create()
element.select("a").first().let {
manga.setUrlWithoutDomain(it.attr("href"))
manga.title = element.select("img").first().attr("alt").toString()
//manga.thumbnail_url = element.select("img").first().attr("src").toString()
}
return manga
} }
override fun popularMangaNextPageSelector() = "div.paging:last-child:not(.current_page)" override fun popularMangaNextPageSelector() = "div.paging:last-child:not(.current_page)"
override fun latestUpdatesNextPageSelector() = popularMangaNextPageSelector() override fun latestUpdatesNextPageSelector() = "ul.pagination.paging.list-unstyled > li:nth-last-child(2) > a"
override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
var temp = "$baseUrl/timkiem/nangcao/1/0" var temp = "$baseUrl/timkiem/nangcao/1/0"
val genres = mutableListOf<String>() val genres = mutableListOf<Int>()
val genresEx = mutableListOf<String>() val genresEx = mutableListOf<Int>()
var aut = "" var aut = ""
(if (filters.isEmpty()) getFilterList() else filters).forEach { filter -> (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
when (filter) { when (filter) {
is GenreList -> filter.state.forEach { is GenreList -> filter.state.forEach {
genre -> genre ->
when (genre.state) { when (genre.state) {
Filter.TriState.STATE_INCLUDE -> genres.add(genre.name.toLowerCase()) Filter.TriState.STATE_INCLUDE -> genres.add(genre.id)
Filter.TriState.STATE_EXCLUDE -> genresEx.add(genre.name.toLowerCase()) Filter.TriState.STATE_EXCLUDE -> genresEx.add(genre.id)
} }
} }
is Author -> { is Author -> {
@ -173,6 +179,7 @@ class Blogtruyen : ParsedHttpSource() {
Genre("Harem", 12), Genre("Harem", 12),
Genre("Historical", 13), Genre("Historical", 13),
Genre("Horror", 14), Genre("Horror", 14),
Genre("Isekai/Dị Giới", 63),
Genre("Josei", 15), Genre("Josei", 15),
Genre("Live Action", 16), Genre("Live Action", 16),
Genre("Magic", 46), Genre("Magic", 46),
@ -184,7 +191,7 @@ class Blogtruyen : ParsedHttpSource() {
Genre("Mecha", 21), Genre("Mecha", 21),
Genre("Mystery", 22), Genre("Mystery", 22),
Genre("Nấu ăn", 56), Genre("Nấu ăn", 56),
Genre("NTR", 61), Genre("NTR", 62),
Genre("One shot", 23), Genre("One shot", 23),
Genre("Psychological", 24), Genre("Psychological", 24),
Genre("Romance", 25), Genre("Romance", 25),