IzzyOnDroid now uses API (+ other minor tweaks)

lib/app_sources/fdroid.dart

@@ -30,19 +30,12 @@ class FDroid extends AppSource {
   String? changeLogPageFromStandardUrl(String standardUrl) => null;
 
   @override
-  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
+  String? tryInferringAppId(String standardUrl) {
-
-  @override
-  String? tryGettingAppIdFromURL(String standardUrl) {
     return Uri.parse(standardUrl).pathSegments.last;
   }
 
-  @override
+  APKDetails getAPKUrlsFromFDroidPackagesAPIResponse(
-  Future<APKDetails> getLatestAPKDetails(
+      Response res, String apkUrlPrefix) {
-      String standardUrl, List<String> additionalData) async {
-    String? appId = tryGettingAppIdFromURL(standardUrl);
-    Response res =
-        await get(Uri.parse('https://f-droid.org/api/v1/packages/$appId'));
     if (res.statusCode == 200) {
       List<dynamic> releases = jsonDecode(res.body)['packages'] ?? [];
       if (releases.isEmpty) {
@@ -54,8 +47,7 @@ class FDroid extends AppSource {
       }
       List<String> apkUrls = releases
           .where((element) => element['versionName'] == latestVersion)
-          .map((e) =>
+          .map((e) => '${apkUrlPrefix}_${e['versionCode']}.apk')
-              'https://f-droid.org/repo/${appId}_${e['versionCode']}.apk')
           .toList();
       if (apkUrls.isEmpty) {
         throw NoAPKError();
@@ -66,6 +58,15 @@ class FDroid extends AppSource {
     }
   }
 
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+      String standardUrl, List<String> additionalData) async {
+    String? appId = tryInferringAppId(standardUrl);
+    return getAPKUrlsFromFDroidPackagesAPIResponse(
+        await get(Uri.parse('https://f-droid.org/api/v1/packages/$appId')),
+        'https://f-droid.org/repo/$appId');
+  }
+
   @override
   AppNames getAppNames(String standardUrl) {
     return AppNames('F-Droid', Uri.parse(standardUrl).pathSegments.last);

lib/app_sources/github.dart

@@ -105,9 +105,6 @@ class GitHub extends AppSource {
   String? changeLogPageFromStandardUrl(String standardUrl) =>
       '$standardUrl/releases';
 
-  @override
-  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
       String standardUrl, List<String> additionalData) async {

lib/app_sources/gitlab.dart

@@ -23,9 +23,6 @@ class GitLab extends AppSource {
   String? changeLogPageFromStandardUrl(String standardUrl) =>
       '$standardUrl/-/releases';
 
-  @override
-  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
       String standardUrl, List<String> additionalData) async {

lib/app_sources/izzyondroid.dart

@@ -1,5 +1,6 @@
 import 'package:html/parser.dart';
 import 'package:http/http.dart';
+import 'package:obtainium/app_sources/fdroid.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
 
@@ -22,41 +23,18 @@ class IzzyOnDroid extends AppSource {
   String? changeLogPageFromStandardUrl(String standardUrl) => null;
 
   @override
-  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
+  String? tryInferringAppId(String standardUrl) {
+    return FDroid().tryInferringAppId(standardUrl);
+  }
 
   @override
   Future<APKDetails> getLatestAPKDetails(
       String standardUrl, List<String> additionalData) async {
-    Response res = await get(Uri.parse(standardUrl));
+    String? appId = tryInferringAppId(standardUrl);
-    if (res.statusCode == 200) {
+    return FDroid().getAPKUrlsFromFDroidPackagesAPIResponse(
-      var parsedHtml = parse(res.body);
+        await get(
-      var multipleVersionApkUrls = parsedHtml
+            Uri.parse('https://apt.izzysoft.de/fdroid/api/v1/packages/$appId')),
-          .querySelectorAll('a')
+        'https://android.izzysoft.de/frepo/$appId');
-          .where((element) =>
-              element.attributes['href']?.toLowerCase().endsWith('.apk') ??
-              false)
-          .map((e) => 'https://$host${e.attributes['href'] ?? ''}')
-          .toList();
-      if (multipleVersionApkUrls.isEmpty) {
-        throw NoAPKError();
-      }
-      var version = parsedHtml
-          .querySelector('#keydata')
-          ?.querySelectorAll('b')
-          .where(
-              (element) => element.innerHtml.toLowerCase().contains('version'))
-          .toList()[0]
-          .parentNode
-          ?.parentNode
-          ?.children[1]
-          .innerHtml;
-      if (version == null) {
-        throw NoVersionError();
-      }
-      return APKDetails(version, [multipleVersionApkUrls[0]]);
-    } else {
-      throw NoReleasesError();
-    }
   }
 
   @override

lib/app_sources/mullvad.dart

@@ -22,9 +22,6 @@ class Mullvad extends AppSource {
   String? changeLogPageFromStandardUrl(String standardUrl) =>
       'https://github.com/mullvad/mullvadvpn-app/blob/master/CHANGELOG.md';
 
-  @override
-  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
       String standardUrl, List<String> additionalData) async {

lib/app_sources/signal.dart

@@ -16,9 +16,6 @@ class Signal extends AppSource {
   @override
   String? changeLogPageFromStandardUrl(String standardUrl) => null;
 
-  @override
-  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
       String standardUrl, List<String> additionalData) async {

lib/app_sources/sourceforge.dart

@@ -21,9 +21,6 @@ class SourceForge extends AppSource {
   @override
   String? changeLogPageFromStandardUrl(String standardUrl) => null;
 
-  @override
-  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
       String standardUrl, List<String> additionalData) async {

lib/providers/source_provider.dart

@@ -155,8 +155,8 @@ class AppSource {
     throw NotImplementedError();
   }
 
-  Future<String> apkUrlPrefetchModifier(String apkUrl) {
+  Future<String> apkUrlPrefetchModifier(String apkUrl) async {
-    throw NotImplementedError();
+    return apkUrl;
   }
 
   bool canSearch = false;
@@ -164,7 +164,7 @@ class AppSource {
     throw NotImplementedError();
   }
 
-  String? tryGettingAppIdFromURL(String standardUrl) {
+  String? tryInferringAppId(String standardUrl) {
     return null;
   }
 }
@@ -245,7 +245,7 @@ class SourceProvider {
         await source.getLatestAPKDetails(standardUrl, additionalData);
     return App(
         id ??
-            source.tryGettingAppIdFromURL(standardUrl) ??
+            source.tryInferringAppId(standardUrl) ??
             generateTempID(names, source),
         standardUrl,
         names.author[0].toUpperCase() + names.author.substring(1),