♻️ Better current track metadata

This commit is contained in:
2025-12-20 00:25:48 +08:00
parent cb4cca2917
commit a86e8b1cab
8 changed files with 299 additions and 247 deletions

View File

@@ -1,7 +1,11 @@
import 'dart:typed_data';
import 'package:audio_service/audio_service.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:http/http.dart' as http;
import 'package:media_kit/media_kit.dart' as media_kit;
import 'package:groovybox/data/db.dart';
import 'package:groovybox/logic/metadata_service.dart';
import 'package:groovybox/providers/audio_provider.dart';
import 'package:groovybox/providers/theme_provider.dart';
import 'package:groovybox/providers/remote_provider.dart';
import 'package:groovybox/providers/db_provider.dart';
@@ -47,11 +51,13 @@ class AudioHandler extends BaseAudioHandler with QueueHandler, SeekHandler {
_container = container;
}
// Update theme color based on current track's album art
// Update theme color based on current track's album art and set current metadata
void _updateThemeFromCurrentTrack(MediaItem mediaItem) async {
if (_container == null) return;
try {
TrackMetadata? metadata;
// For remote tracks, get metadata from database
final urlResolver = _container!.read(remoteUrlResolverProvider);
if (urlResolver.isProtocolUrl(mediaItem.id)) {
@@ -60,22 +66,59 @@ class AudioHandler extends BaseAudioHandler with QueueHandler, SeekHandler {
database.tracks,
)..where((t) => t.path.equals(mediaItem.id))).getSingleOrNull();
if (track != null && track.artUri != null) {
if (track != null) {
// Fetch album art bytes for remote tracks
// TODO: Implement remote album art fetching for theme
Uint8List? artBytes;
if (track.artUri != null) {
try {
final response = await http.get(Uri.parse(track.artUri!));
if (response.statusCode == 200) {
artBytes = response.bodyBytes;
}
} catch (e) {
// Ignore art fetching errors
}
}
metadata = TrackMetadata(
title: track.title,
artist: track.artist,
album: track.album,
artBytes: artBytes,
);
// Update theme from album art
final seedColorNotifier = _container!.read(
seedColorProvider.notifier,
);
seedColorNotifier.updateFromAlbumArtBytes(artBytes);
}
} else {
// For local tracks, use existing metadata service
// TODO: Get metadata service working
// For local tracks, use metadata service
final metadataService = MetadataService();
metadata = await metadataService.getMetadata(mediaItem.id);
// Update theme from album art
final seedColorNotifier = _container!.read(seedColorProvider.notifier);
seedColorNotifier.updateFromAlbumArtBytes(metadata.artBytes);
}
// Reset to default for now
final seedColorNotifier = _container!.read(seedColorProvider.notifier);
seedColorNotifier.resetToDefault();
// Set current track metadata
if (metadata != null) {
final metadataNotifier = _container!.read(
currentTrackMetadataProvider.notifier,
);
metadataNotifier.setMetadata(metadata);
}
} catch (e) {
// If metadata retrieval fails, reset to default color
// If metadata retrieval fails, reset to default color and clear metadata
final seedColorNotifier = _container!.read(seedColorProvider.notifier);
seedColorNotifier.resetToDefault();
final metadataNotifier = _container!.read(
currentTrackMetadataProvider.notifier,
);
metadataNotifier.clear();
}
}

View File

@@ -1,10 +1,9 @@
import 'dart:io';
import 'package:flutter/foundation.dart';
import 'package:flutter_media_metadata/flutter_media_metadata.dart';
import 'package:http/http.dart' as http;
import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:groovybox/providers/remote_provider.dart';
import 'package:groovybox/providers/db_provider.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:http/http.dart' as http;
class TrackMetadata {
final String? title;
@@ -38,20 +37,16 @@ class MetadataService {
}
}
@Riverpod(keepAlive: true)
MetadataService metadataService(Ref ref) {
return MetadataService();
}
final trackMetadataProvider = FutureProvider.family<TrackMetadata, String>((
ref,
path,
) async {
try {
// Import the database provider directly
final db = ref.watch(databaseProvider);
@riverpod
Future<TrackMetadata> trackMetadata(Ref ref, String path) async {
// Check if this is a remote track (protocol URL)
final urlResolver = ref.watch(remoteUrlResolverProvider);
if (urlResolver.isProtocolUrl(path)) {
// For remote tracks, get metadata from database
final database = ref.watch(databaseProvider);
final track = await (database.select(
database.tracks,
final track = await (db.select(
db.tracks,
)..where((t) => t.path.equals(path))).getSingleOrNull();
if (track != null) {
@@ -75,11 +70,21 @@ Future<TrackMetadata> trackMetadata(Ref ref, String path) async {
album: track.album,
artBytes: artBytes,
);
} else {
return TrackMetadata(
title: 'Unknown Title',
artist: 'Unknown Artist',
album: 'Unknown Album',
artBytes: null,
);
}
return TrackMetadata();
} else {
// For local tracks, use file metadata
final service = MetadataService();
return service.getMetadata(path);
} catch (e) {
debugPrint('Error fetching metadata for $path: $e');
return TrackMetadata(
title: 'Unknown Title',
artist: 'Unknown Artist',
album: 'Unknown Album',
artBytes: null,
);
}
}
});