From 890787f87f9318df4ad9036393f0b950fa64b2f1 Mon Sep 17 00:00:00 2001 From: Imran Remtulla Date: Thu, 16 Feb 2023 22:36:53 -0500 Subject: [PATCH] Fixed type errors and HTML APK filter --- lib/app_sources/codeberg.dart | 4 ++-- lib/app_sources/github.dart | 4 ++-- lib/app_sources/html.dart | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/app_sources/codeberg.dart b/lib/app_sources/codeberg.dart index b4101ca..e2fa5ab 100644 --- a/lib/app_sources/codeberg.dart +++ b/lib/app_sources/codeberg.dart @@ -54,9 +54,9 @@ class Codeberg extends AppSource { String standardUrl, Map additionalSettings, ) async { - bool includePrereleases = additionalSettings['includePrereleases']; + bool includePrereleases = additionalSettings['includePrereleases'] == true; bool fallbackToOlderReleases = - additionalSettings['fallbackToOlderReleases']; + additionalSettings['fallbackToOlderReleases'] == true; String? regexFilter = (additionalSettings['filterReleaseTitlesByRegEx'] as String?) ?.isNotEmpty == diff --git a/lib/app_sources/github.dart b/lib/app_sources/github.dart index 7d92ed1..f4660a5 100644 --- a/lib/app_sources/github.dart +++ b/lib/app_sources/github.dart @@ -101,9 +101,9 @@ class GitHub extends AppSource { String standardUrl, Map additionalSettings, ) async { - bool includePrereleases = additionalSettings['includePrereleases']; + bool includePrereleases = additionalSettings['includePrereleases'] == true; bool fallbackToOlderReleases = - additionalSettings['fallbackToOlderReleases']; + additionalSettings['fallbackToOlderReleases'] == true; String? regexFilter = (additionalSettings['filterReleaseTitlesByRegEx'] as String?) ?.isNotEmpty == diff --git a/lib/app_sources/html.dart b/lib/app_sources/html.dart index 865162c..003eef0 100644 --- a/lib/app_sources/html.dart +++ b/lib/app_sources/html.dart @@ -27,6 +27,10 @@ class HTML extends AppSource { .where((element) => element.toLowerCase().endsWith('.apk')) .toList(); links.sort((a, b) => a.split('/').last.compareTo(b.split('/').last)); + if (additionalSettings['apkFilterRegEx'] != null) { + var reg = RegExp(additionalSettings['apkFilterRegEx']); + links = links.where((element) => reg.hasMatch(element)).toList(); + } if (links.isEmpty) { throw NoReleasesError(); }