From 19fcc3b41dd0a03c5301874a49a5c0ff88bd610c Mon Sep 17 00:00:00 2001 From: Nikhil Badyal Date: Fri, 30 Sep 2022 12:44:58 +0530 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=8E=A8=20Variable=20renaming?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/main.py b/main.py index b01ee61..f8683bb 100644 --- a/main.py +++ b/main.py @@ -180,7 +180,7 @@ class Patches(object): ) patches = resp.json() - app_ids = { + revanced_app_ids = { "com.google.android.youtube": ("youtube", "_yt"), "com.google.android.apps.youtube.music": ("youtube-music", "_ytm"), "com.reddit.frontpage": ("reddit", "_reddit"), @@ -189,21 +189,21 @@ class Patches(object): "de.dwd.warnapp": ("warnwetter", "_warnwetter"), } - for app_name in (app_ids[x][1] for x in app_ids): + for app_name in (revanced_app_ids[x][1] for x in revanced_app_ids): setattr(self, app_name, []) for patch in patches: for compatible_package, version in [ (x["name"], x["versions"]) for x in patch["compatiblePackages"] ]: - if compatible_package in app_ids: - app_name = app_ids[compatible_package][1] + if compatible_package in revanced_app_ids: + app_name = revanced_app_ids[compatible_package][1] p = {x: patch[x] for x in ["name", "description"]} p["app"] = compatible_package p["version"] = version[-1] if version else "all" getattr(self, app_name).append(p) - for app_name, app_id in app_ids.values(): + for app_name, app_id in revanced_app_ids.values(): n_patches = len(getattr(self, app_id)) logger.debug(f"Total patches in {app_name} are {n_patches}") From 04b3fdc3287081553eeba300f08640889d0afb78 Mon Sep 17 00:00:00 2001 From: Nikhil Badyal Date: Fri, 30 Sep 2022 12:45:44 +0530 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=8E=A8=20Removed=20hardcoded=20variab?= =?UTF-8?q?les?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/main.py b/main.py index f8683bb..4ea7c8f 100644 --- a/main.py +++ b/main.py @@ -247,15 +247,18 @@ class ArgParser(object): def run(self, app: str, version: str, is_experimental: bool = False) -> None: logger.debug(f"Sending request to revanced cli for building {app} revanced") + cli = "revanced-cli.jar" + patches = "revanced-patches.jar" + integrations = "revanced-integrations.apk" args = [ "-jar", - "revanced-cli.jar", + cli, "-a", app + ".apk", "-b", - "revanced-patches.jar", + patches, "-m", - "revanced-integrations.apk", + integrations, "-o", f"Re-{app}-{version}-output.apk", "--keystore",