Goz3rr#173 - Search for items in containers

This commit builds on my previous to allow for searching of items within containers.
Amanekomee · Aug 15, 2020 · 59de9a9 · 59de9a9
1 parent 6e23f07
commit 59de9a9
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/SatisfactorySaveEditor/Model/SaveComponentModel.cs b/SatisfactorySaveEditor/Model/SaveComponentModel.cs
@@ -1,4 +1,8 @@
-using System.Windows;
+using System;
+using System.Collections.ObjectModel;
+using System.Globalization;
+using System.Linq;
+using System.Windows;
 using GalaSoft.MvvmLight.Command;
 using SatisfactorySaveEditor.View;
 using SatisfactorySaveEditor.ViewModel;
@@ -42,6 +46,23 @@ public ArrayPropertyViewModel Inventory
            get => FindField<ArrayPropertyViewModel>("mInventoryStacks");
         }
 
+        public override bool MatchesFilter(string filter)
+        {
+            return base.MatchesFilter(filter) || MatchesFilterInventory(filter);
+        }
+
+        private bool MatchesFilterInventory(string filter)
+        {
+
+            return Inventory?.Elements.Cast<StructPropertyViewModel>().Any(element =>
+            {
+                DynamicStructDataViewModel structData = (DynamicStructDataViewModel)element.StructData;
+                InventoryItem item = (InventoryItem)((StructPropertyViewModel) structData.Fields[0]).StructData;
+
+                return item.ItemType.ToLower(CultureInfo.InvariantCulture).Contains(filter);
+            }) ?? false;
+        }
+
         private void FillInventory()
         {
             FillWindow dialog = new FillWindow();

diff --git a/SatisfactorySaveEditor/Model/SaveObjectModel.cs b/SatisfactorySaveEditor/Model/SaveObjectModel.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Globalization;
 using System.Linq;
 using System.Windows;
 using GalaSoft.MvvmLight;
@@ -227,6 +228,11 @@ public T FindOrCreateField<T>(string fieldName, Action<T> edit = null) where T :
             throw new InvalidOperationException($"A field with the name {fieldName} already exists but with a different type ({field.GetType()} != {typeof(T)})");
         }
 
+        public virtual bool MatchesFilter(string filter)
+        {
+            return this.Model?.InstanceName.ToLower(CultureInfo.InvariantCulture).Contains(filter) ?? false;
+        }
+
         private void AddProperty()
         {
             AddWindow window = new AddWindow

diff --git a/SatisfactorySaveEditor/ViewModel/MainViewModel.cs b/SatisfactorySaveEditor/ViewModel/MainViewModel.cs
@@ -691,7 +691,7 @@ private void Filter(string value)
             else
             {
                 var valueLower = value.ToLower(CultureInfo.InvariantCulture);
-                var filter = rootItem.DescendantSelfViewModel.WithCancellation(tokenSource.Token).Where(vm => vm.Model?.InstanceName.ToLower(CultureInfo.InvariantCulture).Contains(valueLower) ?? false);
+                var filter = rootItem.DescendantSelfViewModel.WithCancellation(tokenSource.Token).Where(vm => vm.MatchesFilter(valueLower));
                 Application.Current.Dispatcher.Invoke(() =>
                 {
                     RootItem = new ObservableCollection<SaveObjectModel>(filter);