ReVanced-Mirror/revanced-cli
1
0
Fork 0
mirror of https://github.com/revanced/revanced-cli.git synced 2024-06-02 11:26:06 +02:00
Code Issues Projects Releases Wiki Activity

fix: print original instead of kebab cased names

Browse Source
This commit is contained in:
oSumAtrIX 2023-07-24 14:18:15 +02:00
parent fa85482c4a
commit 5eaad33dc1
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/kotlin/app/revanced/utils/patcher/Patcher.kt
View File

@ -17,12 +17,11 @@ fun Patcher.addPatchesFiltered(allPatches: PatchList) {
val includedPatches = mutableListOf<Class<out Patch<Context>>>() val includedPatches = mutableListOf<Class<out Patch<Context>>>()
allPatches.forEach patchLoop@{ patch -> allPatches.forEach patchLoop@{ patch ->
val compatiblePackages = patch.compatiblePackages val compatiblePackages = patch.compatiblePackages
val patchName = patch.patchName.lowercase().replace(" ", "-")
val args = args.patchArgs?.patchingArgs!! val args = args.patchArgs?.patchingArgs!!
val prefix = "Skipping $patchName" val prefix = "Skipping ${patch.patchName}"
if (compatiblePackages == null) logger.trace("$patchName: No constraint on packages.") if (compatiblePackages == null) logger.trace("${patch.patchName}: No package constraints.")
else { else {
if (!compatiblePackages.any { it.name == packageName }) { if (!compatiblePackages.any { it.name == packageName }) {
logger.trace("$prefix: Incompatible with $packageName. This patch is only compatible with ${ logger.trace("$prefix: Incompatible with $packageName. This patch is only compatible with ${
@ -42,15 +41,16 @@ fun Patcher.addPatchesFiltered(allPatches: PatchList) {
} }
} }
if (args.excludedPatches.contains(patchName)) { val kebabCasedPatchName = patch.patchName.lowercase().replace(" ", "-")
if (args.excludedPatches.contains(kebabCasedPatchName)) {
logger.info("$prefix: Manually excluded") logger.info("$prefix: Manually excluded")
return@patchLoop return@patchLoop
} else if ((!patch.include || args.exclusive) && !args.includedPatches.contains(patchName)) { } else if ((!patch.include || args.exclusive) && !args.includedPatches.contains(kebabCasedPatchName)) {
logger.info("$prefix: Excluded by default") logger.info("$prefix: Excluded by default")
return@patchLoop return@patchLoop
} }
logger.trace("Adding $patchName") logger.trace("Adding ${patch.patchName}")
includedPatches.add(patch) includedPatches.add(patch)
} }