chore(release): 1.7.0 [skip ci]

# [1.7.0](https://github.com/revanced/revanced-cli/compare/v1.6.3...v1.7.0) (2022-06-21)

### Features

* show description when listing patches ([af32572](af32572f29))

CHANGELOG.md

@@ -1,3 +1,40 @@
+# [1.7.0](https://github.com/revanced/revanced-cli/compare/v1.6.3...v1.7.0) (2022-06-21)
+
+
+### Features
+
+* show description when listing patches ([af32572](https://github.com/revanced/revanced-cli/commit/af32572f29d0f0a45ee5c3e01ba4cf1f91fe2f10))
+
+## [1.6.3](https://github.com/revanced/revanced-cli/compare/v1.6.2...v1.6.3) (2022-06-21)
+
+
+### Bug Fixes
+
+* update patcher version ([80c11fe](https://github.com/revanced/revanced-cli/commit/80c11fef734bdba9026e91f95ee0a4a522cbefab))
+
+## [1.6.2](https://github.com/revanced/revanced-cli/compare/v1.6.1...v1.6.2) (2022-06-21)
+
+
+### Bug Fixes
+
+* CLI not working ([29105ba](https://github.com/revanced/revanced-cli/commit/29105bab3dabd9d16af6b511caef9727f98afd1a))
+* improper use of mount variable ([31853fe](https://github.com/revanced/revanced-cli/commit/31853fe5393af04805857b78a54434e1c51e4c8e))
+
+## [1.6.1](https://github.com/revanced/revanced-cli/compare/v1.6.0...v1.6.1) (2022-06-21)
+
+
+### Bug Fixes
+
+* remove `-e` from `experimental` option ([3829136](https://github.com/revanced/revanced-cli/commit/3829136c49ddce1dc6b01eda04ce013540b213c2))
+
+# [1.6.0](https://github.com/revanced/revanced-cli/compare/v1.5.1...v1.6.0) (2022-06-21)
+
+
+### Features
+
+* rename `debugging` option to `experimental` ([98bd6f3](https://github.com/revanced/revanced-cli/commit/98bd6f3f4b3eb34c445cbd5e3a3196f399f8bb3b))
+* use `install` mode by default ([1a3db77](https://github.com/revanced/revanced-cli/commit/1a3db77c21b5795220fbac1ec36827fc521fface))
+
 ## [1.5.1](https://github.com/revanced/revanced-cli/compare/v1.5.0...v1.5.1) (2022-06-21)
 
 

build.gradle.kts

@@ -31,7 +31,8 @@ repositories {
 dependencies {
     implementation(kotlin("stdlib"))
     implementation(kotlin("reflect"))
-    implementation("app.revanced:revanced-patcher:1.3.1")
+
+    implementation("app.revanced:revanced-patcher:1.3.4")
     implementation("info.picocli:picocli:4.6.3")
     implementation("com.android.tools.build:apksig:7.2.1")
     implementation("com.github.revanced:jadb:master-SNAPSHOT") // updated fork

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 1.5.1
+version = 1.7.0

src/main/kotlin/app/revanced/cli/command/MainCommand.kt

@@ -4,6 +4,7 @@ import app.revanced.cli.patcher.Patcher
 import app.revanced.cli.signing.Signing
 import app.revanced.patcher.PatcherOptions
 import app.revanced.patcher.extensions.PatchExtensions.patchName
+import app.revanced.patcher.extensions.PatchExtensions.description
 import app.revanced.patcher.util.patch.implementation.JarPatchBundle
 import app.revanced.utils.adb.Adb
 import picocli.CommandLine.*
@@ -11,10 +12,11 @@ import java.io.File
 import java.nio.file.Files
 
 @Command(
-    name = "ReVanced-CLI", version = ["1.0.0"], mixinStandardHelpOptions = true,
+    name = "ReVanced-CLI",
+    version = ["1.0.0"],
+    mixinStandardHelpOptions = true
 )
 internal object MainCommand : Runnable {
-
     @ArgGroup(exclusive = false, multiplicity = "1")
     lateinit var args: Args
 
@@ -23,10 +25,10 @@ internal object MainCommand : Runnable {
         var patchBundles = arrayOf<String>()
 
         @ArgGroup(exclusive = false)
-        lateinit var lArgs: ListingArgs
+        var lArgs: ListingArgs? = null
 
         @ArgGroup(exclusive = false)
-        lateinit var pArgs: PatchingArgs
+        var pArgs: PatchingArgs? = null
     }
 
     class ListingArgs {
@@ -41,23 +43,20 @@ internal object MainCommand : Runnable {
         @Option(names = ["-o", "--out"], description = ["Output file path"], required = true)
         lateinit var outputPath: String
 
-        @Option(
+        @Option(names = ["-e", "--exclude"], description = ["Explicitly exclude patches"])
-            names = ["-i", "--include"],
+        var excludedPatches = arrayOf<String>()
-            description = ["Which patches to include. If none is specified, all compatible default patches will be included"]
-        )
-        var includedPatches = arrayOf<String>()
 
         @Option(names = ["-r", "--resource-patcher"], description = ["Disable patching resources"])
         var disableResourcePatching: Boolean = false
 
-        @Option(names = ["--debugging"], description = ["Disable patch version compatibility"])
+        @Option(names = ["--experimental"], description = ["Disable patch version compatibility patch"])
-        var debugging: Boolean = false
+        var experimental: Boolean = false
 
         @Option(names = ["-m", "--merge"], description = ["One or more dex file containers to merge"])
         var mergeFiles = listOf<File>()
 
-        @Option(names = ["--install"], description = ["If specified, instead of mounting, install"])
+        @Option(names = ["--mount"], description = ["If specified, instead of installing, mount"])
-        var install: Boolean = false
+        var mount: Boolean = false
 
         @Option(names = ["--cn"], description = ["Overwrite the default CN for the signed file"])
         var cn = "ReVanced"
@@ -79,17 +78,14 @@ internal object MainCommand : Runnable {
     }
 
     override fun run() {
-        try {
+        if (args.lArgs?.listOnly == true) {
-            if (args.lArgs.listOnly) {
+            for (patchBundlePath in args.patchBundles) for (patch in JarPatchBundle(patchBundlePath).loadPatches()) {
-                for (patchBundlePath in args.patchBundles) for (patch in JarPatchBundle(patchBundlePath).loadPatches()) {
+                println("[available] ${patch.patchName}: ${patch.description}")
-                    println("[available] ${patch.patchName}")
-                }
-                return
             }
-        } catch (_: UninitializedPropertyAccessException) {
+            return
         }
 
-        val args = args.pArgs
+        val args = args.pArgs ?: return
 
         val patcher = app.revanced.patcher.Patcher(
             PatcherOptions(
@@ -100,17 +96,18 @@ internal object MainCommand : Runnable {
         val outputFile = File(args.outputPath)
 
         val adb: Adb? = args.deploy?.let {
-            Adb(outputFile, patcher.data.packageMetadata.packageName, args.deploy!!, args.install)
+            Adb(outputFile, patcher.data.packageMetadata.packageName, args.deploy!!, !args.mount)
         }
 
-        val patchedFile =
+        val patchedFile = if (args.mount) {
-            if (args.install) File(args.cacheDirectory).resolve("${outputFile.nameWithoutExtension}_raw.apk") else outputFile
+            File(args.cacheDirectory).resolve("${outputFile.nameWithoutExtension}_raw.apk")
+        } else outputFile
 
         Patcher.start(patcher, patchedFile)
 
         println("[aligning & signing]")
 
-        if (args.install) {
+        if (!args.mount) {
             Signing.start(
                 patchedFile,
                 outputFile,

src/main/kotlin/app/revanced/cli/patcher/Patcher.kt

@@ -10,12 +10,12 @@ import java.nio.file.Files
 
 internal object Patcher {
     internal fun start(patcher: app.revanced.patcher.Patcher, output: File) {
-		val args = args.pArgs;
+        val args = args.pArgs!!
 
         // merge files like necessary integrations
         patcher.mergeFiles()
         // add patches, but filter incompatible or excluded patches
-        patcher.addPatchesFiltered(includeFilter = args.includedPatches.isNotEmpty())
+        patcher.addPatchesFiltered(excludePatches = args.excludedPatches.isNotEmpty())
         // apply patches
         patcher.applyPatchesVerbose()
 
@@ -23,16 +23,20 @@ internal object Patcher {
         if (output.exists()) Files.delete(output.toPath())
         args.inputFile.copyTo(output)
 
-        ZipFileSystemUtils(output).use { fileSystem ->
+        val result = patcher.save()
+        val inputFile = if (!args.disableResourcePatching && result.resourceFile != null) {
+            result.resourceFile
+        } else null
+        ZipFileSystemUtils(inputFile, output).use { fileSystem ->
             // replace all dex files
-            val result = patcher.save()
             result.dexFiles.forEach {
                 fileSystem.write(it.name, it.memoryDataStore.data)
             }
 
-            // write resources
+            // inputFile being null implies resource patching being disabled
-            if (!args.disableResourcePatching) {
+            if (inputFile != null) {
-                fileSystem.writePathRecursively(File(args.cacheDirectory).resolve("build").toPath())
+                // write resources
+                fileSystem.writeInput()
                 fileSystem.uncompress(*result.doNotCompress!!.toTypedArray())
             }
         }

src/main/kotlin/app/revanced/cli/signing/Signing.kt

@@ -7,7 +7,7 @@ import java.io.File
 
 object Signing {
     fun start(inputFile: File, outputFile: File, cn: String, password: String) {
-        val cacheDirectory = File(args.pArgs.cacheDirectory)
+        val cacheDirectory = File(args.pArgs!!.cacheDirectory)
         val alignedOutput = cacheDirectory.resolve("${outputFile.nameWithoutExtension}_aligned.apk")
         val signedOutput = cacheDirectory.resolve("${outputFile.nameWithoutExtension}_signed.apk")
 

src/main/kotlin/app/revanced/utils/filesystem/ZipFileSystemUtils.kt

@@ -7,12 +7,17 @@ import java.nio.file.Files
 import java.nio.file.Path
 import java.util.zip.ZipEntry
 
-internal class ZipFileSystemUtils(
+internal class ZipFileSystemUtils(input: File?, output: File) : Closeable {
-    file: File
+    private val inFileSystem = if (input != null) {
-) : Closeable {
+        FileSystems.newFileSystem(input.toPath())
-    private var zipFileSystem = FileSystems.newFileSystem(file.toPath(), mapOf("noCompression" to true))
+    } else null
+    private val outFileSystem = FileSystems.newFileSystem(output.toPath(), mapOf("noCompression" to true))
 
     private fun Path.deleteRecursively() {
+        if (!Files.exists(this)) {
+            throw IllegalStateException("File exists in input but not in output, cannot delete")
+        }
+
         if (Files.isDirectory(this)) {
             Files.list(this).forEach { path ->
                 path.deleteRecursively()
@@ -22,19 +27,25 @@ internal class ZipFileSystemUtils(
         Files.delete(this)
     }
 
-    internal fun writePathRecursively(path: Path) {
+    internal fun writeInput() {
-        Files.list(path).let { fileStream ->
+        if (inFileSystem == null) {
+            throw IllegalArgumentException("Input file not set")
+        }
+        val root = inFileSystem.getPath(inFileSystem.separator)
+
+        Files.list(root).close()
+
+        Files.list(root).also { fileStream ->
             fileStream.forEach { filePath ->
-                val fileSystemPath = filePath.getRelativePath(path)
+                val fileSystemPath = filePath.getRelativePath(root)
                 fileSystemPath.deleteRecursively()
             }
-
-            fileStream
         }.close()
 
-        Files.walk(path).let { fileStream ->
+        Files.walk(root).also { fileStream ->
+            // don't include build directory by skipping the root node.
             fileStream.skip(1).forEach { filePath ->
-                val relativePath = filePath.getRelativePath(path)
+                val relativePath = filePath.getRelativePath(root)
 
                 if (Files.isDirectory(filePath)) {
                     Files.createDirectory(relativePath)
@@ -43,17 +54,18 @@ internal class ZipFileSystemUtils(
 
                 Files.copy(filePath, relativePath)
             }
-
-            fileStream
         }.close()
     }
 
-    internal fun write(path: String, content: ByteArray) = Files.write(zipFileSystem.getPath(path), content)
+    internal fun write(path: String, content: ByteArray) = Files.write(outFileSystem.getPath(path), content)
 
-    private fun Path.getRelativePath(path: Path): Path = zipFileSystem.getPath(path.relativize(this).toString())
+    private fun Path.getRelativePath(path: Path): Path = outFileSystem.getPath(path.relativize(this).toString())
 
     internal fun uncompress(vararg paths: String) =
-        paths.forEach { Files.setAttribute(zipFileSystem.getPath(it), "zip:method", ZipEntry.STORED) }
+        paths.forEach { Files.setAttribute(outFileSystem.getPath(it), "zip:method", ZipEntry.STORED) }
 
-    override fun close() = zipFileSystem.close()
+    override fun close() {
+        inFileSystem?.close()
+        outFileSystem.close()
+    }
 }

src/main/kotlin/app/revanced/utils/patcher/Patcher.kt

@@ -11,12 +11,12 @@ import app.revanced.patcher.patch.base.Patch
 import app.revanced.patcher.util.patch.implementation.JarPatchBundle
 
 fun Patcher.addPatchesFiltered(
-    includeFilter: Boolean = false
+    excludePatches: Boolean = false
 ) {
     val packageName = this.data.packageMetadata.packageName
     val packageVersion = this.data.packageMetadata.packageVersion
 
-    MainCommand.args.patchBundles.forEach { bundle ->
+    args.patchBundles.forEach { bundle ->
         val includedPatches = mutableListOf<Class<out Patch<Data>>>()
         JarPatchBundle(bundle).loadPatches().forEach patch@{ patch ->
             val compatiblePackages = patch.compatiblePackages
@@ -24,13 +24,11 @@ fun Patcher.addPatchesFiltered(
 
             val prefix = "[skipped] $patchName"
 
-			val args = MainCommand.args.pArgs
+            val args = MainCommand.args.pArgs!!
 
-            if (includeFilter) {
+            if (excludePatches && args.excludedPatches.contains(patchName)) {
-                if (!args.includedPatches.contains(patchName)) {
+                println("$prefix: Explicitly excluded.")
-                    println("$prefix: Explicitly excluded.")
+                return@patch
-                    return@patch
-                }
             } else if (!patch.include) {
                 println("$prefix: Implicitly excluded.")
                 return@patch
@@ -43,7 +41,7 @@ fun Patcher.addPatchesFiltered(
                     return@patch
                 }
 
-                if (!(args.debugging || compatiblePackages.any { it.versions.isEmpty() || it.versions.any { version -> version == packageVersion }})) {
+                if (!(args.experimental || compatiblePackages.any { it.versions.isEmpty() || it.versions.any { version -> version == packageVersion } })) {
                     println("$prefix: The package version is $packageVersion and is incompatible.")
                     return@patch
                 }
@@ -68,5 +66,5 @@ fun Patcher.applyPatchesVerbose() {
 }
 
 fun Patcher.mergeFiles() {
-    this.addFiles(MainCommand.args.pArgs.mergeFiles)
+    this.addFiles(args.pArgs!!.mergeFiles)
 }