Add invert option to apk filter regex

assets/translations/bs.json

@@ -299,6 +299,7 @@
     "pseudoVersionInUse": "A Pseudo-Version is in Use",
     "installed": "Installed",
     "latest": "Latest",
+    "invertRegEx": "Invert regular expression",
     "removeAppQuestion": {
         "one": "Želite li ukloniti aplikaciju?",
         "other": "Želite li ukloniti aplikacije?"

assets/translations/cs.json

@@ -299,6 +299,7 @@
     "pseudoVersionInUse": "A Pseudo-Version is in Use",
     "installed": "Installed",
     "latest": "Latest",
+    "invertRegEx": "Invert regular expression",
     "removeAppQuestion": {
         "one": "Odstranit Apku?",
         "other": "Odstranit Apky?"

assets/translations/de.json

@@ -301,6 +301,7 @@
     "pseudoVersionInUse": "A Pseudo-Version is in Use",
     "installed": "Installed",
     "latest": "Latest",
+    "invertRegEx": "Invert regular expression",
     "removeAppQuestion": {
         "one": "App entfernen?",
         "other": "Apps entfernen?"

assets/translations/en.json

@@ -301,6 +301,7 @@
     "pseudoVersionInUse": "A Pseudo-Version is in Use",
     "installed": "Installed",
     "latest": "Latest",
+    "invertRegEx": "Invert regular expression",
     "removeAppQuestion": {
         "one": "Remove App?",
         "other": "Remove Apps?"

assets/translations/es.json

@@ -299,6 +299,7 @@
     "pseudoVersionInUse": "A Pseudo-Version is in Use",
     "installed": "Installed",
     "latest": "Latest",
+    "invertRegEx": "Invert regular expression",
     "removeAppQuestion": {
         "one": "¿Eliminar Aplicación?",
         "other": "¿Eliminar Aplicaciones?"

assets/translations/fa.json

@@ -299,6 +299,7 @@
     "pseudoVersionInUse": "A Pseudo-Version is in Use",
     "installed": "Installed",
     "latest": "Latest",
+    "invertRegEx": "Invert regular expression",
     "removeAppQuestion": {
         "one": "برنامه حذف شود؟",
         "other": "برنامه ها حذف شوند؟"

assets/translations/fr.json

@@ -299,6 +299,7 @@
     "pseudoVersionInUse": "A Pseudo-Version is in Use",
     "installed": "Installed",
     "latest": "Latest",
+    "invertRegEx": "Invert regular expression",
     "removeAppQuestion": {
         "one": "Supprimer l'application ?",
         "other": "Supprimer les applications ?"

assets/translations/hu.json

@@ -299,6 +299,7 @@
     "pseudoVersionInUse": "A Pseudo-Version is in Use",
     "installed": "Installed",
     "latest": "Latest",
+    "invertRegEx": "Invert regular expression",
     "removeAppQuestion": {
         "one": "Eltávolítja az alkalmazást?",
         "other": "Eltávolítja az alkalmazást?"

assets/translations/it.json

@@ -299,6 +299,7 @@
     "pseudoVersionInUse": "A Pseudo-Version is in Use",
     "installed": "Installed",
     "latest": "Latest",
+    "invertRegEx": "Invert regular expression",
     "removeAppQuestion": {
         "one": "Rimuovere l'app?",
         "other": "Rimuovere le app?"

assets/translations/ja.json

@@ -301,6 +301,7 @@
     "pseudoVersionInUse": "A Pseudo-Version is in Use",
     "installed": "Installed",
     "latest": "Latest",
+    "invertRegEx": "Invert regular expression",
     "removeAppQuestion": {
         "one": "アプリを削除しますか？",
         "other": "アプリを削除しますか？"

assets/translations/nl.json

@@ -299,6 +299,7 @@
     "pseudoVersionInUse": "A Pseudo-Version is in Use",
     "installed": "Installed",
     "latest": "Latest",
+    "invertRegEx": "Invert regular expression",
     "removeAppQuestion": {
         "one": "App verwijderen?",
         "other": "Apps verwijderen?"

assets/translations/pl.json

@@ -299,6 +299,7 @@
     "pseudoVersionInUse": "A Pseudo-Version is in Use",
     "installed": "Installed",
     "latest": "Latest",
+    "invertRegEx": "Invert regular expression",
     "removeAppQuestion": {
         "one": "Usunąć aplikację?",
         "few": "Usunąć aplikacje?",

assets/translations/pt.json

@@ -299,6 +299,7 @@
     "pseudoVersionInUse": "A Pseudo-Version is in Use",
     "installed": "Installed",
     "latest": "Latest",
+    "invertRegEx": "Invert regular expression",
     "removeAppQuestion": {
         "one": "Remover aplicativo?",
         "other": "Remover aplicativos?"

assets/translations/ru.json

@@ -301,6 +301,7 @@
     "pseudoVersionInUse": "A Pseudo-Version is in Use",
     "installed": "Installed",
     "latest": "Latest",
+    "invertRegEx": "Invert regular expression",
     "removeAppQuestion": {
         "one": "Удалить приложение?",
         "other": "Удалить приложения?"

assets/translations/sv.json

@@ -285,6 +285,7 @@
     "pseudoVersionInUse": "A Pseudo-Version is in Use",
     "installed": "Installed",
     "latest": "Latest",
+    "invertRegEx": "Invert regular expression",
     "removeAppQuestion": {
         "one": "Ta Bort App?",
         "other": "Ta Bort Appar?"

assets/translations/tr.json

@@ -299,6 +299,7 @@
     "pseudoVersionInUse": "A Pseudo-Version is in Use",
     "installed": "Installed",
     "latest": "Latest",
+    "invertRegEx": "Invert regular expression",
     "removeAppQuestion": {
         "one": "Uygulamayı Kaldır?",
         "other": "Uygulamaları Kaldır?"

assets/translations/vi.json

@@ -297,6 +297,7 @@
     "pseudoVersionInUse": "A Pseudo-Version is in Use",
     "installed": "Installed",
     "latest": "Latest",
+    "invertRegEx": "Invert regular expression",
     "removeAppQuestion":{
         "one": "Gỡ ứng dụng?",
         "other": "Gỡ ứng dụng?"

assets/translations/zh.json

@@ -301,6 +301,7 @@
     "pseudoVersionInUse": "A Pseudo-Version is in Use",
     "installed": "Installed",
     "latest": "Latest",
+    "invertRegEx": "Invert regular expression",
     "removeAppQuestion": {
         "one": "是否删除应用？",
         "other": "是否删除应用？"

lib/app_sources/github.dart

@@ -382,11 +382,8 @@ class GitHub extends AppSource {
           continue;
         }
         var apkUrls = getReleaseAPKUrls(releases[i]);
-        if (additionalSettings['apkFilterRegEx'] != null) {
+        apkUrls = filterApks(apkUrls, additionalSettings['apkFilterRegEx'],
-          var reg = RegExp(additionalSettings['apkFilterRegEx']);
+            additionalSettings['invertAPKFilter']);
-          apkUrls =
-              apkUrls.where((element) => reg.hasMatch(element.key)).toList();
-        }
         if (apkUrls.isEmpty && additionalSettings['trackOnly'] != true) {
           continue;
         }

lib/app_sources/html.dart

@@ -300,12 +300,8 @@ class HTML extends AppSource {
       versionExtractionWholePageString =
           res.body.split('\r\n').join('\n').split('\n').join('\\n');
       links = await grabLinksCommon(res, additionalSettings);
-
+      links = filterApks(links, additionalSettings['apkFilterRegEx'],
-      if ((additionalSettings['apkFilterRegEx'] as String?)?.isNotEmpty ==
+          additionalSettings['invertAPKFilter']);
-          true) {
-        var reg = RegExp(additionalSettings['apkFilterRegEx']);
-        links = links.where((element) => reg.hasMatch(element.key)).toList();
-      }
       if (links.isEmpty) {
         throw NoReleasesError();
       }

lib/providers/source_provider.dart

@@ -504,6 +504,11 @@ abstract class AppSource {
             }
           ])
     ],
+    [
+      GeneratedFormSwitch('invertAPKFilter',
+          label: '${tr('invertRegEx')} (${tr('filterAPKsByRegEx')})',
+          defaultValue: false)
+    ],
     [
       GeneratedFormSwitch('autoApkFilterByArch',
           label: tr('autoApkFilterByArch'), defaultValue: true)
@@ -708,6 +713,20 @@ String? extractVersion(String? versionExtractionRegEx, String? matchGroupString,
   }
 }
 
+List<MapEntry<String, String>> filterApks(
+    List<MapEntry<String, String>> apkUrls,
+    String? apkFilterRegEx,
+    bool? invert) {
+  if (apkFilterRegEx?.isNotEmpty == true) {
+    var reg = RegExp(apkFilterRegEx!);
+    apkUrls = apkUrls.where((element) {
+      var hasMatch = reg.hasMatch(element.key);
+      return invert == true ? !hasMatch : hasMatch;
+    }).toList();
+  }
+  return apkUrls;
+}
+
 class SourceProvider {
   // Add more source classes here so they are available via the service
   List<AppSource> get sources => [
@@ -825,11 +844,8 @@ class SourceProvider {
         apk.releaseDate != null) {
       apk.version = apk.releaseDate!.microsecondsSinceEpoch.toString();
     }
-    if (additionalSettings['apkFilterRegEx'] != null) {
+    apk.apkUrls = filterApks(apk.apkUrls, additionalSettings['apkFilterRegEx'],
-      var reg = RegExp(additionalSettings['apkFilterRegEx']);
+        additionalSettings['invertAPKFilter']);
-      apk.apkUrls =
-          apk.apkUrls.where((element) => reg.hasMatch(element.key)).toList();
-    }
     if (apk.apkUrls.isEmpty && !trackOnly) {
       throw NoAPKError();
     }