From 88edb9c474d6a0963a073098c0691abb56a74b66 Mon Sep 17 00:00:00 2001
From: oSumAtrIX <johan.melkonyan1@web.de>
Date: Tue, 18 Jun 2024 03:11:27 +0200
Subject: [PATCH] refactor

---
 .../app/revanced/cli/command/PatchCommand.kt  | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/main/kotlin/app/revanced/cli/command/PatchCommand.kt b/src/main/kotlin/app/revanced/cli/command/PatchCommand.kt
index 3e45c89..f8fd012 100644
--- a/src/main/kotlin/app/revanced/cli/command/PatchCommand.kt
+++ b/src/main/kotlin/app/revanced/cli/command/PatchCommand.kt
@@ -293,25 +293,23 @@ internal object PatchCommand : Runnable {
                     }
                 }
 
-            // region Patch
+            patcher += filteredPatches to integrations
 
-            patcher.context.packageMetadata.packageName to patcher.apply {
-                this += filteredPatches to integrations
+            // Execute patches.
+            runBlocking {
+                patcher().collect { patchResult ->
+                    val exception = patchResult.exception
+                        ?: return@collect logger.info("\"${patchResult.patch}\" succeeded")
 
-                // Execute patches.
-                runBlocking {
-                    execute().collect { patchResult ->
-                        patchResult.exception?.let {
-                            StringWriter().use { writer ->
-                                it.printStackTrace(PrintWriter(writer))
-                                logger.severe("\"${patchResult.patch.name}\" failed:\n$writer")
-                            }
-                        } ?: logger.info("\"${patchResult.patch.name}\" succeeded")
+                    StringWriter().use { writer ->
+                        exception.printStackTrace(PrintWriter(writer))
+
+                        logger.severe("\"${patchResult.patch}\" failed:\n$writer")
                     }
                 }
-            }.get()
+            }
 
-            // endregion
+            patcher.context.packageMetadata.packageName to patcher.get()
         }
 
         // region Save