♻️ Refactor lyrics fetching

2025-12-19 00:16:23 +08:00
parent a37d762b1b
commit e820fb08de
8 changed files with 53 additions and 263 deletions
--- a/lib/logic/lrc_providers.dart
+++ b/lib/logic/lrc_providers.dart
@@ -1,5 +1,5 @@
 import 'dart:convert';
-import 'package:http/http.dart' as http;
+import 'package:dio/dio.dart';
 import 'package:path/path.dart' as path;
 import 'package:path_provider/path_provider.dart' as path_provider;
 import 'dart:io';
@@ -16,10 +16,10 @@ class Lyrics {

 /// Abstract base class for LRC providers
 abstract class LrcProvider {
-  late final http.Client session;
+  late final Dio session;

  LrcProvider() {
-    session = http.Client();
+    session = Dio();
  }

  String get name;
@@ -41,7 +41,7 @@ class MusixmatchProvider extends LrcProvider {
  @override
  String get name => 'Musixmatch';

-  Future<http.Response> _get(
+  Future<Response> _get(
    String action,
    List<MapEntry<String, String>> query,
  ) async {
@@ -55,7 +55,7 @@ class MusixmatchProvider extends LrcProvider {
    final t = DateTime.now().millisecondsSinceEpoch.toString();
    query.add(MapEntry("t", t));
    final url = rootUrl + action;
-    return await session.get(Uri.parse(url), headers: Map.fromEntries(query));
+    return await session.get(url, queryParameters: Map.fromEntries(query));
  }

  Future<void> _getToken() async {
@@ -84,7 +84,7 @@ class MusixmatchProvider extends LrcProvider {
      await Future.delayed(Duration(seconds: 10));
      return await _getToken();
    }
-    final newToken = jsonDecode(d.body)["message"]["body"]["user_token"];
+    final newToken = jsonDecode(d.data)["message"]["body"]["user_token"];
    final currentTime = DateTime.now().millisecondsSinceEpoch ~/ 1000;
    final expirationTime = currentTime + 600; // 10 minutes
    token = newToken;
@@ -105,7 +105,7 @@ class MusixmatchProvider extends LrcProvider {
        MapEntry("translation_fields_set", "minimal"),
        MapEntry("selected_language", lang!),
      ]);
-      final bodyTr = jsonDecode(rTr.body)["message"]["body"];
+      final bodyTr = jsonDecode(rTr.data)["message"]["body"];
      if (bodyTr["translations_list"] == null ||
          (bodyTr["translations_list"] as List).isEmpty) {
        throw Exception("Couldn't find translations");
@@ -113,7 +113,7 @@ class MusixmatchProvider extends LrcProvider {
      // Translation handling would need full implementation
    }
    if (r.statusCode != 200) return null;
-    final body = jsonDecode(r.body)["message"]["body"];
+    final body = jsonDecode(r.data)["message"]["body"];
    if (body == null) return null;
    final lrcStr = body["subtitle"]["subtitle_body"];
    final lrc = Lyrics(synced: lrcStr);
@@ -124,9 +124,9 @@ class MusixmatchProvider extends LrcProvider {
    var lrc = Lyrics();
    final r = await _get("track.richsync.get", [MapEntry("track_id", trackId)]);
    if (r.statusCode == 200 &&
-        jsonDecode(r.body)["message"]["header"]["status_code"] == 200) {
+        jsonDecode(r.data)["message"]["header"]["status_code"] == 200) {
      final lrcRaw = jsonDecode(
-        r.body,
+        r.data,
      )["message"]["body"]["richsync"]["richsync_body"];
      final data = jsonDecode(lrcRaw);
      String lrcStr = "";
@@ -157,9 +157,9 @@ class MusixmatchProvider extends LrcProvider {
      MapEntry("page_size", "5"),
      MapEntry("page", "1"),
    ]);
-    final statusCode = jsonDecode(r.body)["message"]["header"]["status_code"];
+    final statusCode = jsonDecode(r.data)["message"]["header"]["status_code"];
    if (statusCode != 200) return null;
-    final body = jsonDecode(r.body)["message"]["body"];
+    final body = jsonDecode(r.data)["message"]["body"];
    if (body == null || body is! Map) return null;
    final tracks = body["track_list"];
    if (tracks == null || tracks is! List || tracks.isEmpty) return null;
@@ -194,12 +194,13 @@ class NetEaseProvider extends LrcProvider {
  Future<Map<String, dynamic>?> searchTrack(String searchTerm) async {
    final params = {"limit": "10", "type": "1", "offset": "0", "s": searchTerm};
    final response = await session.get(
-      Uri.parse(apiEndpointMetadata).replace(queryParameters: params),
-      headers: {"cookie": cookie},
+      apiEndpointMetadata,
+      queryParameters: params,
+      options: Options(headers: {"cookie": cookie}),
    );
    // Update the session cookies from the new sent cookies for the next request.
    // In http package, we can set it, but for simplicity, pass to next call
-    final results = jsonDecode(response.body)["result"]["songs"];
+    final results = jsonDecode(response.data)["result"]["songs"];
    if (results == null || results.isEmpty) return null;
    // Simple best match - first track
    return results[0];
@@ -208,10 +209,11 @@ class NetEaseProvider extends LrcProvider {
  Future<Lyrics?> getLrcById(String trackId) async {
    final params = {"id": trackId, "lv": "1"};
    final response = await session.get(
-      Uri.parse(apiEndpointLyrics).replace(queryParameters: params),
-      headers: {"cookie": cookie},
+      apiEndpointLyrics,
+      queryParameters: params,
+      options: Options(headers: {"cookie": cookie}),
    );
-    final data = jsonDecode(response.body);
+    final data = jsonDecode(response.data);
    final lrc = Lyrics(synced: data["lrc"]["lyric"]);
    return lrc;
  }
--- a/lib/providers/watch_folder_provider.dart
+++ b/lib/providers/watch_folder_provider.dart
@@ -1,11 +1,11 @@
 import 'dart:io';
 import 'package:flutter/foundation.dart';
-import 'package:riverpod/riverpod.dart';
+import 'package:groovybox/data/db.dart';
+import 'package:groovybox/data/track_repository.dart';
+import 'package:groovybox/providers/db_provider.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:path/path.dart' as p;
 import 'package:drift/drift.dart';
-import '../data/db.dart';
-import '../data/track_repository.dart';
-import '../providers/db_provider.dart';

 // Simple watch folder provider using Riverpod
 final watchFoldersProvider = FutureProvider<List<WatchFolder>>((ref) async {
--- a/lib/ui/screens/library_screen.dart
+++ b/lib/ui/screens/library_screen.dart
@@ -732,7 +732,7 @@ class LibraryScreen extends HookConsumerWidget {
      if (await file.exists()) {
        final stat = await file.stat();
        final sizeInMB = (stat.size / (1024 * 1024)).toStringAsFixed(2);
-        fileSize = '${sizeInMB} MB';
+        fileSize = '$sizeInMB MB';
        dateAdded = stat.modified.toString().split(
          ' ',
        )[0]; // Just the date part
@@ -752,7 +752,9 @@ class LibraryScreen extends HookConsumerWidget {
      }
    });

-    final screenSize = MediaQuery.of(context).size;
+    if (!context.mounted) return;
+
+    final screenSize = MediaQuery.sizeOf(context);

    showDialog(
      context: context,
--- a/lib/ui/screens/player_screen.dart
+++ b/lib/ui/screens/player_screen.dart
@@ -371,7 +371,12 @@ class _CoverView extends StatelessWidget {
      child: Column(
        children: [
          Expanded(
-            child: Center(child: _PlayerCoverArt(metadataAsync: metadataAsync)),
+            child: Padding(
+              padding: const EdgeInsets.only(bottom: 32),
+              child: Center(
+                child: _PlayerCoverArt(metadataAsync: metadataAsync),
+              ),
+            ),
          ),
          _PlayerControls(
            player: player,
@@ -456,7 +461,7 @@ class _PlayerCoverArt extends StatelessWidget {
      loading: () => const Center(child: CircularProgressIndicator()),
      error: (_, _) => Container(
        decoration: BoxDecoration(
-          color: Theme.of(context).colorScheme.surfaceVariant,
+          color: Theme.of(context).colorScheme.surfaceContainer,
          borderRadius: BorderRadius.circular(24),
        ),
        child: Center(
--- a/lib/ui/screens/settings_screen.dart
+++ b/lib/ui/screens/settings_screen.dart
@@ -160,40 +160,6 @@ class SettingsScreen extends ConsumerWidget {
                  ),
                ),
              ),
-
-              const SizedBox(height: 16),
-
-              // Supported Formats Section
-              Card(
-                child: Padding(
-                  padding: const EdgeInsets.all(16.0),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      const Text(
-                        'Supported Formats',
-                        style: TextStyle(
-                          fontSize: 18,
-                          fontWeight: FontWeight.bold,
-                        ),
-                      ),
-                      const SizedBox(height: 8),
-                      Wrap(
-                        spacing: 8,
-                        runSpacing: 4,
-                        children: settings.supportedFormats.map((format) {
-                          return Chip(
-                            label: Text(format.toUpperCase()),
-                            backgroundColor: Theme.of(
-                              context,
-                            ).primaryColor.withOpacity(0.1),
-                          );
-                        }).toList(),
-                      ),
-                    ],
-                  ),
-                ),
-              ),
            ],
          ),
        ),