Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: added new --compatibility option to lists compatibilities #60

Merged
merged 2 commits into from
Jul 3, 2022
Merged

feat: added new --compatibility option to lists compatibilities #60

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3e0f44
feat: added new --compatibility option that lists compatibilities for…
EdgE790 Jun 25, 2022
94c4117
feat: Changed --compatibility flag to option to existing --list flag,…
EdgE790 Jun 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 42 additions & 3 deletions src/main/kotlin/app/revanced/cli/command/MainCommand.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import app.revanced.cli.patcher.logging.impl.PatcherLogger
import app.revanced.cli.signing.Signing
import app.revanced.cli.signing.SigningOptions
import app.revanced.patcher.PatcherOptions
import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
import app.revanced.patcher.extensions.PatchExtensions.description
import app.revanced.patcher.extensions.PatchExtensions.patchName
import app.revanced.patcher.util.patch.implementation.JarPatchBundle
Expand Down Expand Up @@ -45,6 +46,15 @@ internal object MainCommand : Runnable {
class ListingArgs {
@Option(names = ["-l", "--list"], description = ["List patches only"], required = true)
var listOnly: Boolean = false

@Option(names = ["--with-versions"], description = ["List patches with compatible versions"])
var withVersions: Boolean = false

@Option(names = ["--with-packages"], description = ["List patches with compatible packages"])
var withPackages: Boolean = false

@Option(names = ["--with-descriptions"], description = ["List patches with their descriptions"])
var withDescriptions: Boolean = true
}

class PatchingArgs {
Expand Down Expand Up @@ -93,9 +103,7 @@ internal object MainCommand : Runnable {

override fun run() {
if (args.lArgs?.listOnly == true) {
for (patchBundlePath in args.patchBundles) for (patch in JarPatchBundle(patchBundlePath).loadPatches()) {
logger.info("${patch.patchName}: ${patch.description}")
}
printListOfPatches()
return
}

Expand Down Expand Up @@ -143,4 +151,35 @@ internal object MainCommand : Runnable {

logger.info("Finished")
}

private fun printListOfPatches() {
for (patchBundlePath in args.patchBundles) for (patch in JarPatchBundle(patchBundlePath).loadPatches()) {
for (compatiblePackage in patch.compatiblePackages!!) {
val packageEntryStr = buildString {
// Add package if flag is set
if (args.lArgs?.withPackages == true) {
val packageName = compatiblePackage.name.substringAfterLast(".").padStart(10)
append(packageName)
append("\t")
}
// Add patch name
val patchName = patch.patchName.padStart(25)
append(patchName)
// Add description if flag is set.
if (args.lArgs?.withDescriptions == true) {
append("\t")
append(patch.description)
}
// Add compatible versions, if flag is set
if (args.lArgs?.withVersions == true) {
val compatibleVersions = compatiblePackage.versions.joinToString(separator = ", ")
append("\t")
append(compatibleVersions)
}

}
logger.info(packageEntryStr)
}
}
}
}