Filters: Added Producer Filter.

Author: Zoltanar

Happy Reader/Model/VnFilters/GeneralFilter.cs

@@ -97,6 +97,10 @@ public object Value
 						IntValue = dumpItemValue.ID;
 						_stringValue = IntValue.ToString();
 						break;
+					case ListedProducer producer:
+						IntValue = producer.ID;
+						_stringValue = IntValue.ToString();
+						break;
 					default:
 						IntValue = 0;
 						_stringValue = value?.ToString();
@@ -181,6 +185,8 @@ private Func<IDataItem<int>, bool> GetFunction()
 					return i => ((i is CharacterItem ch && ch.ImageId != null) ||
 											 (i is ListedVN vn && StaticHelpers.LocalDatabase.GetCharactersForVN(vn.VNID).Any(chara => chara.ImageId != null)))
 											!= Exclude;
+				case GeneralFilterType.Producer:
+					return i => (i is CharacterItem ch && ch.Producer?.ID == IntValue) || (i is ListedVN vn && vn.ProducerID == IntValue) != Exclude;
 				default: throw new ArgumentOutOfRangeException();
 			}
 		}
@@ -220,8 +226,7 @@ public Func<VisualNovelDatabase, HashSet<int>> GetGlobalFunction(Func<VisualNove
 			if (Type != GeneralFilterType.Staff) throw new InvalidOperationException($"Filter type {Type} should use per-item function.");
 			return db => db.GetVnsWithStaff(IntValue);
 		}
-
-
+		
 		Func<IDataItem<int>, bool> IFilter.GetFunction()
 		{
 			//we determine what the filter function is only once, rather than per-item
@@ -355,6 +360,8 @@ public override string ToString()
 					return $"{result} - {DumpFiles.GetTrait(IntValue).Name}";
 				case GeneralFilterType.Staff:
 					return $"{result} - {StaticHelpers.LocalDatabase.StaffAliases[StaticHelpers.LocalDatabase.StaffItems[IntValue].AliasID]}";
+				case GeneralFilterType.Producer:
+					return $"{result} - {StaticHelpers.LocalDatabase.Producers[IntValue]}";
 				// ReSharper disable once RedundantCaseLabel
 				case GeneralFilterType.Multi:
 				default:
@@ -415,6 +422,8 @@ public enum GeneralFilterType
 		CharacterGender = 22,
 		[Description("Character Has Image"), TypeConverter(typeof(bool))]
 		CharacterHasImage = 23,
+		[Description("Producer"), TypeConverter(typeof(ListedProducer))]
+		Producer = 24,
 #pragma warning restore 1591
 	}
 }

Happy Reader/View/FiltersPane.xaml.cs

@@ -5,6 +5,7 @@
 using System.Windows.Data;
 using System.Windows.Input;
 using Happy_Apps_Core;
+using Happy_Apps_Core.Database;
 using Happy_Reader.ViewModel;
 
 namespace Happy_Reader.View
@@ -15,7 +16,7 @@ public partial class FiltersPane : UserControl
 		// ReSharper disable once NotAccessedField.Local
 		private FiltersViewModel ViewModel => (FiltersViewModel)DataContext;
 		private AutoCompleteBox _traitOrTagControl;
-		
+
 		public FiltersPane()
 		{
 			InitializeComponent();
@@ -55,12 +56,12 @@ private void FilterTypeChanged(object sender, SelectionChangedEventArgs e)
 			if (type == null) return;
 			FrameworkElement control;
 			DependencyProperty bindingProperty = null;
-			var valueBinding = new Binding($"{nameof(ViewModel.NewFilter)}.{nameof(IFilter.Value)}"){Mode = BindingMode.OneWayToSource};
+			var valueBinding = new Binding($"{nameof(ViewModel.NewFilter)}.{nameof(IFilter.Value)}") { Mode = BindingMode.OneWayToSource };
 			if (type.IsEnum)
 			{
 				control = new ComboBox
 				{
-					ItemsSource = StaticMethods.GetEnumValues(type), 
+					ItemsSource = StaticMethods.GetEnumValues(type),
 					SelectedIndex = 0,
 					SelectedValuePath = nameof(Tag)
 				};
@@ -108,19 +109,25 @@ private void FilterTypeChanged(object sender, SelectionChangedEventArgs e)
 					control = _traitOrTagControl;
 					bindingProperty = AutoCompleteBox.SelectedItemProperty;
 				}
+				else if (type == typeof(ListedProducer))
+				{
+					_traitOrTagControl = new AutoCompleteBox() { ItemFilter = ProducerBoxFilter, ItemsSource = StaticHelpers.LocalDatabase.Producers };
+					control = _traitOrTagControl;
+					bindingProperty = AutoCompleteBox.SelectedItemProperty;
+				}
 				else control = new TextBlock(new System.Windows.Documents.Run(type.ToString()));
 			}
-			if(bindingProperty != null) control.SetBinding(bindingProperty, valueBinding);
+			if (bindingProperty != null) control.SetBinding(bindingProperty, valueBinding);
 			FilterValuesGrid.Children.Add(control);
 		}
-		
+
 		private void RootControl_SelectionChanged(object sender, SelectionChangedEventArgs e)
 		{
 			if (e.AddedItems.Count == 0) return;
 			var selectedTraitRoot = (DumpFiles.RootTrait)((ComboBoxItem)e.AddedItems[0]).Tag;
 			_traitOrTagControl.ItemsSource = DumpFiles.GetTraitsForRoot(selectedTraitRoot);
 		}
-		
+
 		private bool TraitOrTagBoxFilter(string input, object item)
 		{
 			//Short input is not filtered to prevent excessive loading times
@@ -129,6 +136,14 @@ private bool TraitOrTagBoxFilter(string input, object item)
 			return trait.Name.ToLowerInvariant().Contains(input.ToLowerInvariant());
 		}
 
+		private bool ProducerBoxFilter(string input, object item)
+		{
+			//Short input is not filtered to prevent excessive loading times
+			if (input.Length <= 2) return false;
+			var producer = (ListedProducer)item;
+			return producer.Name.ToLowerInvariant().Contains(input.ToLowerInvariant());
+		}
+
 		private void NumberValidationTextBox(object sender, TextCompositionEventArgs e)
 		{
 			var regex = new System.Text.RegularExpressions.Regex("[^0-9]+");