Fix mangadex not respecting setting changes (#3276)

* rename file
add missing languages
move english into factory

* force network on browse, latest, and chapter pages request so setting changes are respected

* update build.gradle
This commit is contained in:
Carlos 2020-05-22 10:48:04 -04:00 committed by GitHub
parent 0c24811178
commit 07075bd2fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 98 additions and 95 deletions

View File

@ -4,8 +4,8 @@ apply plugin: 'kotlin-android'
ext {
appName = 'Tachiyomi: MangaDex'
pkgNameSuffix = 'all.mangadex'
extClass = '.MangadexFactory'
extVersionCode = 91
extClass = '.MangaDexFactory'
extVersionCode = 92
libVersion = '1.2'
}

View File

@ -45,7 +45,7 @@ import rx.Observable
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
abstract class Mangadex(
abstract class MangaDex(
override val lang: String,
private val internalLang: String
) : ConfigurableSource, ParsedHttpSource() {
@ -108,11 +108,11 @@ abstract class Mangadex(
// url matches default SortFilter selection (Rating Descending)
override fun popularMangaRequest(page: Int): Request {
return GET("$baseUrl/titles/7/$page/", headersBuilder().build())
return GET("$baseUrl/titles/7/$page/", headersBuilder().build(), CacheControl.FORCE_NETWORK)
}
override fun latestUpdatesRequest(page: Int): Request {
return GET("$baseUrl/updates/$page", headersBuilder().build())
return GET("$baseUrl/updates/$page", headersBuilder().build(), CacheControl.FORCE_NETWORK)
}
override fun popularMangaFromElement(element: Element): SManga {
@ -568,7 +568,7 @@ abstract class Mangadex(
val server = getServer()
val saver = getUseDataSaver()
return GET("$baseUrl${chapter.url}?server=$server&saver=$saver", headers)
return GET("$baseUrl${chapter.url}?server=$server&saver=$saver", headers, CacheControl.FORCE_NETWORK)
}
override fun pageListParse(document: Document) = throw Exception("Not used")

View File

@ -0,0 +1,91 @@
package eu.kanade.tachiyomi.extension.all.mangadex
import eu.kanade.tachiyomi.source.Source
import eu.kanade.tachiyomi.source.SourceFactory
class MangaDexFactory : SourceFactory {
override fun createSources(): List<Source> = listOf(
MangaDexEnglish(),
MangaDexJapanese(),
MangaDexPolish(),
MangaDexSerboCroatian(),
MangaDexDutch(),
MangaDexItalian(),
MangaDexRussian(),
MangaDexGerman(),
MangaDexHungarian(),
MangaDexFrench(),
MangaDexFinnish(),
MangaDexVietnamese(),
MangaDexGreek(),
MangaDexBulgarian(),
MangaDexSpanishSpain(),
MangaDexPortugueseBrazil(),
MangaDexPortuguesePortugal(),
MangaDexSwedish(),
MangaDexArabic(),
MangaDexDanish(),
MangaDexChineseSimp(),
MangaDexBengali(),
MangaDexRomanian(),
MangaDexCzech(),
MangaDexMongolian(),
MangaDexTurkish(),
MangaDexIndonesian(),
MangaDexKorean(),
MangaDexSpanishLTAM(),
MangaDexPersian(),
MangaDexMalay(),
MangaDexThai(),
MangaDexCatalan(),
MangaDexFilipino(),
MangaDexChineseTrad(),
MangaDexUkrainian(),
MangaDexBurmese(),
MangaDexLithuanian(),
MangaDexHebrew(),
MangaDexHindi(),
MangaDexNorwegian()
)
}
class MangaDexEnglish : MangaDex("en", "gb")
class MangaDexJapanese : MangaDex("ja", "jp")
class MangaDexPolish : MangaDex("pl", "pl")
class MangaDexSerboCroatian : MangaDex("sh", "rs")
class MangaDexDutch : MangaDex("nl", "nl")
class MangaDexItalian : MangaDex("it", "it")
class MangaDexRussian : MangaDex("ru", "ru")
class MangaDexGerman : MangaDex("de", "de")
class MangaDexHungarian : MangaDex("hu", "hu")
class MangaDexFrench : MangaDex("fr", "fr")
class MangaDexFinnish : MangaDex("fi", "fi")
class MangaDexVietnamese : MangaDex("vi", "vn")
class MangaDexGreek : MangaDex("el", "gr")
class MangaDexBulgarian : MangaDex("bg", "bg")
class MangaDexSpanishSpain : MangaDex("es", "es")
class MangaDexPortugueseBrazil : MangaDex("pt-BR", "br")
class MangaDexPortuguesePortugal : MangaDex("pt", "pt")
class MangaDexSwedish : MangaDex("sv", "se")
class MangaDexArabic : MangaDex("ar", "sa")
class MangaDexDanish : MangaDex("da", "dk")
class MangaDexChineseSimp : MangaDex("zh-Hans", "cn")
class MangaDexBengali : MangaDex("bn", "bd")
class MangaDexRomanian : MangaDex("ro", "ro")
class MangaDexCzech : MangaDex("cs", "cz")
class MangaDexMongolian : MangaDex("mn", "mn")
class MangaDexTurkish : MangaDex("tr", "tr")
class MangaDexIndonesian : MangaDex("id", "id")
class MangaDexKorean : MangaDex("ko", "kr")
class MangaDexSpanishLTAM : MangaDex("es-419", "mx")
class MangaDexPersian : MangaDex("fa", "ir")
class MangaDexMalay : MangaDex("ms", "my")
class MangaDexThai : MangaDex("th", "th")
class MangaDexCatalan : MangaDex("ca", "ct")
class MangaDexFilipino : MangaDex("fil", "ph")
class MangaDexChineseTrad : MangaDex("zh-Hant", "hk")
class MangaDexUkrainian : MangaDex("uk", "ua")
class MangaDexBurmese : MangaDex("my", "mm")
class MangaDexLithuanian : MangaDex("lt", "il")
class MangaDexHebrew : MangaDex("he", "il")
class MangaDexHindi : MangaDex("hi", "in")
class MangaDexNorwegian : MangaDex("no", "no")

View File

@ -1,85 +0,0 @@
package eu.kanade.tachiyomi.extension.all.mangadex
import eu.kanade.tachiyomi.source.Source
import eu.kanade.tachiyomi.source.SourceFactory
class MangadexFactory : SourceFactory {
override fun createSources(): List<Source> = listOf(
MangaDexEnglish(),
MangaDexPolish(),
MangaDexItalian(),
MangaDexRussian(),
MangaDexGerman(),
MangaDexFrench(),
MangaDexVietnamese(),
MangaDexSpanishSpain(),
MangaDexSpanishLTAM(),
MangaDexCatalan(),
MangaDexPortuguesePortugal(),
MangaDexPortugueseBrazil(),
MangaDexSwedish(),
MangaDexTurkish(),
MangaDexIndonesian(),
MangaDexHungarian(),
MangaDexBulgarian(),
MangaDexFilipino(),
MangaDexDutch(),
MangaDexArabic(),
MangaDexChineseSimp(),
MangaDexChineseTrad(),
MangaDexThai(),
MangaDexBengali(),
MangaDexBurmese(),
MangaDexCzech(),
MangaDexDanish(),
MangaDexFinnish(),
MangaDexGreek(),
MangaDexJapanese(),
MangaDexKorean(),
MangaDexLithuanian(),
MangaDexMalay(),
MangaDexMongolian(),
MangaDexPersian(),
MangaDexRomanian(),
MangaDexSerboCroatian(),
MangaDexUkrainian()
)
}
class MangaDexPolish : Mangadex("pl", "pl")
class MangaDexItalian : Mangadex("it", "it")
class MangaDexRussian : Mangadex("ru", "ru")
class MangaDexGerman : Mangadex("de", "de")
class MangaDexFrench : Mangadex("fr", "fr")
class MangaDexVietnamese : Mangadex("vi", "vn")
class MangaDexSpanishSpain : Mangadex("es", "es")
class MangaDexSpanishLTAM : Mangadex("es-419", "mx")
class MangaDexCatalan : Mangadex("ca", "ct")
class MangaDexPortuguesePortugal : Mangadex("pt", "pt")
class MangaDexPortugueseBrazil : Mangadex("pt-BR", "br")
class MangaDexSwedish : Mangadex("sv", "se")
class MangaDexTurkish : Mangadex("tr", "tr")
class MangaDexIndonesian : Mangadex("id", "id")
class MangaDexHungarian : Mangadex("hu", "hu")
class MangaDexBulgarian : Mangadex("bg", "bg")
class MangaDexFilipino : Mangadex("fil", "ph")
class MangaDexDutch : Mangadex("nl", "nl")
class MangaDexArabic : Mangadex("ar", "sa")
class MangaDexChineseSimp : Mangadex("zh-Hans", "cn")
class MangaDexChineseTrad : Mangadex("zh-Hant", "hk")
class MangaDexThai : Mangadex("th", "th")
class MangaDexBengali : Mangadex("bn", "bd")
class MangaDexBurmese : Mangadex("my", "mm")
class MangaDexCzech : Mangadex("cs", "cz")
class MangaDexDanish : Mangadex("da", "dk")
class MangaDexFinnish : Mangadex("fi", "fi")
class MangaDexGreek : Mangadex("el", "gr")
class MangaDexJapanese : Mangadex("ja", "jp")
class MangaDexKorean : Mangadex("ko", "kr")
class MangaDexLithuanian : Mangadex("lt", "lt")
class MangaDexMalay : Mangadex("ms", "my")
class MangaDexMongolian : Mangadex("mn", "mn")
class MangaDexPersian : Mangadex("fa", "ir")
class MangaDexRomanian : Mangadex("ro", "ro")
class MangaDexSerboCroatian : Mangadex("sh", "rs")
class MangaDexUkrainian : Mangadex("uk", "ua")

View File

@ -25,7 +25,7 @@ class MangadexUrlActivity : Activity() {
val titleid = pathSegments[1]
val mainIntent = Intent().apply {
action = "eu.kanade.tachiyomi.SEARCH"
putExtra("query", "${Mangadex.PREFIX_ID_SEARCH}$titleid")
putExtra("query", "${MangaDex.PREFIX_ID_SEARCH}$titleid")
putExtra("filter", packageName)
}

View File

@ -1,3 +0,0 @@
package eu.kanade.tachiyomi.extension.all.mangadex
class MangaDexEnglish : Mangadex("en", "gb")