From 50c0f98ce5927e07839437a2e550aa85f5a7e62d Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Fri, 22 Sep 2023 02:35:43 +0200 Subject: [PATCH] feat: Add option to filter patches to be listed by package name --- .../app/revanced/cli/command/ListPatchesCommand.kt | 13 ++++++++++++- .../test/kotlin/app/revanced/lib/PatchUtilsTest.kt | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/revanced-cli/src/main/kotlin/app/revanced/cli/command/ListPatchesCommand.kt b/revanced-cli/src/main/kotlin/app/revanced/cli/command/ListPatchesCommand.kt index 3f5535a..c899aa2 100644 --- a/revanced-cli/src/main/kotlin/app/revanced/cli/command/ListPatchesCommand.kt +++ b/revanced-cli/src/main/kotlin/app/revanced/cli/command/ListPatchesCommand.kt @@ -42,6 +42,11 @@ internal object ListPatchesCommand : Runnable { ) private var withOptions: Boolean = false + @Option( + names = ["-f", "--filter-package-name"], description = ["Filter patches by package name"] + ) + private var packageName: String? = null + override fun run() { fun Patch.CompatiblePackage.buildString() = buildString { if (withVersions && versions != null) { @@ -83,6 +88,12 @@ internal object ListPatchesCommand : Runnable { } } - logger.info(PatchBundleLoader.Jar(*patchBundles).joinToString("\n\n") { it.buildString() }) + fun Patch<*>.anyPackageName(name: String) = compatiblePackages?.any { it.name == name } == true + + val patches = PatchBundleLoader.Jar(*patchBundles) + + val filtered = packageName?.let { patches.filter { patch -> patch.anyPackageName(it) } } ?: patches + + if (filtered.isNotEmpty()) logger.info(filtered.joinToString("\n\n") { it.buildString() }) } } \ No newline at end of file diff --git a/revanced-lib/src/test/kotlin/app/revanced/lib/PatchUtilsTest.kt b/revanced-lib/src/test/kotlin/app/revanced/lib/PatchUtilsTest.kt index 7b29529..ac3ece4 100644 --- a/revanced-lib/src/test/kotlin/app/revanced/lib/PatchUtilsTest.kt +++ b/revanced-lib/src/test/kotlin/app/revanced/lib/PatchUtilsTest.kt @@ -23,7 +23,7 @@ internal object PatchUtilsTest { @Test fun `return null because no patch is compatible with the supplied package name`() { - val patches = setOf(newPatch("other.package", "a")) + val patches = setOf(newPatch("some.package", "a")) assertEqualsVersion(null, patches, "other.package") }