kitty/spotube
1
0
Fork 0
mirror of https://github.com/KRTirtho/spotube.git synced 2025-12-13 10:27:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added fallback for AZLyrics

Browse Source 
Now, it will fetch lyrics from genius.com if they're not found on AZLyrics.
This commit is contained in:
Aditya Kumar Das 2024-02-25 02:02:08 +05:30 committed by GitHub
parent 40dae56fd9
commit faa4af01a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/pages/lyrics/plain_lyrics.dart
View File

@ -33,11 +33,13 @@ class PlainLyrics extends HookConsumerWidget {
final lyricsQuery = final lyricsQuery =
useQueries.lyrics.spotifySynced(ref, playlist.activeTrack); useQueries.lyrics.spotifySynced(ref, playlist.activeTrack);
final azLyricsQuery = useQueries.lyrics.azLyrics(playlist.activeTrack); final azLyricsQuery = useQueries.lyrics.azLyrics(playlist.activeTrack);
final geniusLyricsQuery =
useQueries.lyrics.geniusLyrics(playlist.activeTrack);
final mediaQuery = MediaQuery.of(context); final mediaQuery = MediaQuery.of(context);
final textTheme = Theme.of(context).textTheme; final textTheme = Theme.of(context).textTheme;
final textZoomLevel = useState<int>(defaultTextZoom); final textZoomLevel = useState<int>(defaultTextZoom);
bool useAZLyrics = false; bool useAZLyrics = false, useGenius = false;
return Stack( return Stack(
children: [ children: [
@ -78,9 +80,13 @@ class PlainLyrics extends HookConsumerWidget {
return const ShimmerLyrics(); return const ShimmerLyrics();
} else if (lyricsQuery.hasError) { } else if (lyricsQuery.hasError) {
if (azLyricsQuery.isLoading || if (azLyricsQuery.isLoading ||
azLyricsQuery.isRefreshing) { azLyricsQuery.isRefreshing ||
geniusLyricsQuery.isLoading ||
geniusLyricsQuery.isRefreshing) {
return const ShimmerLyrics(); return const ShimmerLyrics();
} else if (azLyricsQuery.hasError) { }
if (azLyricsQuery.hasError &&
geniusLyricsQuery.hasError) {
return Container( return Container(
alignment: Alignment.center, alignment: Alignment.center,
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
@ -99,15 +105,24 @@ class PlainLyrics extends HookConsumerWidget {
], ],
), ),
); );
} else if (azLyricsQuery.hasError) {
useGenius = true;
} else if (geniusLyricsQuery.hasError) {
useAZLyrics = true;
} else { } else {
useAZLyrics = true; useAZLyrics = true;
} }
} }
final lyrics = !useAZLyrics String? lyrics;
? lyricsQuery.data?.lyrics.mapIndexed((i, e) { if (useAZLyrics) {
final next = lyricsQuery.data?.lyrics lyrics = azLyricsQuery.data;
.elementAtOrNull(i + 1); } else if (useGenius) {
lyrics = geniusLyricsQuery.data;
} else {
lyrics = lyricsQuery.data?.lyrics.mapIndexed((i, e) {
final next =
lyricsQuery.data?.lyrics.elementAtOrNull(i + 1);
if (next != null && if (next != null &&
e.time - next.time > e.time - next.time >
const Duration(milliseconds: 700)) { const Duration(milliseconds: 700)) {
@ -115,8 +130,8 @@ class PlainLyrics extends HookConsumerWidget {
} }
return e.text; return e.text;
}).join("\n") }).join("\n");
: azLyricsQuery.data; }
return AnimatedDefaultTextStyle( return AnimatedDefaultTextStyle(
duration: const Duration(milliseconds: 200), duration: const Duration(milliseconds: 200),