peter/Obtainium
1
0
Fork 0
mirror of https://github.com/ImranR98/Obtainium.git synced 2025-07-13 13:26:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2138 from ImranR98/dev

Browse Source 
- Fix GitLab bug that broke all repos with hyphens in their names (#2125)
- Provide "current" link in HTML source errors to help w/ troubleshooting
This commit is contained in:
Imran
2025-02-22 18:47:23 -06:00
committed by GitHub
parent 375caa4511 b223522801
commit 9a58643088
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/app_sources/gitlab.dart
View File

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

4
lib/app_sources/html.dart
View File

@ -313,7 +313,7 @@ class HTML extends AppSource {
await sourceRequest(currentUrl, additionalSettings), await sourceRequest(currentUrl, additionalSettings),
additionalSettings['intermediateLink'][i]); additionalSettings['intermediateLink'][i]);
if (intLinks.isEmpty) { if (intLinks.isEmpty) {
throw NoReleasesError(); throw NoReleasesError(note: currentUrl);
} else { } else {
currentUrl = intLinks.last.key; currentUrl = intLinks.last.key;
} }
@ -329,7 +329,7 @@ class HTML extends AppSource {
links = filterApks(links, additionalSettings['apkFilterRegEx'], links = filterApks(links, additionalSettings['apkFilterRegEx'],
additionalSettings['invertAPKFilter']); additionalSettings['invertAPKFilter']);
if (links.isEmpty) { if (links.isEmpty) {
throw NoReleasesError(); throw NoReleasesError(note: currentUrl);
} }
} else { } else {
links = [MapEntry(currentUrl, currentUrl)]; links = [MapEntry(currentUrl, currentUrl)];

8
pubspec.lock
View File

@ -80,10 +80,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: archive name: archive
sha256: "6199c74e3db4fbfbd04f66d739e72fe11c8a8957d5f219f1f4482dbde6420b5a" sha256: "528579c7e4579719f04b21eeeeddfd73a18b31dabc22766893b7d1be7f49b967"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "4.0.2" version: "4.0.3"
args: args:
dependency: transitive dependency: transitive
description: description:
@ -580,10 +580,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: image name: image
sha256: "8346ad4b5173924b5ddddab782fc7d8a6300178c8b1dc427775405a01701c4a6" sha256: "13d3349ace88f12f4a0d175eb5c12dcdd39d35c4c109a8a13dfeb6d0bd9e31c3"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "4.5.2" version: "4.5.3"
intl: intl:
dependency: transitive dependency: transitive
description: description:

2
pubspec.yaml
View File

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