mirror of
				https://github.com/ImranR98/Obtainium.git
				synced 2025-10-30 21:13:28 +01:00 
			
		
		
		
	Merge pull request #630 from ImranR98/dev
HTML Source: treat whole link as version (also applies to APK filter regex)
This commit is contained in:
		| @@ -111,8 +111,7 @@ class HTML extends AppSource { | ||||
|           .where((element) => | ||||
|               Uri.parse(element).path.toLowerCase().endsWith('.apk')) | ||||
|           .toList(); | ||||
|       links.sort( | ||||
|           (a, b) => compareAlphaNumeric(a.split('/').last, b.split('/').last)); | ||||
|       links.sort((a, b) => compareAlphaNumeric(a, b)); | ||||
|       if (additionalSettings['apkFilterRegEx'] != null) { | ||||
|         var reg = RegExp(additionalSettings['apkFilterRegEx']); | ||||
|         links = links.where((element) => reg.hasMatch(element)).toList(); | ||||
| @@ -121,12 +120,11 @@ class HTML extends AppSource { | ||||
|         throw NoReleasesError(); | ||||
|       } | ||||
|       var rel = links.last; | ||||
|       var apkName = rel.split('/').last; | ||||
|       var version = apkName.substring(0, apkName.length - 4); | ||||
|       var version = rel.hashCode.toString(); | ||||
|       List<String> apkUrls = | ||||
|           [rel].map((e) => ensureAbsoluteUrl(e, uri)).toList(); | ||||
|       return APKDetails( | ||||
|           version, getApkUrlsFromUrls(apkUrls), AppNames(uri.host, tr('app'))); | ||||
|       return APKDetails(version, apkUrls.map((e) => MapEntry(e, e)).toList(), | ||||
|           AppNames(uri.host, tr('app'))); | ||||
|     } else { | ||||
|       throw getObtainiumHttpError(res); | ||||
|     } | ||||
|   | ||||
| @@ -21,7 +21,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart'; | ||||
| // ignore: implementation_imports | ||||
| import 'package:easy_localization/src/localization.dart'; | ||||
|  | ||||
| const String currentVersion = '0.13.11'; | ||||
| const String currentVersion = '0.13.12'; | ||||
| const String currentReleaseTag = | ||||
|     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES | ||||
|  | ||||
|   | ||||
| @@ -17,7 +17,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 | ||||
| # 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. | ||||
| version: 0.13.11+175 # When changing this, update the tag in main() accordingly | ||||
| version: 0.13.12+176 # When changing this, update the tag in main() accordingly | ||||
|  | ||||
| environment: | ||||
|   sdk: '>=2.18.2 <3.0.0' | ||||
|   | ||||
		Reference in New Issue
	
	Block a user