chore: Merge branch dev to main #3

Author: AzyrRuthless

src/main/kotlin/app/morphe/cli/command/PatchCommand.kt

@@ -15,9 +15,13 @@ import picocli.CommandLine.Help.Visibility.ALWAYS
 import picocli.CommandLine.Model.CommandSpec
 import picocli.CommandLine.Spec
 import java.io.File
+import java.io.FileOutputStream
 import java.io.PrintWriter
 import java.io.StringWriter
 import java.util.logging.Logger
+import java.util.zip.ZipEntry
+import java.util.zip.ZipFile
+import java.util.zip.ZipOutputStream
 
 @CommandLine.Command(
     name = "patch",
@@ -181,6 +185,19 @@ internal object PatchCommand : Runnable {
     )
     private var purge: Boolean = false
 
+    @CommandLine.Option(
+        names = ["--rip-lib"],
+        description = ["Remove native libraries for specific architectures (e.g., x86, x86_64)."],
+    )
+    private var ripLibs: List<String> = emptyList()
+
+    @CommandLine.Option(
+        names = ["--unsigned"],
+        description = ["Don't sign the patched APK file."],
+        showDefaultValue = ALWAYS,
+    )
+    private var unsigned: Boolean = false
+
     @CommandLine.Parameters(
         description = ["APK file to patch."],
         arity = "1",
@@ -228,12 +245,6 @@ internal object PatchCommand : Runnable {
         this.aaptBinaryPath = aaptBinaryPath
     }
 
-    @CommandLine.Option(
-        names = ["--unsigned"],
-        description = ["Disable signing of the final apk."],
-    )
-    private var unsigned: Boolean = false
-    
     override fun run() {
         // region Setup
 
@@ -338,6 +349,37 @@ internal object PatchCommand : Runnable {
         apk.copyTo(temporaryFilesPath.resolve(apk.name), overwrite = true).apply {
             patcherResult.applyTo(this)
         }.let { patchedApkFile ->
+
+            if (ripLibs.isNotEmpty()) {
+                ripLibraries(patchedApkFile, ripLibs)
+            }
+
+            // zipalign logic start
+            if (!mount) {
+                try {
+                    logger.info("Running zipalign...")
+                    val alignedApk = File.createTempFile("aligned", ".apk", temporaryFilesPath)
+                    val pb = ProcessBuilder(
+                        "zipalign", "-p", "-f", "4",
+                        patchedApkFile.absolutePath,
+                        alignedApk.absolutePath
+                    )
+                    val process = pb.start()
+                    if (process.waitFor() == 0) {
+                        if (patchedApkFile.delete()) {
+                            alignedApk.renameTo(patchedApkFile)
+                            logger.info("zipalign completed")
+                        }
+                    } else {
+                        logger.warning("zipalign failed (exit code ${process.exitValue()})")
+                        alignedApk.delete()
+                    }
+                } catch (e: Exception) {
+                    logger.warning("Failed to run zipalign: ${e.message}. Ensure it is in PATH.")
+                }
+            }
+            // zipalign logic end
+
             if (!mount && !unsigned) {
                 ApkUtils.signApk(
                     patchedApkFile,
@@ -456,4 +498,42 @@ internal object PatchCommand : Runnable {
             }
         logger.info(result)
     }
+
+    private fun ripLibraries(apkFile: File, archsToRemove: List<String>) {
+        if (archsToRemove.isEmpty()) return
+
+        logger.info("Ripping libraries for architectures: $archsToRemove")
+
+        val tempFile = File.createTempFile("temp-rip", ".apk", apkFile.parentFile)
+
+        ZipFile(apkFile).use { zip ->
+            ZipOutputStream(FileOutputStream(tempFile)).use { out ->
+                val entries = zip.entries()
+                while (entries.hasMoreElements()) {
+                    val entry = entries.nextElement()
+                    var shouldRemove = false
+
+                    for (arch in archsToRemove) {
+                        if (entry.name.startsWith("lib/$arch/")) {
+                            shouldRemove = true
+                            break
+                        }
+                    }
+
+                    if (!shouldRemove) {
+                        out.putNextEntry(ZipEntry(entry.name))
+                        zip.getInputStream(entry).copyTo(out)
+                        out.closeEntry()
+                    }
+                }
+            }
+        }
+
+        if (apkFile.delete()) {
+            tempFile.renameTo(apkFile)
+        } else {
+            tempFile.copyTo(apkFile, overwrite = true)
+            tempFile.delete()
+        }
+    }
 }