YouTube fix

Author: arianneorpilla

…app/lrorpilla/yuuna/AnkiDroidHelper.java …rianneorpilla/yuuna/AnkiDroidHelper.javayuuna/android/app/src/main/java/app/lrorpilla/yuuna/AnkiDroidHelper.java renamed to yuuna/android/app/src/main/java/app/arianneorpilla/yuuna/AnkiDroidHelper.java yuuna/android/app/src/main/java/app/lrorpilla/yuuna/AnkiDroidHelper.java renamed to yuuna/android/app/src/main/java/app/arianneorpilla/yuuna/AnkiDroidHelper.java

@@ -14,6 +14,7 @@ export 'src/media/source_types/viewer_media_source.dart';
 export 'src/media/sources/player_local_media_source.dart';
 export 'src/media/sources/player_network_stream_source.dart';
 export 'src/media/sources/player_youtube_source.dart';
+export 'src/media/sources/player_youtube_source_util.dart';
 export 'src/media/sources/reader_ttu_source.dart';
 export 'src/media/sources/reader_browser_source.dart';
 export 'src/media/sources/reader_lyrics_source.dart';

…va/app/lrorpilla/yuuna/MainActivity.java …p/arianneorpilla/yuuna/MainActivity.javayuuna/android/app/src/main/java/app/lrorpilla/yuuna/MainActivity.java renamed to yuuna/android/app/src/main/java/app/arianneorpilla/yuuna/MainActivity.java yuuna/android/app/src/main/java/app/lrorpilla/yuuna/MainActivity.java renamed to yuuna/android/app/src/main/java/app/arianneorpilla/yuuna/MainActivity.java

@@ -1,10 +1,10 @@
 import 'dart:async';
 import 'dart:io';
 
+import 'package:ffmpeg_kit_https_flutter/ffmpeg_kit.dart';
 import 'package:ffmpeg_kit_https_flutter/ffmpeg_session.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:ffmpeg_kit_https_flutter/ffmpeg_kit.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_vlc_player/flutter_vlc_player.dart';
 import 'package:fluttertoast/fluttertoast.dart';
@@ -255,14 +255,16 @@ abstract class PlayerMediaSource extends MediaSource {
 
     MediaSource source = item.getMediaSource(appModel: appModel);
     if (source is PlayerYoutubeSource) {
-      inputPath = await source.getAudioUrl(item, playerController.dataSource);
+      inputPath =
+          await source.getAudioExportUrl(item, playerController.dataSource);
       audioIndex = 0;
     }
 
     String command =
         '-ss $timeStart -to $timeEnd -y -i "$inputPath" -map 0:a:$audioIndex "$outputPath"';
 
     await FFmpegKit.execute(command);
+    debugPrint(inputPath, wrapWidth: 10000);
 
     return audioFile;
   }

yuuna/lib/media.dart

@@ -479,7 +479,7 @@ class PlayerYoutubeSource extends PlayerMediaSource {
   /// Get cached item.
   List<String>? getSubtitleItems(String videoId) {
     return getPreference<List<String>?>(
-      key: 'subtitles_cache/$videoId',
+      key: 'subs_cache/$videoId',
       defaultValue: null,
     );
   }
@@ -488,15 +488,15 @@ class PlayerYoutubeSource extends PlayerMediaSource {
   void setSubtitleItems(
       {required String videoId, required List<String> subtitles}) async {
     await setPreference<List<String>?>(
-      key: 'subtitles_cache/$videoId',
+      key: 'subs_cache/$videoId',
       value: subtitles,
     );
   }
 
   /// Get cached item.
   List<String>? getSubtitleMetadata(String videoId) {
     return getPreference<List<String>?>(
-      key: 'subtitle_metadata_cache/$videoId',
+      key: 'subs_meta_cache/$videoId',
       defaultValue: null,
     );
   }
@@ -505,7 +505,7 @@ class PlayerYoutubeSource extends PlayerMediaSource {
   void setSubtitleMetadata(
       {required String videoId, required List<String> metadata}) async {
     await setPreference<List<String>?>(
-      key: 'subtitle_metadata_cache/$videoId',
+      key: 'subs_meta_cache/$videoId',
       value: metadata,
     );
   }
@@ -559,20 +559,21 @@ class PlayerYoutubeSource extends PlayerMediaSource {
   Future<String> getAudioUrl(MediaItem item, String dataSource) async {
     StreamManifest manifest = getStreamManifest(item);
 
-    if (manifest.muxed
-        .where((e) => e.videoCodec.contains('avc1'))
-        .map((e) => e.url.toString())
-        .contains(dataSource)) {
+    if (manifest.muxed.map((e) => e.url.toString()).contains(dataSource)) {
       return dataSource;
     } else {
       AudioStreamInfo streamAudioInfo =
-          manifest.audioOnly.sortByBitrate().lastWhere((info) {
-        return info.audioCodec.contains('mp4a');
-      });
+          manifest.audioOnly.sortByBitrate().first;
       return streamAudioInfo.url.toString();
     }
   }
 
+  /// Used to get the audio source for a video.
+  Future<String> getAudioExportUrl(MediaItem item, String dataSource) async {
+    StreamManifest manifest = getStreamManifest(item);
+    return manifest.audio.first.url.toString();
+  }
+
   /// Gets the video qualities available for a [StreamManifest].
   List<VideoQuality> getVideoQualities(
     StreamManifest manifest,
@@ -997,33 +998,21 @@ Future<VideoManifest> computeManifests(ComputeManifestParams params) async {
   if (!params.subtitlesCached) {
     entries.addAll(
       await Future.wait(
-        tracksByLanguage.values.map(
+        tracksByLanguage.values.whereNot((e) => e.isAutoGenerated).map(
           (trackInfo) async {
             String shortCode = trackInfo.language.code.substring(0, 2);
-            String subtitles =
-                await yt.videos.closedCaptions.getSubTitles(trackInfo);
-
-            if (trackInfo.isAutoGenerated) {
-              subtitles = subtitles.replaceAllMapped(vttRegex, (match) {
-                String text = match.group(11) ?? '';
-                List<String> lines = text.split('\n');
-
-                String currentSubtitle =
-                    subtitles.substring(match.start, match.end);
-                int position = currentSubtitle
-                    .lastIndexOf(text)
-                    .clamp(0, currentSubtitle.length);
-
-                String newSubtitle = currentSubtitle.replaceFirst(
-                    text, lines.last.trim(), position);
-
-                return newSubtitle;
-              });
+            String xml = await YouTubeTranscriptFetcher().fetchCaptions(
+                params.videoId,
+                languageCode: trackInfo.language.code);
+            final captions = CaptionParser.parseXml(xml);
+            final sb = StringBuffer('WEBVTT\n');
+
+            for (final caption in captions) {
+              sb.write(caption.vtt);
             }
 
-            String metadata = trackInfo.isAutoGenerated
-                ? 'YouTube - Auto - [$shortCode]'
-                : 'YouTube - CC - [$shortCode]';
+            final metadata = 'YouTube - CC - [$shortCode]';
+            final subtitles = sb.toString().trim();
 
             return MapEntry(metadata, subtitles);
           },