🎧 Your Personal Streaming Service
Go airsonicmadsonicmedia-servermusicmusic-servernavidromeopensubsonicraspberry-piself-hostedstreamerstreaming-apistreaming-audiosubsonicsubsonic-server
Make sure to select cover art from media_file that has it. Fix #360
Deluanbcaf33023303
diff --git a/persistence/album_repository.go b/persistence/album_repository.goindex a30ab4046..fb4240ad9 100644--- a/persistence/album_repository.go+++ b/persistence/album_repository.go@@ -123,16 +123,18 @@ func (r *albumRepository) Refresh(ids ...string) error {DiscSubtitles string}var albums []refreshAlbum- sel := Select(`album_id as id, album as name, f.artist, f.album_artist, f.artist_id, f.album_artist_id,+ sel := Select(`f.album_id as id, f.album as name, f.artist, f.album_artist, f.artist_id, f.album_artist_id,f.sort_album_name, f.sort_artist_name, f.sort_album_artist_name,f.order_album_name, f.order_album_artist_name,f.compilation, f.genre, max(f.year) as max_year, sum(f.duration) as duration,- count(*) as song_count, a.id as current_id, f.id as cover_art_id, f.path as cover_art_path, f.has_cover_art,+ count(*) as song_count, a.id as current_id,+ f2.id as cover_art_id, f2.path as cover_art_path, f2.has_cover_art,group_concat(f.disc_subtitle, ' ') as disc_subtitles,group_concat(f.artist, ' ') as song_artists, group_concat(f.year, ' ') as years`).From("media_file f").LeftJoin("album a on f.album_id = a.id").- Where(Eq{"f.album_id": ids}).GroupBy("album_id").OrderBy("f.id")+ LeftJoin("(select * from media_file where has_cover_art) f2 on (f.album_id = f2.album_id)").+ Where(Eq{"f.album_id": ids}).GroupBy("f.album_id")err := r.queryAll(sel, &albums)if err != nil {return errdiff --git a/scanner/metadata_ffmpeg.go b/scanner/metadata_ffmpeg.goindex c74965536..ade72fc4a 100644--- a/scanner/metadata_ffmpeg.go+++ b/scanner/metadata_ffmpeg.go@@ -119,7 +119,7 @@ var ()func parseOutput(output string) map[string]string {- split := map[string]string{}+ outputs := map[string]string{}all := inputRegex.FindAllStringSubmatchIndex(output, -1)for i, loc := range all {// Filename is the first captured group@@ -135,9 +135,9 @@ func parseOutput(output string) map[string]string {// if this is the last matchinfo = output[initial:]}- split[file] = info+ outputs[file] = info}- return split+ return outputs}func extractMetadata(filePath, info string) (*Metadata, error) {