From a1c9fef70a6f2da377f016bab6d53866ac722006 Mon Sep 17 00:00:00 2001 From: Nikhil Badyal Date: Thu, 24 Aug 2023 17:34:40 +0530 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Properly=20set=20download=20sour?= =?UTF-8?q?ce?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app.py | 4 +++- src/downloader/apkpure.py | 5 ++--- src/downloader/apksos.py | 3 +-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app.py b/src/app.py index 7cd7333..43c15b6 100644 --- a/src/app.py +++ b/src/app.py @@ -69,7 +69,9 @@ class APP(object): logger.info("Downloading apk to be patched by scrapping") try: if not self.download_source: - self.download_source = apk_sources[self.app_name] + self.download_source = apk_sources[self.app_name].format( + self.package_name + ) except KeyError: raise DownloadFailure(f"No download source found for {self.app_name}") downloader = DownloaderFactory.create_downloader( diff --git a/src/downloader/apkpure.py b/src/downloader/apkpure.py index b590a45..ee61df3 100644 --- a/src/downloader/apkpure.py +++ b/src/downloader/apkpure.py @@ -15,7 +15,6 @@ class ApkPure(Downloader): :param app: Name of the application :return: Version of downloaded apk """ - download_url = app.download_source.format(app.package_name) file_name = f"{app.app_name}.apk" - self._download(download_url, file_name) - return file_name, download_url + self._download(app.download_source, file_name) + return file_name, app.download_source diff --git a/src/downloader/apksos.py b/src/downloader/apksos.py index 60d6d4a..0194611 100644 --- a/src/downloader/apksos.py +++ b/src/downloader/apksos.py @@ -37,5 +37,4 @@ class ApkSos(Downloader): :param app: Name of the application :return: Version of downloaded apk """ - download_url = app.download_source.format(app.package_name) - return self.extract_download_link(download_url, app.app_name) + return self.extract_download_link(app.download_source, app.app_name)