mirror of
https://github.com/KRTirtho/spotube.git
synced 2025-09-13 07:55:18 +00:00
fix(lyrics): LRCLIB lyrics should be usable without logging in #1803
This commit is contained in:
parent
57c8f85731
commit
1cad097d0b
@ -17,7 +17,6 @@ import 'package:spotube/extensions/context.dart';
|
|||||||
import 'package:spotube/extensions/image.dart';
|
import 'package:spotube/extensions/image.dart';
|
||||||
import 'package:spotube/hooks/utils/use_brightness_value.dart';
|
import 'package:spotube/hooks/utils/use_brightness_value.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:spotube/provider/authentication/authentication.dart';
|
|
||||||
import 'package:spotube/provider/audio_player/audio_player.dart';
|
import 'package:spotube/provider/audio_player/audio_player.dart';
|
||||||
import 'package:spotube/provider/user_preferences/user_preferences_provider.dart';
|
import 'package:spotube/provider/user_preferences/user_preferences_provider.dart';
|
||||||
|
|
||||||
@ -30,7 +29,6 @@ class BottomPlayer extends HookConsumerWidget {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context, ref) {
|
Widget build(BuildContext context, ref) {
|
||||||
final auth = ref.watch(authenticationProvider);
|
|
||||||
final playlist = ref.watch(audioPlayerProvider);
|
final playlist = ref.watch(audioPlayerProvider);
|
||||||
final layoutMode =
|
final layoutMode =
|
||||||
ref.watch(userPreferencesProvider.select((s) => s.layoutMode));
|
ref.watch(userPreferencesProvider.select((s) => s.layoutMode));
|
||||||
@ -89,35 +87,34 @@ class BottomPlayer extends HookConsumerWidget {
|
|||||||
children: [
|
children: [
|
||||||
PlayerActions(
|
PlayerActions(
|
||||||
extraActions: [
|
extraActions: [
|
||||||
if (auth.asData?.value != null)
|
IconButton(
|
||||||
IconButton(
|
tooltip: context.l10n.mini_player,
|
||||||
tooltip: context.l10n.mini_player,
|
icon: const Icon(SpotubeIcons.miniPlayer),
|
||||||
icon: const Icon(SpotubeIcons.miniPlayer),
|
onPressed: () async {
|
||||||
onPressed: () async {
|
if (!kIsDesktop) return;
|
||||||
if (!kIsDesktop) return;
|
|
||||||
|
|
||||||
final prevSize = await windowManager.getSize();
|
final prevSize = await windowManager.getSize();
|
||||||
await windowManager.setMinimumSize(
|
await windowManager.setMinimumSize(
|
||||||
const Size(300, 300),
|
const Size(300, 300),
|
||||||
);
|
);
|
||||||
await windowManager.setAlwaysOnTop(true);
|
await windowManager.setAlwaysOnTop(true);
|
||||||
if (!kIsLinux) {
|
if (!kIsLinux) {
|
||||||
await windowManager.setHasShadow(false);
|
await windowManager.setHasShadow(false);
|
||||||
}
|
}
|
||||||
await windowManager
|
await windowManager
|
||||||
.setAlignment(Alignment.topRight);
|
.setAlignment(Alignment.topRight);
|
||||||
await windowManager.setSize(const Size(400, 500));
|
await windowManager.setSize(const Size(400, 500));
|
||||||
await Future.delayed(
|
await Future.delayed(
|
||||||
const Duration(milliseconds: 100),
|
const Duration(milliseconds: 100),
|
||||||
() async {
|
() async {
|
||||||
GoRouter.of(context).go(
|
GoRouter.of(context).go(
|
||||||
'/mini-player',
|
'/mini-player',
|
||||||
extra: prevSize,
|
extra: prevSize,
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
Container(
|
Container(
|
||||||
|
@ -6,7 +6,6 @@ import 'package:gap/gap.dart';
|
|||||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||||
|
|
||||||
import 'package:spotube/collections/spotube_icons.dart';
|
import 'package:spotube/collections/spotube_icons.dart';
|
||||||
import 'package:spotube/components/fallbacks/anonymous_fallback.dart';
|
|
||||||
import 'package:spotube/components/titlebar/titlebar.dart';
|
import 'package:spotube/components/titlebar/titlebar.dart';
|
||||||
import 'package:spotube/components/image/universal_image.dart';
|
import 'package:spotube/components/image/universal_image.dart';
|
||||||
import 'package:spotube/components/themed_button_tab_bar.dart';
|
import 'package:spotube/components/themed_button_tab_bar.dart';
|
||||||
@ -17,7 +16,6 @@ import 'package:spotube/hooks/utils/use_custom_status_bar_color.dart';
|
|||||||
import 'package:spotube/hooks/utils/use_palette_color.dart';
|
import 'package:spotube/hooks/utils/use_palette_color.dart';
|
||||||
import 'package:spotube/pages/lyrics/plain_lyrics.dart';
|
import 'package:spotube/pages/lyrics/plain_lyrics.dart';
|
||||||
import 'package:spotube/pages/lyrics/synced_lyrics.dart';
|
import 'package:spotube/pages/lyrics/synced_lyrics.dart';
|
||||||
import 'package:spotube/provider/authentication/authentication.dart';
|
|
||||||
import 'package:spotube/provider/audio_player/audio_player.dart';
|
import 'package:spotube/provider/audio_player/audio_player.dart';
|
||||||
import 'package:spotube/utils/platform.dart';
|
import 'package:spotube/utils/platform.dart';
|
||||||
import 'package:spotube/provider/spotify/spotify.dart';
|
import 'package:spotube/provider/spotify/spotify.dart';
|
||||||
@ -82,15 +80,6 @@ class LyricsPage extends HookConsumerWidget {
|
|||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
final auth = ref.watch(authenticationProvider);
|
|
||||||
|
|
||||||
if (auth.asData?.value == null) {
|
|
||||||
return Scaffold(
|
|
||||||
appBar: !kIsMacOS && !isModal ? const PageWindowTitleBar() : null,
|
|
||||||
body: const AnonymousFallback(),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isModal) {
|
if (isModal) {
|
||||||
return DefaultTabController(
|
return DefaultTabController(
|
||||||
length: 2,
|
length: 2,
|
||||||
|
@ -8,13 +8,10 @@ import 'package:spotube/collections/spotube_icons.dart';
|
|||||||
import 'package:spotube/modules/player/player_controls.dart';
|
import 'package:spotube/modules/player/player_controls.dart';
|
||||||
import 'package:spotube/modules/player/player_queue.dart';
|
import 'package:spotube/modules/player/player_queue.dart';
|
||||||
import 'package:spotube/modules/root/sidebar.dart';
|
import 'package:spotube/modules/root/sidebar.dart';
|
||||||
import 'package:spotube/components/fallbacks/anonymous_fallback.dart';
|
|
||||||
import 'package:spotube/components/titlebar/titlebar.dart';
|
|
||||||
import 'package:spotube/extensions/context.dart';
|
import 'package:spotube/extensions/context.dart';
|
||||||
import 'package:spotube/hooks/utils/use_force_update.dart';
|
import 'package:spotube/hooks/utils/use_force_update.dart';
|
||||||
import 'package:spotube/pages/lyrics/plain_lyrics.dart';
|
import 'package:spotube/pages/lyrics/plain_lyrics.dart';
|
||||||
import 'package:spotube/pages/lyrics/synced_lyrics.dart';
|
import 'package:spotube/pages/lyrics/synced_lyrics.dart';
|
||||||
import 'package:spotube/provider/authentication/authentication.dart';
|
|
||||||
import 'package:spotube/provider/audio_player/audio_player.dart';
|
import 'package:spotube/provider/audio_player/audio_player.dart';
|
||||||
import 'package:spotube/utils/platform.dart';
|
import 'package:spotube/utils/platform.dart';
|
||||||
import 'package:window_manager/window_manager.dart';
|
import 'package:window_manager/window_manager.dart';
|
||||||
@ -46,14 +43,7 @@ class MiniLyricsPage extends HookConsumerWidget {
|
|||||||
return null;
|
return null;
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
final auth = ref.watch(authenticationProvider);
|
|
||||||
|
|
||||||
if (auth.asData?.value == null) {
|
|
||||||
return const Scaffold(
|
|
||||||
appBar: PageWindowTitleBar(),
|
|
||||||
body: AnonymousFallback(),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return MouseRegion(
|
return MouseRegion(
|
||||||
onEnter: !hoverMode.value
|
onEnter: !hoverMode.value
|
||||||
|
@ -82,7 +82,7 @@ class SyncedLyrics extends HookConsumerWidget {
|
|||||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
subscription = audioPlayer.positionStream.listen((event) {
|
subscription = audioPlayer.positionStream.listen((event) {
|
||||||
try {
|
try {
|
||||||
if (event > Duration.zero) return;
|
if (event > Duration.zero || !controller.hasClients) return;
|
||||||
controller.animateTo(
|
controller.animateTo(
|
||||||
0,
|
0,
|
||||||
duration: const Duration(milliseconds: 500),
|
duration: const Duration(milliseconds: 500),
|
||||||
|
@ -125,6 +125,7 @@ class SyncedLyricsNotifier extends FamilyAsyncNotifier<SubtitleSimple, Track?> {
|
|||||||
try {
|
try {
|
||||||
final database = ref.watch(databaseProvider);
|
final database = ref.watch(databaseProvider);
|
||||||
final spotify = ref.watch(spotifyProvider);
|
final spotify = ref.watch(spotifyProvider);
|
||||||
|
final auth = await ref.watch(authenticationProvider.future);
|
||||||
|
|
||||||
if (track == null) {
|
if (track == null) {
|
||||||
throw "No track currently";
|
throw "No track currently";
|
||||||
@ -139,11 +140,13 @@ class SyncedLyricsNotifier extends FamilyAsyncNotifier<SubtitleSimple, Track?> {
|
|||||||
|
|
||||||
final token = await spotify.getCredentials();
|
final token = await spotify.getCredentials();
|
||||||
|
|
||||||
if (lyrics == null || lyrics.lyrics.isEmpty) {
|
if ((lyrics == null || lyrics.lyrics.isEmpty) && auth != null) {
|
||||||
lyrics = await getSpotifyLyrics(token.accessToken);
|
lyrics = await getSpotifyLyrics(token.accessToken);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (lyrics.lyrics.isEmpty || lyrics.lyrics.length <= 5) {
|
if (lyrics == null ||
|
||||||
|
lyrics.lyrics.isEmpty ||
|
||||||
|
lyrics.lyrics.length <= 5) {
|
||||||
lyrics = await getLRCLibLyrics();
|
lyrics = await getLRCLibLyrics();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4,6 +4,7 @@ import 'dart:async';
|
|||||||
|
|
||||||
import 'package:drift/drift.dart';
|
import 'package:drift/drift.dart';
|
||||||
import 'package:spotube/models/database/database.dart';
|
import 'package:spotube/models/database/database.dart';
|
||||||
|
import 'package:spotube/provider/authentication/authentication.dart';
|
||||||
import 'package:spotube/provider/database/database.dart';
|
import 'package:spotube/provider/database/database.dart';
|
||||||
import 'package:spotube/provider/spotify/utils/json_cast.dart';
|
import 'package:spotube/provider/spotify/utils/json_cast.dart';
|
||||||
import 'package:spotube/services/logger/logger.dart';
|
import 'package:spotube/services/logger/logger.dart';
|
||||||
|
Loading…
Reference in New Issue
Block a user