feat(library): add Artist and Album browsing tabs
- Library screen now has a TabBar (Alle / Künstler / Alben) inside a
DefaultTabController; scan/permission/error banners stay above the
TabBarView so they remain visible regardless of the active sub-tab
- New lib/library/song_grouping.dart: pure, unit-tested functions
groupByArtist/groupByAlbum (null artist/album -> "Unbekannt" /
"Unbekanntes Album", alphabetically sorted) plus albumArtistLabel
("Verschiedene Interpreten" when an album mixes artists)
- New lib/library/artist_list.dart + album_list.dart: StreamBuilder on
MeloDb.watchSongs(), grouped client-side, tapping a row pushes a
SongList screen for that artist/album; album rows show a CoverImage
thumbnail from the first song's coverPath
- Existing "Alle" tab content (recently-added strip, full song list,
empty state) preserved unchanged, moved into _AllSongsTab
Genre browsing is intentionally out of scope: the Songs table has no
genre column and neither scanner extracts genre metadata — needs a
schema migration + scanner work in a future task.
Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
This commit is contained in:
Hermes (Server)
co-authored by
Claude Haiku 4.5
Claude Haiku 4.5
parent
4477370766
commit
58ceb42769
@@ -0,0 +1,110 @@
|
||||
import 'package:drift/drift.dart';
|
||||
import 'package:drift/native.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:melo/library/database.dart';
|
||||
import 'package:melo/library/library_screen.dart';
|
||||
import 'package:melo/library/library_service.dart';
|
||||
import 'package:melo/library/playlist_service.dart';
|
||||
import 'package:melo/player/audio_handler.dart';
|
||||
|
||||
Widget _wrap(
|
||||
MeloDb db,
|
||||
LibraryService lib,
|
||||
PlaylistService playlists,
|
||||
MeloAudioHandler handler,
|
||||
Widget child,
|
||||
) {
|
||||
return MultiProvider(
|
||||
providers: [
|
||||
Provider<MeloDb>.value(value: db),
|
||||
ChangeNotifierProvider<LibraryService>.value(value: lib),
|
||||
ChangeNotifierProvider<PlaylistService>.value(value: playlists),
|
||||
Provider<MeloAudioHandler>.value(value: handler),
|
||||
],
|
||||
child: MaterialApp(home: child),
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _insertSong(
|
||||
MeloDb db, {
|
||||
required String id,
|
||||
required String title,
|
||||
String? artist,
|
||||
String? album,
|
||||
}) {
|
||||
return db.into(db.songs).insert(SongsCompanion.insert(
|
||||
id: id,
|
||||
path: '/$id.mp3',
|
||||
title: title,
|
||||
artist: Value(artist),
|
||||
album: Value(album),
|
||||
dateAddedMs: 0,
|
||||
updatedAtMs: 0,
|
||||
));
|
||||
}
|
||||
|
||||
void main() {
|
||||
testWidgets('zeigt die drei Bibliotheks-Tabs "Alle", "Künstler", "Alben"',
|
||||
(tester) async {
|
||||
final db = MeloDb(NativeDatabase.memory());
|
||||
final lib = LibraryService(db);
|
||||
final playlists = PlaylistService(db);
|
||||
final handler = MeloAudioHandler();
|
||||
|
||||
await tester.pumpWidget(
|
||||
_wrap(db, lib, playlists, handler, const LibraryScreen()),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.text('Alle'), findsOneWidget);
|
||||
expect(find.text('Künstler'), findsOneWidget);
|
||||
expect(find.text('Alben'), findsOneWidget);
|
||||
|
||||
await db.close();
|
||||
});
|
||||
|
||||
testWidgets('Künstler-Tab zeigt je Künstler eine Zeile', (tester) async {
|
||||
final db = MeloDb(NativeDatabase.memory());
|
||||
final lib = LibraryService(db);
|
||||
final playlists = PlaylistService(db);
|
||||
final handler = MeloAudioHandler();
|
||||
await _insertSong(db, id: '1', title: 'Song A', artist: 'Alice');
|
||||
await _insertSong(db, id: '2', title: 'Song B', artist: 'Bob');
|
||||
|
||||
await tester.pumpWidget(
|
||||
_wrap(db, lib, playlists, handler, const LibraryScreen()),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
await tester.tap(find.text('Künstler'));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.text('Alice'), findsOneWidget);
|
||||
expect(find.text('Bob'), findsOneWidget);
|
||||
expect(find.text('1 Songs'), findsNWidgets(2));
|
||||
|
||||
await db.close();
|
||||
});
|
||||
|
||||
testWidgets('Alben-Tab zeigt je Album eine Zeile', (tester) async {
|
||||
final db = MeloDb(NativeDatabase.memory());
|
||||
final lib = LibraryService(db);
|
||||
final playlists = PlaylistService(db);
|
||||
final handler = MeloAudioHandler();
|
||||
await _insertSong(db, id: '1', title: 'Song A', artist: 'Alice', album: 'Best Of');
|
||||
|
||||
await tester.pumpWidget(
|
||||
_wrap(db, lib, playlists, handler, const LibraryScreen()),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
await tester.tap(find.text('Alben'));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.text('Best Of'), findsOneWidget);
|
||||
|
||||
await db.close();
|
||||
});
|
||||
}
|
||||
@@ -0,0 +1,112 @@
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:melo/library/database.dart';
|
||||
import 'package:melo/library/song_grouping.dart';
|
||||
|
||||
Song _song({
|
||||
required String id,
|
||||
required String title,
|
||||
String? artist,
|
||||
String? album,
|
||||
}) {
|
||||
return Song(
|
||||
id: id,
|
||||
path: '/$id.mp3',
|
||||
title: title,
|
||||
artist: artist,
|
||||
album: album,
|
||||
dateAddedMs: 0,
|
||||
updatedAtMs: 0,
|
||||
deleted: false,
|
||||
);
|
||||
}
|
||||
|
||||
void main() {
|
||||
group('groupByArtist', () {
|
||||
test('gruppiert mehrere Künstler getrennt', () {
|
||||
final songs = [
|
||||
_song(id: '1', title: 'A', artist: 'Bob'),
|
||||
_song(id: '2', title: 'B', artist: 'Alice'),
|
||||
_song(id: '3', title: 'C', artist: 'Alice'),
|
||||
];
|
||||
|
||||
final grouped = groupByArtist(songs);
|
||||
|
||||
expect(grouped.keys, ['Alice', 'Bob']);
|
||||
expect(grouped['Alice']!.length, 2);
|
||||
expect(grouped['Bob']!.length, 1);
|
||||
});
|
||||
|
||||
test('gruppiert Songs ohne Künstler unter "Unbekannt"', () {
|
||||
final songs = [
|
||||
_song(id: '1', title: 'A', artist: null),
|
||||
_song(id: '2', title: 'B', artist: null),
|
||||
];
|
||||
|
||||
final grouped = groupByArtist(songs);
|
||||
|
||||
expect(grouped.keys, [unbekannterKuenstler]);
|
||||
expect(grouped[unbekannterKuenstler]!.length, 2);
|
||||
});
|
||||
|
||||
test('sortiert Künstlernamen alphabetisch', () {
|
||||
final songs = [
|
||||
_song(id: '1', title: 'A', artist: 'Zebra'),
|
||||
_song(id: '2', title: 'B', artist: 'Anton'),
|
||||
_song(id: '3', title: 'C', artist: 'Mitte'),
|
||||
];
|
||||
|
||||
final grouped = groupByArtist(songs);
|
||||
|
||||
expect(grouped.keys.toList(), ['Anton', 'Mitte', 'Zebra']);
|
||||
});
|
||||
|
||||
test('leere Liste ergibt leere Map', () {
|
||||
expect(groupByArtist(const []), isEmpty);
|
||||
});
|
||||
});
|
||||
|
||||
group('groupByAlbum', () {
|
||||
test('gruppiert mehrere Alben getrennt', () {
|
||||
final songs = [
|
||||
_song(id: '1', title: 'A', album: 'Best Of'),
|
||||
_song(id: '2', title: 'B', album: 'Anthology'),
|
||||
];
|
||||
|
||||
final grouped = groupByAlbum(songs);
|
||||
|
||||
expect(grouped.keys.toList(), ['Anthology', 'Best Of']);
|
||||
});
|
||||
|
||||
test('gruppiert Songs ohne Album unter "Unbekanntes Album"', () {
|
||||
final songs = [_song(id: '1', title: 'A', album: null)];
|
||||
|
||||
final grouped = groupByAlbum(songs);
|
||||
|
||||
expect(grouped.keys, [unbekanntesAlbum]);
|
||||
});
|
||||
|
||||
test('leere Liste ergibt leere Map', () {
|
||||
expect(groupByAlbum(const []), isEmpty);
|
||||
});
|
||||
});
|
||||
|
||||
group('albumArtistLabel', () {
|
||||
test('zeigt gemeinsamen Künstler, wenn alle Songs von ihm stammen', () {
|
||||
final songs = [
|
||||
_song(id: '1', title: 'A', artist: 'Alice', album: 'X'),
|
||||
_song(id: '2', title: 'B', artist: 'Alice', album: 'X'),
|
||||
];
|
||||
|
||||
expect(albumArtistLabel(songs), 'Alice');
|
||||
});
|
||||
|
||||
test('zeigt "Verschiedene Interpreten" bei unterschiedlichen Künstlern', () {
|
||||
final songs = [
|
||||
_song(id: '1', title: 'A', artist: 'Alice', album: 'X'),
|
||||
_song(id: '2', title: 'B', artist: 'Bob', album: 'X'),
|
||||
];
|
||||
|
||||
expect(albumArtistLabel(songs), 'Verschiedene Interpreten');
|
||||
});
|
||||
});
|
||||
}
|
||||
Reference in New Issue
Block a user