ReVanced-Mirror/revanced-cli
1
0
Fork 0
mirror of https://github.com/revanced/revanced-cli.git synced 2024-12-12 13:17:46 +01:00
Code Issues Projects Releases Wiki Activity

fix: don't log when package is incompatible and exclusive option is used

Browse Source
This commit is contained in:
oSumAtrIX 2022-12-15 23:37:11 +01:00
parent 8c2aeff2cf
commit ad81a1b656
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/app/revanced/cli/command/MainCommand.kt
View File

@ -87,7 +87,7 @@ internal object MainCommand : Runnable {
names = ["--exclusive"], names = ["--exclusive"],
description = ["Only installs the patches you include, not including any patch by default"] description = ["Only installs the patches you include, not including any patch by default"]
) )
var defaultExclude = false var exclusive = false
@Option(names = ["-i", "--include"], description = ["Include patches"]) @Option(names = ["-i", "--include"], description = ["Include patches"])
var includedPatches = arrayOf<String>() var includedPatches = arrayOf<String>()

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

@ -18,18 +18,9 @@ fun Patcher.addPatchesFiltered(allPatches: List<Class<out Patch<Context>>>) {
allPatches.forEach patchLoop@{ patch -> allPatches.forEach patchLoop@{ patch ->
val compatiblePackages = patch.compatiblePackages val compatiblePackages = patch.compatiblePackages
val patchName = patch.patchName val patchName = patch.patchName
val prefix = "Skipping $patchName"
val args = MainCommand.args.patchArgs?.patchingArgs!! val args = MainCommand.args.patchArgs?.patchingArgs!!
if (args.excludedPatches.contains(patchName)) { val prefix = "Skipping $patchName"
logger.info("$prefix: Manually excluded")
return@patchLoop
} else if ((!patch.include || args.defaultExclude) && !args.includedPatches.contains(patchName)) {
logger.info("$prefix: Excluded by default")
return@patchLoop
}
if (compatiblePackages == null) logger.trace("$patchName: No constraint on packages.") if (compatiblePackages == null) logger.trace("$patchName: No constraint on packages.")
else { else {
@ -51,6 +42,14 @@ fun Patcher.addPatchesFiltered(allPatches: List<Class<out Patch<Context>>>) {
} }
} }
if (args.excludedPatches.contains(patchName)) {
logger.info("$prefix: Manually excluded")
return@patchLoop
} else if ((!patch.include || args.exclusive) && !args.includedPatches.contains(patchName)) {
logger.info("$prefix: Excluded by default")
return@patchLoop
}
logger.trace("Adding $patchName") logger.trace("Adding $patchName")
includedPatches.add(patch) includedPatches.add(patch)
} }