diff --git a/CHANGELOG.md b/CHANGELOG.md index 5df6c40a..8e490a6e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ ### Changelog -#### Version - 2.4.3.3 - 4/12/2021 +#### Version - 2.4.4.0 - ??? +* Search by tags in the gallery view + +#### Version - 2.4.3.3 - 4/13/2021 * Default to a "Wabbajack" user agent when making HTTP calls * Some niceties for Mod authors uploading to our CDN * upgrade several external dependencies diff --git a/Wabbajack/View Models/Gallery/ModListGalleryVM.cs b/Wabbajack/View Models/Gallery/ModListGalleryVM.cs index 640dd4e4..bb31ad23 100644 --- a/Wabbajack/View Models/Gallery/ModListGalleryVM.cs +++ b/Wabbajack/View Models/Gallery/ModListGalleryVM.cs @@ -144,7 +144,7 @@ namespace Wabbajack .Select>(search => (vm) => { if (string.IsNullOrWhiteSpace(search)) return true; - return vm.Metadata.Title.ContainsCaseInsensitive(search); + return vm.Metadata.Title.ContainsCaseInsensitive(search) || vm.Metadata.tags.Any(t => t.ContainsCaseInsensitive(search)); })) .Filter(this.WhenAny(x => x.ShowNSFW) .Select>(showNSFW => vm => diff --git a/Wabbajack/View Models/Gallery/ModListMetadataVM.cs b/Wabbajack/View Models/Gallery/ModListMetadataVM.cs index bb650868..343a87f3 100644 --- a/Wabbajack/View Models/Gallery/ModListMetadataVM.cs +++ b/Wabbajack/View Models/Gallery/ModListMetadataVM.cs @@ -11,6 +11,7 @@ using System.Windows; using System.Windows.Input; using System.Windows.Media.Imaging; using Alphaleonis.Win32.Filesystem; +using DynamicData; using ReactiveUI; using ReactiveUI.Fody.Helpers; using Wabbajack.Common; @@ -77,10 +78,13 @@ namespace Wabbajack Metadata = metadata; Location = LauncherUpdater.CommonFolder.Value.Combine("downloaded_mod_lists", Metadata.Links.MachineURL + (string)Consts.ModListExtension); ModListTagList = new List(); + Metadata.tags.ForEach(tag => { ModListTagList.Add(new ModListTag(tag)); }); + ModListTagList.Add(new ModListTag(metadata.Game.MetaData().HumanFriendlyGameName)); + DownloadSizeText = "Download size : " + UIUtils.FormatBytes(Metadata.DownloadMetadata.SizeOfArchives); InstallSizeText = "Installation size : " + UIUtils.FormatBytes(Metadata.DownloadMetadata.SizeOfInstalledFiles); IsBroken = metadata.ValidationSummary.HasFailures || metadata.ForceDown; diff --git a/Wabbajack/Views/ModListTileView.xaml b/Wabbajack/Views/ModListTileView.xaml index bd3f01ee..180839ea 100644 --- a/Wabbajack/Views/ModListTileView.xaml +++ b/Wabbajack/Views/ModListTileView.xaml @@ -69,11 +69,12 @@ + @@ -143,28 +144,6 @@ - - - - - - - - - - - - - -