27f123f7d9
Two fixes in one commit because they're entangled — the systemVariant work would have been theater otherwise. ## The wire-format bug /api/library/sync was emitting PascalCase JSON for artist / album / track / playlist upserts (raw json.Marshal of sqlc-generated structs with no JSON tags — sqlc.yaml: emit_json_tags=false). Flutter's sync_controller _*FromJson reads snake_case keys, so all metadata sync rows landed in drift with empty strings / zero ints. The like_track / like_album / like_artist / playlist_track entities work because they're hand-built `map[string]string` payloads with snake_case keys — they sidestepped the bug. The 4 raw-marshal entities did not. Existing sync test caught zero of this — it asserts on len(upserts) not field shape. Fix: server-side view structs in library_sync_views.go with proper JSON tags + pgtype-flattening (UUID → 8-4-4-4-12 hex string, Date → "2006-01-02"). Mirrors the playlistRowView pattern from /api/playlists. New library_sync_views_test.go pins the wire keys so future field-name drift breaks loud. ## systemVariant column (closes #357 plan C v1 limitation) playlistSyncView now carries `system_variant` server → wire. Flutter drift schema bumped from 1 → 2 with onUpgrade adding the `systemVariant TEXT NULL` column to cached_playlists. Cursor reset to 0 in the migration so existing rows refresh with the new field on the next sync. playlistsListProvider now filters locally by systemVariant: - kind='user' → systemVariant IS NULL (the add-to-playlist sheet's intent) - kind='system' → systemVariant IS NOT NULL - kind='all' → no filter Closes the documented v1 limitation where the add-to-playlist sheet showed system playlists alongside user-created ones. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
111 lines
3.3 KiB
Dart
111 lines
3.3 KiB
Dart
// Drift row → model adapters and reverse-write adapters for populating
|
|
// drift from REST responses (#357 plan C).
|
|
//
|
|
// The cache loses some server-derived fields:
|
|
// - ArtistRef.coverUrl (server computes from most-recent album)
|
|
// - AlbumRef.coverUrl (server-emitted derived path)
|
|
// - TrackRef.streamUrl (could be reconstructed but kept empty for clarity)
|
|
// UI already handles empty coverUrl/streamUrl gracefully. REST cold-cache
|
|
// fallback briefly shows the real values before drift takes over.
|
|
|
|
import 'package:drift/drift.dart' as drift;
|
|
|
|
import '../models/album.dart';
|
|
import '../models/artist.dart';
|
|
import '../models/playlist.dart';
|
|
import '../models/track.dart';
|
|
import 'db.dart';
|
|
|
|
extension CachedArtistAdapter on CachedArtist {
|
|
ArtistRef toRef() => ArtistRef(
|
|
id: id,
|
|
name: name,
|
|
sortName: sortName,
|
|
);
|
|
}
|
|
|
|
extension ArtistRefDriftWrite on ArtistRef {
|
|
CachedArtistsCompanion toDrift() => CachedArtistsCompanion.insert(
|
|
id: id,
|
|
name: name,
|
|
sortName: sortName.isNotEmpty ? sortName : name,
|
|
);
|
|
}
|
|
|
|
extension CachedAlbumAdapter on CachedAlbum {
|
|
/// `artistName` is supplied by the joined CachedArtists row at query time.
|
|
AlbumRef toRef({String artistName = ''}) => AlbumRef(
|
|
id: id,
|
|
title: title,
|
|
sortTitle: sortTitle,
|
|
artistId: artistId,
|
|
artistName: artistName,
|
|
);
|
|
}
|
|
|
|
extension AlbumRefDriftWrite on AlbumRef {
|
|
CachedAlbumsCompanion toDrift() => CachedAlbumsCompanion.insert(
|
|
id: id,
|
|
artistId: artistId,
|
|
title: title,
|
|
sortTitle: sortTitle.isNotEmpty ? sortTitle : title,
|
|
);
|
|
}
|
|
|
|
extension CachedTrackAdapter on CachedTrack {
|
|
/// `artistName` and `albumTitle` come from joined rows.
|
|
TrackRef toRef({String artistName = '', String albumTitle = ''}) => TrackRef(
|
|
id: id,
|
|
title: title,
|
|
albumId: albumId,
|
|
albumTitle: albumTitle,
|
|
artistId: artistId,
|
|
artistName: artistName,
|
|
trackNumber: trackNumber,
|
|
discNumber: discNumber,
|
|
durationSec: durationMs ~/ 1000,
|
|
);
|
|
}
|
|
|
|
extension TrackRefDriftWrite on TrackRef {
|
|
CachedTracksCompanion toDrift() => CachedTracksCompanion.insert(
|
|
id: id,
|
|
albumId: albumId,
|
|
artistId: artistId,
|
|
title: title,
|
|
durationMs: drift.Value(durationSec * 1000),
|
|
trackNumber: drift.Value(trackNumber),
|
|
discNumber: drift.Value(discNumber),
|
|
);
|
|
}
|
|
|
|
extension CachedPlaylistAdapter on CachedPlaylist {
|
|
/// `ownerUsername` is server-derived; cache stores the userId only.
|
|
/// Pass empty unless a join supplies it.
|
|
Playlist toRef({String ownerUsername = ''}) => Playlist(
|
|
id: id,
|
|
userId: userId,
|
|
name: name,
|
|
description: description,
|
|
isPublic: isPublic,
|
|
systemVariant: systemVariant,
|
|
trackCount: trackCount,
|
|
coverUrl: '', // server-derived; cache doesn't persist
|
|
ownerUsername: ownerUsername,
|
|
createdAt: '',
|
|
updatedAt: '',
|
|
);
|
|
}
|
|
|
|
extension PlaylistDriftWrite on Playlist {
|
|
CachedPlaylistsCompanion toDrift() => CachedPlaylistsCompanion.insert(
|
|
id: id,
|
|
userId: userId,
|
|
name: name,
|
|
description: drift.Value(description),
|
|
isPublic: drift.Value(isPublic),
|
|
trackCount: drift.Value(trackCount),
|
|
systemVariant: drift.Value(systemVariant),
|
|
);
|
|
}
|