Improvement on remote track metadata

This commit is contained in:
2025-12-19 23:51:02 +08:00
parent 2f1130b424
commit cb4cca2917
7 changed files with 300 additions and 190 deletions

View File

@@ -3,7 +3,8 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:media_kit/media_kit.dart' as media_kit;
import 'package:groovybox/data/db.dart';
import 'package:groovybox/providers/theme_provider.dart';
import 'package:groovybox/logic/metadata_service.dart';
import 'package:groovybox/providers/remote_provider.dart';
import 'package:groovybox/providers/db_provider.dart';
class AudioHandler extends BaseAudioHandler with QueueHandler, SeekHandler {
final media_kit.Player _player;
@@ -51,12 +52,26 @@ class AudioHandler extends BaseAudioHandler with QueueHandler, SeekHandler {
if (_container == null) return;
try {
// Get metadata for the current track to access artBytes
final metadataService = _container!.read(metadataServiceProvider);
final metadata = await metadataService.getMetadata(mediaItem.id);
// For remote tracks, get metadata from database
final urlResolver = _container!.read(remoteUrlResolverProvider);
if (urlResolver.isProtocolUrl(mediaItem.id)) {
final database = _container!.read(databaseProvider);
final track = await (database.select(
database.tracks,
)..where((t) => t.path.equals(mediaItem.id))).getSingleOrNull();
if (track != null && track.artUri != null) {
// Fetch album art bytes for remote tracks
// TODO: Implement remote album art fetching for theme
}
} else {
// For local tracks, use existing metadata service
// TODO: Get metadata service working
}
// Reset to default for now
final seedColorNotifier = _container!.read(seedColorProvider.notifier);
seedColorNotifier.updateFromAlbumArtBytes(metadata.artBytes);
seedColorNotifier.resetToDefault();
} catch (e) {
// If metadata retrieval fails, reset to default color
final seedColorNotifier = _container!.read(seedColorProvider.notifier);
@@ -134,7 +149,35 @@ class AudioHandler extends BaseAudioHandler with QueueHandler, SeekHandler {
}
Future<void> _updatePlaylist() async {
final medias = _queue.map((item) => media_kit.Media(item.id)).toList();
if (_container == null) {
// Fallback if container not set
final medias = _queue.map((item) => media_kit.Media(item.id)).toList();
if (medias.isNotEmpty) {
await _player.open(media_kit.Playlist(medias, index: _queueIndex));
}
return;
}
final urlResolver = _container!.read(remoteUrlResolverProvider);
final medias = <media_kit.Media>[];
for (final item in _queue) {
String uri = item.id;
// Check if this is a protocol URL that needs resolution
if (urlResolver.isProtocolUrl(item.id)) {
final resolvedUrl = await urlResolver.resolveUrl(item.id);
if (resolvedUrl != null) {
uri = resolvedUrl;
} else {
// If resolution fails, skip this track or use original URL
continue;
}
}
medias.add(media_kit.Media(uri));
}
if (medias.isNotEmpty) {
await _player.open(media_kit.Playlist(medias, index: _queueIndex));
}

View File

@@ -1,9 +1,10 @@
import 'dart:io';
import 'dart:typed_data';
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';
part 'metadata_service.g.dart';
import 'package:groovybox/providers/remote_provider.dart';
import 'package:groovybox/providers/db_provider.dart';
class TrackMetadata {
final String? title;
@@ -43,6 +44,42 @@ MetadataService metadataService(Ref ref) {
}
@riverpod
Future<TrackMetadata> trackMetadata(Ref ref, String path) {
return ref.watch(metadataServiceProvider).getMetadata(path);
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,
)..where((t) => t.path.equals(path))).getSingleOrNull();
if (track != null) {
// For remote tracks, try to fetch album art from the stored URL
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 - album art is not critical
debugPrint('Failed to fetch album art from ${track.artUri}: $e');
}
}
return TrackMetadata(
title: track.title,
artist: track.artist,
album: track.album,
artBytes: artBytes,
);
}
return TrackMetadata();
} else {
// For local tracks, use file metadata
final service = MetadataService();
return service.getMetadata(path);
}
}

View File

@@ -1,127 +0,0 @@
// GENERATED CODE - DO NOT MODIFY BY HAND
part of 'metadata_service.dart';
// **************************************************************************
// RiverpodGenerator
// **************************************************************************
// GENERATED CODE - DO NOT MODIFY BY HAND
// ignore_for_file: type=lint, type=warning
@ProviderFor(metadataService)
const metadataServiceProvider = MetadataServiceProvider._();
final class MetadataServiceProvider
extends
$FunctionalProvider<MetadataService, MetadataService, MetadataService>
with $Provider<MetadataService> {
const MetadataServiceProvider._()
: super(
from: null,
argument: null,
retry: null,
name: r'metadataServiceProvider',
isAutoDispose: false,
dependencies: null,
$allTransitiveDependencies: null,
);
@override
String debugGetCreateSourceHash() => _$metadataServiceHash();
@$internal
@override
$ProviderElement<MetadataService> $createElement($ProviderPointer pointer) =>
$ProviderElement(pointer);
@override
MetadataService create(Ref ref) {
return metadataService(ref);
}
/// {@macro riverpod.override_with_value}
Override overrideWithValue(MetadataService value) {
return $ProviderOverride(
origin: this,
providerOverride: $SyncValueProvider<MetadataService>(value),
);
}
}
String _$metadataServiceHash() => r'62471f009f532ce97bab1ea7e87171ae385592b7';
@ProviderFor(trackMetadata)
const trackMetadataProvider = TrackMetadataFamily._();
final class TrackMetadataProvider
extends
$FunctionalProvider<
AsyncValue<TrackMetadata>,
TrackMetadata,
FutureOr<TrackMetadata>
>
with $FutureModifier<TrackMetadata>, $FutureProvider<TrackMetadata> {
const TrackMetadataProvider._({
required TrackMetadataFamily super.from,
required String super.argument,
}) : super(
retry: null,
name: r'trackMetadataProvider',
isAutoDispose: true,
dependencies: null,
$allTransitiveDependencies: null,
);
@override
String debugGetCreateSourceHash() => _$trackMetadataHash();
@override
String toString() {
return r'trackMetadataProvider'
''
'($argument)';
}
@$internal
@override
$FutureProviderElement<TrackMetadata> $createElement(
$ProviderPointer pointer,
) => $FutureProviderElement(pointer);
@override
FutureOr<TrackMetadata> create(Ref ref) {
final argument = this.argument as String;
return trackMetadata(ref, argument);
}
@override
bool operator ==(Object other) {
return other is TrackMetadataProvider && other.argument == argument;
}
@override
int get hashCode {
return argument.hashCode;
}
}
String _$trackMetadataHash() => r'9833c87e90297f7c9aa952c31f78a73aae78422b';
final class TrackMetadataFamily extends $Family
with $FunctionalFamilyOverride<FutureOr<TrackMetadata>, String> {
const TrackMetadataFamily._()
: super(
retry: null,
name: r'trackMetadataProvider',
dependencies: null,
$allTransitiveDependencies: null,
isAutoDispose: true,
);
TrackMetadataProvider call(String path) =>
TrackMetadataProvider._(argument: path, from: this);
@override
String toString() => r'trackMetadataProvider';
}