mirror of
https://github.com/KRTirtho/spotube.git
synced 2025-09-13 07:55:18 +00:00
chore: fix artist top tracks play button not showing loading indicator
This commit is contained in:
parent
2e48ac380b
commit
69d50eec35
@ -101,7 +101,9 @@ extension ToMetadataSpotubeFullTrackObject on SpotubeFullTrackObject {
|
|||||||
albumArtist: artists.map((a) => a.name).join(", "),
|
albumArtist: artists.map((a) => a.name).join(", "),
|
||||||
year: album.releaseDate == null
|
year: album.releaseDate == null
|
||||||
? 1970
|
? 1970
|
||||||
: DateTime.parse(album.releaseDate!).year,
|
: DateTime.tryParse(album.releaseDate!)?.year ??
|
||||||
|
int.tryParse(album.releaseDate!) ??
|
||||||
|
1970,
|
||||||
durationMs: durationMs.toDouble(),
|
durationMs: durationMs.toDouble(),
|
||||||
fileSize: BigInt.from(fileLength),
|
fileSize: BigInt.from(fileLength),
|
||||||
picture: imageBytes != null
|
picture: imageBytes != null
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
|
import 'package:flutter_hooks/flutter_hooks.dart';
|
||||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||||
import 'package:shadcn_flutter/shadcn_flutter.dart';
|
import 'package:shadcn_flutter/shadcn_flutter.dart';
|
||||||
|
import 'package:shadcn_flutter/shadcn_flutter_extension.dart';
|
||||||
import 'package:skeletonizer/skeletonizer.dart';
|
import 'package:skeletonizer/skeletonizer.dart';
|
||||||
import 'package:spotube/collections/fake.dart';
|
import 'package:spotube/collections/fake.dart';
|
||||||
import 'package:spotube/collections/spotube_icons.dart';
|
import 'package:spotube/collections/spotube_icons.dart';
|
||||||
@ -19,6 +21,7 @@ class ArtistPageTopTracks extends HookConsumerWidget {
|
|||||||
@override
|
@override
|
||||||
Widget build(BuildContext context, ref) {
|
Widget build(BuildContext context, ref) {
|
||||||
final theme = Theme.of(context);
|
final theme = Theme.of(context);
|
||||||
|
final isLoading = useState(false);
|
||||||
|
|
||||||
final playlist = ref.watch(audioPlayerProvider);
|
final playlist = ref.watch(audioPlayerProvider);
|
||||||
final playlistNotifier = ref.watch(audioPlayerProvider.notifier);
|
final playlistNotifier = ref.watch(audioPlayerProvider.notifier);
|
||||||
@ -40,10 +43,14 @@ class ArtistPageTopTracks extends HookConsumerWidget {
|
|||||||
final topTracks = topTracksQuery.asData?.value.items ??
|
final topTracks = topTracksQuery.asData?.value.items ??
|
||||||
List.generate(10, (index) => FakeData.track);
|
List.generate(10, (index) => FakeData.track);
|
||||||
|
|
||||||
void playPlaylist(List<SpotubeFullTrackObject> tracks,
|
void playPlaylist(
|
||||||
{SpotubeTrackObject? currentTrack}) async {
|
List<SpotubeFullTrackObject> tracks, {
|
||||||
currentTrack ??= tracks.first;
|
SpotubeTrackObject? currentTrack,
|
||||||
|
}) async {
|
||||||
|
isLoading.value = true;
|
||||||
|
|
||||||
|
currentTrack ??= tracks.first;
|
||||||
|
try {
|
||||||
final isRemoteDevice = await showSelectDeviceDialog(context, ref);
|
final isRemoteDevice = await showSelectDeviceDialog(context, ref);
|
||||||
|
|
||||||
if (isRemoteDevice == null) return;
|
if (isRemoteDevice == null) return;
|
||||||
@ -59,7 +66,8 @@ class ArtistPageTopTracks extends HookConsumerWidget {
|
|||||||
WebSocketLoadEventData.playlist(
|
WebSocketLoadEventData.playlist(
|
||||||
tracks: tracks,
|
tracks: tracks,
|
||||||
collection: null,
|
collection: null,
|
||||||
initialIndex: tracks.indexWhere((s) => s.id == currentTrack?.id),
|
initialIndex:
|
||||||
|
tracks.indexWhere((s) => s.id == currentTrack?.id),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
} else if (isPlaylistPlaying &&
|
} else if (isPlaylistPlaying &&
|
||||||
@ -81,6 +89,9 @@ class ArtistPageTopTracks extends HookConsumerWidget {
|
|||||||
await playlistNotifier.jumpToTrack(currentTrack);
|
await playlistNotifier.jumpToTrack(currentTrack);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} finally {
|
||||||
|
isLoading.value = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return SliverMainAxisGroup(
|
return SliverMainAxisGroup(
|
||||||
@ -120,10 +131,17 @@ class ArtistPageTopTracks extends HookConsumerWidget {
|
|||||||
const SizedBox(width: 5),
|
const SizedBox(width: 5),
|
||||||
IconButton.primary(
|
IconButton.primary(
|
||||||
shape: ButtonShape.circle,
|
shape: ButtonShape.circle,
|
||||||
enabled: !isPlaylistPlaying,
|
enabled: !isPlaylistPlaying && !isLoading.value,
|
||||||
icon: Skeleton.keep(
|
icon: isLoading.value
|
||||||
|
? CircularProgressIndicator(
|
||||||
|
size: 20 * context.theme.scaling,
|
||||||
|
color: theme.colorScheme.primaryForeground,
|
||||||
|
)
|
||||||
|
: Skeleton.keep(
|
||||||
child: Icon(
|
child: Icon(
|
||||||
isPlaylistPlaying ? SpotubeIcons.pause : SpotubeIcons.play,
|
isPlaylistPlaying
|
||||||
|
? SpotubeIcons.pause
|
||||||
|
: SpotubeIcons.play,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
onPressed: () => playPlaylist(topTracks.toList()),
|
onPressed: () => playPlaylist(topTracks.toList()),
|
||||||
|
@ -225,15 +225,12 @@ class LocalLibraryPage extends HookConsumerWidget {
|
|||||||
Button.primary(
|
Button.primary(
|
||||||
onPressed: trackSnapshot.asData?.value != null
|
onPressed: trackSnapshot.asData?.value != null
|
||||||
? () async {
|
? () async {
|
||||||
if (trackSnapshot
|
if (trackSnapshot.asData?.value.isNotEmpty ==
|
||||||
.asData?.value.isNotEmpty ==
|
|
||||||
true) {
|
true) {
|
||||||
if (!isPlaylistPlaying) {
|
if (!isPlaylistPlaying) {
|
||||||
await playLocalTracks(
|
await playLocalTracks(
|
||||||
ref,
|
ref,
|
||||||
trackSnapshot
|
trackSnapshot.asData!.value[location] ?? [],
|
||||||
.asData!.value[location] ??
|
|
||||||
[],
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -294,8 +291,7 @@ class LocalLibraryPage extends HookConsumerWidget {
|
|||||||
data: (tracks) {
|
data: (tracks) {
|
||||||
final sortedTracks = useMemoized(() {
|
final sortedTracks = useMemoized(() {
|
||||||
return ServiceUtils.sortTracks(
|
return ServiceUtils.sortTracks(
|
||||||
tracks[location] ??
|
tracks[location] ?? <SpotubeLocalTrackObject>[],
|
||||||
<SpotubeLocalTrackObject>[],
|
|
||||||
sortBy.value);
|
sortBy.value);
|
||||||
}, [sortBy.value, tracks]);
|
}, [sortBy.value, tracks]);
|
||||||
|
|
||||||
@ -321,8 +317,7 @@ class LocalLibraryPage extends HookConsumerWidget {
|
|||||||
.toList();
|
.toList();
|
||||||
}, [searchController.text, sortedTracks]);
|
}, [searchController.text, sortedTracks]);
|
||||||
|
|
||||||
if (!trackSnapshot.isLoading &&
|
if (!trackSnapshot.isLoading && filteredTracks.isEmpty) {
|
||||||
filteredTracks.isEmpty) {
|
|
||||||
return Expanded(
|
return Expanded(
|
||||||
child: Column(
|
child: Column(
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
@ -353,8 +348,7 @@ class LocalLibraryPage extends HookConsumerWidget {
|
|||||||
enabled: trackSnapshot.isLoading,
|
enabled: trackSnapshot.isLoading,
|
||||||
child: ListView.builder(
|
child: ListView.builder(
|
||||||
controller: controller,
|
controller: controller,
|
||||||
physics:
|
physics: const AlwaysScrollableScrollPhysics(),
|
||||||
const AlwaysScrollableScrollPhysics(),
|
|
||||||
itemCount: trackSnapshot.isLoading
|
itemCount: trackSnapshot.isLoading
|
||||||
? 5
|
? 5
|
||||||
: filteredTracks.length,
|
: filteredTracks.length,
|
||||||
@ -406,7 +400,9 @@ class LocalLibraryPage extends HookConsumerWidget {
|
|||||||
);
|
);
|
||||||
})
|
})
|
||||||
],
|
],
|
||||||
))),
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -393,6 +393,7 @@ class YoutubeSourcedTrack extends SourcedTrack {
|
|||||||
Future<SourcedTrack> refreshStream() async {
|
Future<SourcedTrack> refreshStream() async {
|
||||||
List<TrackSource> validStreams = [];
|
List<TrackSource> validStreams = [];
|
||||||
|
|
||||||
|
final stringBuffer = StringBuffer();
|
||||||
for (final source in sources) {
|
for (final source in sources) {
|
||||||
final res = await globalDio.head(
|
final res = await globalDio.head(
|
||||||
source.url,
|
source.url,
|
||||||
@ -400,11 +401,17 @@ class YoutubeSourcedTrack extends SourcedTrack {
|
|||||||
Options(validateStatus: (status) => status != null && status < 500),
|
Options(validateStatus: (status) => status != null && status < 500),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
stringBuffer.writeln(
|
||||||
|
"[${query.id}] ${res.statusCode} ${source.quality} ${source.codec} ${source.bitrate}",
|
||||||
|
);
|
||||||
|
|
||||||
if (res.statusCode! < 400) {
|
if (res.statusCode! < 400) {
|
||||||
validStreams.add(source);
|
validStreams.add(source);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
AppLogger.log.d(stringBuffer.toString());
|
||||||
|
|
||||||
if (validStreams.isEmpty) {
|
if (validStreams.isEmpty) {
|
||||||
final manifest =
|
final manifest =
|
||||||
await ref.read(youtubeEngineProvider).getStreamManifest(info.id);
|
await ref.read(youtubeEngineProvider).getStreamManifest(info.id);
|
||||||
|
Loading…
Reference in New Issue
Block a user