Removed VLC (#1943)

README.md

@@ -31,8 +31,6 @@ Currently supported App sources:
   - [Tencent App Store](https://sj.qq.com/)
   - Jenkins Jobs
   - [APKMirror](https://apkmirror.com/) (Track-Only)
-- Open Source - App-Specific:
-  - [VLC](https://videolan.org/)
 - Other - App-Specific:
   - [Telegram App](https://telegram.org)
   - [Neutron Code](https://neutroncode.com)

lib/app_sources/vlc.dart

@@ -1,110 +0,0 @@
-import 'package:easy_localization/easy_localization.dart';
-import 'package:html/parser.dart';
-import 'package:http/http.dart';
-import 'package:obtainium/custom_errors.dart';
-import 'package:obtainium/providers/source_provider.dart';
-
-class VLC extends AppSource {
-  VLC() {
-    hosts = ['videolan.org'];
-  }
-  get dwUrlBase => 'https://get.${hosts[0]}/vlc-android/';
-
-  @override
-  Future<Map<String, String>?> getRequestHeaders(
-      Map<String, dynamic> additionalSettings,
-      {bool forAPKDownload = false}) async {
-    return {
-      "User-Agent":
-          "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Mobile Safari/537.36"
-    };
-  }
-
-  @override
-  String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
-    return 'https://${hosts[0]}';
-  }
-
-  Future<String?> getLatestVersion(
-      String standardUrl, Map<String, dynamic> additionalSettings) async {
-    Response res = await sourceRequest(dwUrlBase, additionalSettings);
-    if (res.statusCode == 200) {
-      var dwLinks = parse(res.body)
-          .querySelectorAll('a')
-          .where((element) => element.attributes['href'] != 'last/')
-          .map((e) => e.attributes['href']?.split('/')[0])
-          .toList();
-      String? version = dwLinks.isNotEmpty ? dwLinks.last : null;
-      if (version == null) {
-        throw NoVersionError();
-      }
-      return version;
-    } else {
-      throw getObtainiumHttpError(res);
-    }
-  }
-
-  @override
-  Future<APKDetails> getLatestAPKDetails(
-    String standardUrl,
-    Map<String, dynamic> additionalSettings,
-  ) async {
-    Response res = await get(
-        Uri.parse('https://www.videolan.org/vlc/download-android.html'));
-    if (res.statusCode == 200) {
-      var dwUrlBase = 'get.videolan.org/vlc-android';
-      var dwLinks = parse(res.body)
-          .querySelectorAll('a')
-          .where((element) =>
-              element.attributes['href']?.contains(dwUrlBase) ?? false)
-          .toList();
-      String? version = dwLinks.isNotEmpty
-          ? dwLinks.first.attributes['href']
-              ?.split('/')
-              .where((s) => s.isNotEmpty)
-              .last
-          : null;
-      if (version == null) {
-        throw NoVersionError();
-      }
-      String? targetUrl = 'https://$dwUrlBase/$version/';
-      var apkUrls = ['arm64-v8a', 'armeabi-v7a', 'x86', 'x86_64']
-          .map((e) => '${targetUrl}VLC-Android-$version-$e.apk')
-          .toList();
-      return APKDetails(
-          version, getApkUrlsFromUrls(apkUrls), AppNames('VideoLAN', 'VLC'));
-    } else {
-      throw getObtainiumHttpError(res);
-    }
-  }
-
-  @override
-  Future<String> apkUrlPrefetchModifier(String apkUrl, String standardUrl,
-      Map<String, dynamic> additionalSettings) async {
-    Response res = await sourceRequest(apkUrl, additionalSettings);
-    if (res.statusCode == 200) {
-      String? apkUrl =
-          parse(res.body).querySelector('#alt_link')?.attributes['href'];
-      if (apkUrl == null) {
-        throw NoAPKError();
-      }
-      return apkUrl;
-    } else if (res.statusCode == 500 &&
-        res.body.toLowerCase().indexOf('mirror') > 0) {
-      var html = parse(res.body);
-      var err = '';
-      html.body?.nodes.forEach((element) {
-        if (element.text != null) {
-          err += '${element.text}\n';
-        }
-      });
-      err = err.trim();
-      if (err.isEmpty) {
-        err = tr('err');
-      }
-      throw ObtainiumError(err);
-    } else {
-      throw getObtainiumHttpError(res);
-    }
-  }
-}

lib/providers/source_provider.dart

@@ -28,7 +28,6 @@ import 'package:obtainium/app_sources/sourcehut.dart';
 import 'package:obtainium/app_sources/telegramapp.dart';
 import 'package:obtainium/app_sources/tencent.dart';
 import 'package:obtainium/app_sources/uptodown.dart';
-import 'package:obtainium/app_sources/vlc.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/mass_app_sources/githubstars.dart';
@@ -228,6 +227,41 @@ appJSONCompatibilityModifiers(Map<String, dynamic> json) {
       replacementAdditionalSettings['refreshBeforeDownload'] = true;
       additionalSettings = replacementAdditionalSettings;
     }
+    // VLC from before it was removed should be converted to HTML (#1943)
+    if (json['url'] == 'https://videolan.org' &&
+        json['id'] == 'org.videolan.vlc' &&
+        json['author'] == 'VideoLAN' &&
+        json['name'] == 'VLC' &&
+        json['overrideSource'] == null &&
+        additionalSettings['trackOnly'] == false &&
+        additionalSettings['versionExtractionRegEx'] == '' &&
+        json['lastUpdateCheck'] != null) {
+      json['url'] = 'https://www.videolan.org/vlc/download-android.html';
+      var replacementAdditionalSettings = getDefaultValuesFromFormItems(
+          HTML().combinedAppSpecificSettingFormItems);
+      replacementAdditionalSettings['refreshBeforeDownload'] = true;
+      replacementAdditionalSettings['intermediateLink'] =
+          <Map<String, dynamic>>[
+        {
+          'customLinkFilterRegex': 'APK',
+          'filterByLinkText': true,
+          'skipSort': false,
+          'reverseSort': false,
+          'sortByLastLinkSegment': false
+        },
+        {
+          'customLinkFilterRegex': 'arm64-v8a\\.apk\$',
+          'filterByLinkText': false,
+          'skipSort': false,
+          'reverseSort': false,
+          'sortByLastLinkSegment': false
+        }
+      ];
+      replacementAdditionalSettings['versionExtractionRegEx'] =
+          '/vlc-android/([^/]+)/';
+      replacementAdditionalSettings['matchGroupToUse'] = "1";
+      additionalSettings = replacementAdditionalSettings;
+    }
   }
   json['additionalSettings'] = jsonEncode(additionalSettings);
   // F-Droid no longer needs cloudflare exception since override can be used - migrate apps appropriately
@@ -826,7 +860,6 @@ class SourceProvider {
         Tencent(),
         Jenkins(),
         APKMirror(),
-        VLC(),
         TelegramApp(),
         NeutronCode(),
         DirectAPKLink(),