refactor

2019-06-05 16:03:01 +01:00
parent cc43c93610
commit 406b133713
44 changed files with 804 additions and 718 deletions
--- a/server/handler/construct_sub_by_folder.go
+++ b/server/handler/construct_sub_by_folder.go
@@ -1,15 +1,17 @@
 package handler

 import (
+	"path"
+
 	"github.com/sentriz/gonic/model"
 	"github.com/sentriz/gonic/server/subsonic"
 )

-func makeChildFromFolder(f *model.Folder, parent *model.Folder) *subsonic.Track {
+func makeChildFromFolder(f *model.Album, parent *model.Album) *subsonic.Track {
 	child := &subsonic.Track{
 		ID:      f.ID,
-		Title:   f.Name,
-		CoverID: f.CoverID,
+		CoverID: f.ID,
+		Title:   f.RightPath,
 		IsDir:   true,
 	}
 	if parent != nil {
@@ -18,48 +20,52 @@ func makeChildFromFolder(f *model.Folder, parent *model.Folder) *subsonic.Track
 	return child
 }

-func makeChildFromTrack(t *model.Track, parent *model.Folder) *subsonic.Track {
+func makeChildFromTrack(t *model.Track, parent *model.Album) *subsonic.Track {
 	return &subsonic.Track{
 		ID:          t.ID,
-		Album:       t.Album.Title,
-		Artist:      t.TrackArtist,
-		ContentType: t.ContentType,
-		Path:        t.Path,
+		Album:       t.Album.RightPath,
+		ContentType: t.MIME(),
+		Suffix:      t.Ext(),
 		Size:        t.Size,
-		Suffix:      t.Suffix,
-		Title:       t.Title,
-		TrackNumber: t.TrackNumber,
-		ParentID:    parent.ID,
-		CoverID:     parent.CoverID,
-		Duration:    0,
-		IsDir:       false,
-		Type:        "music",
+		Artist:      t.TagTrackArtist,
+		Title:       t.TagTitle,
+		TrackNumber: t.TagTrackNumber,
+		Path: path.Join(
+			parent.LeftPath,
+			parent.RightPath,
+			t.Filename,
+		),
+		ParentID: parent.ID,
+		CoverID:  parent.ID,
+		Duration: 0,
+		IsDir:    false,
+		Type:     "music",
 	}
 }

-func makeAlbumFromFolder(f *model.Folder) *subsonic.Album {
+func makeAlbumFromFolder(f *model.Album) *subsonic.Album {
 	return &subsonic.Album{
 		ID:       f.ID,
-		Title:    f.Name,
-		CoverID:  f.CoverID,
+		Title:    f.RightPath,
+		CoverID:  f.ID,
 		ParentID: f.ParentID,
-		Artist:   f.Parent.Name,
+		Artist:   f.Parent.RightPath,
 		IsDir:    true,
 	}
 }

-func makeArtistFromFolder(f *model.Folder) *subsonic.Artist {
+func makeArtistFromFolder(f *model.Album) *subsonic.Artist {
 	return &subsonic.Artist{
 		ID:   f.ID,
-		Name: f.Name,
+		Name: f.RightPath,
 	}
 }

-func makeDirFromFolder(f *model.Folder, children []*subsonic.Track) *subsonic.Directory {
+func makeDirFromFolder(f *model.Album, children []*subsonic.Track) *subsonic.Directory {
 	return &subsonic.Directory{
 		ID:       f.ID,
 		Parent:   f.ParentID,
-		Name:     f.Name,
+		Name:     f.RightPath,
 		Children: children,
 	}
 }
--- a/server/handler/construct_sub_by_tags.go
+++ b/server/handler/construct_sub_by_tags.go
@@ -1,6 +1,8 @@
 package handler

 import (
+	"path"
+
 	"github.com/sentriz/gonic/model"
 	"github.com/sentriz/gonic/server/subsonic"
 )
@@ -8,9 +10,9 @@ import (
 func makeAlbumFromAlbum(a *model.Album, artist *model.Artist) *subsonic.Album {
 	return &subsonic.Album{
 		ID:       a.ID,
-		Name:     a.Title,
+		Name:     a.TagTitle,
 		Created:  a.CreatedAt,
-		CoverID:  a.CoverID,
+		CoverID:  a.ID,
 		Artist:   artist.Name,
 		ArtistID: artist.ID,
 	}
@@ -19,20 +21,24 @@ func makeAlbumFromAlbum(a *model.Album, artist *model.Artist) *subsonic.Album {
 func makeTrackFromTrack(t *model.Track, album *model.Album) *subsonic.Track {
 	return &subsonic.Track{
 		ID:          t.ID,
-		Title:       t.Title,
-		Artist:      t.TrackArtist,
-		TrackNumber: t.TrackNumber,
-		ContentType: t.ContentType,
-		Path:        t.Path,
-		ParentID:    t.FolderID,
-		Suffix:      t.Suffix,
+		ContentType: t.MIME(),
+		Suffix:      t.Ext(),
+		ParentID:    t.AlbumID,
 		CreatedAt:   t.CreatedAt,
 		Size:        t.Size,
-		Album:       album.Title,
-		AlbumID:     album.ID,
-		ArtistID:    album.Artist.ID,
-		CoverID:     album.CoverID,
-		Type:        "music",
+		Title:       t.TagTitle,
+		Artist:      t.TagTrackArtist,
+		TrackNumber: t.TagTrackNumber,
+		Path: path.Join(
+			album.LeftPath,
+			album.RightPath,
+			t.Filename,
+		),
+		Album:    album.TagTitle,
+		AlbumID:  album.ID,
+		ArtistID: album.TagArtist.ID,
+		CoverID:  album.ID,
+		Type:     "music",
 	}
 }

--- a/server/handler/handler.go
+++ b/server/handler/handler.go
@@ -25,7 +25,9 @@ type Controller struct {

 func (c *Controller) GetSetting(key string) string {
 	var setting model.Setting
-	c.DB.Where("key = ?", key).First(&setting)
+	c.DB.
+		Where("key = ?", key).
+		First(&setting)
 	return setting.Value
 }

--- a/server/handler/handler_admin.go
+++ b/server/handler/handler_admin.go
@@ -128,7 +128,10 @@ func (c *Controller) ServeChangePassword(w http.ResponseWriter, r *http.Request)
 		return
 	}
 	var user model.User
-	err := c.DB.Where("name = ?", username).First(&user).Error
+	err := c.DB.
+		Where("name = ?", username).
+		First(&user).
+		Error
 	if gorm.IsRecordNotFoundError(err) {
 		http.Error(w, "couldn't find a user with that name", 400)
 		return
@@ -142,7 +145,9 @@ func (c *Controller) ServeChangePasswordDo(w http.ResponseWriter, r *http.Reques
 	session := r.Context().Value(contextSessionKey).(*sessions.Session)
 	username := r.URL.Query().Get("user")
 	var user model.User
-	c.DB.Where("name = ?", username).First(&user)
+	c.DB.
+		Where("name = ?", username).
+		First(&user)
 	passwordOne := r.FormValue("password_one")
 	passwordTwo := r.FormValue("password_two")
 	err := validatePasswords(passwordOne, passwordTwo)
@@ -164,7 +169,10 @@ func (c *Controller) ServeDeleteUser(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	var user model.User
-	err := c.DB.Where("name = ?", username).First(&user).Error
+	err := c.DB.
+		Where("name = ?", username).
+		First(&user).
+		Error
 	if gorm.IsRecordNotFoundError(err) {
 		http.Error(w, "couldn't find a user with that name", 400)
 		return
@@ -177,7 +185,9 @@ func (c *Controller) ServeDeleteUser(w http.ResponseWriter, r *http.Request) {
 func (c *Controller) ServeDeleteUserDo(w http.ResponseWriter, r *http.Request) {
 	username := r.URL.Query().Get("user")
 	var user model.User
-	c.DB.Where("name = ?", username).First(&user)
+	c.DB.
+		Where("name = ?", username).
+		First(&user)
 	c.DB.Delete(&user)
 	http.Redirect(w, r, "/admin/home", http.StatusSeeOther)
 }
--- a/server/handler/handler_admin_utils_test.go
+++ b/server/handler/handler_admin_utils_test.go
@@ -22,7 +22,9 @@ func TestFirstExisting(t *testing.T) {
 			"default"},
 	}
 	for _, tc := range cases {
+		tc := tc // pin
 		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
 			actu := firstExisting(tc.or, tc.values...)
 			if actu != tc.exp {
 				t.Errorf("expected %q, got %q", tc.exp, actu)
--- a/server/handler/handler_sub_by_folder.go
+++ b/server/handler/handler_sub_by_folder.go
@@ -19,12 +19,14 @@ import (
 // under the root directory

 func (c *Controller) GetIndexes(w http.ResponseWriter, r *http.Request) {
-	var folders []model.Folder
-	c.DB.Where("parent_id = 1").Find(&folders)
+	var folders []model.Album
+	c.DB.
+		Where("parent_id = 1").
+		Find(&folders)
 	var indexMap = make(map[rune]*subsonic.Index)
 	var indexes []*subsonic.Index
 	for _, folder := range folders {
-		i := indexOf(folder.Name)
+		i := indexOf(folder.RightPath)
 		index, ok := indexMap[i]
 		if !ok {
 			index = &subsonic.Index{
@@ -37,7 +39,7 @@ func (c *Controller) GetIndexes(w http.ResponseWriter, r *http.Request) {
 		index.Artists = append(index.Artists,
 			makeArtistFromFolder(&folder))
 	}
-	sort.Slice(indexes[:], func(i, j int) bool {
+	sort.Slice(indexes, func(i, j int) bool {
 		return indexes[i].Name < indexes[j].Name
 	})
 	sub := subsonic.NewResponse()
@@ -55,11 +57,11 @@ func (c *Controller) GetMusicDirectory(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	childrenObj := []*subsonic.Track{}
-	var folder model.Folder
+	var folder model.Album
 	c.DB.First(&folder, id)
 	//
 	// start looking for child childFolders in the current dir
-	var childFolders []model.Folder
+	var childFolders []model.Album
 	c.DB.
 		Where("parent_id = ?", id).
 		Find(&childFolders)
@@ -71,18 +73,18 @@ func (c *Controller) GetMusicDirectory(w http.ResponseWriter, r *http.Request) {
 	// start looking for child childTracks in the current dir
 	var childTracks []model.Track
 	c.DB.
-		Where("folder_id = ?", id).
+		Where("album_id = ?", id).
 		Preload("Album").
-		Order("title").
+		Order("filename").
 		Find(&childTracks)
 	for _, c := range childTracks {
+		toAppend := makeChildFromTrack(&c, &folder)
 		if getStrParam(r, "c") == "Jamstash" {
 			// jamstash thinks it can't play flacs
-			c.ContentType = "audio/mpeg"
-			c.Suffix = "mp3"
+			toAppend.ContentType = "audio/mpeg"
+			toAppend.Suffix = "mp3"
 		}
-		childrenObj = append(childrenObj,
-			makeChildFromTrack(&c, &folder))
+		childrenObj = append(childrenObj, toAppend)
 	}
 	//
 	// respond section
@@ -103,16 +105,16 @@ func (c *Controller) GetAlbumList(w http.ResponseWriter, r *http.Request) {
 	switch listType {
 	case "alphabeticalByArtist":
 		q = q.Joins(`
-			JOIN folders AS parent_folders
-			ON folders.parent_id = parent_folders.id`)
-		q = q.Order("parent_folders.name")
+			JOIN albums AS parent_albums
+			ON albums.parent_id = parent_albums.id`)
+		q = q.Order("parent_albums.right_path")
 	case "alphabeticalByName":
-		q = q.Order("name")
+		q = q.Order("right_path")
 	case "frequent":
 		user := r.Context().Value(contextUserKey).(*model.User)
 		q = q.Joins(`
 			JOIN plays
-			ON folders.id = plays.folder_id AND plays.user_id = ?`,
+			ON albums.id = plays.album_id AND plays.user_id = ?`,
 			user.ID)
 		q = q.Order("plays.count DESC")
 	case "newest":
@@ -123,7 +125,7 @@ func (c *Controller) GetAlbumList(w http.ResponseWriter, r *http.Request) {
 		user := r.Context().Value(contextUserKey).(*model.User)
 		q = q.Joins(`
 			JOIN plays
-			ON folders.id = plays.folder_id AND plays.user_id = ?`,
+			ON albums.id = plays.album_id AND plays.user_id = ?`,
 			user.ID)
 		q = q.Order("plays.time DESC")
 	default:
@@ -131,9 +133,9 @@ func (c *Controller) GetAlbumList(w http.ResponseWriter, r *http.Request) {
 			"unknown value `%s` for parameter 'type'", listType)
 		return
 	}
-	var folders []model.Folder
+	var folders []model.Album
 	q.
-		Where("folders.has_tracks = 1").
+		Where("albums.tag_artist_id IS NOT NULL").
 		Offset(getIntParamOr(r, "offset", 0)).
 		Limit(getIntParamOr(r, "size", 10)).
 		Preload("Parent").
@@ -158,9 +160,9 @@ func (c *Controller) SearchTwo(w http.ResponseWriter, r *http.Request) {
 	results := &subsonic.SearchResultTwo{}
 	//
 	// search "artists"
-	var artists []model.Folder
+	var artists []model.Album
 	c.DB.
-		Where("parent_id = 1 AND name LIKE ?", query).
+		Where("parent_id = 1 AND right_path LIKE ?", query).
 		Offset(getIntParamOr(r, "artistOffset", 0)).
 		Limit(getIntParamOr(r, "artistCount", 20)).
 		Find(&artists)
@@ -170,10 +172,10 @@ func (c *Controller) SearchTwo(w http.ResponseWriter, r *http.Request) {
 	}
 	//
 	// search "albums"
-	var albums []model.Folder
+	var albums []model.Album
 	c.DB.
 		Preload("Parent").
-		Where("has_tracks = 1 AND name LIKE ?", query).
+		Where("tag_artist_id IS NOT NULL AND right_path LIKE ?", query).
 		Offset(getIntParamOr(r, "albumOffset", 0)).
 		Limit(getIntParamOr(r, "albumCount", 20)).
 		Find(&albums)
@@ -185,14 +187,14 @@ func (c *Controller) SearchTwo(w http.ResponseWriter, r *http.Request) {
 	// search tracks
 	var tracks []model.Track
 	c.DB.
-		Preload("Folder").
-		Where("title LIKE ?", query).
+		Preload("Album").
+		Where("filename LIKE ?", query).
 		Offset(getIntParamOr(r, "songOffset", 0)).
 		Limit(getIntParamOr(r, "songCount", 20)).
 		Find(&tracks)
 	for _, t := range tracks {
 		results.Tracks = append(results.Tracks,
-			makeChildFromTrack(&t, &t.Folder))
+			makeChildFromTrack(&t, &t.Album))
 	}
 	//
 	sub := subsonic.NewResponse()
--- a/server/handler/handler_sub_by_folder_test.go
+++ b/server/handler/handler_sub_by_folder_test.go
@@ -9,7 +9,7 @@ import (

 func TestGetIndexes(t *testing.T) {
 	testQueryCases(t, testController.GetIndexes, []*queryCase{
-		{url.Values{"id": []string{"2"}}, "id_two", false},
+		{url.Values{}, "no_args", false},
 	})
 }

--- a/server/handler/handler_sub_by_tags.go
+++ b/server/handler/handler_sub_by_tags.go
@@ -31,7 +31,7 @@ func (c *Controller) GetArtists(w http.ResponseWriter, r *http.Request) {
 		index.Artists = append(index.Artists,
 			makeArtistFromArtist(&artist))
 	}
-	sort.Slice(indexes.List[:], func(i, j int) bool {
+	sort.Slice(indexes.List, func(i, j int) bool {
 		return indexes.List[i].Name < indexes.List[j].Name
 	})
 	sub := subsonic.NewResponse()
@@ -66,9 +66,9 @@ func (c *Controller) GetAlbum(w http.ResponseWriter, r *http.Request) {
 	}
 	var album model.Album
 	err = c.DB.
-		Preload("Artist").
+		Preload("TagArtist").
 		Preload("Tracks", func(db *gorm.DB) *gorm.DB {
-			return db.Order("tracks.track_number")
+			return db.Order("tracks.tag_track_number")
 		}).
 		First(&album, id).
 		Error
@@ -77,7 +77,7 @@ func (c *Controller) GetAlbum(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	sub := subsonic.NewResponse()
-	sub.Album = makeAlbumFromAlbum(&album, &album.Artist)
+	sub.Album = makeAlbumFromAlbum(&album, &album.TagArtist)
 	for _, track := range album.Tracks {
 		sub.Album.Tracks = append(sub.Album.Tracks,
 			makeTrackFromTrack(&track, &album))
@@ -98,16 +98,16 @@ func (c *Controller) GetAlbumListTwo(w http.ResponseWriter, r *http.Request) {
 	case "alphabeticalByArtist":
 		q = q.Joins(`
 			JOIN artists
-			ON albums.artist_id = artists.id`)
+			ON albums.tag_artist_id = artists.id`)
 		q = q.Order("artists.name")
 	case "alphabeticalByName":
-		q = q.Order("title")
+		q = q.Order("tag_title")
 	case "byYear":
 		q = q.Where(
-			"year BETWEEN ? AND ?",
+			"tag_year BETWEEN ? AND ?",
 			getIntParamOr(r, "fromYear", 1800),
 			getIntParamOr(r, "toYear", 2200))
-		q = q.Order("year")
+		q = q.Order("tag_year")
 	case "frequent":
 		user := r.Context().Value(contextUserKey).(*model.User)
 		q = q.Joins(`
@@ -133,15 +133,16 @@ func (c *Controller) GetAlbumListTwo(w http.ResponseWriter, r *http.Request) {
 	}
 	var albums []model.Album
 	q.
+		Where("albums.tag_artist_id IS NOT NULL").
 		Offset(getIntParamOr(r, "offset", 0)).
 		Limit(getIntParamOr(r, "size", 10)).
-		Preload("Artist").
+		Preload("TagArtist").
 		Find(&albums)
 	sub := subsonic.NewResponse()
 	sub.AlbumsTwo = &subsonic.Albums{}
 	for _, album := range albums {
 		sub.AlbumsTwo.List = append(sub.AlbumsTwo.List,
-			makeAlbumFromAlbum(&album, &album.Artist))
+			makeAlbumFromAlbum(&album, &album.TagArtist))
 	}
 	respond(w, r, sub)
 }
@@ -171,21 +172,21 @@ func (c *Controller) SearchThree(w http.ResponseWriter, r *http.Request) {
 	// search "albums"
 	var albums []model.Album
 	c.DB.
-		Preload("Artist").
-		Where("title LIKE ?", query).
+		Preload("TagArtist").
+		Where("tag_title LIKE ?", query).
 		Offset(getIntParamOr(r, "albumOffset", 0)).
 		Limit(getIntParamOr(r, "albumCount", 20)).
 		Find(&albums)
 	for _, a := range albums {
 		results.Albums = append(results.Albums,
-			makeAlbumFromAlbum(&a, &a.Artist))
+			makeAlbumFromAlbum(&a, &a.TagArtist))
 	}
 	//
 	// search tracks
 	var tracks []model.Track
 	c.DB.
 		Preload("Album").
-		Where("title LIKE ?", query).
+		Where("tag_title LIKE ?", query).
 		Offset(getIntParamOr(r, "songOffset", 0)).
 		Limit(getIntParamOr(r, "songCount", 20)).
 		Find(&tracks)
--- a/server/handler/handler_sub_common.go
+++ b/server/handler/handler_sub_common.go
@@ -8,6 +8,7 @@ import (
 	"time"
 	"unicode"

+	"github.com/jinzhu/gorm"
 	"github.com/rainycape/unidecode"

 	"github.com/sentriz/gonic/model"
@@ -32,15 +33,20 @@ func (c *Controller) Stream(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	var track model.Track
-	c.DB.
+	err = c.DB.
 		Preload("Album").
-		Preload("Folder").
-		First(&track, id)
-	if track.Path == "" {
+		First(&track, id).
+		Error
+	if gorm.IsRecordNotFoundError(err) {
 		respondError(w, r, 70, "media with id `%d` was not found", id)
 		return
 	}
-	absPath := path.Join(c.MusicPath, track.Path)
+	absPath := path.Join(
+		c.MusicPath,
+		track.Album.LeftPath,
+		track.Album.RightPath,
+		track.Filename,
+	)
 	file, err := os.Open(absPath)
 	if err != nil {
 		respondError(w, r, 0, "error while streaming media: %v", err)
@@ -52,11 +58,12 @@ func (c *Controller) Stream(w http.ResponseWriter, r *http.Request) {
 	// after we've served the file, mark the album as played
 	user := r.Context().Value(contextUserKey).(*model.User)
 	play := model.Play{
-		AlbumID:  track.Album.ID,
-		FolderID: track.Folder.ID,
-		UserID:   user.ID,
+		AlbumID: track.Album.ID,
+		UserID:  user.ID,
 	}
-	c.DB.Where(play).First(&play)
+	c.DB.
+		Where(play).
+		First(&play)
 	play.Time = time.Now() // for getAlbumList?type=recent
 	play.Count++           // for getAlbumList?type=frequent
 	c.DB.Save(&play)
@@ -68,9 +75,26 @@ func (c *Controller) GetCoverArt(w http.ResponseWriter, r *http.Request) {
 		respondError(w, r, 10, "please provide an `id` parameter")
 		return
 	}
-	var cover model.Cover
-	c.DB.First(&cover, id)
-	w.Write(cover.Image)
+	var folder model.Album
+	err = c.DB.
+		Select("id, path, cover").
+		First(&folder, id).
+		Error
+	if gorm.IsRecordNotFoundError(err) {
+		respondError(w, r, 10, "could not find a cover with that id")
+		return
+	}
+	if folder.Cover == "" {
+		respondError(w, r, 10, "no cover found for that folder")
+		return
+	}
+	absPath := path.Join(
+		c.MusicPath,
+		folder.RightPath,
+		folder.LeftPath,
+		folder.Cover,
+	)
+	http.ServeFile(w, r, absPath)
 }

 func (c *Controller) GetLicence(w http.ResponseWriter, r *http.Request) {
--- a/server/handler/test_data/db
+++ b/server/handler/test_data/db
--- a/server/handler/test_data/test_get_album_list_alpha_artist
+++ b/server/handler/test_data/test_get_album_list_alpha_artist
@@ -6,7 +6,7 @@
      "album": [
        {
          "id": 6,
-          "coverArt": 2,
+          "coverArt": 6,
          "artist": "13th Floor Lowervators",
          "title": "(1967) Easter Nowhere",
          "parent": 5,
@@ -15,7 +15,7 @@
        },
        {
          "id": 7,
-          "coverArt": 3,
+          "coverArt": 7,
          "artist": "13th Floor Lowervators",
          "title": "(1966) The Psychedelic Sounds of the 13th Floor Elevators",
          "parent": 5,
@@ -24,7 +24,7 @@
        },
        {
          "id": 3,
-          "coverArt": 1,
+          "coverArt": 3,
          "artist": "A Certain Ratio",
          "title": "(1994) The Graveyard and the Ballroom",
          "parent": 2,
@@ -33,6 +33,7 @@
        },
        {
          "id": 4,
+          "coverArt": 4,
          "artist": "A Certain Ratio",
          "title": "(1981) To Each.",
          "parent": 2,
@@ -41,7 +42,7 @@
        },
        {
          "id": 11,
-          "coverArt": 4,
+          "coverArt": 11,
          "artist": "There",
          "title": "(2010) Anika",
          "parent": 10,
--- a/server/handler/test_data/test_get_album_list_alpha_name
+++ b/server/handler/test_data/test_get_album_list_alpha_name
@@ -6,7 +6,7 @@
      "album": [
        {
          "id": 7,
-          "coverArt": 3,
+          "coverArt": 7,
          "artist": "13th Floor Lowervators",
          "title": "(1966) The Psychedelic Sounds of the 13th Floor Elevators",
          "parent": 5,
@@ -15,7 +15,7 @@
        },
        {
          "id": 6,
-          "coverArt": 2,
+          "coverArt": 6,
          "artist": "13th Floor Lowervators",
          "title": "(1967) Easter Nowhere",
          "parent": 5,
@@ -24,6 +24,7 @@
        },
        {
          "id": 4,
+          "coverArt": 4,
          "artist": "A Certain Ratio",
          "title": "(1981) To Each.",
          "parent": 2,
@@ -32,7 +33,7 @@
        },
        {
          "id": 3,
-          "coverArt": 1,
+          "coverArt": 3,
          "artist": "A Certain Ratio",
          "title": "(1994) The Graveyard and the Ballroom",
          "parent": 2,
@@ -41,7 +42,7 @@
        },
        {
          "id": 11,
-          "coverArt": 4,
+          "coverArt": 11,
          "artist": "There",
          "title": "(2010) Anika",
          "parent": 10,
--- a/server/handler/test_data/test_get_album_list_newest
+++ b/server/handler/test_data/test_get_album_list_newest
@@ -6,7 +6,7 @@
      "album": [
        {
          "id": 11,
-          "coverArt": 4,
+          "coverArt": 11,
          "artist": "There",
          "title": "(2010) Anika",
          "parent": 10,
@@ -15,7 +15,7 @@
        },
        {
          "id": 7,
-          "coverArt": 3,
+          "coverArt": 7,
          "artist": "13th Floor Lowervators",
          "title": "(1966) The Psychedelic Sounds of the 13th Floor Elevators",
          "parent": 5,
@@ -24,7 +24,7 @@
        },
        {
          "id": 6,
-          "coverArt": 2,
+          "coverArt": 6,
          "artist": "13th Floor Lowervators",
          "title": "(1967) Easter Nowhere",
          "parent": 5,
@@ -33,6 +33,7 @@
        },
        {
          "id": 4,
+          "coverArt": 4,
          "artist": "A Certain Ratio",
          "title": "(1981) To Each.",
          "parent": 2,
@@ -41,7 +42,7 @@
        },
        {
          "id": 3,
-          "coverArt": 1,
+          "coverArt": 3,
          "artist": "A Certain Ratio",
          "title": "(1994) The Graveyard and the Ballroom",
          "parent": 2,
--- a/server/handler/test_data/test_get_album_list_random
+++ b/server/handler/test_data/test_get_album_list_random
@@ -4,44 +4,45 @@
    "version": "1.9.0",
    "albumList": {
      "album": [
-        {
-          "id": 11,
-          "coverArt": 4,
-          "artist": "There",
-          "title": "(2010) Anika",
-          "parent": 10,
-          "isDir": true,
-          "created": "0001-01-01T00:00:00Z"
-        },
-        {
-          "id": 6,
-          "coverArt": 2,
-          "artist": "13th Floor Lowervators",
-          "title": "(1967) Easter Nowhere",
-          "parent": 5,
-          "isDir": true,
-          "created": "0001-01-01T00:00:00Z"
-        },
-        {
-          "id": 4,
-          "artist": "A Certain Ratio",
-          "title": "(1981) To Each.",
-          "parent": 2,
-          "isDir": true,
-          "created": "0001-01-01T00:00:00Z"
-        },
        {
          "id": 3,
-          "coverArt": 1,
+          "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,
+          "artist": "There",
+          "title": "(2010) Anika",
+          "parent": 10,
+          "isDir": true,
+          "created": "0001-01-01T00:00:00Z"
+        },
+        {
+          "id": 4,
+          "coverArt": 4,
+          "artist": "A Certain Ratio",
+          "title": "(1981) To Each.",
+          "parent": 2,
+          "isDir": true,
+          "created": "0001-01-01T00:00:00Z"
+        },
+        {
+          "id": 6,
+          "coverArt": 6,
+          "artist": "13th Floor Lowervators",
+          "title": "(1967) Easter Nowhere",
+          "parent": 5,
+          "isDir": true,
+          "created": "0001-01-01T00:00:00Z"
+        },
        {
          "id": 7,
-          "coverArt": 3,
+          "coverArt": 7,
          "artist": "13th Floor Lowervators",
          "title": "(1966) The Psychedelic Sounds of the 13th Floor Elevators",
          "parent": 5,
--- a/server/handler/test_data/test_get_album_list_two_alpha_artist
+++ b/server/handler/test_data/test_get_album_list_two_alpha_artist
@@ -5,43 +5,44 @@
    "albumList2": {
      "album": [
        {
-          "id": 3,
-          "coverArt": 2,
+          "id": 6,
+          "coverArt": 6,
          "artistId": 2,
          "artist": "13th Floor Elevators",
          "name": "Easter Everywhere",
-          "created": "2019-05-28T20:59:03.010415595+01:00"
+          "created": "2019-06-05T16:00:10.556862345+01:00"
        },
        {
-          "id": 4,
-          "coverArt": 3,
+          "id": 7,
+          "coverArt": 7,
          "artistId": 2,
          "artist": "13th Floor Elevators",
          "name": "The Psychedelic Sounds of the 13th Floor Elevators",
-          "created": "2019-05-28T20:59:03.022922683+01:00"
+          "created": "2019-06-05T16:00:10.560355528+01:00"
        },
        {
-          "id": 1,
-          "coverArt": 1,
+          "id": 3,
+          "coverArt": 3,
          "artistId": 1,
          "artist": "A Certain Ratio",
          "name": "The Graveyard and the Ballroom",
-          "created": "2019-05-28T20:59:02.988372626+01:00"
+          "created": "2019-06-05T16:00:10.54747823+01:00"
        },
        {
-          "id": 2,
+          "id": 4,
+          "coverArt": 4,
          "artistId": 1,
          "artist": "A Certain Ratio",
          "name": "To Each...",
-          "created": "2019-05-28T20:59:02.995320471+01:00"
+          "created": "2019-06-05T16:00:10.553065063+01:00"
        },
        {
-          "id": 5,
-          "coverArt": 4,
+          "id": 11,
+          "coverArt": 11,
          "artistId": 3,
          "artist": "Anikas",
          "name": "Anika",
-          "created": "2019-05-28T20:59:03.035442597+01:00"
+          "created": "2019-06-05T16:00:10.565661506+01:00"
        }
      ]
    }
--- a/server/handler/test_data/test_get_album_list_two_alpha_name
+++ b/server/handler/test_data/test_get_album_list_two_alpha_name
@@ -5,43 +5,44 @@
    "albumList2": {
      "album": [
        {
-          "id": 5,
-          "coverArt": 4,
+          "id": 11,
+          "coverArt": 11,
          "artistId": 3,
          "artist": "Anikas",
          "name": "Anika",
-          "created": "2019-05-28T20:59:03.035442597+01:00"
+          "created": "2019-06-05T16:00:10.565661506+01:00"
        },
        {
-          "id": 3,
-          "coverArt": 2,
+          "id": 6,
+          "coverArt": 6,
          "artistId": 2,
          "artist": "13th Floor Elevators",
          "name": "Easter Everywhere",
-          "created": "2019-05-28T20:59:03.010415595+01:00"
+          "created": "2019-06-05T16:00:10.556862345+01:00"
        },
        {
-          "id": 1,
-          "coverArt": 1,
+          "id": 3,
+          "coverArt": 3,
          "artistId": 1,
          "artist": "A Certain Ratio",
          "name": "The Graveyard and the Ballroom",
-          "created": "2019-05-28T20:59:02.988372626+01:00"
+          "created": "2019-06-05T16:00:10.54747823+01:00"
        },
        {
-          "id": 4,
-          "coverArt": 3,
+          "id": 7,
+          "coverArt": 7,
          "artistId": 2,
          "artist": "13th Floor Elevators",
          "name": "The Psychedelic Sounds of the 13th Floor Elevators",
-          "created": "2019-05-28T20:59:03.022922683+01:00"
+          "created": "2019-06-05T16:00:10.560355528+01:00"
        },
        {
-          "id": 2,
+          "id": 4,
+          "coverArt": 4,
          "artistId": 1,
          "artist": "A Certain Ratio",
          "name": "To Each...",
-          "created": "2019-05-28T20:59:02.995320471+01:00"
+          "created": "2019-06-05T16:00:10.553065063+01:00"
        }
      ]
    }
--- a/server/handler/test_data/test_get_album_list_two_newest
+++ b/server/handler/test_data/test_get_album_list_two_newest
@@ -5,43 +5,44 @@
    "albumList2": {
      "album": [
        {
-          "id": 5,
-          "coverArt": 4,
+          "id": 11,
+          "coverArt": 11,
          "artistId": 3,
          "artist": "Anikas",
          "name": "Anika",
-          "created": "2019-05-28T20:59:03.035442597+01:00"
+          "created": "2019-06-05T16:00:10.565661506+01:00"
        },
        {
-          "id": 4,
-          "coverArt": 3,
+          "id": 7,
+          "coverArt": 7,
          "artistId": 2,
          "artist": "13th Floor Elevators",
          "name": "The Psychedelic Sounds of the 13th Floor Elevators",
-          "created": "2019-05-28T20:59:03.022922683+01:00"
+          "created": "2019-06-05T16:00:10.560355528+01:00"
        },
        {
-          "id": 3,
-          "coverArt": 2,
+          "id": 6,
+          "coverArt": 6,
          "artistId": 2,
          "artist": "13th Floor Elevators",
          "name": "Easter Everywhere",
-          "created": "2019-05-28T20:59:03.010415595+01:00"
+          "created": "2019-06-05T16:00:10.556862345+01:00"
        },
        {
-          "id": 2,
+          "id": 4,
+          "coverArt": 4,
          "artistId": 1,
          "artist": "A Certain Ratio",
          "name": "To Each...",
-          "created": "2019-05-28T20:59:02.995320471+01:00"
+          "created": "2019-06-05T16:00:10.553065063+01:00"
        },
        {
-          "id": 1,
-          "coverArt": 1,
+          "id": 3,
+          "coverArt": 3,
          "artistId": 1,
          "artist": "A Certain Ratio",
          "name": "The Graveyard and the Ballroom",
-          "created": "2019-05-28T20:59:02.988372626+01:00"
+          "created": "2019-06-05T16:00:10.54747823+01:00"
        }
      ]
    }
--- a/server/handler/test_data/test_get_album_list_two_random
+++ b/server/handler/test_data/test_get_album_list_two_random
@@ -6,42 +6,43 @@
      "album": [
        {
          "id": 4,
-          "coverArt": 3,
-          "artistId": 2,
-          "artist": "13th Floor Elevators",
-          "name": "The Psychedelic Sounds of the 13th Floor Elevators",
-          "created": "2019-05-28T20:59:03.022922683+01:00"
-        },
-        {
-          "id": 5,
          "coverArt": 4,
-          "artistId": 3,
-          "artist": "Anikas",
-          "name": "Anika",
-          "created": "2019-05-28T20:59:03.035442597+01:00"
-        },
-        {
-          "id": 1,
-          "coverArt": 1,
-          "artistId": 1,
-          "artist": "A Certain Ratio",
-          "name": "The Graveyard and the Ballroom",
-          "created": "2019-05-28T20:59:02.988372626+01:00"
-        },
-        {
-          "id": 3,
-          "coverArt": 2,
-          "artistId": 2,
-          "artist": "13th Floor Elevators",
-          "name": "Easter Everywhere",
-          "created": "2019-05-28T20:59:03.010415595+01:00"
-        },
-        {
-          "id": 2,
          "artistId": 1,
          "artist": "A Certain Ratio",
          "name": "To Each...",
-          "created": "2019-05-28T20:59:02.995320471+01:00"
+          "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": 3,
+          "coverArt": 3,
+          "artistId": 1,
+          "artist": "A Certain Ratio",
+          "name": "The Graveyard and the Ballroom",
+          "created": "2019-06-05T16:00:10.54747823+01:00"
+        },
+        {
+          "id": 7,
+          "coverArt": 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"
+        },
+        {
+          "id": 6,
+          "coverArt": 6,
+          "artistId": 2,
+          "artist": "13th Floor Elevators",
+          "name": "Easter Everywhere",
+          "created": "2019-06-05T16:00:10.556862345+01:00"
        }
      ]
    }
--- a/server/handler/test_data/test_get_album_with_cover
+++ b/server/handler/test_data/test_get_album_with_cover
@@ -4,181 +4,249 @@
    "version": "1.9.0",
    "album": {
      "id": 3,
-      "coverArt": 2,
-      "artistId": 2,
-      "artist": "13th Floor Elevators",
-      "name": "Easter Everywhere",
-      "created": "2019-05-28T20:59:03.010415595+01:00",
+      "coverArt": 3,
+      "artistId": 1,
+      "artist": "A Certain Ratio",
+      "name": "The Graveyard and the Ballroom",
+      "created": "2019-06-05T16:00:10.54747823+01:00",
      "song": [
        {
-          "album": "Easter Everywhere",
+          "album": "The Graveyard and the Ballroom",
          "albumId": 3,
-          "artist": "13th Floor Elevators",
-          "artistId": 2,
+          "artist": "A Certain Ratio",
+          "artistId": 1,
          "contentType": "audio/x-flac",
-          "coverArt": 2,
-          "created": "2019-05-28T20:59:03.01067974+01:00",
-          "id": 25,
-          "parent": 6,
-          "path": "13th Floor Lowervators/(1967) Easter Nowhere/01.10 Slip Inside This House.flac",
-          "size": 52229000,
+          "coverArt": 3,
+          "created": "2019-06-05T16:00:10.552108331+01:00",
+          "id": 12,
+          "parent": 3,
+          "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/01.14 Do the Du (casse).flac",
+          "size": 20545509,
          "suffix": "flac",
-          "title": "Slip Inside This House",
+          "title": "Do the Du (casse)",
          "track": 1,
          "type": "music"
        },
        {
-          "album": "Easter Everywhere",
+          "album": "The Graveyard and the Ballroom",
          "albumId": 3,
-          "artist": "13th Floor Elevators",
-          "artistId": 2,
+          "artist": "A Certain Ratio",
+          "artistId": 1,
          "contentType": "audio/x-flac",
-          "coverArt": 2,
-          "created": "2019-05-28T20:59:03.010814449+01:00",
-          "id": 27,
-          "parent": 6,
-          "path": "13th Floor Lowervators/(1967) Easter Nowhere/02.10 Slide Machine.flac",
-          "size": 22964562,
+          "coverArt": 3,
+          "created": "2019-06-05T16:00:10.550632503+01:00",
+          "id": 8,
+          "parent": 3,
+          "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/02.14 Faceless.flac",
+          "size": 16657561,
          "suffix": "flac",
-          "title": "Slide Machine",
+          "title": "Faceless",
          "track": 2,
          "type": "music"
        },
        {
-          "album": "Easter Everywhere",
+          "album": "The Graveyard and the Ballroom",
          "albumId": 3,
-          "artist": "13th Floor Elevators",
-          "artistId": 2,
+          "artist": "A Certain Ratio",
+          "artistId": 1,
          "contentType": "audio/x-flac",
-          "coverArt": 2,
-          "created": "2019-05-28T20:59:03.010880444+01:00",
-          "id": 28,
-          "parent": 6,
-          "path": "13th Floor Lowervators/(1967) Easter Nowhere/03.10 She Lives (In a Time of Her Own).flac",
-          "size": 18474888,
+          "coverArt": 3,
+          "created": "2019-06-05T16:00:10.549864008+01:00",
+          "id": 6,
+          "parent": 3,
+          "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/03.14 Crippled Child.flac",
+          "size": 21325811,
          "suffix": "flac",
-          "title": "She Lives (In a Time of Her Own)",
+          "title": "Crippled Child",
          "track": 3,
          "type": "music"
        },
        {
-          "album": "Easter Everywhere",
+          "album": "The Graveyard and the Ballroom",
          "albumId": 3,
-          "artist": "13th Floor Elevators",
-          "artistId": 2,
+          "artist": "A Certain Ratio",
+          "artistId": 1,
          "contentType": "audio/x-flac",
-          "coverArt": 2,
-          "created": "2019-05-28T20:59:03.011044654+01:00",
-          "id": 30,
-          "parent": 6,
-          "path": "13th Floor Lowervators/(1967) Easter Nowhere/04.10 Nobody to Love.flac",
-          "size": 18067448,
+          "coverArt": 3,
+          "created": "2019-06-05T16:00:10.551742258+01:00",
+          "id": 11,
+          "parent": 3,
+          "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/04.14 Choir.flac",
+          "size": 24728976,
          "suffix": "flac",
-          "title": "Nobody to Love",
+          "title": "Choir",
          "track": 4,
          "type": "music"
        },
        {
-          "album": "Easter Everywhere",
+          "album": "The Graveyard and the Ballroom",
          "albumId": 3,
-          "artist": "13th Floor Elevators",
-          "artistId": 2,
+          "artist": "A Certain Ratio",
+          "artistId": 1,
          "contentType": "audio/x-flac",
-          "coverArt": 2,
-          "created": "2019-05-28T20:59:03.011106774+01:00",
-          "id": 31,
-          "parent": 6,
-          "path": "13th Floor Lowervators/(1967) Easter Nowhere/05.10 Baby Blue.flac",
-          "size": 31828836,
+          "coverArt": 3,
+          "created": "2019-06-05T16:00:10.548393601+01:00",
+          "id": 2,
+          "parent": 3,
+          "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/05.14 Flight.flac",
+          "size": 24860635,
          "suffix": "flac",
-          "title": "Baby Blue",
+          "title": "Flight",
          "track": 5,
          "type": "music"
        },
        {
-          "album": "Easter Everywhere",
+          "album": "The Graveyard and the Ballroom",
          "albumId": 3,
-          "artist": "13th Floor Elevators",
-          "artistId": 2,
+          "artist": "A Certain Ratio",
+          "artistId": 1,
          "contentType": "audio/x-flac",
-          "coverArt": 2,
-          "created": "2019-05-28T20:59:03.011174899+01:00",
-          "id": 32,
-          "parent": 6,
-          "path": "13th Floor Lowervators/(1967) Easter Nowhere/06.10 Earthquake.flac",
-          "size": 29066645,
+          "coverArt": 3,
+          "created": "2019-06-05T16:00:10.552469878+01:00",
+          "id": 13,
+          "parent": 3,
+          "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/06.14 I Feel.flac",
+          "size": 16118749,
          "suffix": "flac",
-          "title": "Earthquake",
+          "title": "I Feel",
          "track": 6,
          "type": "music"
        },
        {
-          "album": "Easter Everywhere",
+          "album": "The Graveyard and the Ballroom",
          "albumId": 3,
-          "artist": "13th Floor Elevators",
-          "artistId": 2,
+          "artist": "A Certain Ratio",
+          "artistId": 1,
          "contentType": "audio/x-flac",
-          "coverArt": 2,
-          "created": "2019-05-28T20:59:03.010597689+01:00",
-          "id": 24,
-          "parent": 6,
-          "path": "13th Floor Lowervators/(1967) Easter Nowhere/07.10 Dust.flac",
-          "size": 22652796,
+          "coverArt": 3,
+          "created": "2019-06-05T16:00:10.552842449+01:00",
+          "id": 14,
+          "parent": 3,
+          "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/07.14 Strain.flac",
+          "size": 17608752,
          "suffix": "flac",
-          "title": "Dust",
+          "title": "Strain",
          "track": 7,
          "type": "music"
        },
        {
-          "album": "Easter Everywhere",
+          "album": "The Graveyard and the Ballroom",
          "albumId": 3,
-          "artist": "13th Floor Elevators",
-          "artistId": 2,
+          "artist": "A Certain Ratio",
+          "artistId": 1,
          "contentType": "audio/x-flac",
-          "coverArt": 2,
-          "created": "2019-05-28T20:59:03.010749083+01:00",
-          "id": 26,
-          "parent": 6,
-          "path": "13th Floor Lowervators/(1967) Easter Nowhere/08.10 Levitation.flac",
-          "size": 16354677,
+          "coverArt": 3,
+          "created": "2019-06-05T16:00:10.549504916+01:00",
+          "id": 5,
+          "parent": 3,
+          "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/08.14 All Night Party.flac",
+          "size": 24960016,
          "suffix": "flac",
-          "title": "Levitation",
+          "title": "All Night Party",
          "track": 8,
          "type": "music"
        },
        {
-          "album": "Easter Everywhere",
+          "album": "The Graveyard and the Ballroom",
          "albumId": 3,
-          "artist": "13th Floor Elevators",
-          "artistId": 2,
+          "artist": "A Certain Ratio",
+          "artistId": 1,
          "contentType": "audio/x-flac",
-          "coverArt": 2,
-          "created": "2019-05-28T20:59:03.011238025+01:00",
-          "id": 33,
-          "parent": 6,
-          "path": "13th Floor Lowervators/(1967) Easter Nowhere/09.10 I Had to Tell You.flac",
-          "size": 14261007,
+          "coverArt": 3,
+          "created": "2019-06-05T16:00:10.549134887+01:00",
+          "id": 4,
+          "parent": 3,
+          "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/09.14 Oceans.flac",
+          "size": 26401567,
          "suffix": "flac",
-          "title": "I Had to Tell You",
+          "title": "Oceans",
          "track": 9,
          "type": "music"
        },
        {
-          "album": "Easter Everywhere",
+          "album": "The Graveyard and the Ballroom",
          "albumId": 3,
-          "artist": "13th Floor Elevators",
-          "artistId": 2,
+          "artist": "A Certain Ratio",
+          "artistId": 1,
          "contentType": "audio/x-flac",
-          "coverArt": 2,
-          "created": "2019-05-28T20:59:03.010949903+01:00",
-          "id": 29,
-          "parent": 6,
-          "path": "13th Floor Lowervators/(1967) Easter Nowhere/10.10 Pictures (Leave Your Body Behind).flac",
-          "size": 39529576,
+          "coverArt": 3,
+          "created": "2019-06-05T16:00:10.551373999+01:00",
+          "id": 10,
+          "parent": 3,
+          "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/10.14 The Choir.flac",
+          "size": 24106680,
          "suffix": "flac",
-          "title": "Pictures (Leave Your Body Behind)",
+          "title": "The Choir",
          "track": 10,
          "type": "music"
+        },
+        {
+          "album": "The Graveyard and the Ballroom",
+          "albumId": 3,
+          "artist": "A Certain Ratio",
+          "artistId": 1,
+          "contentType": "audio/x-flac",
+          "coverArt": 3,
+          "created": "2019-06-05T16:00:10.550996621+01:00",
+          "id": 9,
+          "parent": 3,
+          "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/11.14 The Fox.flac",
+          "size": 24054498,
+          "suffix": "flac",
+          "title": "The Fox",
+          "track": 11,
+          "type": "music"
+        },
+        {
+          "album": "The Graveyard and the Ballroom",
+          "albumId": 3,
+          "artist": "A Certain Ratio",
+          "artistId": 1,
+          "contentType": "audio/x-flac",
+          "coverArt": 3,
+          "created": "2019-06-05T16:00:10.55027053+01:00",
+          "id": 7,
+          "parent": 3,
+          "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/12.14 Suspect.flac",
+          "size": 16592296,
+          "suffix": "flac",
+          "title": "Suspect",
+          "track": 12,
+          "type": "music"
+        },
+        {
+          "album": "The Graveyard and the Ballroom",
+          "albumId": 3,
+          "artist": "A Certain Ratio",
+          "artistId": 1,
+          "contentType": "audio/x-flac",
+          "coverArt": 3,
+          "created": "2019-06-05T16:00:10.547986038+01:00",
+          "id": 1,
+          "parent": 3,
+          "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/13.14 Flight.flac",
+          "size": 37302417,
+          "suffix": "flac",
+          "title": "Flight",
+          "track": 13,
+          "type": "music"
+        },
+        {
+          "album": "The Graveyard and the Ballroom",
+          "albumId": 3,
+          "artist": "A Certain Ratio",
+          "artistId": 1,
+          "contentType": "audio/x-flac",
+          "coverArt": 3,
+          "created": "2019-06-05T16:00:10.548763765+01:00",
+          "id": 3,
+          "parent": 3,
+          "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/14.14 Genotype_Phenotype.flac",
+          "size": 24349252,
+          "suffix": "flac",
+          "title": "Genotype/Phenotype",
+          "track": 14,
+          "type": "music"
        }
      ]
    }
--- a/server/handler/test_data/test_get_album_without_cover
+++ b/server/handler/test_data/test_get_album_without_cover
@@ -4,156 +4,8 @@
    "version": "1.9.0",
    "album": {
      "id": 2,
-      "artistId": 1,
-      "artist": "A Certain Ratio",
-      "name": "To Each...",
-      "created": "2019-05-28T20:59:02.995320471+01:00",
-      "song": [
-        {
-          "album": "To Each...",
-          "albumId": 2,
-          "artist": "A Certain Ratio",
-          "artistId": 1,
-          "contentType": "audio/x-flac",
-          "created": "2019-05-28T20:59:02.99562727+01:00",
-          "id": 16,
-          "parent": 4,
-          "path": "A Certain Ratio/(1981) To Each./01.09 Felch.flac",
-          "size": 24708838,
-          "suffix": "flac",
-          "title": "Felch",
-          "track": 1,
-          "type": "music"
-        },
-        {
-          "album": "To Each...",
-          "albumId": 2,
-          "artist": "A Certain Ratio",
-          "artistId": 1,
-          "contentType": "audio/x-flac",
-          "created": "2019-05-28T20:59:02.995889638+01:00",
-          "id": 20,
-          "parent": 4,
-          "path": "A Certain Ratio/(1981) To Each./02.09 My Spirit.flac",
-          "size": 17102404,
-          "suffix": "flac",
-          "title": "My Spirit",
-          "track": 2,
-          "type": "music"
-        },
-        {
-          "album": "To Each...",
-          "albumId": 2,
-          "artist": "A Certain Ratio",
-          "artistId": 1,
-          "contentType": "audio/x-flac",
-          "created": "2019-05-28T20:59:02.99609285+01:00",
-          "id": 23,
-          "parent": 4,
-          "path": "A Certain Ratio/(1981) To Each./03.09 Forced Laugh.flac",
-          "size": 37924980,
-          "suffix": "flac",
-          "title": "Forced Laugh",
-          "track": 3,
-          "type": "music"
-        },
-        {
-          "album": "To Each...",
-          "albumId": 2,
-          "artist": "A Certain Ratio",
-          "artistId": 1,
-          "contentType": "audio/x-flac",
-          "created": "2019-05-28T20:59:02.995953401+01:00",
-          "id": 21,
-          "parent": 4,
-          "path": "A Certain Ratio/(1981) To Each./04.09 Choir.flac",
-          "size": 21205583,
-          "suffix": "flac",
-          "title": "Choir",
-          "track": 4,
-          "type": "music"
-        },
-        {
-          "album": "To Each...",
-          "albumId": 2,
-          "artist": "A Certain Ratio",
-          "artistId": 1,
-          "contentType": "audio/x-flac",
-          "created": "2019-05-28T20:59:02.99569934+01:00",
-          "id": 17,
-          "parent": 4,
-          "path": "A Certain Ratio/(1981) To Each./05.09 Back to the Start.flac",
-          "size": 56733069,
-          "suffix": "flac",
-          "title": "Back to the Start",
-          "track": 5,
-          "type": "music"
-        },
-        {
-          "album": "To Each...",
-          "albumId": 2,
-          "artist": "A Certain Ratio",
-          "artistId": 1,
-          "contentType": "audio/x-flac",
-          "created": "2019-05-28T20:59:02.995826449+01:00",
-          "id": 19,
-          "parent": 4,
-          "path": "A Certain Ratio/(1981) To Each./06.09 The Fox.flac",
-          "size": 26835335,
-          "suffix": "flac",
-          "title": "The Fox",
-          "track": 6,
-          "type": "music"
-        },
-        {
-          "album": "To Each...",
-          "albumId": 2,
-          "artist": "A Certain Ratio",
-          "artistId": 1,
-          "contentType": "audio/x-flac",
-          "created": "2019-05-28T20:59:02.995544892+01:00",
-          "id": 15,
-          "parent": 4,
-          "path": "A Certain Ratio/(1981) To Each./07.09 Loss.flac",
-          "size": 20494369,
-          "suffix": "flac",
-          "title": "Loss",
-          "track": 7,
-          "type": "music"
-        },
-        {
-          "album": "To Each...",
-          "albumId": 2,
-          "artist": "A Certain Ratio",
-          "artistId": 1,
-          "contentType": "audio/x-flac",
-          "created": "2019-05-28T20:59:02.995761233+01:00",
-          "id": 18,
-          "parent": 4,
-          "path": "A Certain Ratio/(1981) To Each./08.09 Oceans.flac",
-          "size": 25233096,
-          "suffix": "flac",
-          "title": "Oceans",
-          "track": 8,
-          "type": "music"
-        },
-        {
-          "album": "To Each...",
-          "albumId": 2,
-          "artist": "A Certain Ratio",
-          "artistId": 1,
-          "contentType": "audio/x-flac",
-          "created": "2019-05-28T20:59:02.99603217+01:00",
-          "id": 22,
-          "parent": 4,
-          "path": "A Certain Ratio/(1981) To Each./09.09 Winter Hill.flac",
-          "size": 89483446,
-          "suffix": "flac",
-          "title": "Winter Hill",
-          "track": 9,
-          "type": "music"
-        }
-      ]
+      "coverArt": 2,
+      "created": "2019-06-05T16:00:10.547172057+01:00"
    }
  }
 }
--- a/server/handler/test_data/test_get_artist_id_one
+++ b/server/handler/test_data/test_get_artist_id_one
@@ -7,19 +7,20 @@
      "name": "A Certain Ratio",
      "album": [
        {
-          "id": 1,
-          "coverArt": 1,
+          "id": 3,
+          "coverArt": 3,
          "artistId": 1,
          "artist": "A Certain Ratio",
          "name": "The Graveyard and the Ballroom",
-          "created": "2019-05-28T20:59:02.988372626+01:00"
+          "created": "2019-06-05T16:00:10.54747823+01:00"
        },
        {
-          "id": 2,
+          "id": 4,
+          "coverArt": 4,
          "artistId": 1,
          "artist": "A Certain Ratio",
          "name": "To Each...",
-          "created": "2019-05-28T20:59:02.995320471+01:00"
+          "created": "2019-06-05T16:00:10.553065063+01:00"
        }
      ]
    }
--- a/server/handler/test_data/test_get_artist_id_three
+++ b/server/handler/test_data/test_get_artist_id_three
@@ -7,12 +7,12 @@
      "name": "Anikas",
      "album": [
        {
-          "id": 5,
-          "coverArt": 4,
+          "id": 11,
+          "coverArt": 11,
          "artistId": 3,
          "artist": "Anikas",
          "name": "Anika",
-          "created": "2019-05-28T20:59:03.035442597+01:00"
+          "created": "2019-06-05T16:00:10.565661506+01:00"
        }
      ]
    }
--- a/server/handler/test_data/test_get_artist_id_two
+++ b/server/handler/test_data/test_get_artist_id_two
@@ -7,20 +7,20 @@
      "name": "13th Floor Elevators",
      "album": [
        {
-          "id": 3,
-          "coverArt": 2,
+          "id": 6,
+          "coverArt": 6,
          "artistId": 2,
          "artist": "13th Floor Elevators",
          "name": "Easter Everywhere",
-          "created": "2019-05-28T20:59:03.010415595+01:00"
+          "created": "2019-06-05T16:00:10.556862345+01:00"
        },
        {
-          "id": 4,
-          "coverArt": 3,
+          "id": 7,
+          "coverArt": 7,
          "artistId": 2,
          "artist": "13th Floor Elevators",
          "name": "The Psychedelic Sounds of the 13th Floor Elevators",
-          "created": "2019-05-28T20:59:03.022922683+01:00"
+          "created": "2019-06-05T16:00:10.560355528+01:00"
        }
      ]
    }
--- a/server/handler/test_data/test_get_indexes_no_args
+++ b/server/handler/test_data/test_get_indexes_no_args
@@ -11,6 +11,10 @@
            {
              "id": 5,
              "name": "13th Floor Lowervators"
+            },
+            {
+              "id": 8,
+              "name": "___Anika"
            }
          ]
        },
@@ -20,10 +24,6 @@
            {
              "id": 2,
              "name": "A Certain Ratio"
-            },
-            {
-              "id": 8,
-              "name": "Anika"
            }
          ]
        }
--- a/server/handler/test_data/test_get_music_directory_with_tracks
+++ b/server/handler/test_data/test_get_music_directory_with_tracks
@@ -8,55 +8,10 @@
      "name": "(1994) The Graveyard and the Ballroom",
      "child": [
        {
-          "album": "The Graveyard and the Ballroom",
+          "album": "(1994) The Graveyard and the Ballroom",
          "artist": "A Certain Ratio",
          "contentType": "audio/x-flac",
-          "coverArt": 1,
-          "created": "0001-01-01T00:00:00Z",
-          "id": 5,
-          "parent": 3,
-          "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/08.14 All Night Party.flac",
-          "size": 24960016,
-          "suffix": "flac",
-          "title": "All Night Party",
-          "track": 8,
-          "type": "music"
-        },
-        {
-          "album": "The Graveyard and the Ballroom",
-          "artist": "A Certain Ratio",
-          "contentType": "audio/x-flac",
-          "coverArt": 1,
-          "created": "0001-01-01T00:00:00Z",
-          "id": 11,
-          "parent": 3,
-          "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/04.14 Choir.flac",
-          "size": 24728976,
-          "suffix": "flac",
-          "title": "Choir",
-          "track": 4,
-          "type": "music"
-        },
-        {
-          "album": "The Graveyard and the Ballroom",
-          "artist": "A Certain Ratio",
-          "contentType": "audio/x-flac",
-          "coverArt": 1,
-          "created": "0001-01-01T00:00:00Z",
-          "id": 6,
-          "parent": 3,
-          "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/03.14 Crippled Child.flac",
-          "size": 21325811,
-          "suffix": "flac",
-          "title": "Crippled Child",
-          "track": 3,
-          "type": "music"
-        },
-        {
-          "album": "The Graveyard and the Ballroom",
-          "artist": "A Certain Ratio",
-          "contentType": "audio/x-flac",
-          "coverArt": 1,
+          "coverArt": 3,
          "created": "0001-01-01T00:00:00Z",
          "id": 12,
          "parent": 3,
@@ -68,10 +23,10 @@
          "type": "music"
        },
        {
-          "album": "The Graveyard and the Ballroom",
+          "album": "(1994) The Graveyard and the Ballroom",
          "artist": "A Certain Ratio",
          "contentType": "audio/x-flac",
-          "coverArt": 1,
+          "coverArt": 3,
          "created": "0001-01-01T00:00:00Z",
          "id": 8,
          "parent": 3,
@@ -83,25 +38,40 @@
          "type": "music"
        },
        {
-          "album": "The Graveyard and the Ballroom",
+          "album": "(1994) The Graveyard and the Ballroom",
          "artist": "A Certain Ratio",
          "contentType": "audio/x-flac",
-          "coverArt": 1,
+          "coverArt": 3,
          "created": "0001-01-01T00:00:00Z",
-          "id": 1,
+          "id": 6,
          "parent": 3,
-          "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/13.14 Flight.flac",
-          "size": 37302417,
+          "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/03.14 Crippled Child.flac",
+          "size": 21325811,
          "suffix": "flac",
-          "title": "Flight",
-          "track": 13,
+          "title": "Crippled Child",
+          "track": 3,
          "type": "music"
        },
        {
-          "album": "The Graveyard and the Ballroom",
+          "album": "(1994) The Graveyard and the Ballroom",
          "artist": "A Certain Ratio",
          "contentType": "audio/x-flac",
-          "coverArt": 1,
+          "coverArt": 3,
+          "created": "0001-01-01T00:00:00Z",
+          "id": 11,
+          "parent": 3,
+          "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/04.14 Choir.flac",
+          "size": 24728976,
+          "suffix": "flac",
+          "title": "Choir",
+          "track": 4,
+          "type": "music"
+        },
+        {
+          "album": "(1994) The Graveyard and the Ballroom",
+          "artist": "A Certain Ratio",
+          "contentType": "audio/x-flac",
+          "coverArt": 3,
          "created": "0001-01-01T00:00:00Z",
          "id": 2,
          "parent": 3,
@@ -113,25 +83,10 @@
          "type": "music"
        },
        {
-          "album": "The Graveyard and the Ballroom",
+          "album": "(1994) The Graveyard and the Ballroom",
          "artist": "A Certain Ratio",
          "contentType": "audio/x-flac",
-          "coverArt": 1,
-          "created": "0001-01-01T00:00:00Z",
-          "id": 3,
-          "parent": 3,
-          "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/14.14 Genotype_Phenotype.flac",
-          "size": 24349252,
-          "suffix": "flac",
-          "title": "Genotype/Phenotype",
-          "track": 14,
-          "type": "music"
-        },
-        {
-          "album": "The Graveyard and the Ballroom",
-          "artist": "A Certain Ratio",
-          "contentType": "audio/x-flac",
-          "coverArt": 1,
+          "coverArt": 3,
          "created": "0001-01-01T00:00:00Z",
          "id": 13,
          "parent": 3,
@@ -143,25 +98,10 @@
          "type": "music"
        },
        {
-          "album": "The Graveyard and the Ballroom",
+          "album": "(1994) The Graveyard and the Ballroom",
          "artist": "A Certain Ratio",
          "contentType": "audio/x-flac",
-          "coverArt": 1,
-          "created": "0001-01-01T00:00:00Z",
-          "id": 4,
-          "parent": 3,
-          "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/09.14 Oceans.flac",
-          "size": 26401567,
-          "suffix": "flac",
-          "title": "Oceans",
-          "track": 9,
-          "type": "music"
-        },
-        {
-          "album": "The Graveyard and the Ballroom",
-          "artist": "A Certain Ratio",
-          "contentType": "audio/x-flac",
-          "coverArt": 1,
+          "coverArt": 3,
          "created": "0001-01-01T00:00:00Z",
          "id": 14,
          "parent": 3,
@@ -173,25 +113,40 @@
          "type": "music"
        },
        {
-          "album": "The Graveyard and the Ballroom",
+          "album": "(1994) The Graveyard and the Ballroom",
          "artist": "A Certain Ratio",
          "contentType": "audio/x-flac",
-          "coverArt": 1,
+          "coverArt": 3,
          "created": "0001-01-01T00:00:00Z",
-          "id": 7,
+          "id": 5,
          "parent": 3,
-          "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/12.14 Suspect.flac",
-          "size": 16592296,
+          "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/08.14 All Night Party.flac",
+          "size": 24960016,
          "suffix": "flac",
-          "title": "Suspect",
-          "track": 12,
+          "title": "All Night Party",
+          "track": 8,
          "type": "music"
        },
        {
-          "album": "The Graveyard and the Ballroom",
+          "album": "(1994) The Graveyard and the Ballroom",
          "artist": "A Certain Ratio",
          "contentType": "audio/x-flac",
-          "coverArt": 1,
+          "coverArt": 3,
+          "created": "0001-01-01T00:00:00Z",
+          "id": 4,
+          "parent": 3,
+          "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/09.14 Oceans.flac",
+          "size": 26401567,
+          "suffix": "flac",
+          "title": "Oceans",
+          "track": 9,
+          "type": "music"
+        },
+        {
+          "album": "(1994) The Graveyard and the Ballroom",
+          "artist": "A Certain Ratio",
+          "contentType": "audio/x-flac",
+          "coverArt": 3,
          "created": "0001-01-01T00:00:00Z",
          "id": 10,
          "parent": 3,
@@ -203,10 +158,10 @@
          "type": "music"
        },
        {
-          "album": "The Graveyard and the Ballroom",
+          "album": "(1994) The Graveyard and the Ballroom",
          "artist": "A Certain Ratio",
          "contentType": "audio/x-flac",
-          "coverArt": 1,
+          "coverArt": 3,
          "created": "0001-01-01T00:00:00Z",
          "id": 9,
          "parent": 3,
@@ -216,6 +171,51 @@
          "title": "The Fox",
          "track": 11,
          "type": "music"
+        },
+        {
+          "album": "(1994) The Graveyard and the Ballroom",
+          "artist": "A Certain Ratio",
+          "contentType": "audio/x-flac",
+          "coverArt": 3,
+          "created": "0001-01-01T00:00:00Z",
+          "id": 7,
+          "parent": 3,
+          "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/12.14 Suspect.flac",
+          "size": 16592296,
+          "suffix": "flac",
+          "title": "Suspect",
+          "track": 12,
+          "type": "music"
+        },
+        {
+          "album": "(1994) The Graveyard and the Ballroom",
+          "artist": "A Certain Ratio",
+          "contentType": "audio/x-flac",
+          "coverArt": 3,
+          "created": "0001-01-01T00:00:00Z",
+          "id": 1,
+          "parent": 3,
+          "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/13.14 Flight.flac",
+          "size": 37302417,
+          "suffix": "flac",
+          "title": "Flight",
+          "track": 13,
+          "type": "music"
+        },
+        {
+          "album": "(1994) The Graveyard and the Ballroom",
+          "artist": "A Certain Ratio",
+          "contentType": "audio/x-flac",
+          "coverArt": 3,
+          "created": "0001-01-01T00:00:00Z",
+          "id": 3,
+          "parent": 3,
+          "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/14.14 Genotype_Phenotype.flac",
+          "size": 24349252,
+          "suffix": "flac",
+          "title": "Genotype/Phenotype",
+          "track": 14,
+          "type": "music"
        }
      ]
    }
--- a/server/handler/test_data/test_get_music_directory_without_tracks
+++ b/server/handler/test_data/test_get_music_directory_without_tracks
@@ -8,7 +8,7 @@
      "name": "A Certain Ratio",
      "child": [
        {
-          "coverArt": 1,
+          "coverArt": 3,
          "created": "0001-01-01T00:00:00Z",
          "id": 3,
          "isDir": true,
@@ -16,9 +16,10 @@
          "title": "(1994) The Graveyard and the Ballroom"
        },
        {
+          "coverArt": 4,
          "created": "0001-01-01T00:00:00Z",
-          "isDir": true,
          "id": 4,
+          "isDir": true,
          "parent": 2,
          "title": "(1981) To Each."
        }
--- a/server/handler/test_data/test_search_three_q_13
+++ b/server/handler/test_data/test_search_three_q_13
@@ -11,12 +11,12 @@
      ],
      "album": [
        {
-          "id": 4,
-          "coverArt": 3,
+          "id": 7,
+          "coverArt": 7,
          "artistId": 2,
          "artist": "13th Floor Elevators",
          "name": "The Psychedelic Sounds of the 13th Floor Elevators",
-          "created": "2019-05-28T20:59:03.022922683+01:00"
+          "created": "2019-06-05T16:00:10.560355528+01:00"
        }
      ]
    }
--- a/server/handler/test_data/test_search_three_q_ani
+++ b/server/handler/test_data/test_search_three_q_ani
@@ -11,12 +11,12 @@
      ],
      "album": [
        {
-          "id": 5,
-          "coverArt": 4,
+          "id": 11,
+          "coverArt": 11,
          "artistId": 3,
          "artist": "Anikas",
          "name": "Anika",
-          "created": "2019-05-28T20:59:03.035442597+01:00"
+          "created": "2019-06-05T16:00:10.565661506+01:00"
        }
      ]
    }
--- a/server/handler/test_data/test_search_two_q_13
+++ b/server/handler/test_data/test_search_two_q_13
@@ -12,13 +12,45 @@
      ],
      "album": [
        {
-          "coverArt": 3,
+          "coverArt": 7,
          "created": "0001-01-01T00:00:00Z",
          "id": 7,
          "isDir": true,
          "parent": 5,
          "title": "(1966) The Psychedelic Sounds of the 13th Floor Elevators"
        }
+      ],
+      "song": [
+        {
+          "album": "(1994) The Graveyard and the Ballroom",
+          "artist": "A Certain Ratio",
+          "contentType": "audio/x-flac",
+          "coverArt": 3,
+          "created": "0001-01-01T00:00:00Z",
+          "id": 1,
+          "parent": 3,
+          "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/13.14 Flight.flac",
+          "size": 37302417,
+          "suffix": "flac",
+          "title": "Flight",
+          "track": 13,
+          "type": "music"
+        },
+        {
+          "album": "(1966) The Psychedelic Sounds of the 13th Floor Elevators",
+          "artist": "13th Floor Elevators",
+          "contentType": "audio/mpeg",
+          "coverArt": 7,
+          "created": "0001-01-01T00:00:00Z",
+          "id": 35,
+          "parent": 7,
+          "path": "13th Floor Lowervators/(1966) The Psychedelic Sounds of the 13th Floor Elevators/13.21 Before You Accuse Me.mp3",
+          "size": 4722688,
+          "suffix": "mp3",
+          "title": "Before You Accuse Me",
+          "track": 13,
+          "type": "music"
+        }
      ]
    }
  }
--- a/server/handler/test_data/test_search_two_q_ani
+++ b/server/handler/test_data/test_search_two_q_ani
@@ -7,12 +7,12 @@
        {
          "id": 8,
          "parent": 1,
-          "name": "Anika"
+          "name": "___Anika"
        }
      ],
      "album": [
        {
-          "coverArt": 4,
+          "coverArt": 11,
          "created": "0001-01-01T00:00:00Z",
          "id": 11,
          "isDir": true,