From a621a45f0bbbb4dfc4b342388996827fb64dfad8 Mon Sep 17 00:00:00 2001
From: Kingkor Roy Tirtho <krtirtho@gmail.com>
Date: Mon, 24 Jun 2024 21:43:09 +0600
Subject: [PATCH] chore: fix alternative track sources not showing up

---
 lib/modules/player/player_controls.dart       | 57 +++++++++++--------
 lib/modules/player/sibling_tracks_sheet.dart  |  4 +-
 .../audio_player/querying_track_info.dart     | 12 +++-
 3 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/lib/modules/player/player_controls.dart b/lib/modules/player/player_controls.dart
index 25080b66..1b9d9f86 100644
--- a/lib/modules/player/player_controls.dart
+++ b/lib/modules/player/player_controls.dart
@@ -11,6 +11,7 @@ import 'package:spotube/extensions/context.dart';
 import 'package:spotube/extensions/duration.dart';
 import 'package:spotube/modules/player/use_progress.dart';
 import 'package:spotube/models/logger.dart';
+import 'package:spotube/provider/audio_player/audio_player.dart';
 import 'package:spotube/provider/audio_player/querying_track_info.dart';
 import 'package:spotube/services/audio_player/audio_player.dart';
 
@@ -232,32 +233,38 @@ class PlayerControls extends HookConsumerWidget {
                     onPressed:
                         isFetchingActiveTrack ? null : audioPlayer.skipToNext,
                   ),
-                  StreamBuilder<PlaylistMode>(
-                      stream: audioPlayer.loopModeStream,
-                      builder: (context, snapshot) {
-                        final loopMode = snapshot.data ?? PlaylistMode.none;
-                        return IconButton(
-                          tooltip: loopMode == PlaylistMode.single
-                              ? context.l10n.loop_track
-                              : loopMode == PlaylistMode.loop
-                                  ? context.l10n.repeat_playlist
-                                  : null,
-                          icon: Icon(
-                            loopMode == PlaylistMode.single
-                                ? SpotubeIcons.repeatOne
-                                : SpotubeIcons.repeat,
-                          ),
-                          style: loopMode == PlaylistMode.single ||
-                                  loopMode == PlaylistMode.loop
-                              ? activeButtonStyle
-                              : buttonStyle,
-                          onPressed: isFetchingActiveTrack
-                              ? null
-                              : () async {
-                                  await audioPlayer.setLoopMode(loopMode);
+                  Consumer(builder: (context, ref, _) {
+                    final loopMode = ref
+                        .watch(audioPlayerProvider.select((s) => s.loopMode));
+
+                    return IconButton(
+                      tooltip: loopMode == PlaylistMode.single
+                          ? context.l10n.loop_track
+                          : loopMode == PlaylistMode.loop
+                              ? context.l10n.repeat_playlist
+                              : null,
+                      icon: Icon(
+                        loopMode == PlaylistMode.single
+                            ? SpotubeIcons.repeatOne
+                            : SpotubeIcons.repeat,
+                      ),
+                      style: loopMode == PlaylistMode.single ||
+                              loopMode == PlaylistMode.loop
+                          ? activeButtonStyle
+                          : buttonStyle,
+                      onPressed: isFetchingActiveTrack
+                          ? null
+                          : () async {
+                              await audioPlayer.setLoopMode(
+                                switch (loopMode) {
+                                  PlaylistMode.loop => PlaylistMode.single,
+                                  PlaylistMode.single => PlaylistMode.none,
+                                  PlaylistMode.none => PlaylistMode.loop,
                                 },
-                        );
-                      }),
+                              );
+                            },
+                    );
+                  }),
                 ],
               ),
               const SizedBox(height: 5)
diff --git a/lib/modules/player/sibling_tracks_sheet.dart b/lib/modules/player/sibling_tracks_sheet.dart
index ddc77b15..092d631f 100644
--- a/lib/modules/player/sibling_tracks_sheet.dart
+++ b/lib/modules/player/sibling_tracks_sheet.dart
@@ -131,13 +131,13 @@ class SiblingTracksSheet extends HookConsumerWidget {
     ]);
 
     final siblings = useMemoized(
-      () => isFetchingActiveTrack
+      () => !isFetchingActiveTrack
           ? [
               (activeTrack as SourcedTrack).sourceInfo,
               ...activeTrack.siblings,
             ]
           : <SourceInfo>[],
-      [activeTrack],
+      [activeTrack, isFetchingActiveTrack],
     );
 
     final borderRadius = floating
diff --git a/lib/provider/audio_player/querying_track_info.dart b/lib/provider/audio_player/querying_track_info.dart
index 4069523b..f03efd9e 100644
--- a/lib/provider/audio_player/querying_track_info.dart
+++ b/lib/provider/audio_player/querying_track_info.dart
@@ -1,12 +1,20 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotube/provider/audio_player/audio_player.dart';
 import 'package:spotube/provider/server/sourced_track.dart';
+import 'package:spotube/services/audio_player/audio_player.dart';
 
 final queryingTrackInfoProvider = Provider<bool>((ref) {
+  final media = audioPlayer.playlist.index == -1
+      ? null
+      : audioPlayer.playlist.medias.elementAtOrNull(audioPlayer.playlist.index);
+  final audioPlayerActiveTrack =
+      media == null ? null : SpotubeMedia.fromMedia(media).track;
+
   final activeTrack =
-      ref.watch(audioPlayerProvider.select((s) => s.activeTrack));
+      ref.watch(audioPlayerProvider.select((s) => s.activeTrack)) ??
+          audioPlayerActiveTrack;
 
   if (activeTrack == null) return false;
 
-  return ref.read(sourcedTrackProvider(activeTrack)).isLoading;
+  return ref.watch(sourcedTrackProvider(activeTrack)).isLoading;
 });