playlist search - title and author filter

VDownload.Core/VDownload.Core.ViewModels/Home/HomePlaylistViewModel.cs

@@ -15,6 +15,7 @@ using VDownload.Services.Data.Settings;
 using VDownload.Services.UI.StoragePicker;
 using VDownload.Sources.Twitch.Configuration.Models;
 using SimpleToolkit.MVVM;
+using System.Text.RegularExpressions;
 
 namespace VDownload.Core.ViewModels.Home
 {
@@ -58,6 +59,28 @@ namespace VDownload.Core.ViewModels.Home
         [ObservableProperty]
         protected bool _isSomethingHidden;
 
+        public string TitleFilter
+        {
+            get => _titleFilter;
+            set
+            {
+                SetProperty(ref _titleFilter, value, nameof(TitleFilter));
+                UpdateFilter();
+            }
+        }
+        protected string _titleFilter;
+
+        public string AuthorFilter
+        {
+            get => _authorFilter;
+            set
+            {
+                SetProperty(ref _authorFilter, value, nameof(AuthorFilter));
+                UpdateFilter();
+            }
+        }
+        protected string _authorFilter;
+
         #endregion
 
 
@@ -87,13 +110,15 @@ namespace VDownload.Core.ViewModels.Home
 
             _removedVideos.Clear();
 
+            _titleFilter = string.Empty;
+            _authorFilter = string.Empty;
             Name = _playlist.Name;
             Videos.Clear();
             foreach (Video video in playlist)
             {
                 Videos.Add(new VideoViewModel(video, _settingsService, _storagePickerService), true);
             }
-            UpdateCounters();
+            UpdateFilter();
         }
 
         #endregion
@@ -122,7 +147,7 @@ namespace VDownload.Core.ViewModels.Home
 
             _removedVideos.Add(video);
 
-            UpdateCounters();
+            UpdateFilter();
         }
 
         [RelayCommand]
@@ -134,7 +159,7 @@ namespace VDownload.Core.ViewModels.Home
             }
             _removedVideos.Clear();
 
-            UpdateCounters();
+            UpdateFilter();
         }
 
         [RelayCommand]
@@ -162,8 +187,34 @@ namespace VDownload.Core.ViewModels.Home
             CloseRequested?.Invoke(this, EventArgs.Empty);
         }
 
-        protected void UpdateCounters()
+        protected void UpdateFilter()
         {
+            Regex titleRegex = new Regex(TitleFilter);
+            Regex authorRegex = new Regex(AuthorFilter);
+
+            foreach (ObservableKeyValuePair<VideoViewModel, bool> item in Videos)
+            {
+                if (!titleRegex.IsMatch(item.Key.Title))
+                {
+                    item.Value = false;
+                    continue;
+                }
+
+                if (!authorRegex.IsMatch(item.Key.Author))
+                {
+                    item.Value = false;
+                    continue;
+                }
+
+                if (_removedVideos.Contains(item.Key))
+                {
+                    item.Value = false;
+                    continue;
+                }
+
+                item.Value = true;
+            }
+
             RemovedCount = _removedVideos.Count;
             HiddenCount = Videos.Values.Where(x => !x).Count();
             IsSomethingHidden = HiddenCount > 0;

VDownload.Core/VDownload.Core.ViewModels/VDownload.Core.ViewModels.csproj

@@ -13,8 +13,8 @@
 		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
 		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-		<PackageReference Include="SimpleToolkit.MVVM" Version="1.7.1" />
+		<PackageReference Include="SimpleToolkit.MVVM" Version="1.7.2" />
-		<PackageReference Include="SimpleToolkit.UI.Models" Version="1.7.1" />
+		<PackageReference Include="SimpleToolkit.UI.Models" Version="1.7.2" />
 	</ItemGroup>
 
   <ItemGroup>

VDownload.Core/VDownload.Core.Views/Home/HomePlaylistView.xaml

@@ -75,14 +75,16 @@
                                            VerticalAlignment="Center"/>
                                 <TextBox x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterTitleTextBox"
                                          Grid.Row="0"
-                                         Grid.Column="1"/>
+                                         Grid.Column="1"
+                                         Text="{Binding TitleFilter, Mode=TwoWay}"/>
                                 <TextBlock x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterAuthorTextBlock"
                                            Grid.Row="1"
                                            Grid.Column="0"
                                            VerticalAlignment="Center"/>
                                 <TextBox x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterAuthorTextBox"
                                          Grid.Row="1"
-                                         Grid.Column="1"/>
+                                         Grid.Column="1"
+                                         Text="{Binding AuthorFilter, Mode=TwoWay}"/>
                                 <TextBlock x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterViewsTextBlock"
                                            Grid.Row="2"
                                            Grid.Column="0"

VDownload.Core/VDownload.Core.Views/VDownload.Core.Views.csproj

@@ -21,8 +21,8 @@
       <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
       <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
       <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
-      <PackageReference Include="SimpleToolkit.UI.WinUI.Behaviors" Version="1.7.1" />
+      <PackageReference Include="SimpleToolkit.UI.WinUI.Behaviors" Version="1.7.2" />
-      <PackageReference Include="SimpleToolkit.UI.WinUI.Controls" Version="1.7.1" />
+      <PackageReference Include="SimpleToolkit.UI.WinUI.Controls" Version="1.7.2" />
   </ItemGroup>
 
   <ItemGroup>

VDownload/VDownload.csproj

@@ -155,7 +155,7 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
-    <PackageReference Include="SimpleToolkit.UI.WinUI.Converters" Version="1.7.1" />
+    <PackageReference Include="SimpleToolkit.UI.WinUI.Converters" Version="1.7.2" />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>