Merge pull request #1177 from ImranR98/dev

- Add "Don't Sort" option to the HTML Source (#1168 ) - Fix syntax error in translation file (#1169) - Parallel download option (#1175)
ImranR98 · Dec 21, 2023 · 13066b3 · 13066b3
2 parents 2b977fc + ccbe9d0
commit 13066b3
Show file tree

Hide file tree

Showing 25 changed files with 133 additions and 35 deletions.
diff --git a/assets/translations/bs.json b/assets/translations/bs.json
@@ -261,6 +261,8 @@
     "trySelectingSuggestedVersionCode": "Probajte izabrati preloženu (verziju) versionCode APK-a",
     "dontSortReleasesList": "Zadrži redosled izdanja iz API-a",
     "reverseSort": "Obrni redosled",
+    "takeFirstLink": "Take first link",
+    "skipSort": "Skip sorting",
     "debugMenu": "Meni za otkrivanje grešaka",
     "bgTaskStarted": "Rad u pozadini pokrenut - provjerite log-ove.",
     "runBgCheckNow": "Pokrenite pozadinsku provjeru ažuriranja sad",
@@ -278,6 +280,7 @@
     "onlyCheckInstalledOrTrackOnlyApps": "Isključivo provjerite ažuriranje za instalirane i aplikacije 'samo za praćenje'",
     "supportFixedAPKURL": "Podržite fiksne APK URL-ove",
     "selectX": "Izaberite {}",
+    "parallelDownloads": "Allow parallel downloads",
     "removeAppQuestion": {
         "one": "Želite li ukloniti aplikaciju?",
         "other": "Želite li ukloniti aplikacije?"

diff --git a/assets/translations/cs.json b/assets/translations/cs.json
@@ -261,6 +261,8 @@
     "trySelectingSuggestedVersionCode": "Zkusit vybrat navrhovaný kód verze APK",
     "dontSortReleasesList": "Retain release order from API",
     "reverseSort": "Reverse sorting",
+    "takeFirstLink": "Take first link",
+    "skipSort": "Skip sorting",
     "debugMenu": "Debug Menu",
     "bgTaskStarted": "Background task started - check logs.",
     "runBgCheckNow": "Run Background Update Check Now",
@@ -278,6 +280,7 @@
     "onlyCheckInstalledOrTrackOnlyApps": "Only check installed and Track-Only apps for updates",
     "supportFixedAPKURL": "Support fixed APK URLs",
     "selectX": "Select {}",
+    "parallelDownloads": "Allow parallel downloads",
     "removeAppQuestion": {
         "one": "Odstranit Apku?",
         "other": "Odstranit Apky?"

diff --git a/assets/translations/de.json b/assets/translations/de.json
@@ -261,6 +261,8 @@
     "trySelectingSuggestedVersionCode": "Versuchen, den vorgeschlagenen APK-Versionscode auszuwählen",
     "dontSortReleasesList": "Freigaberelease von der API ordern",
     "reverseSort": "Umgekehrtes Sortieren",
+    "takeFirstLink": "Take first link",
+    "skipSort": "Skip sorting",
     "debugMenu": "Debug-Menü",
     "bgTaskStarted": "Hintergrundaufgabe gestartet – Logs prüfen.",
     "runBgCheckNow": "Hintergrundaktualisierungsprüfung jetzt durchführen",
@@ -278,6 +280,7 @@
     "onlyCheckInstalledOrTrackOnlyApps": "Überprüfe nur installierte und mit „nur Nachverfolgen“ markierte Apps auf Aktualisierungen",
     "supportFixedAPKURL": "neuere Version anhand der ersten dreißig Zahlen der Checksumme der APK URL erraten, wenn anderweitig nicht unterstützt",
     "selectX": "Wähle {}",
+    "parallelDownloads": "Allow parallel downloads",
     "removeAppQuestion": {
         "one": "App entfernen?",
         "other": "Apps entfernen?"

diff --git a/assets/translations/en.json b/assets/translations/en.json
@@ -261,6 +261,8 @@
     "trySelectingSuggestedVersionCode": "Try selecting suggested versionCode APK",
     "dontSortReleasesList": "Retain release order from API",
     "reverseSort": "Reverse sorting",
+    "takeFirstLink": "Take first link",
+    "skipSort": "Skip sorting",
     "debugMenu": "Debug Menu",
     "bgTaskStarted": "Background task started - check logs.",
     "runBgCheckNow": "Run Background Update Check Now",
@@ -278,6 +280,7 @@
     "onlyCheckInstalledOrTrackOnlyApps": "Only check installed and Track-Only apps for updates",
     "supportFixedAPKURL": "Support fixed APK URLs",
     "selectX": "Select {}",
+    "parallelDownloads": "Allow parallel downloads",
     "removeAppQuestion": {
         "one": "Remove App?",
         "other": "Remove Apps?"

diff --git a/assets/translations/es.json b/assets/translations/es.json
@@ -261,6 +261,8 @@
     "trySelectingSuggestedVersionCode": "Prueba seleccionando la versionCode APK sugerida",
     "dontSortReleasesList": "Mantener el order de publicación desde API",
     "reverseSort": "Orden inverso",
+    "takeFirstLink": "Take first link",
+    "skipSort": "Skip sorting",
     "debugMenu": "Menu Depurar",
     "bgTaskStarted": "Iniciada tarea en segundo plano - revisa los logs.",
     "runBgCheckNow": "Ejecutar verficiación de actualizaciones en segundo plano",
@@ -278,6 +280,7 @@
     "onlyCheckInstalledOrTrackOnlyApps": "Only check installed and Track-Only apps for updates",
     "supportFixedAPKURL": "Soporte para URLs fijas de APK",
     "selectX": "Selecciona {}",
+    "parallelDownloads": "Allow parallel downloads",
     "removeAppQuestion": {
         "one": "¿Eliminar Aplicación?",
         "other": "¿Eliminar Aplicaciones?"

diff --git a/assets/translations/fa.json b/assets/translations/fa.json
@@ -245,8 +245,8 @@
     "enableBackgroundUpdates": "به روز رسانی پس زمینه را فعال کنید",
     "backgroundUpdateReqsExplanation": "به روز رسانی پس زمینه ممکن است برای همه برنامه ها امکان پذیر نباشد.",
     "backgroundUpdateLimitsExplanation": "موفقیت نصب پس‌زمینه تنها زمانی مشخص می‌شود که Obtainium باز شود.",
-    "verifyLatestTag": "برچسب "آخرین" را تأیید کنید",
-    "intermediateLinkRegex": "برای اولین بار بازدید از لینک "متوسط" را فیلتر کنید",
+    "verifyLatestTag": "برچسب \"آخرین\" را تأیید کنید",
+    "intermediateLinkRegex": "برای اولین بار بازدید از لینک \"متوسط\" را فیلتر کنید",
     "intermediateLinkNotFound": "لینک میانی پیدا نشد",
     "exemptFromBackgroundUpdates": "معاف از به‌روزرسانی‌های پس‌زمینه (در صورت فعال بودن)",
     "bgUpdatesOnWiFiOnly": "به‌روزرسانی‌های پس‌زمینه را در صورت عدم اتصال به WiFi غیرفعال کنید",
@@ -261,6 +261,8 @@
     "trySelectingSuggestedVersionCode": "نسخه پیشنهادی APK نسخه کد را انتخاب کنید",
     "dontSortReleasesList": "حفظ سفارش انتشار از API",
     "reverseSort": "مرتب سازی معکوس",
+    "takeFirstLink": "Take first link",
+    "skipSort": "Skip sorting",
     "debugMenu": "منوی اشکال زدایی",
     "bgTaskStarted": "کار پس زمینه شروع شد - لاگ های مربوط را بررسی کنید.",
     "runBgCheckNow": "اکنون به‌روزرسانی پس‌زمینه را بررسی کنید",
@@ -278,6 +280,7 @@
     "onlyCheckInstalledOrTrackOnlyApps": "فقط برنامه های نصب شده و فقط ردیابی را برای به روز رسانی بررسی کنید",
     "supportFixedAPKURL": "پشتیبانی از URL های APK ثابت",
     "selectX": "انتخاب کنید {}",
+    "parallelDownloads": "Allow parallel downloads",
     "removeAppQuestion": {
         "one": "برنامه حذف شود؟",
         "other": "برنامه ها حذف شوند؟"

diff --git a/assets/translations/fr.json b/assets/translations/fr.json
@@ -261,6 +261,8 @@
     "trySelectingSuggestedVersionCode": "Try selecting suggested versionCode APK",
     "dontSortReleasesList": "Retain release order from API",
     "reverseSort": "Reverse sorting",
+    "takeFirstLink": "Take first link",
+    "skipSort": "Skip sorting",
     "debugMenu": "Debug Menu",
     "bgTaskStarted": "Background task started - check logs.",
     "runBgCheckNow": "Run Background Update Check Now",
@@ -278,6 +280,7 @@
     "onlyCheckInstalledOrTrackOnlyApps": "Only check installed and Track-Only apps for updates",
     "supportFixedAPKURL": "Support fixed APK URLs",
     "selectX": "Select {}",
+    "parallelDownloads": "Allow parallel downloads",
     "removeAppQuestion": {
         "one": "Supprimer l'application ?",
         "other": "Supprimer les applications ?"

diff --git a/assets/translations/hu.json b/assets/translations/hu.json
@@ -260,6 +260,8 @@
     "trySelectingSuggestedVersionCode": "Próbálja ki a javasolt verziókódú APK-t",
     "dontSortReleasesList": "Az API-ból származó kiadási sorrend megőrzése",
     "reverseSort": "Fordított rendezés",
+    "takeFirstLink": "Take first link",
+    "skipSort": "Skip sorting",
     "debugMenu": "Hibakereső menü",
     "bgTaskStarted": "A háttérfeladat elindult – ellenőrizze a naplókat.",
     "enableBackgroundUpdates": "Frissítések a háttérben",
@@ -278,6 +280,7 @@
     "onlyCheckInstalledOrTrackOnlyApps": "Csak a telepített és a csak követhető appokat ellenőrizze frissítésekért",
     "supportFixedAPKURL": "Támogatja a rögzített APK URL-eket",
     "selectX": "Kiválaszt {}",
+    "parallelDownloads": "Allow parallel downloads",
     "removeAppQuestion": {
         "one": "Eltávolítja az alkalmazást?",
         "other": "Eltávolítja az alkalmazást?"

diff --git a/assets/translations/it.json b/assets/translations/it.json
@@ -261,6 +261,8 @@
     "trySelectingSuggestedVersionCode": "Prova a selezionare APK con versionCode suggerito",
     "dontSortReleasesList": "Conserva l'ordine di release da API",
     "reverseSort": "Ordine inverso",
+    "takeFirstLink": "Take first link",
+    "skipSort": "Skip sorting",
     "debugMenu": "Menu di debug",
     "bgTaskStarted": "Attività in secondo piano iniziata - controllo log.",
     "runBgCheckNow": "Inizia aggiornamento in secondo piano ora",
@@ -278,6 +280,7 @@
     "onlyCheckInstalledOrTrackOnlyApps": "Cerca aggiornamenti solo per app installate e app in Solo-Monitoraggio",
     "supportFixedAPKURL": "Support fixed APK URLs",
     "selectX": "Select {}",
+    "parallelDownloads": "Allow parallel downloads",
     "removeAppQuestion": {
         "one": "Rimuovere l'app?",
         "other": "Rimuovere le app?"

diff --git a/assets/translations/ja.json b/assets/translations/ja.json
@@ -261,6 +261,8 @@
     "trySelectingSuggestedVersionCode": "提案されたバージョンコードのAPKを選択する",
     "dontSortReleasesList": "APIからのリリース順を保持する",
     "reverseSort": "逆順ソート",
+    "takeFirstLink": "Take first link",
+    "skipSort": "Skip sorting",
     "debugMenu": "デバッグメニュー",
     "bgTaskStarted": "バックグラウンドタスクが開始されました - ログを確認してください。",
     "runBgCheckNow": "今すぐバックグラウンドでのアップデート確認を開始する",
@@ -278,6 +280,7 @@
     "onlyCheckInstalledOrTrackOnlyApps": "インストール済みのアプリと「追跡のみ」のアプリのアップデートのみを確認する",
     "supportFixedAPKURL": "Support fixed APK URLs",
     "selectX": "Select {}",
+    "parallelDownloads": "Allow parallel downloads",
     "removeAppQuestion": {
         "one": "アプリを削除しますか？",
         "other": "アプリを削除しますか？"

diff --git a/assets/translations/nl.json b/assets/translations/nl.json
@@ -261,6 +261,8 @@
     "trySelectingSuggestedVersionCode": "Probeer de voorgestelde versiecode APK te selecteren",
     "dontSortReleasesList": "Volgorde van releases behouden vanuit de API",
     "reverseSort": "Sortering omkeren",
+    "takeFirstLink": "Take first link",
+    "skipSort": "Skip sorting",
     "debugMenu": "Debug menu",
     "bgTaskStarted": "Achtergrondtaak gestart - controleer de logs.",
     "runBgCheckNow": "Voer nu een achtergrondupdatecontrole uit",
@@ -278,6 +280,7 @@
     "onlyCheckInstalledOrTrackOnlyApps": "Alleen geïnstalleerde en Track-Only apps controleren op updates",
     "supportFixedAPKURL": "Support fixed APK URLs",
     "selectX": "Select {}",
+    "parallelDownloads": "Allow parallel downloads",
     "removeAppQuestion": {
         "one": "App verwijderen?",
         "other": "Apps verwijderen?"

diff --git a/assets/translations/pl.json b/assets/translations/pl.json
@@ -261,6 +261,8 @@
     "trySelectingSuggestedVersionCode": "Spróbuj wybierać sugerowany kod wersji APK",
     "dontSortReleasesList": "Utrzymaj kolejność wydań z interfejsu API",
     "reverseSort": "Odwrotne sortowanie",
+    "takeFirstLink": "Take first link",
+    "skipSort": "Skip sorting",
     "debugMenu": "Menu debugowania",
     "bgTaskStarted": "Uruchomiono zadanie w tle - sprawdź logi.",
     "runBgCheckNow": "Wymuś sprawdzenie aktualizacji w tle",
@@ -278,6 +280,7 @@
     "onlyCheckInstalledOrTrackOnlyApps": "Sprawdzaj tylko zainstalowane i obserwowane aplikacje pod kątem aktualizacji",
     "supportFixedAPKURL": "Obsługuj stałe adresy URL APK",
     "selectX": "Wybierz {}",
+    "parallelDownloads": "Allow parallel downloads",
     "removeAppQuestion": {
         "one": "Usunąć aplikację?",
         "few": "Usunąć aplikacje?",

diff --git a/assets/translations/pt.json b/assets/translations/pt.json
@@ -261,6 +261,8 @@
     "trySelectingSuggestedVersionCode": "Tente selecionar a versão sugerida",
     "dontSortReleasesList": "Reter a ordem de lançamento da API",
     "reverseSort": "Ordenação reversa",
+    "takeFirstLink": "Take first link",
+    "skipSort": "Skip sorting",
     "debugMenu": "Menu Debug",
     "bgTaskStarted": "Tarefa em segundo plano iniciada - verifique os logs.",
     "runBgCheckNow": "Execute a verificação de atualização em segundo plano agora",
@@ -278,6 +280,7 @@
     "onlyCheckInstalledOrTrackOnlyApps": "Only check installed and Track-Only apps for updates",
     "supportFixedAPKURL": "Support fixed APK URLs",
     "selectX": "Select {}",
+    "parallelDownloads": "Allow parallel downloads",
     "removeAppQuestion": {
         "one": "Remover App?",
         "other": "Remover Apps?"

diff --git a/assets/translations/ru.json b/assets/translations/ru.json
@@ -261,6 +261,8 @@
     "trySelectingSuggestedVersionCode": "Попробуйте выбрать предложенный код версии APK",
     "dontSortReleasesList": "Сохранить порядок релизов от API",
     "reverseSort": "Обратная сортировка",
+    "takeFirstLink": "Take first link",
+    "skipSort": "Skip sorting",
     "debugMenu": "Меню отладки",
     "bgTaskStarted": "Фоновая задача начата — проверьте журналы",
     "runBgCheckNow": "Запустить проверку фонового обновления сейчас",
@@ -278,6 +280,7 @@
     "onlyCheckInstalledOrTrackOnlyApps": "Only check installed and Track-Only apps for updates",
     "supportFixedAPKURL": "Support fixed APK URLs",
     "selectX": "Select {}",
+    "parallelDownloads": "Allow parallel downloads",
     "removeAppQuestion": {
         "one": "Удалить приложение?",
         "other": "Удалить приложения?"

diff --git a/assets/translations/sv.json b/assets/translations/sv.json
@@ -261,9 +261,12 @@
     "trySelectingSuggestedVersionCode": "Try selecting suggested versionCode APK",
     "dontSortReleasesList": "Retain release order from API",
     "reverseSort": "Omvänd sortering",
+    "takeFirstLink": "Take first link",
+    "skipSort": "Skip sorting",
     "debugMenu": "Felsökningsmeny",
     "bgTaskStarted": "Background task started - check logs.",
     "runBgCheckNow": "Kör Bakgrundsuppdateringskoll Nu",
+    "parallelDownloads": "Allow parallel downloads",
     "removeAppQuestion": {
         "one": "Ta Bort App?",
         "other": "Ta Bort Appar?"

diff --git a/assets/translations/tr.json b/assets/translations/tr.json
@@ -261,6 +261,8 @@
     "trySelectingSuggestedVersionCode": "Önerilen sürüm kodunu seçmeyi dene",
     "dontSortReleasesList": "API'den sıralama düzenini koru",
     "reverseSort": "Ters sıralama",
+    "takeFirstLink": "Take first link",
+    "skipSort": "Skip sorting",
     "debugMenu": "Hata Ayıklama Menüsü",
     "bgTaskStarted": "Arka plan görevi başladı - günlükleri kontrol et.",
     "runBgCheckNow": "Arka Plan Güncelleme Kontrolünü Şimdi Çalıştır",
@@ -278,6 +280,7 @@
     "onlyCheckInstalledOrTrackOnlyApps": "Yalnızca yüklü ve Yalnızca İzleme Uygulamalarını güncelleme",
     "supportFixedAPKURL": "Support fixed APK URLs",
     "selectX": "Select {}",
+    "parallelDownloads": "Allow parallel downloads",
     "removeAppQuestion": {
         "one": "Uygulamayı Kaldır?",
         "other": "Uygulamaları Kaldır?"

diff --git a/assets/translations/vi.json b/assets/translations/vi.json
@@ -261,6 +261,8 @@
     "trySelectingSuggestedVersionCode": "Thử chọn APK Mã phiên bản được đề xuất",
     "dontSortReleasesList": "Giữ lại thứ tự phát hành từ API",
     "reverseSort": "Sắp xếp ngược",
+    "takeFirstLink": "Take first link",
+    "skipSort": "Skip sorting",
     "debugMenu": "Danh sách gỡ lỗi",
     "bgTaskStarted": "Tác vụ nền đã bắt đầu - kiểm tra nhật ký.",
     "runBgCheckNow": "Chạy kiểm tra cập nhật nền ngay bây giờ",
@@ -278,6 +280,7 @@
     "onlyCheckInstalledOrTrackOnlyApps": "Chỉ kiểm tra các ứng dụng đã cài đặt và Chỉ-Theo dõi để biết các bản cập nhật",
     "supportFixedAPKURL": "Support fixed APK URLs",
     "selectX": "Select {}",
+    "parallelDownloads": "Allow parallel downloads",
     "removeAppQuestion":{
         "one": "Gỡ ứng dụng?",
         "other": "Gỡ ứng dụng?"

diff --git a/assets/translations/zh.json b/assets/translations/zh.json
@@ -261,6 +261,8 @@
     "trySelectingSuggestedVersionCode": "尝试选择推荐版本的 APK 文件",
     "dontSortReleasesList": "保持来自 API 的发行顺序",
     "reverseSort": "反转排序",
+    "takeFirstLink": "Take first link",
+    "skipSort": "Skip sorting",
     "debugMenu": "调试选项",
     "bgTaskStarted": "后台任务已启动 - 详见日志",
     "runBgCheckNow": "立即进行后台更新检查",
@@ -278,6 +280,7 @@
     "onlyCheckInstalledOrTrackOnlyApps": "只对已安装和“仅追踪”的应用进行更新检查",
     "supportFixedAPKURL": "Support fixed APK URLs",
     "selectX": "Select {}",
+    "parallelDownloads": "Allow parallel downloads",
     "removeAppQuestion": {
         "one": "是否删除应用？",
         "other": "是否删除应用？"

diff --git a/lib/app_sources/html.dart b/lib/app_sources/html.dart
@@ -94,7 +94,8 @@ class HTML extends AppSource {
         GeneratedFormSwitch('sortByFileNamesNotLinks',
             label: tr('sortByFileNamesNotLinks'))
       ],
-      [GeneratedFormSwitch('reverseSort', label: tr('reverseSort'))],
+      [GeneratedFormSwitch('skipSort', label: tr('skipSort'))],
+      [GeneratedFormSwitch('reverseSort', label: tr('takeTopLink'))],
       [
         GeneratedFormSwitch('supportFixedAPKURL',
             defaultValue: true, label: tr('supportFixedAPKURL')),
@@ -185,12 +186,15 @@ class HTML extends AppSource {
             .toList();
       }
       List<String> links = [];
+      bool skipSort = additionalSettings['skipSort'] == true;
       if ((additionalSettings['intermediateLinkRegex'] as String?)
               ?.isNotEmpty ==
           true) {
         var reg = RegExp(additionalSettings['intermediateLinkRegex']);
         links = allLinks.where((element) => reg.hasMatch(element)).toList();
-        links.sort((a, b) => compareAlphaNumeric(a, b));
+        if (!skipSort) {
+          links.sort((a, b) => compareAlphaNumeric(a, b));
+        }
         if (links.isEmpty) {
           throw ObtainiumError(tr('intermediateLinkNotFound'));
         }
@@ -211,10 +215,14 @@ class HTML extends AppSource {
                 Uri.parse(element).path.toLowerCase().endsWith('.apk'))
             .toList();
       }
-      links.sort((a, b) => additionalSettings['sortByFileNamesNotLinks'] == true
-          ? compareAlphaNumeric(a.split('/').where((e) => e.isNotEmpty).last,
-              b.split('/').where((e) => e.isNotEmpty).last)
-          : compareAlphaNumeric(a, b));
+      if (!skipSort) {
+        links.sort((a, b) =>
+            additionalSettings['sortByFileNamesNotLinks'] == true
+                ? compareAlphaNumeric(
+                    a.split('/').where((e) => e.isNotEmpty).last,
+                    b.split('/').where((e) => e.isNotEmpty).last)
+                : compareAlphaNumeric(a, b));
+      }
       if (additionalSettings['reverseSort'] == true) {
         links = links.reversed.toList();
       }

diff --git a/lib/main.dart b/lib/main.dart
@@ -19,7 +19,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart';
 // ignore: implementation_imports
 import 'package:easy_localization/src/localization.dart';
 
-const String currentVersion = '0.14.38';
+const String currentVersion = '0.14.39';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES