Skip to content

Commit 555b38f

Browse files
committed
fix: make cli compatible with breaking changes of the patcher
Signed-off-by: oSumAtrIX <[email protected]>
1 parent 9fc2f96 commit 555b38f

File tree

1 file changed

+6
-16
lines changed
  • src/main/kotlin/app/revanced/cli

1 file changed

+6
-16
lines changed

src/main/kotlin/app/revanced/cli/Main.kt

+6-16
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package app.revanced.cli
33
import app.revanced.cli.utils.PatchLoader
44
import app.revanced.cli.utils.Patches
55
import app.revanced.cli.utils.Preconditions
6-
import app.revanced.cli.utils.SignatureParser
76
import app.revanced.patcher.Patcher
7+
import app.revanced.patcher.patch.PatchMetadata
88
import app.revanced.patcher.patch.PatchResult
99
import kotlinx.cli.ArgParser
1010
import kotlinx.cli.ArgType
@@ -21,7 +21,6 @@ class Main {
2121
companion object {
2222
private fun runCLI(
2323
inApk: String,
24-
inSignatures: String,
2524
inPatches: String,
2625
inIntegrations: String?,
2726
inOutput: String,
@@ -35,21 +34,19 @@ class Main {
3534
.maxHint(1)
3635
.setExtraMessage("Initializing")
3736
val apk = Preconditions.isFile(inApk)
38-
val signatures = Preconditions.isFile(inSignatures)
3937
val patchesFile = Preconditions.isFile(inPatches)
4038
val output = Preconditions.isDirectory(inOutput)
4139
bar.step()
4240

4341
val patcher = Patcher(
4442
apk,
45-
SignatureParser.parse(signatures.readText(), bar)
4643
)
4744

4845
inIntegrations?.let {
4946
bar.reset().maxHint(1)
5047
.extraMessage = "Merging integrations"
5148
val integrations = Preconditions.isFile(it)
52-
patcher.addFiles(listOf(integrations))
49+
//patcher.addFiles(listOf(integrations))
5350
bar.step()
5451
}
5552

@@ -83,12 +80,12 @@ class Main {
8380
printResults(results)
8481
}
8582

86-
private fun printResults(results: Map<String, Result<PatchResult>>) {
87-
for ((name, result) in results) {
83+
private fun printResults(results: Map<PatchMetadata, Result<PatchResult>>) {
84+
for ((metadata, result) in results) {
8885
if (result.isSuccess) {
89-
println("Patch $name was applied successfully!")
86+
println("${metadata.name} was applied successfully!")
9087
} else {
91-
println("Patch $name failed to apply! Cause:")
88+
println("${metadata.name} failed to apply! Cause:")
9289
result.exceptionOrNull()!!.printStackTrace()
9390
}
9491
}
@@ -105,12 +102,6 @@ class Main {
105102
shortName = "a",
106103
description = "APK file"
107104
).required()
108-
val signatures by parser.option(
109-
ArgType.String,
110-
fullName = "signatures",
111-
shortName = "s",
112-
description = "Signatures JSON file"
113-
).required()
114105
val patches by parser.option(
115106
ArgType.String,
116107
fullName = "patches",
@@ -133,7 +124,6 @@ class Main {
133124
parser.parse(args)
134125
runCLI(
135126
apk,
136-
signatures,
137127
patches,
138128
integrations,
139129
output,

0 commit comments

Comments
 (0)