Multisrc bugfix and genkan refactor (#5707)

* themesource bugfix, refactor genkan

* revert 3da46570aa
This commit is contained in:
Aria Moradi
2021-02-08 13:37:48 -08:00
committed by GitHub
parent f1a7a5aac2
commit 0ce4416f09
11 changed files with 57 additions and 31 deletions

View File

@ -135,9 +135,9 @@ interface ThemeSourceGenerator {
private fun writeSourceClasses(projectSrcPath: String, srcOverridePath: String, source: ThemeSourceData, themePkg: String, themeClass: String) {
val projectSrcFile = File(projectSrcPath)
projectSrcFile.mkdirs()
val srcOverride = File("$srcOverridePath/${source.pkgName}")
if (srcOverride.exists())
srcOverride.copyRecursively(projectSrcFile)
val srcOverrideFile = File(srcOverridePath)
if (srcOverrideFile.exists())
srcOverrideFile.copyRecursively(projectSrcFile)
else
writeSourceClass(projectSrcFile, source, themePkg, themeClass)
}

View File

@ -1,6 +1,7 @@
package eu.kanade.tachiyomi.multisrc.genkan
import eu.kanade.tachiyomi.multisrc.ThemeSourceData
import eu.kanade.tachiyomi.multisrc.ThemeSourceData.SingleLang
import eu.kanade.tachiyomi.multisrc.ThemeSourceData.MultiLang
import eu.kanade.tachiyomi.multisrc.ThemeSourceGenerator
class GenkanGenerator : ThemeSourceGenerator {
@ -12,14 +13,14 @@ class GenkanGenerator : ThemeSourceGenerator {
override val baseVersionCode: Int = 1
override val sources = listOf(
ThemeSourceData.MultiLang("Leviatan Scans", "https://leviatanscans.com", listOf("en", "es"),
MultiLang("Leviatan Scans", "https://leviatanscans.com", listOf("en", "es"),
className = "LeviatanScansFactory", pkgName = "leviatanscans", overrideVersionCode = 1),
ThemeSourceData.SingleLang("Hunlight Scans", "https://hunlight-scans.info", "en"),
ThemeSourceData.SingleLang("ZeroScans", "https://zeroscans.com", "en"),
ThemeSourceData.SingleLang("The Nonames Scans", "https://the-nonames.com", "en"),
ThemeSourceData.SingleLang("Edelgarde Scans", "https://edelgardescans.com", "en"),
ThemeSourceData.SingleLang("Method Scans", "https://methodscans.com", "en"),
ThemeSourceData.SingleLang("Sleeping Knight Scans", "https://skscans.com", "en")
SingleLang("Hunlight Scans", "https://hunlight-scans.info", "en"),
SingleLang("ZeroScans", "https://zeroscans.com", "en"),
SingleLang("The Nonames Scans", "https://the-nonames.com", "en"),
SingleLang("Edelgarde Scans", "https://edelgardescans.com", "en"),
SingleLang("Method Scans", "https://methodscans.com", "en"),
SingleLang("Sleeping Knight Scans", "https://skscans.com", "en")
)
companion object {

View File

@ -1,6 +1,6 @@
package eu.kanade.tachiyomi.multisrc.genkan
import eu.kanade.tachiyomi.multisrc.ThemeSourceData
import eu.kanade.tachiyomi.multisrc.ThemeSourceData.SingleLang
import eu.kanade.tachiyomi.multisrc.ThemeSourceGenerator
class GenkanOriginalGenerator : ThemeSourceGenerator {
@ -12,9 +12,9 @@ class GenkanOriginalGenerator : ThemeSourceGenerator {
override val baseVersionCode: Int = 1
override val sources = listOf(
ThemeSourceData.SingleLang("Reaper Scans", "https://reaperscans.com", "en"),
ThemeSourceData.SingleLang("Hatigarm Scans", "https://hatigarmscanz.net", "en", overrideVersionCode = 1),
ThemeSourceData.SingleLang("SecretScans", "https://secretscans.co", "en"),
SingleLang("Reaper Scans", "https://reaperscans.com", "en"),
SingleLang("Hatigarm Scans", "https://hatigarmscanz.net", "en", overrideVersionCode = 1),
SingleLang("SecretScans", "https://secretscans.co", "en"),
)
companion object {