fix: remove duplicate options entries.

This commit is contained in:
oSumAtrIX 2023-06-18 02:18:28 +02:00
parent 1ccbed8d17
commit d0fc886428
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4

View File

@ -5,6 +5,7 @@ import app.revanced.cli.logging.CliLogger
import app.revanced.patcher.extensions.PatchExtensions.options import app.revanced.patcher.extensions.PatchExtensions.options
import app.revanced.patcher.extensions.PatchExtensions.patchName import app.revanced.patcher.extensions.PatchExtensions.patchName
import app.revanced.patcher.patch.NoSuchOptionException import app.revanced.patcher.patch.NoSuchOptionException
import app.revanced.utils.Options.PatchOption.Option
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import java.io.File import java.io.File
@ -25,9 +26,12 @@ internal object Options {
.map { patch -> .map { patch ->
PatchOption( PatchOption(
patch.patchName, patch.patchName,
patch.options!!.map { option -> PatchOption.Option(option.key, option.value) } patch.options!!.map { option -> Option(option.key, option.value) }
) )
}.let { }
// See https://github.com/revanced/revanced-patches/pull/2434/commits/60e550550b7641705e81aa72acfc4faaebb225e7.
.distinctBy { it.patchName }
.let {
if (prettyPrint) if (prettyPrint)
mapper.writerWithDefaultPrettyPrinter().writeValueAsString(it) mapper.writerWithDefaultPrettyPrinter().writeValueAsString(it)
else else