From b635e697ceb64d6de69c066dc082cc15ceddc589 Mon Sep 17 00:00:00 2001 From: Nikhil Badyal Date: Wed, 23 Aug 2023 10:06:36 +0530 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Removed=20patcher=20from=20downl?= =?UTF-8?q?oader=20arguments=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 2 +- src/app.py | 2 +- src/downloader/apksos.py | 3 ++- src/downloader/download.py | 4 +--- src/downloader/factory.py | 16 ++++++---------- 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/main.py b/main.py index b0de6e4..c091639 100644 --- a/main.py +++ b/main.py @@ -32,7 +32,7 @@ def main() -> None: app_all_patches = patcher.get_app_configs(app) patcher.include_exclude_patch(app, parser, app_all_patches) downloader = DownloaderFactory.create_downloader( - app=app.app_name, patcher=patcher, config=config + app=app.app_name, config=config ) app.download_file_name, app.download_dl = downloader.download( app.app_version, app.app_name diff --git a/src/app.py b/src/app.py index 3922798..72eb7b4 100644 --- a/src/app.py +++ b/src/app.py @@ -113,7 +113,7 @@ class APP(object): if not file_name: extension = pathlib.Path(url).suffix file_name = APP.generate_filename(url) + extension - Downloader(None, config).direct_download(url, file_name) # type: ignore + Downloader(config).direct_download(url, file_name) return file_name def download_patch_resources(self, config: RevancedConfig) -> None: diff --git a/src/downloader/apksos.py b/src/downloader/apksos.py index 7e4b315..be764c7 100644 --- a/src/downloader/apksos.py +++ b/src/downloader/apksos.py @@ -7,6 +7,7 @@ from bs4 import BeautifulSoup from src.downloader.download import Downloader from src.downloader.sources import apk_sources from src.exceptions import APKSosAPKDownloadFailure +from src.patches import Patches from src.utils import bs4_parser, request_header @@ -37,6 +38,6 @@ class ApkSos(Downloader): :param app: Name of the application :return: Version of downloaded apk """ - package_name = self.patcher.get_package_name(app) + package_name = Patches.get_package_name(app) download_url = apk_sources[app].format(package_name) return self.extract_download_link(download_url, app) diff --git a/src/downloader/download.py b/src/downloader/download.py index 217a41f..7440c42 100644 --- a/src/downloader/download.py +++ b/src/downloader/download.py @@ -12,19 +12,17 @@ from tqdm import tqdm from src.config import RevancedConfig from src.downloader.utils import implement_method from src.exceptions import DownloadFailure -from src.patches import Patches from src.utils import handle_request_response class Downloader(object): """Files downloader.""" - def __init__(self, patcher: Patches, config: RevancedConfig): + def __init__(self, config: RevancedConfig): self._CHUNK_SIZE = 10485760 self._QUEUE: PriorityQueue[Tuple[float, str]] = PriorityQueue() self._QUEUE_LENGTH = 0 self.config = config - self.patcher = patcher @staticmethod def file_status_check(file_name: Path, dry_run: bool, url: str) -> bool: diff --git a/src/downloader/factory.py b/src/downloader/factory.py index ba9d4ef..2a3019b 100644 --- a/src/downloader/factory.py +++ b/src/downloader/factory.py @@ -14,32 +14,28 @@ from src.downloader.sources import ( ) from src.downloader.uptodown import UptoDown from src.exceptions import DownloadFailure -from src.patches import Patches class DownloaderFactory(object): """Downloader Factory.""" @staticmethod - def create_downloader( - app: str, patcher: Patches, config: RevancedConfig - ) -> Downloader: + def create_downloader(app: str, config: RevancedConfig) -> Downloader: """Returns appropriate downloader. Parameters ---------- app : App Name - patcher : Patcher config : Config """ if apk_sources[app].startswith(GITHUB_BASE_URL): - return Github(patcher, config) + return Github(config) if apk_sources[app].startswith(APK_PURE_URL): - return ApkPure(patcher, config) + return ApkPure(config) elif apk_sources[app].startswith(APK_SOS_URL): - return ApkSos(patcher, config) + return ApkSos(config) elif apk_sources[app].endswith("en.uptodown.com/android"): - return UptoDown(patcher, config) + return UptoDown(config) elif apk_sources[app].startswith(APK_MIRROR_BASE_URL): - return ApkMirror(patcher, config) + return ApkMirror(config) raise DownloadFailure(f"No download factory found for {app}")