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

Don't lint generated source files

This commit is contained in:
arkon 2021-02-07 15:11:56 -05:00
parent 68db37baa8
commit 473a1fbc4e
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common.gradle
View File

@ -58,5 +58,9 @@ repositories {
apply from: "$rootDir/common-dependencies.gradle" apply from: "$rootDir/common-dependencies.gradle"
lintKotlinMain {
exclude 'generated-src/**/*.kt'
}
preBuild.dependsOn(lintKotlin) preBuild.dependsOn(lintKotlin)
lintKotlin.dependsOn(formatKotlin) lintKotlin.dependsOn(formatKotlin)

14
multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/ThemeSourceGenerator.kt
View File

@ -106,8 +106,8 @@ interface ThemeSourceGenerator {
val themeSrcPath = "$userDir/multisrc/src/main/java/${themeSuffix(themePkg, "/")}" val themeSrcPath = "$userDir/multisrc/src/main/java/${themeSuffix(themePkg, "/")}"
val themeSrcFile = File(themeSrcPath) val themeSrcFile = File(themeSrcPath)
val themeDestPath = "$projectRootPath/src/${themeSuffix(themePkg, "/")}" val themeDestPath = "$projectRootPath/src/${themeSuffix(themePkg, "/")}"
val themeDestFile = File(themeDestPath)
val themeDestFile = File(themeDestPath)
themeDestFile.mkdirs() themeDestFile.mkdirs()
themeSrcFile.list()!! themeSrcFile.list()!!
@ -147,7 +147,7 @@ interface ThemeSourceGenerator {
""".trimIndent() """.trimIndent()
} }
is ThemeSourceData.MultiLang -> { is ThemeSourceData.MultiLang -> {
val sourceClasses = source.lang.mapIndexed { index, lang -> val sourceClasses = source.langs.mapIndexed { index, lang ->
val indexedClassName = "$themeClass${index}" val indexedClassName = "$themeClass${index}"
indexedClassName to """$indexedClassName : $themeClass("${source.name}", "${source.baseUrl}", "$lang") { indexedClassName to """$indexedClassName : $themeClass("${source.name}", "${source.baseUrl}", "$lang") {
override val versionId = ${source.versionId} override val versionId = ${source.versionId}
@ -168,7 +168,7 @@ interface ThemeSourceGenerator {
} }
File("$classPath/${source.className}.kt").writeText(""" File("$classPath/${source.className}.kt").writeText("""
// 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, ".")}
import eu.kanade.tachiyomi.multisrc.$themePkg.$themeClass import eu.kanade.tachiyomi.multisrc.$themePkg.$themeClass
@ -181,7 +181,7 @@ interface ThemeSourceGenerator {
} }
private fun cleanDirectory(dir: File) { private fun cleanDirectory(dir: File) {
for (file in dir.listFiles()!!) { dir.listFiles()?.forEach { file ->
if (file.isDirectory) cleanDirectory(file) if (file.isDirectory) cleanDirectory(file)
file.delete() file.delete()
} }
@ -212,20 +212,20 @@ 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 versionId: Int = 1,
override val overrideVersionCode: Int = 0, override val overrideVersionCode: Int = 0,
) : ThemeSourceData() ) : ThemeSourceData()
data class MultiLang( data class MultiLang(
override val name: String, override val name: String,
override val baseUrl: String, override val baseUrl: String,
val lang: 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 versionId: Int = 1,
override val overrideVersionCode: Int = 0, override val overrideVersionCode: Int = 0,
) : ThemeSourceData() ) : ThemeSourceData()
} }