From f51e68103ffd52b097747e1ac0a18373c0bd5448 Mon Sep 17 00:00:00 2001 From: Nikhil Badyal Date: Tue, 9 Apr 2024 17:09:33 +0530 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Updated=20apk=20sources?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/downloader/factory.py | 6 ++++-- src/downloader/sources.py | 15 ++++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/downloader/factory.py b/src/downloader/factory.py index a640043..0f8436a 100644 --- a/src/downloader/factory.py +++ b/src/downloader/factory.py @@ -11,10 +11,12 @@ from src.downloader.google_drive import GoogleDrive from src.downloader.sources import ( APK_MIRROR_BASE_URL, APK_MONK_BASE_URL, + APK_PURE_BASE_APK_URL, APK_PURE_BASE_URL, APKS_SOS_BASE_URL, DRIVE_DOWNLOAD_BASE_URL, GITHUB_BASE_URL, + UPTODOWN_SUFFIX, ) from src.downloader.uptodown import UptoDown from src.exceptions import DownloadError @@ -34,11 +36,11 @@ class DownloaderFactory(object): """ if apk_source.startswith(GITHUB_BASE_URL): return Github(config) - if apk_source.startswith(APK_PURE_BASE_URL): + if apk_source.startswith((APK_PURE_BASE_URL, APK_PURE_BASE_APK_URL)): return ApkPure(config) if apk_source.startswith(APKS_SOS_BASE_URL): return ApkSos(config) - if apk_source.endswith("en.uptodown.com/android"): + if apk_source.endswith(UPTODOWN_SUFFIX): return UptoDown(config) if apk_source.startswith(APK_MIRROR_BASE_URL): return ApkMirror(config) diff --git a/src/downloader/sources.py b/src/downloader/sources.py index 1f49417..950d426 100644 --- a/src/downloader/sources.py +++ b/src/downloader/sources.py @@ -4,6 +4,7 @@ APK_MIRROR_BASE_URL = "https://www.apkmirror.com" APK_MIRROR_BASE_APK_URL = f"{APK_MIRROR_BASE_URL}/apk" APK_MIRROR_PACKAGE_URL = f"{APK_MIRROR_BASE_URL}/?s=" + "{}" APK_MIRROR_APK_CHECK = f"{APK_MIRROR_BASE_URL}/wp-json/apkm/v1/app_exists/" +UPTODOWN_SUFFIX = "en.uptodown.com/android" UPTODOWN_BASE_URL = "https://{}.en.uptodown.com/android" APK_PURE_BASE_URL = "https://apkpure.net" APK_PURE_BASE_APK_URL = "https://d.apkpure.net/b/APK" @@ -70,14 +71,14 @@ apk_sources = { "facebook": f"{APK_MIRROR_BASE_APK_URL}/facebook-2/facebook/", "my-expenses": UPTODOWN_BASE_URL.format("my-expenses"), "spotify": UPTODOWN_BASE_URL.format("spotify"), + "joey": UPTODOWN_BASE_URL.format("joey-for-reddit"), + "scbeasy": UPTODOWN_BASE_URL.format("scb-easy"), + "expensemanager": UPTODOWN_BASE_URL.format("bishinews-expense-manager"), "androidtwelvewidgets": APK_PURE_URL, "reddit-news": APK_PURE_URL, - "expensemanager": APK_SOS_URL, - "finanz-online": APK_SOS_URL, "hex-editor": APK_PURE_URL, - "photomath": APK_MONK_APK_URL, - "joey": APK_MONK_APK_URL, - "spotify-lite": APK_MONK_APK_URL, - "digitales": APK_MONK_APK_URL, - "scbeasy": APK_MONK_APK_URL, + "photomath": APK_PURE_URL, + "spotify-lite": APK_PURE_URL, + "digitales": APK_PURE_URL, + "finanz-online": APK_SOS_URL, }