From ee534b150a331a0b3635ba1916c8ebd878261a30 Mon Sep 17 00:00:00 2001
From: Nikhil Badyal <nikhill773384@gmail.com>
Date: Wed, 23 Aug 2023 10:18:15 +0530
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Moved=20apk=20to=20inside=20app?=
 =?UTF-8?q?=20class?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.py    |  8 +-------
 src/app.py | 27 +++++++++++++++++++++------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/main.py b/main.py
index c091639..f3e65ae 100644
--- a/main.py
+++ b/main.py
@@ -5,7 +5,6 @@ from environs import Env
 from loguru import logger
 
 from src.config import RevancedConfig
-from src.downloader.factory import DownloaderFactory
 from src.exceptions import AppNotFound, PatchesJsonLoadFailed, PatchingFailed
 from src.parser import Parser
 from src.patches import Patches
@@ -30,13 +29,8 @@ def main() -> None:
             patcher = Patches(config, app)
             parser = Parser(patcher, config)
             app_all_patches = patcher.get_app_configs(app)
+            app.download_apk_for_patching(config)
             patcher.include_exclude_patch(app, parser, app_all_patches)
-            downloader = DownloaderFactory.create_downloader(
-                app=app.app_name, config=config
-            )
-            app.download_file_name, app.download_dl = downloader.download(
-                app.app_version, app.app_name
-            )
             logger.info(app)
             parser.patch_app(app)
         except AppNotFound as e:
diff --git a/src/app.py b/src/app.py
index 72eb7b4..3438f58 100644
--- a/src/app.py
+++ b/src/app.py
@@ -3,7 +3,7 @@ import concurrent
 import hashlib
 import pathlib
 from concurrent.futures import ThreadPoolExecutor
-from typing import Dict
+from typing import Dict, List
 
 from loguru import logger
 
@@ -29,20 +29,35 @@ class APP(object):
         self.patches_json_dl = config.env.str(
             f"{app_name}_PATCHES_JSON_DL".upper(), config.global_patches_json_dl
         )
-        self.exclude_request = config.env.list(f"{app_name}_EXCLUDE_PATCH".upper(), [])
-        self.include_request = config.env.list(f"{app_name}_INCLUDE_PATCH".upper(), [])
+        self.exclude_request: List[str] = config.env.list(
+            f"{app_name}_EXCLUDE_PATCH".upper(), []
+        )
+        self.include_request: List[str] = config.env.list(
+            f"{app_name}_INCLUDE_PATCH".upper(), []
+        )
         self.resource: Dict[str, str] = {}
-        self.no_of_patches = 0
+        self.no_of_patches: int = 0
         self.keystore_name = config.env.str(
             f"{app_name}_KEYSTORE_FILE_NAME".upper(), config.global_keystore_name
         )
         self.archs_to_build = config.env.list(
             f"{app_name}_ARCHS_TO_BUILD".upper(), config.global_archs_to_build
         )
-        self.download_file_name = None
-        self.download_dl = None
+        self.download_file_name = ""
+        self.download_dl = ""
         self.download_patch_resources(config)
 
+    def download_apk_for_patching(self, config: RevancedConfig) -> None:
+        """Download apk to be patched."""
+        from src.downloader.factory import DownloaderFactory
+        logger.info("Downloading apk to be patched")
+        downloader = DownloaderFactory.create_downloader(
+            app=self.app_name, config=config
+        )
+        self.download_file_name, self.download_dl = downloader.download(
+            self.app_version, self.app_name
+        )
+
     def get_output_file_name(self) -> str:
         """The function returns a string representing the output file name for
         an APK file appended with version.