Merge branch 'delayed-load'

1 files changed, 19 insertions, 14 deletions

diff --git a/src/page_artists.go b/src/page_artists.go
index 747165b..0b5a0be 100644
--- a/src/page_artists.go
+++ b/src/page_artists.go
@@ -28,6 +28,25 @@ func (a *app) artistsPage() tview.Primitive {
 
                         sel := node.GetReference().(selection)
                         if sel.entryType == "artist" {
+                                if node.GetChildren() != nil || len(node.GetChildren()) == 0 {
+                                        artist, err := a.sub.GetMusicDirectory(sel.id)
+                                        if err != nil {
+                                                LogErrorf("loading album '%s': %v", sel.id, err)
+                                                a.alert("Error: %v", err)
+                                                return
+                                        }
+
+                                        for _, album := range artist.Child {
+                                                subnode := tview.NewTreeNode(album.Title)
+                                                subnode.SetReference(selection{"album", album.ID})
+                                                subnode.SetColor(tcell.ColorBlue)
+                                                subnode.SetSelectable(true)
+
+                                                node.AddChild(subnode)
+                                        }
+
+                                }
+
                                 node.SetExpanded(!node.IsExpanded())
                                 return
                         }
@@ -84,20 +103,6 @@ func (a *app) refreshArtists() error {
                         node.SetSelectable(true)
                         node.SetExpanded(false)
 
-                        albums, err := a.sub.GetMusicDirectory(artist.ID)
-                        if err != nil {
-                                return err
-                        }
-
-                        for _, album := range albums.Child {
-                                subnode := tview.NewTreeNode(album.Title)
-                                subnode.SetReference(selection{"album", album.ID})
-                                subnode.SetColor(tcell.ColorBlue)
-                                subnode.SetSelectable(true)
-
-                                node.AddChild(subnode)
-                        }
-
                         a.artistsTree.GetRoot().AddChild(node)
                 }
         }