fix: download button popup unlimited loading

prateekmedia · Mar 30, 2024 · 129e0a2 · 129e0a2
1 parent 8d6efcf
commit 129e0a2
Show file tree

Hide file tree

Showing 5 changed files with 82 additions and 51 deletions.
diff --git a/lib/foundation/show_download_popover.dart b/lib/foundation/show_download_popover.dart
@@ -43,7 +43,7 @@ Future<dynamic> showDownloadPopup(
   );
 }
 
-class _DownloadWrapper extends ConsumerWidget {
+class _DownloadWrapper extends ConsumerStatefulWidget {
   const _DownloadWrapper({
     required this.video,
     required this.videoUrl,
@@ -55,20 +55,26 @@ class _DownloadWrapper extends ConsumerWidget {
   final bool isClickable;
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final videoData = videoUrl != null || video?.audioStreams == null
-        ? ref.read(
-            videoInfoProvider(
-              videoUrl != null ? VideoId(videoUrl!) : video!.id,
-            ),
-          )
-        : null;
+  ConsumerState<_DownloadWrapper> createState() => _DownloadWrapperState();
+}
 
-    final loadedVideo = video?.videoStreams != null ? video! : videoData!.value;
+class _DownloadWrapperState extends ConsumerState<_DownloadWrapper> {
+  late final provider = videoInfoProvider(
+    widget.videoUrl != null ? VideoId(widget.videoUrl!) : widget.video!.id,
+  );
+  @override
+  Widget build(BuildContext context) {
+    final videoData =
+        widget.videoUrl != null || widget.video?.audioStreams == null
+            ? ref.watch(provider)
+            : null;
+
+    final loadedVideo =
+        widget.video?.videoStreams != null ? widget.video! : videoData!.value;
 
     return loadedVideo != null
         ? DownloadsWidget(
-            isClickable: isClickable,
+            isClickable: widget.isClickable,
             video: loadedVideo,
           )
         : videoData!.isLoading

diff --git a/lib/foundation/view_model/video_info_view_model.dart b/lib/foundation/view_model/video_info_view_model.dart
@@ -7,11 +7,11 @@ final videoViewModelProvider = Provider<VideoViewModel>((ref) {
   return VideoViewModel(pipedService);
 });
 
-FutureProvider<VideoData?> videoInfoProvider(VideoId videoId) =>
-    FutureProvider((ref) async {
-      final videoViewModel = ref.watch(videoViewModelProvider);
-      return videoViewModel.getInfo(videoId);
-    });
+final videoInfoProvider = FutureProvider.autoDispose
+    .family<VideoData?, VideoId>((ref, videoId) async {
+  final videoViewModel = ref.read(videoViewModelProvider);
+  return videoViewModel.getInfo(videoId);
+});
 
 class VideoViewModel {
   VideoViewModel(this.pipedService);

diff --git a/lib/ui/screens/home_page/home_page.dart b/lib/ui/screens/home_page/home_page.dart
@@ -69,11 +69,7 @@ class MyHomePage extends HookConsumerWidget {
               showDownloadPopup(
                 context,
                 isClickable: true,
-                videoUrl: addDownloadController.text
-                    .split('/')
-                    .last
-                    .split('watch?v=')
-                    .last,
+                videoUrl: addDownloadController.text,
               );
             }
           },

diff --git a/lib/ui/widgets/ps_video.dart b/lib/ui/widgets/ps_video.dart
@@ -45,8 +45,10 @@ class PSVideo extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return FutureBuilder<VideoData?>(
-      future: videoUrl != null
-          ? ref.watch(pipedServiceProvider).getVideoData(VideoId(videoUrl!))
+      future: videoUrl != null || videoData?.videoStreams == null
+          ? ref
+              .read(pipedServiceProvider)
+              .getVideoData(VideoId(videoUrl ?? videoData!.id.url))
           : null,
       builder: (context, snapshot) {
         final video = snapshot.data ?? videoData;
@@ -254,7 +256,7 @@ class PSVideo extends ConsumerWidget {
 
   AdwButton getDownloadButton(VideoData? video, BuildContext context) =>
       AdwButton.circular(
-        onPressed: video != null
+        onPressed: video?.videoStreams != null
             ? () => showDownloadPopup(
                   context,
                   isClickable: true,

diff --git a/lib/ui/widgets/video_player_desktop/vid_player_mpv.dart b/lib/ui/widgets/video_player_desktop/vid_player_mpv.dart
@@ -1,3 +1,5 @@
+// ignore_for_file: unawaited_futures
+
 import 'dart:io';
 import 'dart:math';
 
@@ -40,41 +42,53 @@ class _VideoPlayerMpvState extends State<VideoPlayerMpv> {
   @override
   void initState() {
     super.initState();
-    _selectResolution(widget.resolutions.values.first);
+    _selectResolution(widget.resolutions.values.first, true);
   }
 
-  Future<void> _selectResolution(String vid) async {
-    // The maximum bitrate is needed to select the best audio quality
-    final maxBitrate = aud.keys.reduce(max);
-    // The audio URL is needed to load the audio track
-    final audioUrl = aud[maxBitrate]!;
-
-    if (player.platform != null && player.platform is NativePlayer) {
-      try {
-        // The audio track is appended to the video track using the NativePlayer method
-        await (player.platform! as NativePlayer).setProperty(
-          'audio-files',
-          Platform.isWindows
-              ? audioUrl.replaceAll(';', r'\;')
-              : audioUrl.replaceAll(':', r'\:'),
-        );
-      } catch (e) {
-        debugPrint('External Audio error: $e');
+  Future<void> _selectResolution(String vid, [bool firstTime = false]) async {
+    Duration? currentPosition;
+    if (firstTime) {
+      // The maximum bitrate is needed to select the best audio quality
+      final maxBitrate = aud.keys.reduce(max);
+      // The audio URL is needed to load the audio track
+      final audioUrl = aud[maxBitrate]!;
+
+      if (player.platform != null && player.platform is NativePlayer) {
+        try {
+          // The audio track is appended to the video track using the NativePlayer method
+          await (player.platform! as NativePlayer).setProperty(
+            'audio-files',
+            Platform.isWindows
+                ? audioUrl.replaceAll(';', r'\;')
+                : audioUrl.replaceAll(':', r'\:'),
+          );
+        } catch (e) {
+          debugPrint('External Audio error: $e');
+        }
       }
+    } else {
+      await player.pause();
+      currentPosition = player.state.position;
     }
 
     // The playlist with both audio and video tracks is opened by the player
     // await player.open(Playlist(medias));
     // Alternatively, only the video track can be opened by the player
-    await player.open(Playlist([Media(vid)]));
+    await player.open(Playlist([Media(vid)]), play: firstTime);
 
-    setState(() {
-      final aspectlist = aspect.entries.toList();
-      final h = aspectlist[0].key;
-      final w = aspectlist[0].value;
+    if (firstTime) {
+      setState(() {
+        final aspectlist = aspect.entries.toList();
+        final h = aspectlist[0].key;
+        final w = aspectlist[0].value;
 
-      aspectvalue = h / w;
-    });
+        aspectvalue = h / w;
+      });
+    }
+    if (currentPosition != null) {
+      await player.seek(currentPosition).then((value) => player.play());
+      setState(() {});
+    }
   }
 
   @override
@@ -91,6 +105,7 @@ class _VideoPlayerMpvState extends State<VideoPlayerMpv> {
         // Use [Video] widget to display video output.
         child: MaterialDesktopVideoControlsTheme(
           fullscreen: MaterialDesktopVideoControlsThemeData(
+            modifyVolumeOnScroll: false,
             bottomButtonBar: [
               const MaterialDesktopSkipPreviousButton(),
               const MaterialDesktopPlayOrPauseButton(),
@@ -117,6 +132,7 @@ class _VideoPlayerMpvState extends State<VideoPlayerMpv> {
             ],
           ),
           normal: MaterialDesktopVideoControlsThemeData(
+            modifyVolumeOnScroll: false,
             bottomButtonBar: [
               const MaterialDesktopSkipPreviousButton(),
               const MaterialDesktopPlayOrPauseButton(),
@@ -164,8 +180,19 @@ class _VideoPlayerMpvState extends State<VideoPlayerMpv> {
           },
           child: Container(
             padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-            child: Text(
-              entry.key,
+            child: Row(
+              children: [
+                Text(
+                  entry.key,
+                ),
+                if (quality == entry.key) ...[
+                  const SizedBox(width: 8),
+                  const Icon(
+                    Icons.check,
+                    size: 18,
+                  ),
+                ],
+              ],
             ),
           ),
         );