Draff
/
Tachiyomi-Extensions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mangadex: Add search by id (#886) 

mangadex: Add search by id
This commit is contained in:
Jonas 2019-03-10 12:55:06 +01:00 committed by Carlos
parent 39bd568543
commit 0c3c3a938a
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/all/mangadex/build.gradle
View File

@ -5,7 +5,7 @@ ext {
appName = 'Tachiyomi: MangaDex' appName = 'Tachiyomi: MangaDex'
pkgNameSuffix = 'all.mangadex' pkgNameSuffix = 'all.mangadex'
extClass = '.MangadexFactory' extClass = '.MangadexFactory'
extVersionCode = 51 extVersionCode = 52
libVersion = '1.2' libVersion = '1.2'
} }

29
src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/Mangadex.kt
View File

@ -133,11 +133,22 @@ open class Mangadex(override val lang: String, private val internalLang: String,
} }
override fun fetchSearchManga(page: Int, query: String, filters: FilterList): Observable<MangasPage> { override fun fetchSearchManga(page: Int, query: String, filters: FilterList): Observable<MangasPage> {
return getSearchClient(filters).newCall(searchMangaRequest(page, query, filters)) return if (query.startsWith(PREFIX_ID_SEARCH)) {
.asObservableSuccess() val realQuery = query.removePrefix(PREFIX_ID_SEARCH)
.map { response -> client.newCall(searchMangaByIdRequest(realQuery))
searchMangaParse(response) .asObservableSuccess()
} .map { response ->
val details = mangaDetailsParse(response)
details.url = "/manga/$realQuery/"
MangasPage(listOf(details), false)
}
} else {
getSearchClient(filters).newCall(searchMangaRequest(page, query, filters))
.asObservableSuccess()
.map { response ->
searchMangaParse(response)
}
}
} }
private fun getSearchClient(filters: FilterList): OkHttpClient { private fun getSearchClient(filters: FilterList): OkHttpClient {
@ -280,6 +291,10 @@ open class Mangadex(override val lang: String, private val internalLang: String,
return GET(baseUrl + API_MANGA + getMangaId(manga.url), headers) return GET(baseUrl + API_MANGA + getMangaId(manga.url), headers)
} }
private fun searchMangaByIdRequest(id: String): Request {
return GET(baseUrl + API_MANGA + id, headers)
}
private fun getMangaId(url: String): String { private fun getMangaId(url: String): String {
val lastSection = url.trimEnd('/').substringAfterLast("/") val lastSection = url.trimEnd('/').substringAfterLast("/")
return if (lastSection.toIntOrNull() != null) { return if (lastSection.toIntOrNull() != null) {
@ -296,7 +311,7 @@ open class Mangadex(override val lang: String, private val internalLang: String,
val json = JsonParser().parse(jsonData).asJsonObject val json = JsonParser().parse(jsonData).asJsonObject
val mangaJson = json.getAsJsonObject("manga") val mangaJson = json.getAsJsonObject("manga")
val chapterJson = json.getAsJsonObject("chapter") val chapterJson = json.getAsJsonObject("chapter")
manga.title = baseUrl + mangaJson.get("title").string manga.title = mangaJson.get("title").string
manga.thumbnail_url = cdnUrl + mangaJson.get("cover_url").string manga.thumbnail_url = cdnUrl + mangaJson.get("cover_url").string
manga.description = cleanString(mangaJson.get("description").string) manga.description = cleanString(mangaJson.get("description").string)
manga.author = mangaJson.get("author").string manga.author = mangaJson.get("author").string
@ -646,6 +661,8 @@ open class Mangadex(override val lang: String, private val internalLang: String,
private const val API_MANGA = "/api/manga/" private const val API_MANGA = "/api/manga/"
private const val API_CHAPTER = "/api/chapter/" private const val API_CHAPTER = "/api/chapter/"
private const val PREFIX_ID_SEARCH = "id:"
private val sortables = listOf( private val sortables = listOf(
Triple("Update date", 0, 1), Triple("Update date", 0, 1),
Triple("Alphabetically", 2, 3), Triple("Alphabetically", 2, 3),