fix: make disabled playlists visible in manager

pudding-fox · Dec 4, 2024 · dd775d2 · dd775d2
1 parent 3a778fd
commit dd775d2
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/FoxTunes.Core/Playlist/PlaylistBrowser.cs b/FoxTunes.Core/Playlist/PlaylistBrowser.cs
@@ -104,9 +104,6 @@ private IEnumerable<Playlist> GetPlaylistsCore()
                 using (var transaction = database.BeginTransaction(database.PreferredIsolationLevel))
                 {
                     var set = database.Set<Playlist>(transaction);
-                    set.Fetch.Filter.AddColumn(
-                        set.Table.GetColumn(ColumnConfig.By("Enabled", ColumnFlags.None))
-                    ).With(filter => filter.Right = filter.CreateConstant(1));
                     set.Fetch.Sort.Expressions.Clear();
                     set.Fetch.Sort.AddColumn(set.Table.GetColumn(ColumnConfig.By("Sequence", ColumnFlags.None)));
                     foreach (var element in set)

diff --git a/FoxTunes.UI.Windows/ViewModel/PlaylistManager.cs b/FoxTunes.UI.Windows/ViewModel/PlaylistManager.cs
@@ -21,6 +21,14 @@ public PlaylistManager()
 
         public IErrorEmitter ErrorEmitter { get; private set; }
 
+        public override bool EnabledOnly
+        {
+            get
+            {
+                return false;
+            }
+        }
+
         protected override void InitializeComponent(ICore core)
         {
             global::FoxTunes.BackgroundTask.ActiveChanged += this.OnActiveChanged;

diff --git a/FoxTunes.UI.Windows/ViewModel/Playlists.cs b/FoxTunes.UI.Windows/ViewModel/Playlists.cs
@@ -10,6 +10,14 @@ namespace FoxTunes.ViewModel
 {
     public class Playlists : ViewModelBase
     {
+        public virtual bool EnabledOnly
+        {
+            get
+            {
+                return true;
+            }
+        }
+
         public IPlaylistManager PlaylistManager { get; private set; }
 
         public IPlaylistBrowser PlaylistBrowser { get; private set; }
@@ -76,6 +84,12 @@ protected virtual void OnSelectedItemChanged()
         protected virtual Task RefreshItems()
         {
             var playlists = this.PlaylistBrowser.GetPlaylists();
+            if (this.EnabledOnly)
+            {
+                playlists = playlists.Where(
+                    playlist => playlist.Enabled
+                ).ToArray();
+            }
             if (this.Items == null)
             {
                 return Windows.Invoke(() => this.Items = new PlaylistCollection(playlists));
@@ -89,6 +103,15 @@ protected virtual Task RefreshItems()
         protected virtual Task RefreshItems(IEnumerable<Playlist> playlists, DataSignalType type)
         {
             var cached = this.PlaylistBrowser.GetPlaylists();
+            if (this.EnabledOnly)
+            {
+                cached = cached.Where(
+                    playlist => playlist.Enabled
+                ).ToArray();
+                playlists = playlists.Where(
+                    playlist => playlist.Enabled
+                ).ToArray();
+            }
             if (this.Items == null)
             {
                 return Windows.Invoke(() => this.Items = new PlaylistCollection(cached));