mirror of
				https://github.com/ImranR98/Obtainium.git
				synced 2025-11-04 07:13:28 +01:00 
			
		
		
		
	Better support for SourceForge (#1352)
This commit is contained in:
		@@ -10,16 +10,23 @@ class SourceForge extends AppSource {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  @override
 | 
					  @override
 | 
				
			||||||
  String sourceSpecificStandardizeURL(String url) {
 | 
					  String sourceSpecificStandardizeURL(String url) {
 | 
				
			||||||
    RegExp standardUrlRegExB = RegExp(
 | 
					    var sourceRegex = getSourceRegex(hosts);
 | 
				
			||||||
        '^https?://(www\\.)?${getSourceRegex(hosts)}/p/[^/]+',
 | 
					    RegExp standardUrlRegExC =
 | 
				
			||||||
        caseSensitive: false);
 | 
					        RegExp('^https?://(www\\.)?$sourceRegex/p/.+', caseSensitive: false);
 | 
				
			||||||
    RegExpMatch? match = standardUrlRegExB.firstMatch(url);
 | 
					    RegExpMatch? match = standardUrlRegExC.firstMatch(url);
 | 
				
			||||||
    if (match != null) {
 | 
					    if (match != null) {
 | 
				
			||||||
      url =
 | 
					      url =
 | 
				
			||||||
          'https://${Uri.parse(match.group(0)!).host}/projects/${url.substring(Uri.parse(match.group(0)!).host.length + '/projects/'.length + 1)}';
 | 
					          'https://${Uri.parse(match.group(0)!).host}/projects/${url.substring(Uri.parse(match.group(0)!).host.length + '/projects/'.length + 1)}';
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					    RegExp standardUrlRegExB = RegExp(
 | 
				
			||||||
 | 
					        '^https?://(www\\.)?$sourceRegex/projects/[^/]+',
 | 
				
			||||||
 | 
					        caseSensitive: false);
 | 
				
			||||||
 | 
					    match = standardUrlRegExB.firstMatch(url);
 | 
				
			||||||
 | 
					    if (match != null && match.group(0) == url) {
 | 
				
			||||||
 | 
					      url = '$url/files';
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
    RegExp standardUrlRegExA = RegExp(
 | 
					    RegExp standardUrlRegExA = RegExp(
 | 
				
			||||||
        '^https?://(www\\.)?${getSourceRegex(hosts)}/projects/[^/]+',
 | 
					        '^https?://(www\\.)?$sourceRegex/projects/[^/]+/files(/.+)?',
 | 
				
			||||||
        caseSensitive: false);
 | 
					        caseSensitive: false);
 | 
				
			||||||
    match = standardUrlRegExA.firstMatch(url);
 | 
					    match = standardUrlRegExA.firstMatch(url);
 | 
				
			||||||
    if (match == null) {
 | 
					    if (match == null) {
 | 
				
			||||||
@@ -33,38 +40,79 @@ class SourceForge extends AppSource {
 | 
				
			|||||||
    String standardUrl,
 | 
					    String standardUrl,
 | 
				
			||||||
    Map<String, dynamic> additionalSettings,
 | 
					    Map<String, dynamic> additionalSettings,
 | 
				
			||||||
  ) async {
 | 
					  ) async {
 | 
				
			||||||
    Response res =
 | 
					    var standardUri = Uri.parse(standardUrl);
 | 
				
			||||||
        await sourceRequest('$standardUrl/rss?path=/', additionalSettings);
 | 
					    if (standardUri.pathSegments.length == 2) {
 | 
				
			||||||
 | 
					      standardUrl = '$standardUrl/files';
 | 
				
			||||||
 | 
					      standardUri = Uri.parse(standardUrl);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    Response res = await sourceRequest(
 | 
				
			||||||
 | 
					        '${standardUri.origin}/${standardUri.pathSegments.sublist(0, 2).join('/')}/rss?path=/',
 | 
				
			||||||
 | 
					        additionalSettings);
 | 
				
			||||||
    if (res.statusCode == 200) {
 | 
					    if (res.statusCode == 200) {
 | 
				
			||||||
      var parsedHtml = parse(res.body);
 | 
					      var parsedHtml = parse(res.body);
 | 
				
			||||||
      var allDownloadLinks =
 | 
					      var allDownloadLinks = parsedHtml
 | 
				
			||||||
          parsedHtml.querySelectorAll('guid').map((e) => e.innerHtml).toList();
 | 
					          .querySelectorAll('guid')
 | 
				
			||||||
 | 
					          .map((e) => e.innerHtml)
 | 
				
			||||||
 | 
					          .where((element) => element.startsWith(standardUrl))
 | 
				
			||||||
 | 
					          .toList();
 | 
				
			||||||
      getVersion(String url) {
 | 
					      getVersion(String url) {
 | 
				
			||||||
        try {
 | 
					        try {
 | 
				
			||||||
          var tokens = url.split('/');
 | 
					          var segments = url
 | 
				
			||||||
          var fi = tokens.indexOf('files');
 | 
					              .substring(standardUrl.length)
 | 
				
			||||||
          return tokens[tokens[fi + 2] == 'download' ? fi - 1 : fi + 1];
 | 
					              .split('/')
 | 
				
			||||||
 | 
					              .where((element) => element.isNotEmpty)
 | 
				
			||||||
 | 
					              .toList()
 | 
				
			||||||
 | 
					              .reversed
 | 
				
			||||||
 | 
					              .toList()
 | 
				
			||||||
 | 
					              .sublist(1)
 | 
				
			||||||
 | 
					              .reversed
 | 
				
			||||||
 | 
					              .toList();
 | 
				
			||||||
 | 
					          segments = segments.length > 1
 | 
				
			||||||
 | 
					              ? segments.reversed.toList().sublist(1).reversed.toList()
 | 
				
			||||||
 | 
					              : segments;
 | 
				
			||||||
 | 
					          var version = segments.isNotEmpty ? segments.join('/') : null;
 | 
				
			||||||
 | 
					          if (version != null) {
 | 
				
			||||||
 | 
					            try {
 | 
				
			||||||
 | 
					              var extractedVersion = extractVersion(
 | 
				
			||||||
 | 
					                  additionalSettings['versionExtractionRegEx'] as String?,
 | 
				
			||||||
 | 
					                  additionalSettings['matchGroupToUse'] as String?,
 | 
				
			||||||
 | 
					                  version);
 | 
				
			||||||
 | 
					              if (extractedVersion != null) {
 | 
				
			||||||
 | 
					                version = extractedVersion;
 | 
				
			||||||
 | 
					              }
 | 
				
			||||||
 | 
					            } catch (e) {
 | 
				
			||||||
 | 
					              if (e is NoVersionError) {
 | 
				
			||||||
 | 
					                version = null;
 | 
				
			||||||
 | 
					              } else {
 | 
				
			||||||
 | 
					                rethrow;
 | 
				
			||||||
 | 
					              }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					          }
 | 
				
			||||||
 | 
					          return version;
 | 
				
			||||||
        } catch (e) {
 | 
					        } catch (e) {
 | 
				
			||||||
          return null;
 | 
					          return null;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      String? version = getVersion(allDownloadLinks[0]);
 | 
					      var apkUrlListAllReleases = allDownloadLinks
 | 
				
			||||||
 | 
					          .where((element) => element.toLowerCase().endsWith('.apk/download'))
 | 
				
			||||||
 | 
					          .where((element) => getVersion(element) != null)
 | 
				
			||||||
 | 
					          .toList();
 | 
				
			||||||
 | 
					      if (apkUrlListAllReleases.isEmpty) {
 | 
				
			||||||
 | 
					        throw NoReleasesError();
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					      String? version = getVersion(apkUrlListAllReleases[0]);
 | 
				
			||||||
      if (version == null) {
 | 
					      if (version == null) {
 | 
				
			||||||
        throw NoVersionError();
 | 
					        throw NoVersionError();
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
      var apkUrlListAllReleases = allDownloadLinks
 | 
					
 | 
				
			||||||
          .where((element) => element.toLowerCase().endsWith('.apk/download'))
 | 
					 | 
				
			||||||
          .toList();
 | 
					 | 
				
			||||||
      var apkUrlList =
 | 
					      var apkUrlList =
 | 
				
			||||||
          apkUrlListAllReleases // This can be used skipped for fallback support later
 | 
					          apkUrlListAllReleases // This can be used skipped for fallback support later
 | 
				
			||||||
              .where((element) => getVersion(element) == version)
 | 
					              .where((element) => getVersion(element) == version)
 | 
				
			||||||
              .toList();
 | 
					              .toList();
 | 
				
			||||||
      return APKDetails(
 | 
					      var segments = standardUrl.split('/');
 | 
				
			||||||
          version,
 | 
					      return APKDetails(version, getApkUrlsFromUrls(apkUrlList),
 | 
				
			||||||
          getApkUrlsFromUrls(apkUrlList),
 | 
					          AppNames(name, segments[segments.indexOf('files') - 1]));
 | 
				
			||||||
          AppNames(
 | 
					 | 
				
			||||||
              name, standardUrl.substring(standardUrl.lastIndexOf('/') + 1)));
 | 
					 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
      throw getObtainiumHttpError(res);
 | 
					      throw getObtainiumHttpError(res);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -829,8 +829,9 @@ class SourceProvider {
 | 
				
			|||||||
    APKDetails apk =
 | 
					    APKDetails apk =
 | 
				
			||||||
        await source.getLatestAPKDetails(standardUrl, additionalSettings);
 | 
					        await source.getLatestAPKDetails(standardUrl, additionalSettings);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (source.runtimeType != HTML().runtimeType) {
 | 
					    if (source.runtimeType !=
 | 
				
			||||||
      // HTML does it separately
 | 
					            HTML().runtimeType && // Some sources do it separately
 | 
				
			||||||
 | 
					        source.runtimeType != SourceForge().runtimeType) {
 | 
				
			||||||
      String? extractedVersion = extractVersion(
 | 
					      String? extractedVersion = extractVersion(
 | 
				
			||||||
          additionalSettings['versionExtractionRegEx'] as String?,
 | 
					          additionalSettings['versionExtractionRegEx'] as String?,
 | 
				
			||||||
          additionalSettings['matchGroupToUse'] as String?,
 | 
					          additionalSettings['matchGroupToUse'] as String?,
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user