Enable functionality to filter tracks

sabihoshi · May 14, 2021 · b3b3079 · b3b3079
1 parent f2c0f17
commit b3b3079
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 12 deletions.
diff --git a/GenshinLyreMidiPlayer.WPF/GenshinLyreMidiPlayer.WPF.csproj b/GenshinLyreMidiPlayer.WPF/GenshinLyreMidiPlayer.WPF.csproj
@@ -6,7 +6,7 @@
     <UseWPF>true</UseWPF>
     <StartupObject>GenshinLyreMidiPlayer.WPF.App</StartupObject>
     <ApplicationManifest>app.manifest</ApplicationManifest>
-    <Version>1.10.1</Version>
+    <Version>1.10.2</Version>
     <ApplicationIcon>item_windsong_lyre.ico</ApplicationIcon>
     <Nullable>enable</Nullable>
     <RepositoryUrl>https://github.com/sabihoshi/GenshinLyreMidiPlayer</RepositoryUrl>

diff --git a/...WPF/ModernWPF/ProductGroupKeyConverter.cs → ...r.WPF/ModernWPF/TrackGroupKeyConverter.cs b/...WPF/ModernWPF/ProductGroupKeyConverter.cs → ...r.WPF/ModernWPF/TrackGroupKeyConverter.cs
@@ -4,7 +4,7 @@
 
 namespace GenshinLyreMidiPlayer.WPF.ModernWPF
 {
-    public class ProductGroupKeyConverter : IValueConverter
+    public class TrackGroupKeyConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture) =>
             ((string) value).Substring(0, 1).ToUpper();

diff --git a/GenshinLyreMidiPlayer.WPF/ViewModels/MainWindowViewModel.cs b/GenshinLyreMidiPlayer.WPF/ViewModels/MainWindowViewModel.cs
@@ -38,6 +38,8 @@ protected override async void OnViewLoaded()
             // Work around because events do not conform to the signatures Stylet supports
             _navView = ((MainWindowView) View).NavView;
 
+            _navView.AutoSuggestBox.TextChanged += PlaylistView.OnFilterTextChanged;
+
             _navView.SelectionChanged += Navigate;
             _navView.BackRequested    += NavigateBack;
 

diff --git a/GenshinLyreMidiPlayer.WPF/ViewModels/PlaylistViewModel.cs b/GenshinLyreMidiPlayer.WPF/ViewModels/PlaylistViewModel.cs
@@ -10,6 +10,7 @@
 using Melanchall.DryWetMidi.Core;
 using Microsoft.Win32;
 using ModernWpf;
+using ModernWpf.Controls;
 using Stylet;
 using StyletIoC;
 using static Windows.Media.MediaPlaybackAutoRepeatMode;
@@ -28,9 +29,13 @@ public PlaylistViewModel(IContainer ioc, IEventAggregator events)
             _events = events;
         }
 
-        public BindableCollection<MidiFile> Tracks { get; set; } = new();
+        public BindableCollection<MidiFile> FilteredTracks => string.IsNullOrWhiteSpace(FilterText)
+            ? Tracks
+            : new(Tracks.Where(t => t.Title.Contains(FilterText, StringComparison.OrdinalIgnoreCase)));
 
-        public BindableCollection<MidiFile>? ShuffledTracks { get; set; }
+        private BindableCollection<MidiFile> ShuffledTracks { get; set; } = new();
+
+        public BindableCollection<MidiFile> Tracks { get; } = new();
 
         public bool Shuffle { get; set; }
 
@@ -46,6 +51,8 @@ public PlaylistViewModel(IContainer ioc, IEventAggregator events)
 
         public Stack<MidiFile> History { get; } = new();
 
+        public string FilterText { get; set; }
+
         public string LoopStateString =>
             Loop switch
             {
@@ -54,6 +61,11 @@ public PlaylistViewModel(IContainer ioc, IEventAggregator events)
                 List  => "\xE8EE"
             };
 
+        public void OnFilterTextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs e)
+        {
+            FilterText = sender.Text;
+        }
+
         public void ToggleShuffle()
         {
             Shuffle = !Shuffle;
@@ -95,7 +107,7 @@ public void ToggleLoop()
             return next;
         }
 
-        public BindableCollection<MidiFile> GetPlaylist() => (Shuffle ? ShuffledTracks : Tracks)!;
+        public BindableCollection<MidiFile> GetPlaylist() => Shuffle ? ShuffledTracks : Tracks;
 
         public async Task OpenFile()
         {
@@ -122,7 +134,8 @@ public async Task AddFiles(IEnumerable<string> files)
             RefreshPlaylist();
             await UpdateHistory();
 
-            if (OpenedFile is null && Tracks.Count > 0)
+            var next = Next();
+            if (OpenedFile is null && Tracks.Count > 0 && next is not null)
                 _events.Publish(Next());
         }
 

diff --git a/GenshinLyreMidiPlayer.WPF/Views/PlaylistView.xaml b/GenshinLyreMidiPlayer.WPF/Views/PlaylistView.xaml
@@ -17,13 +17,10 @@
 
     d:DataContext="{d:DesignInstance viewModels:PlaylistViewModel}">
     <UserControl.Resources>
-        <modernWpf:ProductGroupKeyConverter x:Key="ProductGroupKeyConverter" />
-        <CollectionViewSource
-            x:Key="Tracks" Source="{Binding Tracks}">
+        <modernWpf:TrackGroupKeyConverter x:Key="TrackGroupKeyConverter" />
+        <CollectionViewSource x:Key="Tracks" Source="{Binding FilteredTracks}">
             <CollectionViewSource.GroupDescriptions>
-                <PropertyGroupDescription
-                    PropertyName="Title"
-                    Converter="{StaticResource ProductGroupKeyConverter}" />
+                <PropertyGroupDescription PropertyName="Title" Converter="{StaticResource TrackGroupKeyConverter}" />
             </CollectionViewSource.GroupDescriptions>
             <CollectionViewSource.SortDescriptions>
                 <componentModel:SortDescription PropertyName="Title" />