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

finish transition to api v2

Browse Source 
(cherry picked from commit 4039f6927e627279cf1b324279a2d817a007d29b)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/source/online/handlers/ApiMangaParser.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterSheet.kt
#	app/src/main/java/exh/md/handlers/MangaHandler.kt
#	app/src/main/java/exh/md/utils/MdUtil.kt
#	app/src/main/res/layout/reader_activity.xml
#	app/src/main/res/layout/reader_chapters_sheet.xml
#	app/src/main/res/menu/reader.xml
This commit is contained in:
Carlos 2021-01-08 16:22:33 -05:00 committed by Jobobby04
parent 7006341fab
commit 35936e3c9a
4 changed files with 56 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt
View File

@ -114,7 +114,7 @@ class MangaDex(delegate: HttpSource, val context: Context) :
override fun mapUrlToChapterUrl(uri: Uri): String? {
if (!uri.pathSegments.firstOrNull().equals("chapter", true)) return null
val id = uri.pathSegments.getOrNull(1) ?: return null
return MdUtil.apiChapterOld + id
return MdUtil.oldApiChapter + id
}
override suspend fun mapChapterUrlToMangaUrl(uri: Uri): String? {

2
app/src/main/java/exh/md/handlers/ApiMangaParser.kt
View File

@ -275,7 +275,7 @@ class ApiMangaParser(private val langs: List<String>) {
groups: Map<Long, String>
): SChapter {
val chapter = SChapter.create()
chapter.url = MdUtil.apiChapterOld + networkChapter.id
chapter.url = MdUtil.oldApiChapter + networkChapter.id
val chapterName = mutableListOf<String>()
// Build chapter name

2
app/src/main/java/exh/md/handlers/MangaHandler.kt
View File

@ -56,7 +56,7 @@ class MangaHandler(val client: OkHttpClient, val headers: Headers, val langs: Li
suspend fun getMangaIdFromChapterId(urlChapterId: String): Int {
return withContext(Dispatchers.IO) {
val request = GET(MdUtil.apiUrl + MdUtil.apiChapter + urlChapterId + MdUtil.apiChapterSuffix, headers, CacheControl.FORCE_NETWORK)
val request = GET(MdUtil.apiUrl + MdUtil.newApiChapter + urlChapterId + MdUtil.apiChapterSuffix, headers, CacheControl.FORCE_NETWORK)
val response = client.newCall(request).await()
ApiMangaParser(langs).chapterParseForMangaId(response)
}

105
app/src/main/java/exh/md/utils/MdUtil.kt
View File

@ -26,8 +26,8 @@ class MdUtil {
const val apiUrl = "https://api.mangadex.org"
const val apiManga = "/v2/manga/"
const val includeChapters = "?include=chapters"
const val apiChapter = "/v2/chapter/"
const val apiChapterOld = "/api/chapter/"
const val oldApiChapter = "/api/chapter/"
const val newApiChapter = "/v2/chapter/"
const val apiChapterSuffix = "?mark_read=0"
const val groupSearchUrl = "$baseUrl/groups/0/1/"
const val followsAllApi = "/v2/user/me/followed-manga"
@ -56,65 +56,66 @@ class MdUtil {
)
val descriptionLanguages = listOf(
"Russian / Русский",
"[u]Russian",
"[b][u]Russian",
"[RUS]",
"Russian / Русский",
"Russian/Русский:",
"Russia/Русское",
"Русский",
"RUS:",
"[b][u]German / Deutsch",
"German/Deutsch:",
"Espa&ntilde;ol / Spanish",
"Spanish / Espa&ntilde;ol",
"Spanish / Espa & ntilde; ol",
"Spanish / Espa&ntilde;ol",
"[b][u]Spanish",
"[Espa&ntilde;ol]:",
"=FRANCAIS=",
"[b] Spanish: [/ b]",
"정보",
"Spanish/Espa&ntilde;ol",
"Espa&ntilde;ol / Spanish",
"Italian / Italiano",
"Italian/Italiano",
"[b][u]Chinese",
"[b][u]French",
"[b][u]German / Deutsch",
"[b][u]Russian",
"[b][u]Spanish",
"[b][u]Vietnamese",
"[b]External Links",
"[b]Link[/b]",
"[b]Links:",
"[Espa&ntilde;ol]:",
"[hr]Fr:",
"[hr]TH",
"[INDO]",
"[PTBR]",
"[right][b][u]Persian",
"[RUS]",
"[u]Russian",
"\r\n\r\nItalian\r\n",
"Arabic /",
"Descriptions in Other Languages",
"Espa&ntilde;ol /",
"Farsi/",
"Fran&ccedil;ais",
"French - ",
"French / ",
"German/",
"Hindi /",
"Italian / ",
"Italian Summary:",
"Italian/",
"Japanese /",
"Links:",
"Pasta-Pizza-Mandolino/Italiano",
"Persian /فارسی",
"Farsi/Persian/",
"Polish / polski",
"Polish / Polski",
"Polish Summary / Polski Opis",
"Polish /",
"Polish Summary /",
"Polish/",
"Polski",
"Portuguese (BR) / Portugu&ecirc;s",
"Portuguese / Portugu&ecirc;s",
"Português / Portuguese",
"Portuguese / Portugu",
"Portuguese / Portugu&ecirc;s",
"Portugu&ecirc;s",
"Portuguese (BR) / Portugu & ecirc;",
"Portuguese (BR) / Portugu&ecirc;",
"[PTBR]",
"R&eacute;sume Fran&ccedil;ais",
"Portuguese (BR)",
"Portuguese /",
"R&eacute;sum&eacute; Fran&ccedil;ais",
"[b][u]French",
"French / Fran&ccedil;ais",
"Fran&ccedil;ais",
"[hr]Fr:",
"French - Français:",
"Turkish / T&uuml;rk&ccedil;e",
"Turkish/T&uuml;rk&ccedil;e",
"R&eacute;sume Fran&ccedil;ais",
"RUS:",
"Russia/",
"Russian /",
"Spanish:",
"Spanish /",
"Spanish Summary:",
"Spanish/",
"T&uuml;rk&ccedil;e",
"[b][u]Chinese",
"Arabic / العربية",
"Thai:",
"Turkish /",
"Turkish/",
"Русский",
"العربية",
"[hr]TH",
"[b][u]Vietnamese",
"[b]Links:",
"[b]Link[/b]",
"Links:",
"[b]External Links"
"정보",
"(zh-Hant)",
)
// guess the thumbnail url is .jpg this has a ~80% success rate