[gnome-music/wip/mschraal/gtk4-v3] artistalbumswidget: Rework widget loading

[Marinus Schraal <mschraal src gnome org>]

commit 6c6c477f08270fcd6360efe51b5639b0bb7918c4
Author: Marinus Schraal <mschraal gnome org>
Date:   Mon Feb 14 11:13:57 2022 +0100

    artistalbumswidget: Rework widget loading
    
    Add a CoreObject setter that reloads the model.

 gnomemusic/views/artistsview.py          |  3 ++-
 gnomemusic/views/searchview.py           |  4 +--
 gnomemusic/widgets/artistalbumswidget.py | 46 +++++++++++++++++++++-----------
 3 files changed, 34 insertions(+), 19 deletions(-)
---
diff --git a/gnomemusic/views/artistsview.py b/gnomemusic/views/artistsview.py
index 6d87803f9..18e9a32a8 100644
--- a/gnomemusic/views/artistsview.py
+++ b/gnomemusic/views/artistsview.py
@@ -165,7 +165,8 @@ class ArtistsView(Gtk.Paned):
             self._artist_view.set_visible_child_name(coreartist.props.artist)
             return
 
-        artist_albums = ArtistAlbumsWidget(coreartist, self._application)
+        artist_albums = ArtistAlbumsWidget(self._application)
+        artist_albums.props.coreartist = coreartist
 
         self.bind_property(
             "selection-mode", artist_albums, "selection-mode",
diff --git a/gnomemusic/views/searchview.py b/gnomemusic/views/searchview.py
index c2469beee..617e39405 100644
--- a/gnomemusic/views/searchview.py
+++ b/gnomemusic/views/searchview.py
@@ -275,8 +275,8 @@ class SearchView(Gtk.Stack):
         if self.props.selection_mode:
             return
 
-        artist_albums_widget = ArtistAlbumsWidget(
-            coreartist, self._application)
+        artist_albums_widget = ArtistAlbumsWidget(self._application)
+        artist_albums_widget.props.coreartist = coreartist
         # FIXME: Recreating a view here. Alternate solution is used
         # in AlbumsView: one view created and an update function.
         # Settle on one design.
diff --git a/gnomemusic/widgets/artistalbumswidget.py b/gnomemusic/widgets/artistalbumswidget.py
index ffbc13c09..f0500f5f1 100644
--- a/gnomemusic/widgets/artistalbumswidget.py
+++ b/gnomemusic/widgets/artistalbumswidget.py
@@ -23,14 +23,15 @@
 # delete this exception statement from your version.
 
 from __future__ import annotations
+from typing import Optional
 import typing
 
 from gi.repository import GObject, Gtk
 
+from gnomemusic.coreartist import CoreArtist
 from gnomemusic.widgets.albumwidget import AlbumWidget
 if typing.TYPE_CHECKING:
     from gnomemusic.application import Application
-    from gnomemusic.coreartist import CoreArtist
 
 
 @Gtk.Template(resource_path="/org/gnome/Music/ui/ArtistAlbumsWidget.ui")
@@ -48,21 +49,18 @@ class ArtistAlbumsWidget(Gtk.Box):
 
     selection_mode = GObject.Property(type=bool, default=False)
 
-    def __init__(
-            self, coreartist: CoreArtist, application: Application) -> None:
+    def __init__(self, application: Application) -> None:
         """Initialize the ArtistAlbumsWidget
 
-        :param CoreArtist coreartist: The CoreArtist object
         :param Aplication application: The Application object
         """
         super().__init__()
 
         self._application = application
-        self._artist = coreartist
-        self._model = coreartist.props.model
-        self._player = self._application.props.player
+        self._coreartist: Optional[CoreArtist] = None
 
-        self._listbox.bind_model(self._model, self._add_album)
+    def _update_model(self) -> None:
+        self._listbox.bind_model(self._coreartist.props.model, self._add_album)
 
     def _add_album(self, corealbum):
         row = Gtk.ListBoxRow()
@@ -72,10 +70,10 @@ class ArtistAlbumsWidget(Gtk.Box):
 
         widget = AlbumWidget(self._application)
         widget.props.corealbum = corealbum
-        widget.props.active_coreobject = self._artist
+        widget.props.active_coreobject = self._coreartist
         widget.props.show_artist_label = False
 
-        self._artist.bind_property(
+        self._coreartist.bind_property(
             "selected", corealbum, "selected",
             GObject.BindingFlags.SYNC_CREATE)
         self.bind_property(
@@ -89,13 +87,29 @@ class ArtistAlbumsWidget(Gtk.Box):
 
     def select_all(self) -> None:
         """Select all items"""
-        self._artist.props.selected = True
+        self._coreartist.props.selected = True
 
     def deselect_all(self) -> None:
         """Deselect all items"""
-        self._artist.props.selected = False
+        self._coreartist.props.selected = False
+
+    @GObject.Property(
+        type=CoreArtist, flags=GObject.ParamFlags.READWRITE, default=None)
+    def coreartist(self) -> CoreArtist:
+        """Current CoreArtist object
+
+        :param CoreArtist coreartist: The CoreArtist object
+        :rtype: CoreArtist
+        """
+        return self._coreartist
+
+    @coreartist.setter  # type: ignore
+    def coreartist(self, coreartist: CoreArtist) -> None:
+        """Sets the CoreArtist for the widget
+
+        :param CoreArtist coreartist: The CoreArtist to use
+        """
+        if self._coreartist is not coreartist:
+            self._coreartist = coreartist
 
-    @GObject.Property(type=str, flags=GObject.ParamFlags.READABLE)
-    def artist(self) -> str:
-        """Artist name"""
-        return self._artist.props.artist
+            self._update_model()