Web UI: setup wizard, auth pages, library browsing, player, admin, streaming, cover art

internal/database/coverart.go

@@ -42,21 +42,23 @@ func scanCoverArt(row *sql.Row) (*CoverArt, error) {
 }
 
 // UpsertAlbumCoverArt records (or replaces) the discovered cover art
-// source for an album and links it as the album's cover.
-func UpsertAlbumCoverArt(db *sql.DB, albumID, source, sourcePath, mimeType, contentHash string, width, height int) (*CoverArt, error) {
+// source for an album and links it as the album's cover. mediaFileID is
+// set (with sourcePath empty) for embedded artwork, which is extracted
+// on demand from the media file rather than at scan time.
+func UpsertAlbumCoverArt(db *sql.DB, albumID, source, sourcePath, mediaFileID, mimeType, contentHash string, width, height int) (*CoverArt, error) {
 	var id string
 	err := db.QueryRow(`SELECT id FROM cover_art WHERE album_id = ?`, albumID).Scan(&id)
 	switch {
 	case err == nil:
-		_, err = db.Exec(`UPDATE cover_art SET source=?, source_path=?, mime_type=?, content_hash=?, width=?, height=?, updated_at=strftime('%Y-%m-%dT%H:%M:%fZ','now') WHERE id=?`,
-			source, sourcePath, mimeType, contentHash, width, height, id)
+		_, err = db.Exec(`UPDATE cover_art SET source=?, source_path=?, media_file_id=?, mime_type=?, content_hash=?, width=?, height=?, updated_at=strftime('%Y-%m-%dT%H:%M:%fZ','now') WHERE id=?`,
+			source, sourcePath, nullEmptyStr(mediaFileID), mimeType, contentHash, width, height, id)
 		if err != nil {
 			return nil, err
 		}
 	case errors.Is(err, sql.ErrNoRows):
 		id = idgen.New("ca")
-		_, err = db.Exec(`INSERT INTO cover_art (id, album_id, source, source_path, mime_type, content_hash, width, height) VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,
-			id, albumID, source, sourcePath, mimeType, contentHash, width, height)
+		_, err = db.Exec(`INSERT INTO cover_art (id, album_id, media_file_id, source, source_path, mime_type, content_hash, width, height) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+			id, albumID, nullEmptyStr(mediaFileID), source, sourcePath, mimeType, contentHash, width, height)
 		if err != nil {
 			return nil, err
 		}
@@ -68,3 +70,10 @@ func UpsertAlbumCoverArt(db *sql.DB, albumID, source, sourcePath, mimeType, cont
 	}
 	return GetCoverArt(db, id)
 }
+
+func nullEmptyStr(s string) any {
+	if s == "" {
+		return nil
+	}
+	return s
+}