Allow for spaces in HTML link and version filters (#1537)

This commit is contained in:
Imran Remtulla
2024-04-15 19:06:24 -04:00
parent 0657f832e1
commit 12dda8bfa9

View File

@@ -244,16 +244,17 @@ class HTML extends AppSource {
true) { true) {
var reg = RegExp(additionalSettings['customLinkFilterRegex']); var reg = RegExp(additionalSettings['customLinkFilterRegex']);
links = allLinks links = allLinks
.where((element) => .where((element) => reg.hasMatch(
reg.hasMatch(filterLinkByText ? element.value : element.key)) filterLinkByText ? element.value : Uri.decodeFull(element.key)))
.toList(); .toList();
} else { } else {
links = allLinks links = allLinks
.where((element) => .where((element) => Uri.parse(filterLinkByText
Uri.parse(filterLinkByText ? element.value : element.key) ? element.value
.path : Uri.decodeFull(element.key))
.toLowerCase() .path
.endsWith('.apk')) .toLowerCase()
.endsWith('.apk'))
.toList(); .toList();
} }
if (!skipSort) { if (!skipSort) {
@@ -315,7 +316,7 @@ class HTML extends AppSource {
additionalSettings['matchGroupToUse'] as String?, additionalSettings['matchGroupToUse'] as String?,
additionalSettings['versionExtractWholePage'] == true additionalSettings['versionExtractWholePage'] == true
? versionExtractionWholePageString ? versionExtractionWholePageString
: rel); : Uri.decodeFull(rel));
version ??= version ??=
additionalSettings['defaultPseudoVersioningMethod'] == 'APKLinkHash' additionalSettings['defaultPseudoVersioningMethod'] == 'APKLinkHash'
? rel.hashCode.toString() ? rel.hashCode.toString()