peter/Obtainium
1
0
Fork 0
mirror of https://github.com/ImranR98/Obtainium.git synced 2025-10-24 19:33:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1212 from ImranR98/dev

Browse Source 
HTML intermediate link bugfix (#1211)
This commit is contained in:
Imran
2023-12-29 12:43:49 -06:00
committed by GitHub
parent bfe09791d5 eb29b908c2
commit 8ea8daa811
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/main.dart
View File

@@ -19,7 +19,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart';
// ignore: implementation_imports // ignore: implementation_imports
import 'package:easy_localization/src/localization.dart'; import 'package:easy_localization/src/localization.dart';
const String currentVersion = '0.15.0'; const String currentVersion = '0.15.1';
const String currentReleaseTag = const String currentReleaseTag =
'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES 'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES

8
lib/providers/source_provider.dart
View File

@@ -147,7 +147,7 @@ appJSONCompatibilityModifiers(Map<String, dynamic> json) {
} }
// HTML single 'intermediate link' should be converted to multi-support version // HTML single 'intermediate link' should be converted to multi-support version
if (originalAdditionalSettings['intermediateLinkRegex'] != null && if (originalAdditionalSettings['intermediateLinkRegex'] != null &&
additionalSettings['intermediateLink']?.isNotEmpty != true) { additionalSettings['intermediateLinkRegex']?.isNotEmpty != true) {
additionalSettings['intermediateLink'] = [ additionalSettings['intermediateLink'] = [
{ {
'customLinkFilterRegex': 'customLinkFilterRegex':
@@ -157,6 +157,12 @@ appJSONCompatibilityModifiers(Map<String, dynamic> json) {
} }
]; ];
} }
if ((additionalSettings['intermediateLink']?.length ?? 0) > 0) {
additionalSettings['intermediateLink'] =
additionalSettings['intermediateLink'].where((e) {
return e['intermediateLinkRegex']?.isNotEmpty == true;
}).toList();
}
} }
json['additionalSettings'] = jsonEncode(additionalSettings); json['additionalSettings'] = jsonEncode(additionalSettings);
// F-Droid no longer needs cloudflare exception since override can be used - migrate apps appropriately // F-Droid no longer needs cloudflare exception since override can be used - migrate apps appropriately

2
pubspec.yaml
View File

@@ -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 # 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: 0.15.0+236 # When changing this, update the tag in main() accordingly version: 0.15.1+237 # When changing this, update the tag in main() accordingly
environment: environment:
sdk: '>=3.0.0 <4.0.0' sdk: '>=3.0.0 <4.0.0'