ReVanced-Mirror/revanced-cli
1
0
Fork 0
mirror of https://github.com/revanced/revanced-cli.git synced 2025-01-22 08:57:32 +01:00
Code Issues Projects Releases Wiki Activity

fix: format patches input

Browse Source 
Previously you could not use the original patches names because they were formatted but not the input
This commit is contained in:
oSumAtrIX 2023-08-28 20:15:50 +02:00
parent f7fcbc55bb
commit bbb1a63abd
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -232,13 +232,20 @@ internal object PatchCommand : Runnable {
* @return The filtered patches. * @return The filtered patches.
*/ */
private fun Patcher.filterPatchSelection(patches: PatchList) = buildList { private fun Patcher.filterPatchSelection(patches: PatchList) = buildList {
// TODO: Remove this eventually because
// patches named "patch-name" and "patch name" will conflict.
fun String.format() = lowercase().replace(" ", "-")
val formattedExcludedPatches = excludedPatches.map { it.format() }
val formattedIncludedPatches = includedPatches.map { it.format() }
val packageName = context.packageMetadata.packageName val packageName = context.packageMetadata.packageName
val packageVersion = context.packageMetadata.packageVersion val packageVersion = context.packageMetadata.packageVersion
patches.forEach patch@{ patch -> patches.forEach patch@{ patch ->
val formattedPatchName = patch.patchName.lowercase().replace(" ", "-") val formattedPatchName = patch.patchName.format()
val explicitlyExcluded = excludedPatches.contains(formattedPatchName) val explicitlyExcluded = formattedExcludedPatches.contains(formattedPatchName)
if (explicitlyExcluded) return@patch logger.info("Excluding ${patch.patchName}") if (explicitlyExcluded) return@patch logger.info("Excluding ${patch.patchName}")
// Make sure the patch is compatible with the supplied APK files package name and version. // Make sure the patch is compatible with the supplied APK files package name and version.
@ -248,12 +255,13 @@ internal object PatchCommand : Runnable {
it.isEmpty() || it.any { version -> version == packageVersion } it.isEmpty() || it.any { version -> version == packageVersion }
} }
if (!matchesVersion) return@patch logger.warning("${patch.patchName} is incompatible with version $packageVersion. " + "This patch is only compatible with version " + packages.joinToString( if (!matchesVersion) return@patch logger.warning(
";" "${patch.patchName} is incompatible with version $packageVersion. "
) { pkg -> + "This patch is only compatible with version "
"${pkg.name}: ${pkg.versions.joinToString(", ")}" + packages.joinToString(";") { pkg ->
}) "${pkg.name}: ${pkg.versions.joinToString(", ")}"
}
)
} ?: return@patch logger.fine("${patch.patchName} is incompatible with $packageName. " } ?: return@patch logger.fine("${patch.patchName} is incompatible with $packageName. "
+ "This patch is only compatible with " + "This patch is only compatible with "
+ packages.joinToString(", ") { `package` -> `package`.name }) + packages.joinToString(", ") { `package` -> `package`.name })
@ -264,7 +272,7 @@ internal object PatchCommand : Runnable {
// If the patch is implicitly included, it will be only included if [exclusive] is false. // If the patch is implicitly included, it will be only included if [exclusive] is false.
val implicitlyIncluded = !exclusive && patch.include val implicitlyIncluded = !exclusive && patch.include
// If the patch is explicitly included, it will be included even if [exclusive] is false. // If the patch is explicitly included, it will be included even if [exclusive] is false.
val explicitlyIncluded = includedPatches.contains(formattedPatchName) val explicitlyIncluded = formattedIncludedPatches.contains(formattedPatchName)
val included = implicitlyIncluded || explicitlyIncluded val included = implicitlyIncluded || explicitlyIncluded
if (!included) return@patch logger.info("${patch.patchName} excluded by default") // Case 1. if (!included) return@patch logger.info("${patch.patchName} excluded by default") // Case 1.