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

Remove ability to define versionId from generator, bump Hatigarm Scans version

Browse Source
This commit is contained in:
arkon 2021-02-07 16:29:01 -05:00
parent 4adf284242
commit 0172dc7d13
3 changed files with 14 additions and 18 deletions
multisrc
overrides/src/genkan/hatigarmscans
HatigarmScans.kt
src/main/java/eu/kanade/tachiyomi/multisrc
ThemeSourceGenerator.kt
genkan
GenkanOriginalGenerator.kt

7
multisrc/overrides/src/genkan/hatigarmscans/HatigarmScans.kt Normal file

@ -0,0 +1,7 @@
package eu.kanade.tachiyomi.extension.en.hatigarmscans
import eu.kanade.tachiyomi.multisrc.genkan.GenkanOriginal
class HatigarmScans : GenkanOriginal("Hatigarm Scans", "https://hatigarmscanz.net", "en") {
override val versionId = 2
}

23
multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/ThemeSourceGenerator.kt

@ -140,26 +140,17 @@ interface ThemeSourceGenerator {
fun factoryClassText(): String { fun factoryClassText(): String {
return when (source) { return when (source) {
is ThemeSourceData.SingleLang -> { is ThemeSourceData.SingleLang -> {
""" """class ${source.className} : $themeClass("${source.name}", "${source.baseUrl}", "${source.lang}")"""
class ${source.className} : $themeClass("${source.name}", "${source.baseUrl}", "${source.lang}") {
override val versionId = ${source.versionId}
}
""".trimIndent()
} }
is ThemeSourceData.MultiLang -> { is ThemeSourceData.MultiLang -> {
val sourceClasses = source.langs.mapIndexed { index, lang -> val sourceClasses = source.langs.map { lang ->
val indexedClassName = "$themeClass${index}" """$themeClass("${source.name}", "${source.baseUrl}", "$lang")"""
indexedClassName to """$indexedClassName : $themeClass("${source.name}", "${source.baseUrl}", "$lang") {
override val versionId = ${source.versionId}
}""".trimIndent()
} }
""" """
class ${source.className} : SourceFactory { class ${source.className} : SourceFactory {
${sourceClasses.joinToString("\n") { it.second }}
override fun createSources() = listOf( override fun createSources() = listOf(
${sourceClasses.joinToString(",\n") { "${it.first}()" }} ${sourceClasses.joinToString(",\n")}
) )
} }
""".trimIndent() """.trimIndent()
@ -167,7 +158,8 @@ interface ThemeSourceGenerator {
} }
} }
File("$classPath/${source.className}.kt").writeText("""/* ktlint-disable */ File("$classPath/${source.className}.kt").writeText("""
/* ktlint-disable */
// THIS FILE IS AUTO-GENERATED; DO NOT EDIT // THIS FILE IS AUTO-GENERATED; DO NOT EDIT
package eu.kanade.tachiyomi.extension.${pkgNameSuffix(source, ".")} package eu.kanade.tachiyomi.extension.${pkgNameSuffix(source, ".")}
@ -195,7 +187,6 @@ sealed class ThemeSourceData {
abstract val isNsfw: Boolean abstract val isNsfw: Boolean
abstract val className: String abstract val className: String
abstract val pkgName: String abstract val pkgName: String
abstract val versionId: Int
/** /**
* overrideVersionCode defaults to 0, if a source changes their source override code or * overrideVersionCode defaults to 0, if a source changes their source override code or
@ -212,7 +203,6 @@ sealed class ThemeSourceData {
override val baseUrl: String, override val baseUrl: String,
val lang: String, val lang: String,
override val isNsfw: Boolean = false, override val isNsfw: Boolean = false,
override val versionId: Int = 1,
override val className: String = name.replace(" ", ""), override val className: String = name.replace(" ", ""),
override val pkgName: String = className.toLowerCase(Locale.ENGLISH), override val pkgName: String = className.toLowerCase(Locale.ENGLISH),
override val overrideVersionCode: Int = 0, override val overrideVersionCode: Int = 0,
@ -223,7 +213,6 @@ sealed class ThemeSourceData {
override val baseUrl: String, override val baseUrl: String,
val langs: List<String>, val langs: List<String>,
override val isNsfw: Boolean = false, override val isNsfw: Boolean = false,
override val versionId: Int = 1,
override val className: String = name.replace(" ", "") + "Factory", override val className: String = name.replace(" ", "") + "Factory",
override val pkgName: String = className.substringBefore("Factory").toLowerCase(Locale.ENGLISH), override val pkgName: String = className.substringBefore("Factory").toLowerCase(Locale.ENGLISH),
override val overrideVersionCode: Int = 0, override val overrideVersionCode: Int = 0,

2
multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/genkan/GenkanOriginalGenerator.kt

@ -13,7 +13,7 @@ class GenkanOriginalGenerator : ThemeSourceGenerator {
override val sources = listOf( override val sources = listOf(
ThemeSourceData.SingleLang("Reaper Scans", "https://reaperscans.com", "en"), ThemeSourceData.SingleLang("Reaper Scans", "https://reaperscans.com", "en"),
ThemeSourceData.SingleLang("Hatigarm Scans", "https://hatigarmscanz.net", "en", versionId = 2), ThemeSourceData.SingleLang("Hatigarm Scans", "https://hatigarmscanz.net", "en", overrideVersionCode = 1),
ThemeSourceData.SingleLang("SecretScans", "https://secretscans.co", "en"), ThemeSourceData.SingleLang("SecretScans", "https://secretscans.co", "en"),
) )