From 7e59d4d4537eabb39d9eb4c3a4855c87488c6855 Mon Sep 17 00:00:00 2001
From: Nikhil Badyal <nikhill773384@gmail.com>
Date: Sat, 1 Jul 2023 18:04:06 +0530
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Removed=20duplicate=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/patches.py | 89 +++++++++++++++++++++-----------------------------
 src/utils.py   | 25 --------------
 2 files changed, 37 insertions(+), 77 deletions(-)

diff --git a/src/patches.py b/src/patches.py
index 9089431..6ba7fb5 100644
--- a/src/patches.py
+++ b/src/patches.py
@@ -12,35 +12,42 @@ from src.utils import AppNotFound, handle_response
 class Patches(object):
     """Revanced Patches."""
 
-    revanced_app_ids = {
-        "com.reddit.frontpage": ("reddit", "_reddit"),
-        "com.ss.android.ugc.trill": ("tiktok", "_tiktok"),
-        "com.twitter.android": ("twitter", "_twitter"),
-        "de.dwd.warnapp": ("warnwetter", "_warnwetter"),
-        "com.spotify.music": ("spotify", "_spotify"),
-        "com.awedea.nyx": ("nyx-music-player", "_nyx"),
-        "ginlemon.iconpackstudio": ("icon_pack_studio", "_iconpackstudio"),
-        "com.ticktick.task": ("ticktick", "_ticktick"),
-        "tv.twitch.android.app": ("twitch", "_twitch"),
-        "com.myprog.hexedit": ("hex-editor", "_hexeditor"),
-        "co.windyapp.android": ("windy", "_windy"),
-        "org.totschnig.myexpenses": ("my-expenses", "_expenses"),
-        "com.backdrops.wallpapers": ("backdrops", "_backdrops"),
-        "com.ithebk.expensemanager": ("expensemanager", "_expensemanager"),
-        "net.dinglisch.android.taskerm": ("tasker", "_tasker"),
-        "net.binarymode.android.irplus": ("irplus", "_irplus"),
-        "com.vsco.cam": ("vsco", "_vsco"),
-        "com.zombodroid.MemeGenerator": ("meme-generator-free", "_meme-generator-free"),
-        "com.teslacoilsw.launcher": ("nova_launcher", "_nova_launcher"),
-        "eu.faircode.netguard": ("netguard", "_netguard"),
-        "com.instagram.android": ("instagram", "_instagram"),
-        "com.nis.app": ("inshorts", "_inshorts"),
-        "com.facebook.orca": ("facebook", "_facebook"),
+    _revanced_app_ids = {
+        "com.reddit.frontpage": "reddit",
+        "com.ss.android.ugc.trill": "tiktok",
+        "com.twitter.android": "twitter",
+        "de.dwd.warnapp": "warnwetter",
+        "com.spotify.music": "spotify",
+        "com.awedea.nyx": "nyx-music-player",
+        "ginlemon.iconpackstudio": "icon_pack_studio",
+        "com.ticktick.task": "ticktick",
+        "tv.twitch.android.app": "twitch",
+        "com.myprog.hexedit": "hex-editor",
+        "co.windyapp.android": "windy",
+        "org.totschnig.myexpenses": "my-expenses",
+        "com.backdrops.wallpapers": "backdrops",
+        "com.ithebk.expensemanager": "expensemanager",
+        "net.dinglisch.android.taskerm": "tasker",
+        "net.binarymode.android.irplus": "irplus",
+        "com.vsco.cam": "vsco",
+        "com.zombodroid.MemeGenerator": "meme-generator-free",
+        "com.teslacoilsw.launcher": "nova_launcher",
+        "eu.faircode.netguard": "netguard",
+        "com.instagram.android": "instagram",
+        "com.nis.app": "inshorts",
+        "com.facebook.orca": "facebook",
     }
-    revanced_extended_app_ids = {
+    revanced_app_ids = {
+        key: (value, "_" + value) for key, value in _revanced_app_ids.items()
+    }
+    _revanced_extended_app_ids = {
         "com.google.android.youtube": ("youtube", "_yt"),
         "com.google.android.apps.youtube.music": ("youtube-music", "_ytm"),
     }
+    revanced_extended_app_ids = {
+        key: (value[0], "_" + value[0])
+        for key, value in _revanced_extended_app_ids.items()
+    }
 
     @staticmethod
     def check_java() -> None:
@@ -130,33 +137,11 @@ class Patches(object):
         :return: Patches
         """
         logger.debug("Getting patches for %s" % app)
-        app_names = {
-            "reddit": "_reddit",
-            "tiktok": "_tiktok",
-            "twitter": "_twitter",
-            "warnwetter": "_warnwetter",
-            "youtube": "_yt",
-            "youtube_music": "_ytm",
-            "spotify": "_spotify",
-            "nyx-music-player": "_nyx",
-            "icon_pack_studio": "_iconpackstudio",
-            "ticktick": "_ticktick",
-            "twitch": "_twitch",
-            "hex-editor": "_hexeditor",
-            "windy": "_windy",
-            "my-expenses": "_expenses",
-            "backdrops": "_backdrops",
-            "expensemanager": "_expensemanager",
-            "tasker": "_tasker",
-            "irplus": "_irplus",
-            "vsco": "_vsco",
-            "meme-generator-free": "_meme-generator-free",
-            "nova_launcher": "_nova_launcher",
-            "netguard": "_netguard",
-            "instagram": "_instagram",
-            "inshorts": "_inshorts",
-            "facebook": "_facebook",
-        }
+        app_names = {value[0]: value[1] for value in self.revanced_app_ids.values()}
+        app_names.update(
+            {value[0]: value[1] for value in self.revanced_extended_app_ids.values()}
+        )
+
         if not (app_name := app_names.get(app)):
             raise AppNotFound(app)
         patches = getattr(self, app_name)
diff --git a/src/utils.py b/src/utils.py
index 06d23ee..f6c46b8 100644
--- a/src/utils.py
+++ b/src/utils.py
@@ -8,31 +8,6 @@ default_build = [
     "youtube",
     "youtube_music",
 ]
-all_builds = [
-    "youtube",
-    "youtube_music",
-    "twitter",
-    "reddit",
-    # "tiktok", # Commented because of out of memory issues
-    "warnwetter",
-    "spotify",
-    "nyx-music-player",
-    "icon_pack_studio",
-    "ticktick",
-    "twitch",
-    "hex-editor",
-    "windy",
-    "my-expenses",
-    "backdrops",
-    "tasker",
-    "vsco",
-    "meme-generator-free",
-    "nova_launcher",
-    "netguard",
-    "instagram",
-    "inshorts",
-    "facebook",
-]
 possible_archs = ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]