Skip to content

Commit 9a58643

Browse files
authored
Merge pull request #2138 from ImranR98/dev
- Fix GitLab bug that broke all repos with hyphens in their names (#2125) - Provide "current" link in HTML source errors to help w/ troubleshooting
2 parents 375caa4 + b223522 commit 9a58643

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

lib/app_sources/gitlab.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class GitLab extends AppSource {
5858
url =
5959
urlSegments.sublist(0, cutOffIndex <= 0 ? null : cutOffIndex).join('/');
6060
RegExp standardUrlRegEx = RegExp(
61-
'^https?://(www\\.)?${getSourceRegex(hosts)}/[^/]+(/[^/-]+){1,20}',
61+
'^https?://(www\\.)?${getSourceRegex(hosts)}/[^/]+(/[^((\b/\b)|(\b/-/\b))]+){1,20}',
6262
caseSensitive: false);
6363
RegExpMatch? match = standardUrlRegEx.firstMatch(url);
6464
if (match == null) {

lib/app_sources/html.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ class HTML extends AppSource {
313313
await sourceRequest(currentUrl, additionalSettings),
314314
additionalSettings['intermediateLink'][i]);
315315
if (intLinks.isEmpty) {
316-
throw NoReleasesError();
316+
throw NoReleasesError(note: currentUrl);
317317
} else {
318318
currentUrl = intLinks.last.key;
319319
}
@@ -329,7 +329,7 @@ class HTML extends AppSource {
329329
links = filterApks(links, additionalSettings['apkFilterRegEx'],
330330
additionalSettings['invertAPKFilter']);
331331
if (links.isEmpty) {
332-
throw NoReleasesError();
332+
throw NoReleasesError(note: currentUrl);
333333
}
334334
} else {
335335
links = [MapEntry(currentUrl, currentUrl)];

pubspec.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ packages:
8080
dependency: transitive
8181
description:
8282
name: archive
83-
sha256: "6199c74e3db4fbfbd04f66d739e72fe11c8a8957d5f219f1f4482dbde6420b5a"
83+
sha256: "528579c7e4579719f04b21eeeeddfd73a18b31dabc22766893b7d1be7f49b967"
8484
url: "https://pub.dev"
8585
source: hosted
86-
version: "4.0.2"
86+
version: "4.0.3"
8787
args:
8888
dependency: transitive
8989
description:
@@ -580,10 +580,10 @@ packages:
580580
dependency: transitive
581581
description:
582582
name: image
583-
sha256: "8346ad4b5173924b5ddddab782fc7d8a6300178c8b1dc427775405a01701c4a6"
583+
sha256: "13d3349ace88f12f4a0d175eb5c12dcdd39d35c4c109a8a13dfeb6d0bd9e31c3"
584584
url: "https://pub.dev"
585585
source: hosted
586-
version: "4.5.2"
586+
version: "4.5.3"
587587
intl:
588588
dependency: transitive
589589
description:

pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
1616
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
1717
# In Windows, build-name is used as the major, minor, and patch parts
1818
# of the product and file versions while build-number is used as the build suffix.
19-
version: 1.1.44+2301
19+
version: 1.1.45+2302
2020

2121
environment:
2222
sdk: ^3.6.0

0 commit comments

Comments
 (0)