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

fix: Only set options for filtered patches

Browse Source 
This prevents errors when settings required options from patches that are not accepted to `null`.
This commit is contained in:
oSumAtrIX 2023-10-04 04:18:31 +02:00
parent e3c55507cf
commit 64d9127291
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/kotlin/app/revanced/cli/command/PatchCommand.kt
View File

@ -196,13 +196,6 @@ internal object PatchCommand : Runnable {
logger.warning("Unknown input of patches:\n${unknownPatches.joinToString("\n")}") logger.warning("Unknown input of patches:\n${unknownPatches.joinToString("\n")}")
} }
logger.info("Setting patch options")
optionsFile.let {
if (it.exists()) patches.setOptions(it)
else Options.serialize(patches, prettyPrint = true).let(it::writeText)
}
// endregion // endregion
Patcher( Patcher(
@ -213,11 +206,18 @@ internal object PatchCommand : Runnable {
resourceCachePath.absolutePath, resourceCachePath.absolutePath,
) )
).use { patcher -> ).use { patcher ->
val filteredPatches = patcher.filterPatchSelection(patches).also { patches ->
logger.info("Setting patch options")
if (optionsFile.exists()) patches.setOptions(optionsFile)
else Options.serialize(patches, prettyPrint = true).let(optionsFile::writeText)
}
// region Patch // region Patch
val patcherResult = patcher.apply { val patcherResult = patcher.apply {
acceptIntegrations(integrations) acceptIntegrations(integrations)
acceptPatches(filterPatchSelection(patches)) acceptPatches(filteredPatches.toList())
// Execute patches. // Execute patches.
runBlocking { runBlocking {
@ -277,7 +277,7 @@ internal object PatchCommand : Runnable {
* @param patches The patches to filter. * @param patches The patches to filter.
* @return The filtered patches. * @return The filtered patches.
*/ */
private fun Patcher.filterPatchSelection(patches: PatchSet) = buildList { private fun Patcher.filterPatchSelection(patches: PatchSet): PatchSet = buildSet {
val packageName = context.packageMetadata.packageName val packageName = context.packageMetadata.packageName
val packageVersion = context.packageMetadata.packageVersion val packageVersion = context.packageMetadata.packageVersion