♻️ Cleanup

main.py

@@ -4,27 +4,26 @@ from environs import Env
 from loguru import logger
 
 from src.downloader import Downloader
-from src.parser import ArgParser
+from src.parser import Parser
 from src.patches import Patches
 
-env = Env()
-
 
 def main() -> None:
-    patches = Patches(env)
-    downloader = Downloader()
-    downloader.download_revanced()
+    env = Env()
 
-    logger.info(f"Will Patch only {patches.apps}")
-    for app in patches.apps:
+    patcher = Patches(env)
+    downloader = Downloader(env)
+    parser = Parser(patcher, env)
+
+    logger.info(f"Will Patch only {patcher.apps}")
+    for app in patcher.apps:
         try:
-            arg_parser = ArgParser(patches)
-            logger.debug("Trying to build %s" % app)
-            app_patches, version, is_experimental = patches.get_patches_version(app)
-            version = downloader.download_apk_to_patch(version, app)
-            patches.get_patches(app, arg_parser, app_patches)
-            logger.debug(f"Downloaded {app}, version {version}")
-            arg_parser.run(app=app, version=version, is_experimental=is_experimental)
+            logger.info("Trying to build %s" % app)
+            app_all_patches, version, is_experimental = patcher.get_app_configs(app)
+            version = downloader.download_apk_to_patch(version, app, patcher)
+            patcher.include_and_exclude_patches(app, parser, app_all_patches)
+            logger.info(f"Downloaded {app}, version {version}")
+            parser.patch_app(app=app, version=version, is_experimental=is_experimental)
         except Exception as e:
             logger.exception(f"Failed to build {app} because of {e}")