Initial third party F-Droid repo support

Plus various bugfixes
And version increment

lib/app_sources/apkmirror.dart

@@ -14,7 +14,7 @@ class APKMirror extends AppSource {
     RegExp standardUrlRegEx = RegExp('^https?://$host/apk/[^/]+/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
-      throw InvalidURLError(runtimeType.toString());
+      throw InvalidURLError(name);
     }
     return url.substring(0, match.end);
   }
@@ -43,13 +43,12 @@ class APKMirror extends AppSource {
       if (version == null || version.isEmpty) {
         throw NoVersionError();
       }
-      return APKDetails(version, []);
+      return APKDetails(version, [], getAppNames(standardUrl));
     } else {
       throw NoReleasesError();
     }
   }
 
-  @override
   AppNames getAppNames(String standardUrl) {
     String temp = standardUrl.substring(standardUrl.indexOf('://') + 3);
     List<String> names = temp.substring(temp.indexOf('/') + 1).split('/');

lib/app_sources/fdroid.dart

@@ -1,5 +1,6 @@
 import 'dart:convert';
 
+import 'package:easy_localization/easy_localization.dart';
 import 'package:http/http.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
@@ -7,6 +8,7 @@ import 'package:obtainium/providers/source_provider.dart';
 class FDroid extends AppSource {
   FDroid() {
     host = 'f-droid.org';
+    name = tr('fdroid');
   }
 
   @override
@@ -20,7 +22,7 @@ class FDroid extends AppSource {
     RegExp standardUrlRegExA = RegExp('^https?://$host/+packages/+[^/]+');
     match = standardUrlRegExA.firstMatch(url.toLowerCase());
     if (match == null) {
-      throw InvalidURLError(runtimeType.toString());
+      throw InvalidURLError(name);
     }
     return url.substring(0, match.end);
   }
@@ -29,12 +31,13 @@ class FDroid extends AppSource {
   String? changeLogPageFromStandardUrl(String standardUrl) => null;
 
   @override
-  String? tryInferringAppId(String standardUrl) {
+  String? tryInferringAppId(String standardUrl,
+      {List<String> additionalData = const []}) {
     return Uri.parse(standardUrl).pathSegments.last;
   }
 
   APKDetails getAPKUrlsFromFDroidPackagesAPIResponse(
-      Response res, String apkUrlPrefix) {
+      Response res, String apkUrlPrefix, String standardUrl) {
     if (res.statusCode == 200) {
       List<dynamic> releases = jsonDecode(res.body)['packages'] ?? [];
       if (releases.isEmpty) {
@@ -48,7 +51,8 @@ class FDroid extends AppSource {
           .where((element) => element['versionName'] == latestVersion)
           .map((e) => '${apkUrlPrefix}_${e['versionCode']}.apk')
           .toList();
-      return APKDetails(latestVersion, apkUrls);
+      return APKDetails(latestVersion, apkUrls,
+          AppNames(name, Uri.parse(standardUrl).pathSegments.last));
     } else {
       throw NoReleasesError();
     }
@@ -61,11 +65,7 @@ class FDroid extends AppSource {
     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);
+        'https://f-droid.org/repo/$appId',
+        standardUrl);
   }
 }

lib/app_sources/fdroidRepo.dart

@@ -0,0 +1,81 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:html/parser.dart';
+import 'package:http/http.dart';
+import 'package:obtainium/components/generated_form.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class FDroidRepo extends AppSource {
+  FDroidRepo() {
+    name = tr('fdroidThirdPartyRepo');
+
+    additionalSourceAppSpecificFormItems = [
+      [
+        GeneratedFormItem(
+            label: tr('appId'),
+            hint: tr('reposHaveMultipleApps'),
+            required: true,
+            key: 'appId')
+      ]
+    ];
+  }
+
+  @override
+  String standardizeURL(String url) {
+    RegExp standardUrlRegExp =
+        RegExp('^https?://.+/fdroid/(repo(/|\\?)|repo\$)');
+    RegExpMatch? match = standardUrlRegExp.firstMatch(url.toLowerCase());
+    if (match == null) {
+      throw InvalidURLError(name);
+    }
+    return url.substring(0, match.end);
+  }
+
+  @override
+  String? tryInferringAppId(String standardUrl,
+      {List<String> additionalData = const []}) {
+    return findGeneratedFormValueByKey(
+        additionalSourceAppSpecificFormItems
+            .reduce((value, element) => [...value, ...element]),
+        additionalData,
+        'appId');
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+      String standardUrl, List<String> additionalData,
+      {bool trackOnly = false}) async {
+    String? appId =
+        tryInferringAppId(standardUrl, additionalData: additionalData);
+    if (appId == null) {
+      throw NoReleasesError();
+    }
+    var res = await get(Uri.parse('$standardUrl/index.xml'));
+    if (res.statusCode == 200) {
+      var body = parse(res.body);
+      var foundApps = body
+          .querySelectorAll('application')
+          .where((element) => element.attributes['id'] == appId)
+          .toList();
+      if (foundApps.isEmpty) {
+        throw NoReleasesError();
+      }
+      var authorName = body.querySelector('repo')?.attributes['name'] ?? name;
+      var appName = foundApps[0].querySelector('name')?.innerHtml ?? appId;
+      var releases = foundApps[0].querySelectorAll('package');
+      String? latestVersion = releases[0].querySelector('version')?.innerHtml;
+      if (latestVersion == null) {
+        throw NoVersionError();
+      }
+      List<String> apkUrls = releases
+          .where((element) =>
+              element.querySelector('version')?.innerHtml == latestVersion &&
+              element.querySelector('apkname') != null)
+          .map((e) => '$standardUrl/${e.querySelector('apkname')!.innerHtml}')
+          .toList();
+      return APKDetails(latestVersion, apkUrls, AppNames(authorName, appName));
+    } else {
+      throw NoReleasesError();
+    }
+  }
+}

lib/app_sources/github.dart

@@ -90,7 +90,7 @@ class GitHub extends AppSource {
     RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
-      throw InvalidURLError(runtimeType.toString());
+      throw InvalidURLError(name);
     }
     return url.substring(0, match.end);
   }
@@ -162,14 +162,14 @@ class GitHub extends AppSource {
       if (version == null) {
         throw NoVersionError();
       }
-      return APKDetails(version, targetRelease['apkUrls'] as List<String>);
+      return APKDetails(version, targetRelease['apkUrls'] as List<String>,
+          getAppNames(standardUrl));
     } else {
       rateLimitErrorCheck(res);
       throw getObtainiumHttpError(res);
     }
   }
 
-  @override
   AppNames getAppNames(String standardUrl) {
     String temp = standardUrl.substring(standardUrl.indexOf('://') + 3);
     List<String> names = temp.substring(temp.indexOf('/') + 1).split('/');

lib/app_sources/gitlab.dart

@@ -14,7 +14,7 @@ class GitLab extends AppSource {
     RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
-      throw InvalidURLError(runtimeType.toString());
+      throw InvalidURLError(name);
     }
     return url.substring(0, match.end);
   }
@@ -56,15 +56,9 @@ class GitLab extends AppSource {
       if (version == null) {
         throw NoVersionError();
       }
-      return APKDetails(version, apkUrls);
+      return APKDetails(version, apkUrls, GitHub().getAppNames(standardUrl));
     } else {
       throw NoReleasesError();
     }
   }
-
-  @override
-  AppNames getAppNames(String standardUrl) {
-    // Same as GitHub
-    return GitHub().getAppNames(standardUrl);
-  }
 }

lib/app_sources/izzyondroid.dart

@@ -13,7 +13,7 @@ class IzzyOnDroid extends AppSource {
     RegExp standardUrlRegEx = RegExp('^https?://$host/repo/apk/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
-      throw InvalidURLError(runtimeType.toString());
+      throw InvalidURLError(name);
     }
     return url.substring(0, match.end);
   }
@@ -22,7 +22,8 @@ class IzzyOnDroid extends AppSource {
   String? changeLogPageFromStandardUrl(String standardUrl) => null;
 
   @override
-  String? tryInferringAppId(String standardUrl) {
+  String? tryInferringAppId(String standardUrl,
+      {List<String> additionalData = const []}) {
     return FDroid().tryInferringAppId(standardUrl);
   }
 
@@ -34,11 +35,7 @@ class IzzyOnDroid extends AppSource {
     return FDroid().getAPKUrlsFromFDroidPackagesAPIResponse(
         await get(
             Uri.parse('https://apt.izzysoft.de/fdroid/api/v1/packages/$appId')),
-        'https://android.izzysoft.de/frepo/$appId');
-  }
-
-  @override
-  AppNames getAppNames(String standardUrl) {
-    return AppNames('IzzyOnDroid', Uri.parse(standardUrl).pathSegments.last);
+        'https://android.izzysoft.de/frepo/$appId',
+        standardUrl);
   }
 }

lib/app_sources/mullvad.dart

@@ -13,7 +13,7 @@ class Mullvad extends AppSource {
     RegExp standardUrlRegEx = RegExp('^https?://$host');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
-      throw InvalidURLError(runtimeType.toString());
+      throw InvalidURLError(name);
     }
     return url.substring(0, match.end);
   }
@@ -38,14 +38,11 @@ class Mullvad extends AppSource {
         throw NoVersionError();
       }
       return APKDetails(
-          version, ['https://mullvad.net/download/app/apk/latest']);
+          version,
+          ['https://mullvad.net/download/app/apk/latest'],
+          AppNames(name, 'Mullvad-VPN'));
     } else {
       throw NoReleasesError();
     }
   }
-
-  @override
-  AppNames getAppNames(String standardUrl) {
-    return AppNames('Mullvad-VPN', 'Mullvad-VPN');
-  }
 }

lib/app_sources/signal.dart

@@ -30,12 +30,9 @@ class Signal extends AppSource {
       if (version == null) {
         throw NoVersionError();
       }
-      return APKDetails(version, apkUrls);
+      return APKDetails(version, apkUrls, AppNames(name, 'Signal'));
     } else {
       throw NoReleasesError();
     }
   }
-
-  @override
-  AppNames getAppNames(String standardUrl) => AppNames('Signal', 'Signal');
 }

lib/app_sources/sourceforge.dart

@@ -13,7 +13,7 @@ class SourceForge extends AppSource {
     RegExp standardUrlRegEx = RegExp('^https?://$host/projects/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
-      throw InvalidURLError(runtimeType.toString());
+      throw InvalidURLError(name);
     }
     return url.substring(0, match.end);
   }
@@ -50,15 +50,13 @@ class SourceForge extends AppSource {
           apkUrlListAllReleases // This can be used skipped for fallback support later
               .where((element) => getVersion(element) == version)
               .toList();
-      return APKDetails(version, apkUrlList);
+      return APKDetails(
+          version,
+          apkUrlList,
+          AppNames(
+              name, standardUrl.substring(standardUrl.lastIndexOf('/') + 1)));
     } else {
       throw NoReleasesError();
     }
   }
-
-  @override
-  AppNames getAppNames(String standardUrl) {
-    return AppNames(runtimeType.toString(),
-        standardUrl.substring(standardUrl.lastIndexOf('/') + 1));
-  }
 }