diff --git a/server/handler/construct_sub_by_folder.go b/server/handler/construct_sub_by_folder.go index 9177a49..f197c8a 100644 --- a/server/handler/construct_sub_by_folder.go +++ b/server/handler/construct_sub_by_folder.go @@ -19,20 +19,20 @@ func newAlbumByFolder(f *model.Album) *subsonic.Album { } func newTCAlbumByFolder(f *model.Album, parent *model.Album) *subsonic.TrackChild { - child := &subsonic.TrackChild{ - CoverID: f.ID, - ID: f.ID, - IsDir: true, - Title: f.RightPath, + trCh := &subsonic.TrackChild{ + ID: f.ID, + IsDir: true, + Title: f.RightPath, + ParentID: f.ParentID, } - if parent != nil { - child.ParentID = parent.ID + if f.Cover != "" { + trCh.CoverID = f.ID } - return child + return trCh } func newTCTrackByFolder(t *model.Track, parent *model.Album) *subsonic.TrackChild { - return &subsonic.TrackChild{ + trCh := &subsonic.TrackChild{ ID: t.ID, Album: t.Album.RightPath, ContentType: t.MIME(), @@ -47,12 +47,15 @@ func newTCTrackByFolder(t *model.Track, parent *model.Album) *subsonic.TrackChil t.Filename, ), ParentID: parent.ID, - CoverID: parent.ID, Duration: t.Duration, Bitrate: t.Bitrate, IsDir: false, Type: "music", } + if parent.Cover != "" { + trCh.CoverID = parent.ID + } + return trCh } func newArtistByFolder(f *model.Album) *subsonic.Artist { diff --git a/server/handler/construct_sub_by_tags.go b/server/handler/construct_sub_by_tags.go index 8cfd65b..c748f5b 100644 --- a/server/handler/construct_sub_by_tags.go +++ b/server/handler/construct_sub_by_tags.go @@ -9,11 +9,13 @@ import ( func newAlbumByTags(a *model.Album, artist *model.Artist) *subsonic.Album { ret := &subsonic.Album{ - CoverID: a.ID, Created: a.CreatedAt, ID: a.ID, Name: a.TagTitle, } + if a.Cover != "" { + ret.CoverID = a.ID + } if artist != nil { ret.Artist = artist.Name ret.ArtistID = artist.ID @@ -22,7 +24,7 @@ func newAlbumByTags(a *model.Album, artist *model.Artist) *subsonic.Album { } func newTrackByTags(t *model.Track, album *model.Album) *subsonic.TrackChild { - return &subsonic.TrackChild{ + ret := &subsonic.TrackChild{ ID: t.ID, ContentType: t.MIME(), Suffix: t.Ext(), @@ -40,11 +42,14 @@ func newTrackByTags(t *model.Track, album *model.Album) *subsonic.TrackChild { Album: album.TagTitle, AlbumID: album.ID, ArtistID: album.TagArtist.ID, - CoverID: album.ID, Duration: t.Duration, Bitrate: t.Bitrate, Type: "music", } + if album.Cover != "" { + ret.CoverID = album.ID + } + return ret } func newArtistByTags(a *model.Artist) *subsonic.Artist { diff --git a/server/handler/test_data/db b/server/handler/test_data/db index 8249c95..194561a 100644 Binary files a/server/handler/test_data/db and b/server/handler/test_data/db differ diff --git a/server/handler/test_data/test_get_album_list_random b/server/handler/test_data/test_get_album_list_random index b8427e9..b48a5e3 100644 --- a/server/handler/test_data/test_get_album_list_random +++ b/server/handler/test_data/test_get_album_list_random @@ -4,15 +4,6 @@ "version": "1.9.0", "albumList": { "album": [ - { - "id": 3, - "coverArt": 3, - "artist": "A Certain Ratio", - "title": "(1994) The Graveyard and the Ballroom", - "parent": 2, - "isDir": true, - "created": "0001-01-01T00:00:00Z" - }, { "id": 11, "coverArt": 11, @@ -22,6 +13,15 @@ "isDir": true, "created": "0001-01-01T00:00:00Z" }, + { + "id": 7, + "coverArt": 7, + "artist": "13th Floor Lowervators", + "title": "(1966) The Psychedelic Sounds of the 13th Floor Elevators", + "parent": 5, + "isDir": true, + "created": "0001-01-01T00:00:00Z" + }, { "id": 4, "coverArt": 4, @@ -32,19 +32,19 @@ "created": "0001-01-01T00:00:00Z" }, { - "id": 6, - "coverArt": 6, - "artist": "13th Floor Lowervators", - "title": "(1967) Easter Nowhere", - "parent": 5, + "id": 3, + "coverArt": 3, + "artist": "A Certain Ratio", + "title": "(1994) The Graveyard and the Ballroom", + "parent": 2, "isDir": true, "created": "0001-01-01T00:00:00Z" }, { - "id": 7, - "coverArt": 7, + "id": 6, + "coverArt": 6, "artist": "13th Floor Lowervators", - "title": "(1966) The Psychedelic Sounds of the 13th Floor Elevators", + "title": "(1967) Easter Nowhere", "parent": 5, "isDir": true, "created": "0001-01-01T00:00:00Z" diff --git a/server/handler/test_data/test_get_album_list_two_alpha_artist b/server/handler/test_data/test_get_album_list_two_alpha_artist index e6e10a1..dde3bdc 100644 --- a/server/handler/test_data/test_get_album_list_two_alpha_artist +++ b/server/handler/test_data/test_get_album_list_two_alpha_artist @@ -10,7 +10,7 @@ "artistId": 2, "artist": "13th Floor Elevators", "name": "Easter Everywhere", - "created": "2019-06-05T16:00:10.556862345+01:00" + "created": "2019-06-06T16:38:39.306600701+01:00" }, { "id": 7, @@ -18,7 +18,7 @@ "artistId": 2, "artist": "13th Floor Elevators", "name": "The Psychedelic Sounds of the 13th Floor Elevators", - "created": "2019-06-05T16:00:10.560355528+01:00" + "created": "2019-06-06T16:38:39.309763889+01:00" }, { "id": 3, @@ -26,15 +26,14 @@ "artistId": 1, "artist": "A Certain Ratio", "name": "The Graveyard and the Ballroom", - "created": "2019-06-05T16:00:10.54747823+01:00" + "created": "2019-06-06T16:38:39.298724062+01:00" }, { "id": 4, - "coverArt": 4, "artistId": 1, "artist": "A Certain Ratio", "name": "To Each...", - "created": "2019-06-05T16:00:10.553065063+01:00" + "created": "2019-06-06T16:38:39.303278797+01:00" }, { "id": 11, @@ -42,7 +41,7 @@ "artistId": 3, "artist": "Anikas", "name": "Anika", - "created": "2019-06-05T16:00:10.565661506+01:00" + "created": "2019-06-06T16:38:39.31657693+01:00" } ] } diff --git a/server/handler/test_data/test_get_album_list_two_alpha_name b/server/handler/test_data/test_get_album_list_two_alpha_name index 1f0b097..0257551 100644 --- a/server/handler/test_data/test_get_album_list_two_alpha_name +++ b/server/handler/test_data/test_get_album_list_two_alpha_name @@ -10,7 +10,7 @@ "artistId": 3, "artist": "Anikas", "name": "Anika", - "created": "2019-06-05T16:00:10.565661506+01:00" + "created": "2019-06-06T16:38:39.31657693+01:00" }, { "id": 6, @@ -18,7 +18,7 @@ "artistId": 2, "artist": "13th Floor Elevators", "name": "Easter Everywhere", - "created": "2019-06-05T16:00:10.556862345+01:00" + "created": "2019-06-06T16:38:39.306600701+01:00" }, { "id": 3, @@ -26,7 +26,7 @@ "artistId": 1, "artist": "A Certain Ratio", "name": "The Graveyard and the Ballroom", - "created": "2019-06-05T16:00:10.54747823+01:00" + "created": "2019-06-06T16:38:39.298724062+01:00" }, { "id": 7, @@ -34,15 +34,14 @@ "artistId": 2, "artist": "13th Floor Elevators", "name": "The Psychedelic Sounds of the 13th Floor Elevators", - "created": "2019-06-05T16:00:10.560355528+01:00" + "created": "2019-06-06T16:38:39.309763889+01:00" }, { "id": 4, - "coverArt": 4, "artistId": 1, "artist": "A Certain Ratio", "name": "To Each...", - "created": "2019-06-05T16:00:10.553065063+01:00" + "created": "2019-06-06T16:38:39.303278797+01:00" } ] } diff --git a/server/handler/test_data/test_get_album_list_two_newest b/server/handler/test_data/test_get_album_list_two_newest index 9648a8a..d1c062a 100644 --- a/server/handler/test_data/test_get_album_list_two_newest +++ b/server/handler/test_data/test_get_album_list_two_newest @@ -10,7 +10,7 @@ "artistId": 3, "artist": "Anikas", "name": "Anika", - "created": "2019-06-05T16:00:10.565661506+01:00" + "created": "2019-06-06T16:38:39.31657693+01:00" }, { "id": 7, @@ -18,7 +18,7 @@ "artistId": 2, "artist": "13th Floor Elevators", "name": "The Psychedelic Sounds of the 13th Floor Elevators", - "created": "2019-06-05T16:00:10.560355528+01:00" + "created": "2019-06-06T16:38:39.309763889+01:00" }, { "id": 6, @@ -26,15 +26,14 @@ "artistId": 2, "artist": "13th Floor Elevators", "name": "Easter Everywhere", - "created": "2019-06-05T16:00:10.556862345+01:00" + "created": "2019-06-06T16:38:39.306600701+01:00" }, { "id": 4, - "coverArt": 4, "artistId": 1, "artist": "A Certain Ratio", "name": "To Each...", - "created": "2019-06-05T16:00:10.553065063+01:00" + "created": "2019-06-06T16:38:39.303278797+01:00" }, { "id": 3, @@ -42,7 +41,7 @@ "artistId": 1, "artist": "A Certain Ratio", "name": "The Graveyard and the Ballroom", - "created": "2019-06-05T16:00:10.54747823+01:00" + "created": "2019-06-06T16:38:39.298724062+01:00" } ] } diff --git a/server/handler/test_data/test_get_album_list_two_random b/server/handler/test_data/test_get_album_list_two_random index e5b8c87..ecff8b8 100644 --- a/server/handler/test_data/test_get_album_list_two_random +++ b/server/handler/test_data/test_get_album_list_two_random @@ -5,20 +5,12 @@ "albumList2": { "album": [ { - "id": 4, - "coverArt": 4, - "artistId": 1, - "artist": "A Certain Ratio", - "name": "To Each...", - "created": "2019-06-05T16:00:10.553065063+01:00" - }, - { - "id": 11, - "coverArt": 11, - "artistId": 3, - "artist": "Anikas", - "name": "Anika", - "created": "2019-06-05T16:00:10.565661506+01:00" + "id": 6, + "coverArt": 6, + "artistId": 2, + "artist": "13th Floor Elevators", + "name": "Easter Everywhere", + "created": "2019-06-06T16:38:39.306600701+01:00" }, { "id": 3, @@ -26,7 +18,14 @@ "artistId": 1, "artist": "A Certain Ratio", "name": "The Graveyard and the Ballroom", - "created": "2019-06-05T16:00:10.54747823+01:00" + "created": "2019-06-06T16:38:39.298724062+01:00" + }, + { + "id": 4, + "artistId": 1, + "artist": "A Certain Ratio", + "name": "To Each...", + "created": "2019-06-06T16:38:39.303278797+01:00" }, { "id": 7, @@ -34,15 +33,15 @@ "artistId": 2, "artist": "13th Floor Elevators", "name": "The Psychedelic Sounds of the 13th Floor Elevators", - "created": "2019-06-05T16:00:10.560355528+01:00" + "created": "2019-06-06T16:38:39.309763889+01:00" }, { - "id": 6, - "coverArt": 6, - "artistId": 2, - "artist": "13th Floor Elevators", - "name": "Easter Everywhere", - "created": "2019-06-05T16:00:10.556862345+01:00" + "id": 11, + "coverArt": 11, + "artistId": 3, + "artist": "Anikas", + "name": "Anika", + "created": "2019-06-06T16:38:39.31657693+01:00" } ] } diff --git a/server/handler/test_data/test_get_album_with_cover b/server/handler/test_data/test_get_album_with_cover index 652d725..cd94224 100644 --- a/server/handler/test_data/test_get_album_with_cover +++ b/server/handler/test_data/test_get_album_with_cover @@ -8,16 +8,18 @@ "artistId": 1, "artist": "A Certain Ratio", "name": "The Graveyard and the Ballroom", - "created": "2019-06-05T16:00:10.54747823+01:00", + "created": "2019-06-06T16:38:39.298724062+01:00", "song": [ { "album": "The Graveyard and the Ballroom", "albumId": 3, "artist": "A Certain Ratio", "artistId": 1, + "bitRate": 922, "contentType": "audio/x-flac", "coverArt": 3, - "created": "2019-06-05T16:00:10.552108331+01:00", + "created": "2019-06-06T16:38:39.302489659+01:00", + "duration": 174, "id": 12, "parent": 3, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/01.14 Do the Du (casse).flac", @@ -32,9 +34,11 @@ "albumId": 3, "artist": "A Certain Ratio", "artistId": 1, + "bitRate": 916, "contentType": "audio/x-flac", "coverArt": 3, - "created": "2019-06-05T16:00:10.550632503+01:00", + "created": "2019-06-06T16:38:39.301301007+01:00", + "duration": 142, "id": 8, "parent": 3, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/02.14 Faceless.flac", @@ -49,9 +53,11 @@ "albumId": 3, "artist": "A Certain Ratio", "artistId": 1, + "bitRate": 957, "contentType": "audio/x-flac", "coverArt": 3, - "created": "2019-06-05T16:00:10.549864008+01:00", + "created": "2019-06-06T16:38:39.300698509+01:00", + "duration": 174, "id": 6, "parent": 3, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/03.14 Crippled Child.flac", @@ -66,9 +72,11 @@ "albumId": 3, "artist": "A Certain Ratio", "artistId": 1, + "bitRate": 961, "contentType": "audio/x-flac", "coverArt": 3, - "created": "2019-06-05T16:00:10.551742258+01:00", + "created": "2019-06-06T16:38:39.302194015+01:00", + "duration": 201, "id": 11, "parent": 3, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/04.14 Choir.flac", @@ -83,9 +91,11 @@ "albumId": 3, "artist": "A Certain Ratio", "artistId": 1, + "bitRate": 924, "contentType": "audio/x-flac", "coverArt": 3, - "created": "2019-06-05T16:00:10.548393601+01:00", + "created": "2019-06-06T16:38:39.299490189+01:00", + "duration": 210, "id": 2, "parent": 3, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/05.14 Flight.flac", @@ -100,9 +110,11 @@ "albumId": 3, "artist": "A Certain Ratio", "artistId": 1, + "bitRate": 961, "contentType": "audio/x-flac", "coverArt": 3, - "created": "2019-06-05T16:00:10.552469878+01:00", + "created": "2019-06-06T16:38:39.302789079+01:00", + "duration": 131, "id": 13, "parent": 3, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/06.14 I Feel.flac", @@ -117,9 +129,11 @@ "albumId": 3, "artist": "A Certain Ratio", "artistId": 1, + "bitRate": 929, "contentType": "audio/x-flac", "coverArt": 3, - "created": "2019-06-05T16:00:10.552842449+01:00", + "created": "2019-06-06T16:38:39.303072046+01:00", + "duration": 148, "id": 14, "parent": 3, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/07.14 Strain.flac", @@ -134,9 +148,11 @@ "albumId": 3, "artist": "A Certain Ratio", "artistId": 1, + "bitRate": 898, "contentType": "audio/x-flac", "coverArt": 3, - "created": "2019-06-05T16:00:10.549504916+01:00", + "created": "2019-06-06T16:38:39.300381932+01:00", + "duration": 217, "id": 5, "parent": 3, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/08.14 All Night Party.flac", @@ -151,9 +167,11 @@ "albumId": 3, "artist": "A Certain Ratio", "artistId": 1, + "bitRate": 877, "contentType": "audio/x-flac", "coverArt": 3, - "created": "2019-06-05T16:00:10.549134887+01:00", + "created": "2019-06-06T16:38:39.300087164+01:00", + "duration": 235, "id": 4, "parent": 3, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/09.14 Oceans.flac", @@ -168,9 +186,11 @@ "albumId": 3, "artist": "A Certain Ratio", "artistId": 1, + "bitRate": 888, "contentType": "audio/x-flac", "coverArt": 3, - "created": "2019-06-05T16:00:10.551373999+01:00", + "created": "2019-06-06T16:38:39.301890876+01:00", + "duration": 212, "id": 10, "parent": 3, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/10.14 The Choir.flac", @@ -185,9 +205,11 @@ "albumId": 3, "artist": "A Certain Ratio", "artistId": 1, + "bitRate": 916, "contentType": "audio/x-flac", "coverArt": 3, - "created": "2019-06-05T16:00:10.550996621+01:00", + "created": "2019-06-06T16:38:39.301604638+01:00", + "duration": 205, "id": 9, "parent": 3, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/11.14 The Fox.flac", @@ -202,9 +224,11 @@ "albumId": 3, "artist": "A Certain Ratio", "artistId": 1, + "bitRate": 900, "contentType": "audio/x-flac", "coverArt": 3, - "created": "2019-06-05T16:00:10.55027053+01:00", + "created": "2019-06-06T16:38:39.301006358+01:00", + "duration": 144, "id": 7, "parent": 3, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/12.14 Suspect.flac", @@ -219,9 +243,11 @@ "albumId": 3, "artist": "A Certain Ratio", "artistId": 1, + "bitRate": 877, "contentType": "audio/x-flac", "coverArt": 3, - "created": "2019-06-05T16:00:10.547986038+01:00", + "created": "2019-06-06T16:38:39.299163755+01:00", + "duration": 332, "id": 1, "parent": 3, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/13.14 Flight.flac", @@ -236,9 +262,11 @@ "albumId": 3, "artist": "A Certain Ratio", "artistId": 1, + "bitRate": 893, "contentType": "audio/x-flac", "coverArt": 3, - "created": "2019-06-05T16:00:10.548763765+01:00", + "created": "2019-06-06T16:38:39.299791782+01:00", + "duration": 213, "id": 3, "parent": 3, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/14.14 Genotype_Phenotype.flac", diff --git a/server/handler/test_data/test_get_album_without_cover b/server/handler/test_data/test_get_album_without_cover index 0b9b94f..309f458 100644 --- a/server/handler/test_data/test_get_album_without_cover +++ b/server/handler/test_data/test_get_album_without_cover @@ -4,8 +4,7 @@ "version": "1.9.0", "album": { "id": 2, - "coverArt": 2, - "created": "2019-06-05T16:00:10.547172057+01:00" + "created": "2019-06-06T16:38:39.298507437+01:00" } } } diff --git a/server/handler/test_data/test_get_artist_id_one b/server/handler/test_data/test_get_artist_id_one index 279a8a6..1ece5d9 100644 --- a/server/handler/test_data/test_get_artist_id_one +++ b/server/handler/test_data/test_get_artist_id_one @@ -12,15 +12,14 @@ "artistId": 1, "artist": "A Certain Ratio", "name": "The Graveyard and the Ballroom", - "created": "2019-06-05T16:00:10.54747823+01:00" + "created": "2019-06-06T16:38:39.298724062+01:00" }, { "id": 4, - "coverArt": 4, "artistId": 1, "artist": "A Certain Ratio", "name": "To Each...", - "created": "2019-06-05T16:00:10.553065063+01:00" + "created": "2019-06-06T16:38:39.303278797+01:00" } ] } diff --git a/server/handler/test_data/test_get_artist_id_three b/server/handler/test_data/test_get_artist_id_three index 2cb1d18..10fbb5c 100644 --- a/server/handler/test_data/test_get_artist_id_three +++ b/server/handler/test_data/test_get_artist_id_three @@ -12,7 +12,7 @@ "artistId": 3, "artist": "Anikas", "name": "Anika", - "created": "2019-06-05T16:00:10.565661506+01:00" + "created": "2019-06-06T16:38:39.31657693+01:00" } ] } diff --git a/server/handler/test_data/test_get_artist_id_two b/server/handler/test_data/test_get_artist_id_two index 50ebb3b..e314709 100644 --- a/server/handler/test_data/test_get_artist_id_two +++ b/server/handler/test_data/test_get_artist_id_two @@ -12,7 +12,7 @@ "artistId": 2, "artist": "13th Floor Elevators", "name": "Easter Everywhere", - "created": "2019-06-05T16:00:10.556862345+01:00" + "created": "2019-06-06T16:38:39.306600701+01:00" }, { "id": 7, @@ -20,7 +20,7 @@ "artistId": 2, "artist": "13th Floor Elevators", "name": "The Psychedelic Sounds of the 13th Floor Elevators", - "created": "2019-06-05T16:00:10.560355528+01:00" + "created": "2019-06-06T16:38:39.309763889+01:00" } ] } diff --git a/server/handler/test_data/test_get_music_directory_with_tracks b/server/handler/test_data/test_get_music_directory_with_tracks index b954d3a..35a5a40 100644 --- a/server/handler/test_data/test_get_music_directory_with_tracks +++ b/server/handler/test_data/test_get_music_directory_with_tracks @@ -10,9 +10,11 @@ { "album": "(1994) The Graveyard and the Ballroom", "artist": "A Certain Ratio", + "bitRate": 922, "contentType": "audio/x-flac", "coverArt": 3, "created": "0001-01-01T00:00:00Z", + "duration": 174, "id": 12, "parent": 3, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/01.14 Do the Du (casse).flac", @@ -25,9 +27,11 @@ { "album": "(1994) The Graveyard and the Ballroom", "artist": "A Certain Ratio", + "bitRate": 916, "contentType": "audio/x-flac", "coverArt": 3, "created": "0001-01-01T00:00:00Z", + "duration": 142, "id": 8, "parent": 3, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/02.14 Faceless.flac", @@ -40,9 +44,11 @@ { "album": "(1994) The Graveyard and the Ballroom", "artist": "A Certain Ratio", + "bitRate": 957, "contentType": "audio/x-flac", "coverArt": 3, "created": "0001-01-01T00:00:00Z", + "duration": 174, "id": 6, "parent": 3, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/03.14 Crippled Child.flac", @@ -55,9 +61,11 @@ { "album": "(1994) The Graveyard and the Ballroom", "artist": "A Certain Ratio", + "bitRate": 961, "contentType": "audio/x-flac", "coverArt": 3, "created": "0001-01-01T00:00:00Z", + "duration": 201, "id": 11, "parent": 3, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/04.14 Choir.flac", @@ -70,9 +78,11 @@ { "album": "(1994) The Graveyard and the Ballroom", "artist": "A Certain Ratio", + "bitRate": 924, "contentType": "audio/x-flac", "coverArt": 3, "created": "0001-01-01T00:00:00Z", + "duration": 210, "id": 2, "parent": 3, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/05.14 Flight.flac", @@ -85,9 +95,11 @@ { "album": "(1994) The Graveyard and the Ballroom", "artist": "A Certain Ratio", + "bitRate": 961, "contentType": "audio/x-flac", "coverArt": 3, "created": "0001-01-01T00:00:00Z", + "duration": 131, "id": 13, "parent": 3, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/06.14 I Feel.flac", @@ -100,9 +112,11 @@ { "album": "(1994) The Graveyard and the Ballroom", "artist": "A Certain Ratio", + "bitRate": 929, "contentType": "audio/x-flac", "coverArt": 3, "created": "0001-01-01T00:00:00Z", + "duration": 148, "id": 14, "parent": 3, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/07.14 Strain.flac", @@ -115,9 +129,11 @@ { "album": "(1994) The Graveyard and the Ballroom", "artist": "A Certain Ratio", + "bitRate": 898, "contentType": "audio/x-flac", "coverArt": 3, "created": "0001-01-01T00:00:00Z", + "duration": 217, "id": 5, "parent": 3, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/08.14 All Night Party.flac", @@ -130,9 +146,11 @@ { "album": "(1994) The Graveyard and the Ballroom", "artist": "A Certain Ratio", + "bitRate": 877, "contentType": "audio/x-flac", "coverArt": 3, "created": "0001-01-01T00:00:00Z", + "duration": 235, "id": 4, "parent": 3, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/09.14 Oceans.flac", @@ -145,9 +163,11 @@ { "album": "(1994) The Graveyard and the Ballroom", "artist": "A Certain Ratio", + "bitRate": 888, "contentType": "audio/x-flac", "coverArt": 3, "created": "0001-01-01T00:00:00Z", + "duration": 212, "id": 10, "parent": 3, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/10.14 The Choir.flac", @@ -160,9 +180,11 @@ { "album": "(1994) The Graveyard and the Ballroom", "artist": "A Certain Ratio", + "bitRate": 916, "contentType": "audio/x-flac", "coverArt": 3, "created": "0001-01-01T00:00:00Z", + "duration": 205, "id": 9, "parent": 3, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/11.14 The Fox.flac", @@ -175,9 +197,11 @@ { "album": "(1994) The Graveyard and the Ballroom", "artist": "A Certain Ratio", + "bitRate": 900, "contentType": "audio/x-flac", "coverArt": 3, "created": "0001-01-01T00:00:00Z", + "duration": 144, "id": 7, "parent": 3, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/12.14 Suspect.flac", @@ -190,9 +214,11 @@ { "album": "(1994) The Graveyard and the Ballroom", "artist": "A Certain Ratio", + "bitRate": 877, "contentType": "audio/x-flac", "coverArt": 3, "created": "0001-01-01T00:00:00Z", + "duration": 332, "id": 1, "parent": 3, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/13.14 Flight.flac", @@ -205,9 +231,11 @@ { "album": "(1994) The Graveyard and the Ballroom", "artist": "A Certain Ratio", + "bitRate": 893, "contentType": "audio/x-flac", "coverArt": 3, "created": "0001-01-01T00:00:00Z", + "duration": 213, "id": 3, "parent": 3, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/14.14 Genotype_Phenotype.flac", diff --git a/server/handler/test_data/test_get_music_directory_without_tracks b/server/handler/test_data/test_get_music_directory_without_tracks index 4702d84..325fb24 100644 --- a/server/handler/test_data/test_get_music_directory_without_tracks +++ b/server/handler/test_data/test_get_music_directory_without_tracks @@ -16,7 +16,6 @@ "title": "(1994) The Graveyard and the Ballroom" }, { - "coverArt": 4, "created": "0001-01-01T00:00:00Z", "id": 4, "isDir": true, diff --git a/server/handler/test_data/test_search_three_q_13 b/server/handler/test_data/test_search_three_q_13 index 5f848ed..c70a7c2 100644 --- a/server/handler/test_data/test_search_three_q_13 +++ b/server/handler/test_data/test_search_three_q_13 @@ -16,7 +16,7 @@ "artistId": 2, "artist": "13th Floor Elevators", "name": "The Psychedelic Sounds of the 13th Floor Elevators", - "created": "2019-06-05T16:00:10.560355528+01:00" + "created": "2019-06-06T16:38:39.309763889+01:00" } ] } diff --git a/server/handler/test_data/test_search_three_q_ani b/server/handler/test_data/test_search_three_q_ani index 69e491b..bf21ecf 100644 --- a/server/handler/test_data/test_search_three_q_ani +++ b/server/handler/test_data/test_search_three_q_ani @@ -16,7 +16,7 @@ "artistId": 3, "artist": "Anikas", "name": "Anika", - "created": "2019-06-05T16:00:10.565661506+01:00" + "created": "2019-06-06T16:38:39.31657693+01:00" } ] } diff --git a/server/handler/test_data/test_search_two_q_13 b/server/handler/test_data/test_search_two_q_13 index f9f8334..db2f5a2 100644 --- a/server/handler/test_data/test_search_two_q_13 +++ b/server/handler/test_data/test_search_two_q_13 @@ -24,9 +24,11 @@ { "album": "(1994) The Graveyard and the Ballroom", "artist": "A Certain Ratio", + "bitRate": 877, "contentType": "audio/x-flac", "coverArt": 3, "created": "0001-01-01T00:00:00Z", + "duration": 332, "id": 1, "parent": 3, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/13.14 Flight.flac", @@ -39,9 +41,11 @@ { "album": "(1966) The Psychedelic Sounds of the 13th Floor Elevators", "artist": "13th Floor Elevators", + "bitRate": 245, "contentType": "audio/mpeg", "coverArt": 7, "created": "0001-01-01T00:00:00Z", + "duration": 154, "id": 35, "parent": 7, "path": "13th Floor Lowervators/(1966) The Psychedelic Sounds of the 13th Floor Elevators/13.21 Before You Accuse Me.mp3",