chore: track view play not working properly

KRTirtho · Nov 27, 2023 · 722dd86 · 722dd86
1 parent 64080ef
commit 722dd86
Show file tree

Hide file tree

Showing 5 changed files with 296 additions and 269 deletions.
diff --git a/lib/components/shared/tracks_view/sections/body/track_view_body.dart b/lib/components/shared/tracks_view/sections/body/track_view_body.dart
@@ -25,8 +25,6 @@ class TrackViewBodySection extends HookConsumerWidget {
     final playlistNotifier = ref.watch(ProxyPlaylistNotifier.notifier);
     final props = InheritedTrackView.of(context);
 
-    final trackViewState = ref.watch(trackViewProvider(props.tracks));
-
     final searchController = useTextEditingController();
     final searchFocus = useFocusNode();
 
@@ -35,20 +33,27 @@ class TrackViewBodySection extends HookConsumerWidget {
 
     final isFiltering = useState(false);
 
+    final uniqTracks = useMemoized(() {
+      final trackIds = props.tracks.map((e) => e.id).toSet();
+      return props.tracks.where((e) => trackIds.remove(e.id)).toList();
+    }, [props.tracks]);
+
+    final trackViewState = ref.watch(trackViewProvider(uniqTracks));
+
     final tracks = useMemoized(() {
       List<Track> filteredTracks;
       if (searchQuery.isEmpty) {
-        filteredTracks = props.tracks;
+        filteredTracks = uniqTracks;
       } else {
-        filteredTracks = props.tracks
+        filteredTracks = uniqTracks
             .map((e) => (weightedRatio(e.name!, searchQuery), e))
             .sorted((a, b) => b.$1.compareTo(a.$1))
             .where((e) => e.$1 > 50)
             .map((e) => e.$2)
             .toList();
       }
       return ServiceUtils.sortTracks(filteredTracks, trackViewState.sortBy);
-    }, [trackViewState.sortBy, searchQuery, props.tracks]);
+    }, [trackViewState.sortBy, searchQuery, uniqTracks]);
 
     final isUserPlaylist = useIsUserPlaylist(ref, props.collectionId);
 
@@ -106,8 +111,9 @@ class TrackViewBodySection extends HookConsumerWidget {
                   if (isActive || playlist.tracks.contains(track)) {
                     await playlistNotifier.jumpToTrack(track);
                   } else {
+                    final tracks = await props.pagination.onFetchAll();
                     await playlistNotifier.load(
-                      props.tracks,
+                      tracks,
                       initialIndex: index,
                       autoPlay: true,
                     );

diff --git a/lib/extensions/infinite_query.dart b/lib/extensions/infinite_query.dart
@@ -9,17 +9,21 @@ extension FetchAllTracks on InfiniteQuery<List<Track>, dynamic, int> {
       return pages.expand((page) => page).toList();
     }
     final tracks = await getAllTracks();
-    final pagedTracks = tracks.fold(
-      <int, List<Track>>{},
-      (acc, element) {
-        final index = acc.length;
-        final groupIndex = index ~/ 20;
-        final group = acc[groupIndex] ?? [];
-        group.add(element);
-        acc[groupIndex] = group;
-        return acc;
-      },
-    );
+
+    final numOfPages = (tracks.length / 20).round();
+
+    final Map<int, List<Track>> pagedTracks = {};
+
+    for (var i = 0; i < numOfPages; i++) {
+      if (i == numOfPages - 1) {
+        final pageTracks = tracks.sublist(i * 20);
+        pagedTracks[i] = pageTracks;
+        break;
+      }
+
+      final pageTracks = tracks.sublist(i * 20, (i + 1) * 20);
+      pagedTracks[i] = pageTracks;
+    }
 
     for (final group in pagedTracks.entries) {
       setPageData(group.key, group.value);

diff --git a/lib/pages/artist/section/footer.dart b/lib/pages/artist/section/footer.dart
@@ -38,9 +38,9 @@ class ArtistPageFooter extends HookConsumerWidget {
             BlendMode.darken,
           ),
           image: UniversalImage.imageProvider(
-            summary.data!.originalimage?.source_ ?? artistImage,
-            height: summary.data!.originalimage?.height.toDouble(),
-            width: summary.data!.originalimage?.width.toDouble(),
+            summary.data!.thumbnail?.source_ ?? artistImage,
+            height: summary.data!.thumbnail?.height.toDouble(),
+            width: summary.data!.thumbnail?.width.toDouble(),
           ),
           fit: BoxFit.cover,
           alignment: Alignment.center,