dustin/Melo
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Kategorien (mehrere je Song), Metadaten-Ansicht mit Expertenmodus

Browse Source 
- DB-Schema 4: Tabelle song_categories + Spalte categories_edited
- Kategorien kommen aus dem Genre-Tag (Trennung an ; , | /), manuell
  bearbeitbar; von Hand gesetzte Kategorien ueberlebt der naechste Scan
- Songzeile zeigt "Kuenstler | Kategorie1 - Kategorie2"
- Einstellung "Gleiche Kategorie = gleiches Coverbild" (Standard an)
- Metadaten-Sheet mit ausklappbarem Expertenmodus
- Neu: categories.dart, category_service.dart, song_detail_sheet.dart,
  app_settings.dart

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_011snPXPafPC5i87o68H14W7
This commit is contained in:
dustin
2026-08-20 18:29:45 +02:00
co-authored by Claude Opus 5
parent 2667613a2e
commit 7aa98864aa
22 changed files with 1792 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/library/categories_test.dart
+130
View File
@@ -0,0 +1,130 @@
import 'package:flutter_test/flutter_test.dart';
import 'package:melo/library/categories.dart';
import 'package:melo/library/database.dart';
Song _song(String id, {String? coverPath, String title = 'T'}) => Song(
id: id,
path: '/$id.mp3',
title: title,
dateAddedMs: 0,
updatedAtMs: 0,
deleted: false,
playCount: 0,
coverPath: coverPath,
categoriesEdited: false,
);
void main() {
group('parseCategories', () {
test('trennt an Semikolon, Komma, Schrägstrich und Pipe', () {
expect(parseCategories('Rock; Pop'), ['Rock', 'Pop']);
expect(parseCategories('Rock,Pop'), ['Rock', 'Pop']);
expect(parseCategories('Rock/Pop'), ['Rock', 'Pop']);
expect(parseCategories('Rock|Pop'), ['Rock', 'Pop']);
});
test('behält Leerzeichen innerhalb einer Kategorie', () {
expect(parseCategories('Hip Hop; Trap cool'), ['Hip Hop', 'Trap cool']);
});
test('entfernt Leereinträge und doppelte Kategorien', () {
expect(parseCategories('Rock;;rock; Pop ;Rock'), ['Rock', 'Pop']);
});
test('leerer oder fehlender Tag ergibt keine Kategorie', () {
expect(parseCategories(null), isEmpty);
expect(parseCategories(' '), isEmpty);
});
test('verarbeitet auch eine Liste aus mehreren Tag-Feldern', () {
expect(parseCategoryList(['Rock', 'Pop;Trap', 'rock']),
['Rock', 'Pop', 'Trap']);
});
});
group('categoryCovers', () {
test('nimmt je Kategorie das erste vorhandene Cover', () {
final songs = [
_song('1', title: 'A', coverPath: null),
_song('2', title: 'B', coverPath: '/cover_b.img'),
_song('3', title: 'C', coverPath: '/cover_c.img'),
];
final categories = {
'1': ['Rock'],
'2': ['Rock'],
'3': ['Pop'],
};
final covers = categoryCovers(songs, categories);
expect(covers['Rock'], '/cover_b.img');
expect(covers['Pop'], '/cover_c.img');
});
test('Kategorie ganz ohne Cover taucht nicht auf', () {
final songs = [_song('1', coverPath: null)];
final covers = categoryCovers(songs, {'1': ['Leer']});
expect(covers.containsKey('Leer'), isFalse);
});
test('ist unabhängig von der Reihenfolge der Eingabeliste', () {
final songs = [
_song('2', title: 'B', coverPath: '/cover_b.img'),
_song('1', title: 'A', coverPath: '/cover_a.img'),
];
final categories = {'1': ['Rock'], '2': ['Rock']};
expect(categoryCovers(songs, categories)['Rock'], '/cover_a.img');
});
});
group('effectiveCover', () {
final covers = {'Rock': '/rock.img', 'Pop': '/pop.img'};
test('nimmt das Cover der ersten Kategorie', () {
final cover = effectiveCover(
_song('1', coverPath: '/eigen.img'),
['Pop', 'Rock'],
covers,
groupByCategory: true,
);
expect(cover, '/pop.img');
});
test('fällt auf das eigene Cover zurück, wenn die Kategorie keins hat', () {
final cover = effectiveCover(
_song('1', coverPath: '/eigen.img'),
['Unbekannt'],
covers,
groupByCategory: true,
);
expect(cover, '/eigen.img');
});
test('abgeschaltet gilt immer das eigene Cover', () {
final cover = effectiveCover(
_song('1', coverPath: '/eigen.img'),
['Pop'],
covers,
groupByCategory: false,
);
expect(cover, '/eigen.img');
});
test('ohne Kategorien gilt das eigene Cover', () {
final cover = effectiveCover(
_song('1', coverPath: '/eigen.img'),
const [],
covers,
groupByCategory: true,
);
expect(cover, '/eigen.img');
});
});
}
test/library/category_service_test.dart
+65
View File
@@ -0,0 +1,65 @@
import 'package:drift/drift.dart' show Value;
import 'package:drift/native.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:melo/library/category_service.dart';
import 'package:melo/library/database.dart';
void main() {
late MeloDb db;
late CategoryService service;
setUp(() => db = MeloDb(NativeDatabase.memory()));
tearDown(() async {
service.dispose();
await db.close();
});
Future<void> insert(String id, {String? cover}) => db.upsertSongs([
SongsCompanion.insert(
id: id,
path: '/$id.mp3',
title: 'Song $id',
coverPath: Value(cover),
dateAddedMs: 0,
updatedAtMs: 0,
),
]);
Future<void> settle() => Future<void>.delayed(const Duration(milliseconds: 50));
test('reicht die Kategorien eines Songs durch', () async {
await insert('1');
await db.setCategories('1', ['Rock', 'Pop']);
service = CategoryService(db);
await settle();
expect(service.of('1'), ['Rock', 'Pop']);
expect(service.of('unbekannt'), isEmpty);
});
test('Songs derselben Kategorie bekommen dasselbe Cover', () async {
await insert('1', cover: null);
await insert('2', cover: '/rock.img');
await db.setCategories('1', ['Rock']);
await db.setCategories('2', ['Rock']);
service = CategoryService(db);
await settle();
final ohneCover = (await db.watchSongs().first).firstWhere((s) => s.id == '1');
expect(service.coverFor(ohneCover, groupByCategory: true), '/rock.img');
expect(service.coverFor(ohneCover, groupByCategory: false), isNull);
});
test('von Hand gesetzte Kategorien markieren den Song als bearbeitet',
() async {
await insert('1');
service = CategoryService(db);
await settle();
await service.setCategories('1', ['Eigen']);
await settle();
expect(service.of('1'), ['Eigen']);
expect((await db.watchSongs().first).single.categoriesEdited, isTrue);
});
}
test/library/database_categories_test.dart
+69
View File
@@ -0,0 +1,69 @@
import 'package:drift/native.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:melo/library/database.dart';
void main() {
late MeloDb db;
setUp(() => db = MeloDb(NativeDatabase.memory()));
tearDown(() => db.close());
Future<void> insert(String id) => db.upsertSongs([
SongsCompanion.insert(
id: id,
path: '/$id.mp3',
title: 'Song $id',
dateAddedMs: 0,
updatedAtMs: 0,
),
]);
test('ein Song kann mehreren Kategorien angehören, Reihenfolge bleibt',
() async {
await insert('1');
await db.setCategories('1', ['Trap cool', 'Rock', 'Chill']);
expect(await db.categoriesOf('1'), ['Trap cool', 'Rock', 'Chill']);
});
test('setCategories ersetzt die bisherigen Kategorien', () async {
await insert('1');
await db.setCategories('1', ['Alt']);
await db.setCategories('1', ['Neu']);
expect(await db.categoriesOf('1'), ['Neu']);
});
test('byUser markiert den Song als von Hand bearbeitet', () async {
await insert('1');
await db.setCategories('1', ['Rock']);
expect((await db.watchSongs().first).single.categoriesEdited, isFalse);
await db.setCategories('1', ['Pop'], byUser: true);
expect((await db.watchSongs().first).single.categoriesEdited, isTrue);
});
test('watchCategoriesBySong bündelt nach Song', () async {
await insert('1');
await insert('2');
await db.setCategories('1', ['Rock', 'Pop']);
await db.setCategories('2', ['Jazz']);
final byId = await db.watchCategoriesBySong().first;
expect(byId['1'], ['Rock', 'Pop']);
expect(byId['2'], ['Jazz']);
});
test('allCategoryNames liefert jede Kategorie einmal, alphabetisch',
() async {
await insert('1');
await insert('2');
await db.setCategories('1', ['Rock', 'Ambient']);
await db.setCategories('2', ['Rock']);
expect(await db.allCategoryNames(), ['Ambient', 'Rock']);
});
}
test/library/my_music_screen_test.dart
+4
View File
@@ -2,12 +2,14 @@ import 'package:drift/drift.dart';
import 'package:drift/native.dart';
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:melo/library/category_service.dart';
import 'package:melo/library/database.dart';
import 'package:melo/library/favorites_screen.dart';
import 'package:melo/library/library_service.dart';
import 'package:melo/library/my_music_screen.dart';
import 'package:melo/library/playlist_service.dart';
import 'package:melo/player/audio_handler.dart';
import 'package:melo/settings/app_settings.dart';
import 'package:provider/provider.dart';
import 'package:shared_preferences/shared_preferences.dart';
@@ -19,6 +21,8 @@ Widget _wrap(MeloDb db, LibraryService lib, PlaylistService playlists,
ChangeNotifierProvider<LibraryService>.value(value: lib),
ChangeNotifierProvider<PlaylistService>.value(value: playlists),
Provider<MeloAudioHandler>.value(value: handler),
ChangeNotifierProvider<CategoryService>(create: (_) => CategoryService(db)),
ChangeNotifierProvider<AppSettings>(create: (_) => AppSettings()),
],
child: MaterialApp(home: Scaffold(body: child)),
);
test/library/song_grouping_test.dart
+1
View File
@@ -18,6 +18,7 @@ Song _song({
updatedAtMs: 0,
deleted: false,
playCount: 0,
categoriesEdited: false,
);
}
test/library/song_list_categories_test.dart
+90
View File
@@ -0,0 +1,90 @@
import 'package:drift/drift.dart' show Value;
import 'package:drift/native.dart';
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:melo/library/category_service.dart';
import 'package:melo/library/database.dart';
import 'package:melo/library/playlist_service.dart';
import 'package:melo/library/song_list.dart';
import 'package:melo/player/audio_handler.dart';
import 'package:melo/settings/app_settings.dart';
import 'package:provider/provider.dart';
import 'package:shared_preferences/shared_preferences.dart';
Widget _wrap(MeloDb db, MeloAudioHandler handler) => MultiProvider(
providers: [
Provider<MeloDb>.value(value: db),
Provider<MeloAudioHandler>.value(value: handler),
ChangeNotifierProvider<PlaylistService>(create: (_) => PlaylistService(db)),
ChangeNotifierProvider<CategoryService>(create: (_) => CategoryService(db)),
ChangeNotifierProvider<AppSettings>(create: (_) => AppSettings()),
],
child: MaterialApp(
home: Scaffold(
body: StreamBuilder<List<Song>>(
stream: db.watchSongs(),
builder: (context, snapshot) => SongList(snapshot.data ?? const []),
),
),
),
);
Future<void> _insertRoses(MeloDb db) async {
await db.upsertSongs([
SongsCompanion.insert(
id: '1',
path: '/a.mp3',
title: 'Roses',
artist: const Value('Neoni'),
dateAddedMs: 0,
updatedAtMs: 0,
),
]);
await db.setCategories('1', ['Trap cool', 'Chill']);
}
void main() {
setUp(() => SharedPreferences.setMockInitialValues({}));
testWidgets('Songzeile zeigt "Künstler | Kategorien"', (tester) async {
final db = MeloDb(NativeDatabase.memory());
final handler = MeloAudioHandler(db: db);
await _insertRoses(db);
await tester.pumpWidget(_wrap(db, handler));
await tester.pumpAndSettle();
expect(find.text('Roses'), findsOneWidget);
expect(find.text('Neoni | Trap cool · Chill'), findsOneWidget);
handler.dispose();
await db.close();
});
testWidgets('Metadaten-Ansicht zeigt Kategorien und den Expertenmodus',
(tester) async {
final db = MeloDb(NativeDatabase.memory());
final handler = MeloAudioHandler(db: db);
await _insertRoses(db);
await tester.pumpWidget(_wrap(db, handler));
await tester.pumpAndSettle();
await tester.tap(find.byIcon(Icons.more_vert));
await tester.pumpAndSettle();
await tester.tap(find.text('Metadaten'));
await tester.pumpAndSettle();
expect(find.text('Kategorien'), findsOneWidget);
expect(find.text('Trap cool'), findsWidgets);
expect(find.text('Expertenmodus'), findsOneWidget);
await tester.tap(find.text('Expertenmodus'));
await tester.pumpAndSettle();
expect(find.text('Wiedergaben'), findsOneWidget);
handler.dispose();
await db.close();
});
}
test/library/song_media_test.dart
+1
View File
@@ -16,6 +16,7 @@ void main() {
updatedAtMs: 0,
deleted: false,
playCount: 0,
categoriesEdited: false,
);
final item = songToMediaItem(song);
test/library/song_sort_test.dart
+1
View File
@@ -16,6 +16,7 @@ Song _song(
updatedAtMs: 0,
deleted: false,
playCount: playCount,
categoriesEdited: false,
);
}