From 54c0a03d44c8d1b586bc487ee1ca71859d6f0b57 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Fri, 3 Jun 2022 17:51:13 +0200 Subject: [PATCH] feat: add path for `cacheDirectory` and enable resource patching by default --- src/main/kotlin/app/revanced/cli/MainCommand.kt | 10 +++++----- src/main/kotlin/app/revanced/cli/Patcher.kt | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/app/revanced/cli/MainCommand.kt b/src/main/kotlin/app/revanced/cli/MainCommand.kt index bddc2c9..df51b35 100644 --- a/src/main/kotlin/app/revanced/cli/MainCommand.kt +++ b/src/main/kotlin/app/revanced/cli/MainCommand.kt @@ -22,11 +22,11 @@ internal object MainCommand : Runnable { @Option(names = ["-p", "--patches"], description = ["One or more bundles of patches"]) internal var patchBundles = arrayOf() - @Option(names = ["-t", "--temp-dir"], description = ["Temporal resource cache directory"], required = true) - internal lateinit var cacheDirectory: String + @Option(names = ["-t", "--temp-dir"], description = ["Temporal resource cache directory"]) + internal var cacheDirectory = "revanced-cache" - @Option(names = ["-r", "--resource-patcher"], description = ["Enable patching resources"]) - internal var patchResources: Boolean = false + @Option(names = ["-r", "--resource-patcher"], description = ["Disable patching resources"]) + internal var disableResourcePatching: Boolean = false @Option( names = ["-c", "--clean"], @@ -65,7 +65,7 @@ internal object MainCommand : Runnable { return } - val patcher = app.revanced.patcher.Patcher(PatcherOptions(inputFile, cacheDirectory, patchResources)) + val patcher = app.revanced.patcher.Patcher(PatcherOptions(inputFile, cacheDirectory, !disableResourcePatching)) if (signatureCheck) { patcher.addPatchesFiltered() diff --git a/src/main/kotlin/app/revanced/cli/Patcher.kt b/src/main/kotlin/app/revanced/cli/Patcher.kt index ea943a8..f6d7589 100644 --- a/src/main/kotlin/app/revanced/cli/Patcher.kt +++ b/src/main/kotlin/app/revanced/cli/Patcher.kt @@ -30,7 +30,7 @@ internal class Patcher { zipFileSystem.replaceFile(name, data.data) } - if (MainCommand.patchResources) { + if (!MainCommand.disableResourcePatching) { for (file in File(MainCommand.cacheDirectory).resolve("build/").listFiles(FileFilter { it.isDirectory }) ?.first()?.listFiles()!!) { if (!file.isDirectory) {