Added "skip latest" option to APKPure (also fallback toggle)

2025-08-13 02:18:10 +02:00 · 2024-10-01 15:49:00 -04:00
parent 783e8029b6
commit cbcc8c4eaf
24 changed files with 137 additions and 83 deletions
--- a/assets/translations/bs.json
+++ b/assets/translations/bs.json
@@ -315,6 +315,7 @@
    "wiki": "Pomoć/Wiki",
    "crowdsourcedConfigsLabel": "Konfiguracije aplikacije obezbeđene pomoću velikog broja ljudi (crowdsourcing) (koristite na svoju odgovornost)",
    "allowInsecure": "Allow insecure HTTP requests",
+    "stayOneVersionBehind": "Stay one version behind latest",
    "removeAppQuestion": {
        "one": "Želite li ukloniti aplikaciju?",
        "other": "Želite li ukloniti aplikacije?"
--- a/assets/translations/cs.json
+++ b/assets/translations/cs.json
@@ -315,6 +315,7 @@
    "wiki": "Nápověda/Wiki",
    "crowdsourcedConfigsLabel": "Konfigurace aplikací s využitím crowdsourcingu (použití na vlastní nebezpečí)",
    "allowInsecure": "Povolení nezabezpečených požadavků HTTP",
+    "stayOneVersionBehind": "Zůstaňte o jednu verzi pozadu za nejnovější",
    "removeAppQuestion": {
        "one": "Odstranit Apku?",
        "other": "Odstranit Apky?"
--- a/assets/translations/da.json
+++ b/assets/translations/da.json
@@ -315,6 +315,7 @@
    "wiki": "Hjælp/Wiki",
    "crowdsourcedConfigsLabel": "Crowdsourcede app-konfigurationer (brug på egen risiko)",
    "allowInsecure": "Tillad usikre HTTP-anmodninger",
+    "stayOneVersionBehind": "Vær en version bagud i forhold til den nyeste",
    "removeAppQuestion": {
        "one": "Fjern app?",
        "other": "Fjern apps?"
--- a/assets/translations/de.json
+++ b/assets/translations/de.json
@@ -315,6 +315,7 @@
    "wiki": "Hilfe/Wiki",
    "crowdsourcedConfigsLabel": "Crowdsourced App-Konfigurationen (Verwendung auf eigene Gefahr)",
    "allowInsecure": "Unsichere HTTP-Anfragen zulassen",
+    "stayOneVersionBehind": "Eine Version hinter der neuesten Version bleiben",
    "removeAppQuestion": {
        "one": "App entfernen?",
        "other": "Apps entfernen?"
--- a/assets/translations/en-EO.json
+++ b/assets/translations/en-EO.json
@@ -315,6 +315,7 @@
    "wiki": "Helpo/Vikio",
    "crowdsourcedConfigsLabel": "Komunumaj apo-agordoj (uzu kun singardo)",
    "allowInsecure": "Allow insecure HTTP requests",
+    "stayOneVersionBehind": "Stay one version behind latest",
    "removeAppQuestion": {
        "one": "Forigi la aplikaĵon?",
        "other": "Forigi la aplikaĵojn?"
--- a/assets/translations/en.json
+++ b/assets/translations/en.json
@@ -315,6 +315,7 @@
    "wiki": "Help/Wiki",
    "crowdsourcedConfigsLabel": "Crowdsourced App Configurations (use at your own risk)",
    "allowInsecure": "Allow insecure HTTP requests",
+    "stayOneVersionBehind": "Stay one version behind latest",
    "removeAppQuestion": {
        "one": "Remove App?",
        "other": "Remove Apps?"
--- a/assets/translations/es.json
+++ b/assets/translations/es.json
@@ -315,6 +315,7 @@
    "wiki": "Ayuda/Wiki",
    "crowdsourcedConfigsLabel": "Crowdsourced App Configurations (uso bajo su propia responsabilidad)",
    "allowInsecure": "Permitir peticiones HTTP inseguras",
+    "stayOneVersionBehind": "Mantenerse una versión por detrás de la última",
    "removeAppQuestion": {
        "one": "¿Eliminar aplicación?",
        "other": "¿Eliminar aplicaciones?"
--- a/assets/translations/fa.json
+++ b/assets/translations/fa.json
@@ -315,6 +315,7 @@
    "wiki": "راهنما/ویکی",
    "crowdsourcedConfigsLabel": "تنظیمات برنامه Crowdsourced (با مسئولیت خود استفاده کنید)",
    "allowInsecure": "درخواست های HTTP ناامن را مجاز کنید",
+    "stayOneVersionBehind": "Stay one version behind latest",
    "removeAppQuestion": {
        "one": "برنامه حذف شود؟",
        "other": "برنامه ها حذف شوند؟"
--- a/assets/translations/fr.json
+++ b/assets/translations/fr.json
@@ -315,6 +315,7 @@
    "wiki": "Aide/Wiki",
    "crowdsourcedConfigsLabel": "Configurations d'applications par la communauté (à utiliser à vos risques et périls)",
    "allowInsecure": "Autoriser les requêtes HTTP non sécurisées",
+    "stayOneVersionBehind": "Rester à une version de la dernière",
    "removeAppQuestion": {
        "one": "Supprimer l'application ?",
        "other": "Supprimer les applications ?"
--- a/assets/translations/hu.json
+++ b/assets/translations/hu.json
@@ -315,6 +315,7 @@
    "wiki": "Súgó/Wiki",
    "crowdsourcedConfigsLabel": "Crowdsource-ből származó alkalmazások beállítása (saját felelősségére használja)",
    "allowInsecure": "Nem biztonságos HTTP-kérések engedélyezése",
+    "stayOneVersionBehind": "Maradjon egy verzióval a legfrissebb mögött",
    "removeAppQuestion": {
        "one": "Eltávolítja az alkalmazást?",
        "other": "Eltávolítja az alkalmazásokat?"
--- a/assets/translations/id.json
+++ b/assets/translations/id.json
@@ -204,7 +204,7 @@
    "categoryDeleteWarning": "Semua aplikasi dalam kategori yang dihapus akan diatur sebagai tidak terkategori.",
    "addCategory": "Tambah kategori",
    "label": "Label",
-    "language": "Language",
+    "language": "Bahasa",
    "copiedToClipboard": "Disalin ke papan klip",
    "storagePermissionDenied": "Izin penyimpanan ditolak",
    "selectedCategorizeWarning": "Ini akan mengganti pengaturan kategori yang ada untuk aplikasi terpilih.",
@@ -315,6 +315,7 @@
    "wiki": "Bantuan/Wiki",
    "crowdsourcedConfigsLabel": "Konfigurasi aplikasi Crowdsourced (risiko penggunaan ditanggung sendiri)",
    "allowInsecure": "Izinkan permintaan HTTP yang tidak aman",
+    "stayOneVersionBehind": "Tetap satu versi di belakang versi terbaru",
    "removeAppQuestion": {
        "one": "Hapus aplikasi?",
        "other": "Hapus aplikasi?"
--- a/assets/translations/it.json
+++ b/assets/translations/it.json
@@ -315,6 +315,7 @@
    "wiki": "Aiuto/Wiki",
    "crowdsourcedConfigsLabel": "Configurazioni di app in crowdsourcing (uso a proprio rischio)",
    "allowInsecure": "Consentire le richieste HTTP non sicure",
+    "stayOneVersionBehind": "Rimanere una versione indietro rispetto alla più recente",
    "removeAppQuestion": {
        "one": "Rimuovere l'app?",
        "other": "Rimuovere le app?"
--- a/assets/translations/ja.json
+++ b/assets/translations/ja.json
@@ -315,6 +315,7 @@
    "wiki": "ヘルプ/ウィキ",
    "crowdsourcedConfigsLabel": "クラウドソーシングによるアプリの設定（利用は自己責任で）",
    "allowInsecure": "安全でないHTTPリクエストを許可する",
+    "stayOneVersionBehind": "最新バージョンから1つ遅れ",
    "removeAppQuestion": {
        "one": "アプリを削除しますか？",
        "other": "アプリを削除しますか？"
--- a/assets/translations/nl.json
+++ b/assets/translations/nl.json
@@ -315,6 +315,7 @@
    "wiki": "Help/Wiki",
    "crowdsourcedConfigsLabel": "Crowdsourced App-configuraties (gebruik op eigen risico)",
    "allowInsecure": "Onveilige HTTP-verzoeken toestaan",
+    "stayOneVersionBehind": "Blijf een versie achter op de nieuwste",
    "removeAppQuestion": {
        "one": "App verwijderen?",
        "other": "Apps verwijderen?"
--- a/assets/translations/pl.json
+++ b/assets/translations/pl.json
@@ -315,6 +315,7 @@
    "wiki": "Pomoc/Wiki",
    "crowdsourcedConfigsLabel": "Konfiguracje aplikacji pochodzące z crowdsourcingu (korzystanie na własne ryzyko)",
    "allowInsecure": "Zezwalaj na niezabezpieczone żądania HTTP",
+    "stayOneVersionBehind": "Pozostań jedną wersję za najnowszą",
    "removeAppQuestion": {
        "one": "Usunąć aplikację?",
        "few": "Usunąć aplikacje?",
--- a/assets/translations/pt.json
+++ b/assets/translations/pt.json
@@ -315,6 +315,7 @@
    "wiki": "Ajuda/Wiki",
    "crowdsourcedConfigsLabel": "Configurações de aplicações de crowdsourcing (utilização por sua conta e risco)",
    "allowInsecure": "Permitir pedidos HTTP inseguros",
+    "stayOneVersionBehind": "Manter-se uma versão atrás da mais recente",
    "removeAppQuestion": {
        "one": "Remover aplicativo?",
        "other": "Remover aplicativos?"
--- a/assets/translations/ru.json
+++ b/assets/translations/ru.json
@@ -315,6 +315,7 @@
    "wiki": "Помощь/Вики",
    "crowdsourcedConfigsLabel": "Конфигурации приложений на основе краудсорсинга (используйте на свой страх и риск)",
    "allowInsecure": "Разрешить небезопасные HTTP-запросы",
+    "stayOneVersionBehind": "Не отставайте от последней версии",
    "removeAppQuestion": {
        "one": "Удалить приложение?",
        "other": "Удалить приложения?"
--- a/assets/translations/sv.json
+++ b/assets/translations/sv.json
@@ -315,6 +315,7 @@
    "wiki": "Hjälp/Wiki",
    "crowdsourcedConfigsLabel": "Crowdsourcade appkonfigurationer (använd på egen risk)",
    "allowInsecure": "Tillåt osäkra HTTP-förfrågningar",
+    "stayOneVersionBehind": "Håll dig en version bakom den senaste",
    "removeAppQuestion": {
        "one": "Ta Bort App?",
        "other": "Ta Bort Appar?"
--- a/assets/translations/tr.json
+++ b/assets/translations/tr.json
@@ -315,6 +315,7 @@
    "wiki": "Yardım/Wiki",
    "crowdsourcedConfigsLabel": "Kitle Kaynaklı Uygulama Yapılandırmaları (riski size ait olmak üzere kullanın)",
    "allowInsecure": "Güvensiz HTTP isteklerine izin ver",
+    "stayOneVersionBehind": "En son sürümün bir sürüm gerisinde kalın",
    "removeAppQuestion": {
        "one": "Uygulamayı Kaldır?",
        "other": "Uygulamaları Kaldır?"
--- a/assets/translations/uk.json
+++ b/assets/translations/uk.json
@@ -315,6 +315,7 @@
    "wiki": "Довідка/Вікі",
    "crowdsourcedConfigsLabel": "Краудсорсингові конфігурації додатків (використовуйте на свій страх і ризик)",
    "allowInsecure": "Дозволити незахищені HTTP-запити",
+    "stayOneVersionBehind": "Залишайтеся на одну версію актуальнішою",
    "removeAppQuestion": {
        "one": "Видалити застосунок?",
        "other": "Видалити застосунки?"
--- a/assets/translations/vi.json
+++ b/assets/translations/vi.json
@@ -315,6 +315,7 @@
    "wiki": "Trợ giúp/Wiki",
    "crowdsourcedConfigsLabel": "Crowdsourced App Configurations (use at your own risk)",
    "allowInsecure": "Allow insecure HTTP requests",
+    "stayOneVersionBehind": "Stay one version behind latest",
    "removeAppQuestion": {
        "one": "Gỡ ứng dụng?",
        "other": "Gỡ ứng dụng?"
--- a/assets/translations/zh-Hant-TW.json
+++ b/assets/translations/zh-Hant-TW.json
@@ -315,6 +315,7 @@
    "wiki": "幫助/維基",
    "crowdsourcedConfigsLabel": "群眾外包的應用程式設定（使用風險自負）",
    "allowInsecure": "Allow insecure HTTP requests",
+    "stayOneVersionBehind": "Stay one version behind latest",
    "removeAppQuestion": {
        "one": "移除應用程式？",
        "other": "移除應用程式？"
--- a/assets/translations/zh.json
+++ b/assets/translations/zh.json
@@ -315,6 +315,7 @@
    "wiki": "帮助/Wiki",
    "crowdsourcedConfigsLabel": "众包应用程序配置（使用风险自负）",
    "allowInsecure": "允许不安全的 HTTP 请求",
+    "stayOneVersionBehind": "比最新版本晚一个版本",
    "removeAppQuestion": {
        "one": "是否删除应用？",
        "other": "是否删除应用？"
--- a/lib/app_sources/apkpure.dart
+++ b/lib/app_sources/apkpure.dart
@@ -2,6 +2,7 @@ import 'package:device_info_plus/device_info_plus.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:html/parser.dart';
 import 'package:obtainium/app_sources/html.dart';
+import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';

@@ -26,6 +27,16 @@ class APKPure extends AppSource {
    allowSubDomains = true;
    naiveStandardVersionDetection = true;
    showReleaseDateAsVersionToggle = true;
+    additionalSourceAppSpecificSettingFormItems = [
+      [
+        GeneratedFormSwitch('fallbackToOlderReleases',
+            label: tr('fallbackToOlderReleases'), defaultValue: true)
+      ],
+      [
+        GeneratedFormSwitch('stayOneVersionBehind',
+            label: tr('stayOneVersionBehind'), defaultValue: false)
+      ]
+    ];
  }

  @override
@@ -54,33 +65,14 @@ class APKPure extends AppSource {
    return Uri.parse(standardUrl).pathSegments.last;
  }

-  @override
-  Future<APKDetails> getLatestAPKDetails(
+  getDetailsForVersionLink(
      String standardUrl,
-    Map<String, dynamic> additionalSettings,
-  ) async {
-    String appId = (await tryInferringAppId(standardUrl))!;
-    String host = Uri.parse(standardUrl).host;
-
-    var res0 = await sourceRequest('$standardUrl/versions', additionalSettings);
-    var versionLinks = await grabLinksCommon(res0, {
-      'skipSort': true,
-      'customLinkFilterRegex': '$standardUrl/download/[^/]+\$'
-    });
-
-    var supportedArchs = (await DeviceInfoPlugin().androidInfo).supportedAbis;
-
-    if (additionalSettings['autoApkFilterByArch'] != true) {
-      // No need to request multiple versions when we're not going to filter them (always pick the top one)
-      versionLinks = versionLinks.sublist(0, 1);
-    }
-    if (versionLinks.isEmpty) {
-      throw NoReleasesError();
-    }
-
-    for (var i = 0; i < versionLinks.length; i++) {
-      var link = versionLinks[i];
-      var res = await sourceRequest(link.key, additionalSettings);
+      String appId,
+      String host,
+      List<String> supportedArchs,
+      String link,
+      Map<String, dynamic> additionalSettings) async {
+    var res = await sourceRequest(link, additionalSettings);
    if (res.statusCode == 200) {
      var html = parse(res.body);
      var apksDiv =
@@ -123,8 +115,7 @@ class APKPure extends AppSource {
                    ?.querySelector('div.info-bottom span.time')
                    ?.text
                    .trim();
-                  DateTime? releaseDate =
-                      parseDateTimeMMMddCommayyyy(dateString);
+                DateTime? releaseDate = parseDateTimeMMMddCommayyyy(dateString);
                if (additionalSettings['autoApkFilterByArch'] == true &&
                    architectures.isNotEmpty &&
                    architectures
@@ -142,9 +133,9 @@ class APKPure extends AppSource {
              .toList() ??
          [];
      if (apkUrls.isEmpty) {
-          continue;
+        throw NoAPKError();
      }
-        String version = Uri.parse(link.key).pathSegments.last;
+      String version = Uri.parse(link).pathSegments.last;
      String author = html
              .querySelector('span.info-sdk')
              ?.text
@@ -164,6 +155,46 @@ class APKPure extends AppSource {
      throw getObtainiumHttpError(res);
    }
  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    String appId = (await tryInferringAppId(standardUrl))!;
+    String host = Uri.parse(standardUrl).host;
+
+    var res0 = await sourceRequest('$standardUrl/versions', additionalSettings);
+    var versionLinks = await grabLinksCommon(res0, {
+      'skipSort': true,
+      'customLinkFilterRegex': '$standardUrl/download/[^/]+\$'
+    });
+
+    var supportedArchs = (await DeviceInfoPlugin().androidInfo).supportedAbis;
+
+    if (additionalSettings['autoApkFilterByArch'] != true) {
+      // No need to request multiple versions when we're not going to filter them (always pick the top one)
+      versionLinks = versionLinks.sublist(0, 1);
+    }
+    if (versionLinks.isEmpty) {
+      throw NoReleasesError();
+    }
+
+    for (var i = 0; i < versionLinks.length; i++) {
+      var link = versionLinks[i];
+      try {
+        if (i == 0 && additionalSettings['stayOneVersionBehind'] == true) {
+          throw NoReleasesError();
+        }
+        return await getDetailsForVersionLink(standardUrl, appId, host,
+            supportedArchs, link.key, additionalSettings);
+      } catch (e) {
+        if (additionalSettings['fallbackToOlderReleases'] != true ||
+            i == versionLinks.length - 1) {
+          rethrow;
+        }
+      }
+    }
    throw NoAPKError();
  }
 }