From 6dd960b1473a85760ecbebb830c34215a844c49d Mon Sep 17 00:00:00 2001
From: Nikhil Badyal <nikhill773384@gmail.com>
Date: Mon, 15 Apr 2024 23:13:04 +0530
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactored=20strings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config.py              | 16 +++++++++-------
 src/downloader/download.py |  3 +--
 src/downloader/utils.py    |  4 ----
 src/utils.py               |  8 +++++++-
 4 files changed, 17 insertions(+), 14 deletions(-)
 delete mode 100644 src/downloader/utils.py

diff --git a/src/config.py b/src/config.py
index 6b9646a..a439532 100644
--- a/src/config.py
+++ b/src/config.py
@@ -5,12 +5,14 @@ from typing import Self
 
 from environs import Env
 
-from src.utils import default_build
-
-default_cli = "https://github.com/revanced/revanced-cli/releases/latest"
-default_patches = "https://github.com/revanced/revanced-patches/releases/latest"
-default_patches_json = default_patches
-default_integrations = "https://github.com/revanced/revanced-integrations/releases/latest"
+from src.utils import (
+    default_build,
+    default_cli,
+    default_integrations,
+    default_patches,
+    default_patches_json,
+    resource_folder,
+)
 
 
 class RevancedConfig(object):
@@ -18,7 +20,7 @@ class RevancedConfig(object):
 
     def __init__(self: Self, env: Env) -> None:
         self.env = env
-        self.temp_folder_name = "apks"
+        self.temp_folder_name = resource_folder
         self.temp_folder = Path(self.temp_folder_name)
         self.ci_test = env.bool("CI_TEST", False)
         self.rip_libs_apps: list[str] = []
diff --git a/src/downloader/download.py b/src/downloader/download.py
index 654713f..b3a4059 100644
--- a/src/downloader/download.py
+++ b/src/downloader/download.py
@@ -12,9 +12,8 @@ from tqdm import tqdm
 
 from src.app import APP
 from src.config import RevancedConfig
-from src.downloader.utils import implement_method
 from src.exceptions import DownloadError
-from src.utils import handle_request_response, session
+from src.utils import handle_request_response, implement_method, session
 
 
 class Downloader(object):
diff --git a/src/downloader/utils.py b/src/downloader/utils.py
deleted file mode 100644
index 4292655..0000000
--- a/src/downloader/utils.py
+++ /dev/null
@@ -1,4 +0,0 @@
-"""Utility class."""
-
-implement_method = "Please implement the method"
-status_code_200 = 200
diff --git a/src/utils.py b/src/utils.py
index b3a15d6..60eaa48 100644
--- a/src/utils.py
+++ b/src/utils.py
@@ -20,7 +20,6 @@ if TYPE_CHECKING:
     from src.app import APP
 
 from src.downloader.sources import APK_MIRROR_APK_CHECK
-from src.downloader.utils import status_code_200
 from src.exceptions import ScrapingError
 
 default_build = [
@@ -35,6 +34,10 @@ request_header = {
     "Authorization": "Basic YXBpLWFwa3VwZGF0ZXI6cm01cmNmcnVVakt5MDRzTXB5TVBKWFc4",
     "Content-Type": "application/json",
 }
+default_cli = "https://github.com/revanced/revanced-cli/releases/latest"
+default_patches = "https://github.com/revanced/revanced-patches/releases/latest"
+default_patches_json = default_patches
+default_integrations = "https://github.com/revanced/revanced-integrations/releases/latest"
 bs4_parser = "html.parser"
 changelog_file = "changelog.md"
 changelog_json_file = "changelog.json"
@@ -49,6 +52,9 @@ integration_version_key = "integrations_version"
 patches_version_key = "patches_version"
 cli_version_key = "cli_version"
 patches_json_version_key = "patches_json_version"
+implement_method = "Please implement the method"
+status_code_200 = 200
+resource_folder = "apks"
 
 
 def update_changelog(name: str, response: dict[str, str]) -> None: