Fix nullability warnings in SDMetaUI (#490)

Copilot · web-flow · commit 81482d53db8e · 2026-03-06T06:25:29.000Z
diff --git a/SDMeta/Cache/IImageFileDataSource.cs b/SDMeta/Cache/IImageFileDataSource.cs
@@ -18,18 +18,9 @@ public interface IImageFileDataSource : IDisposable
         void Initialize();
     }
 
-	public class QueryParams(string filter, ModelFilter modelFilter, QuerySortBy querySort)
-    {
-        public string Filter { get; } = filter;
-        public ModelFilter ModelFilter { get; } = modelFilter;
-		public QuerySortBy QuerySortBy { get; } = querySort;
-    }
+	public record QueryParams(string? Filter, ModelFilter? ModelFilter, QuerySortBy QuerySortBy);
 
-	public class ModelFilter(string model, string modelHash)
-    {
-        public string Model { get; } = model;
-        public string ModelHash { get; } = modelHash;
-    }
+	public record class ModelFilter(string? Model, string? ModelHash);
 
 	public enum QuerySortBy
 	{
diff --git a/SDMeta/CachedImageFileLoader.cs b/SDMeta/CachedImageFileLoader.cs
@@ -8,7 +8,7 @@ public class CachedImageFileLoader(
         IImageFileLoader inner,
         IImageFileDataSource imageFileDataSource) : IImageFileLoader
     {
-        public async Task<ImageFile> GetImageFile(IFileInfo fileInfo)
+        public async Task<ImageFile?> GetImageFile(IFileInfo fileInfo)
         {
             var imageFile = imageFileDataSource.ReadImageFile(fileInfo.FullName);
             if (imageFile != null && imageFile.LastUpdated == fileInfo.LastWriteTime && imageFile.Exists)
@@ -18,8 +18,11 @@ public async Task<ImageFile> GetImageFile(IFileInfo fileInfo)
             else
             {
                 imageFile = await inner.GetImageFile(fileInfo);
-                imageFile.Exists = true;
-                imageFileDataSource.WriteImageFile(imageFile);
+                if (imageFile != null)
+                {
+                    imageFile.Exists = true;
+                    imageFileDataSource.WriteImageFile(imageFile);
+                }
                 return imageFile;
             }
         }
diff --git a/SDMeta/IImageFileLoader.cs b/SDMeta/IImageFileLoader.cs
@@ -5,6 +5,6 @@ namespace SDMeta
 {
 	public interface IImageFileLoader
 	{
-		Task<ImageFile> GetImageFile(IFileInfo fileInfo);
+		Task<ImageFile?> GetImageFile(IFileInfo fileInfo);
 	}
 }
diff --git a/SDMeta/ImageFileLoader.cs b/SDMeta/ImageFileLoader.cs
@@ -9,7 +9,7 @@ namespace SDMeta
 {
     public class ImageFileLoader(ILogger<ImageFileLoader> logger) : IImageFileLoader
     {
-        public async Task<ImageFile> GetImageFile(IFileInfo fileInfo)
+        public async Task<ImageFile?> GetImageFile(IFileInfo fileInfo)
         {
             logger.LogInformation("Indexing: {filename}", fileInfo.FullName);
 
diff --git a/SDMetaUI/Models/FilteredList.cs b/SDMetaUI/Models/FilteredList.cs
@@ -13,7 +13,7 @@ Action postFilteringAction
 
         public bool FilterError { get; private set; }
 
-        private ModelSummaryViewModel modelFilter;
+        private ModelSummaryViewModel modelFilter = ModelSummaryViewModel.AllModels;
         public ModelSummaryViewModel ModelFilter
         {
             get
@@ -30,9 +30,9 @@ public ModelSummaryViewModel ModelFilter
             }
         }
 
-        private string filter;
+        private string? filter;
 
-        public string Filter
+        public string? Filter
         {
             get
             {
@@ -80,7 +80,7 @@ public void RunFilter()
         {
             var queryParams = new QueryParams(
                 this.filter,
-                this.modelFilter == null ? null : new ModelFilter(this.modelFilter.Model,this.modelFilter.ModelHash),
+                this.modelFilter == ModelSummaryViewModel.AllModels ? null : new ModelFilter(this.modelFilter.Model, this.modelFilter.ModelHash),
                 sortBy
             );
             try
diff --git a/SDMetaUI/Models/GalleryViewModel.cs b/SDMetaUI/Models/GalleryViewModel.cs
@@ -44,7 +44,7 @@ public ModelSummaryViewModel ModelFilter
 			set => filteredList.ModelFilter = value;
 		}
 
-		public string Filter
+		public string? Filter
 		{
 			get => filteredList.Filter;
 			set => filteredList.Filter = value;
@@ -109,8 +109,11 @@ public void RemoveFile()
 				this.thumbnailService.Delete(filename);
 				File.Delete(filename);
 				var original = imageFileDataSource.ReadImageFile(filename);
-				original.Exists = false;
-				imageFileDataSource.WriteImageFile(original);
+				if (original != null)
+				{
+					original.Exists = false;
+					imageFileDataSource.WriteImageFile(original);
+				}
 
 				var next = this.groupList.GetNext(this.SelectedFile);
 				if (next == this.SelectedFile) next = null;
@@ -122,15 +125,21 @@ public void RemoveFile()
 
 		public void MovePrevious()
 		{
-			this.SelectedFile = this.groupList.GetPrevious(this.SelectedFile);
+			if (this.SelectedFile != null)
+			{
+				this.SelectedFile = this.groupList.GetPrevious(this.SelectedFile);
+			}
 		}
 
 		public void MoveNext()
 		{
-			this.SelectedFile = this.groupList.GetNext(this.SelectedFile);
+			if (this.SelectedFile != null)
+			{
+				this.SelectedFile = this.groupList.GetNext(this.SelectedFile);
+			}
 		}
 
-		public IList<GalleryRow> Rows { get; private set; }
+		public IList<GalleryRow> Rows { get; private set; } = new List<GalleryRow>();
 
 		public void ToggleExpandedState(ImageFileViewModel model)
 		{
@@ -140,7 +149,7 @@ public void ToggleExpandedState(ImageFileViewModel model)
 		public IList<ModelSummaryViewModel> GetModelsList()
 		{
 			var modelsList = this.imageFileDataSource.GetModelSummaryList().Select((p, i) => new ModelSummaryViewModel(p, i + 1)).ToList();
-			modelsList.Insert(0, new ModelSummaryViewModel());
+			modelsList.Insert(0, ModelSummaryViewModel.AllModels);
 			return modelsList;
 		}
 	}
diff --git a/SDMetaUI/Models/GroupedByPromptList.cs b/SDMetaUI/Models/GroupedByPromptList.cs
@@ -2,8 +2,8 @@
 {
 	public class GroupedByPromptList : IGroupList, IExpandable
 	{
-		private IList<ImageFileViewModel>? groupedFiles = null;
-		private IDictionary<string, List<ImageFileViewModel>>? promptGroups = null;
+		private IList<ImageFileViewModel> groupedFiles = new List<ImageFileViewModel>();
+		private IDictionary<string, List<ImageFileViewModel>> promptGroups = new Dictionary<string, List<ImageFileViewModel>>();
 		private readonly FilteredList filteredList;
 		private readonly Action postGroupingAction;
 
diff --git a/SDMetaUI/Models/ImageFileViewModel.cs b/SDMetaUI/Models/ImageFileViewModel.cs
@@ -15,7 +15,7 @@ public ImageFileViewModel(string fileName, string fullPromptHash, Func<string, s
 		public string ThumbnailUrl => $"/images/thumb/{EncodedFileName.Value}";
 		public string ImageUrl => $"/images/full/{EncodedFileName.Value}/{func(this.FileName)}";
 		public string FullPromptHash { get; }
-		public IList<ImageFileViewModel> SubItems { get; set; }
+		public IList<ImageFileViewModel>? SubItems { get; set; }
 
 		private readonly Lazy<string> EncodedFileName; 
 
diff --git a/SDMetaUI/Models/ImageFileViewModelBuilder.cs b/SDMetaUI/Models/ImageFileViewModelBuilder.cs
@@ -7,7 +7,7 @@ public class ImageFileViewModelBuilder(IFileSystem fileSystem)
 	{
 		public ImageFileViewModel BuildModel(ImageFileSummary p)
 		{
-			return new ImageFileViewModel(p.FileName, p.FullPromptHash, fileSystem.Path.GetFileName);
+			return new ImageFileViewModel(p.FileName, p.FullPromptHash ?? "", fileSystem.Path.GetFileName);
 		}
 	}
 }
diff --git a/SDMetaUI/Models/ModelSummaryViewModel.cs b/SDMetaUI/Models/ModelSummaryViewModel.cs
@@ -2,26 +2,29 @@
 
 namespace SDMetaUI.Models
 {
-	public class ModelSummaryViewModel
-	{
-		public ModelSummaryViewModel() {
-			Id = 0; 
-			Text = "-- all models --";
-		}
+    public class ModelSummaryViewModel
+    {
+        public static readonly ModelSummaryViewModel AllModels = new(0, "-- all models --");
 
-		public ModelSummaryViewModel(ModelSummary p, int id)
-		{
-			Id = id;
-			Count = p.Count;
-			Model = p.Model;
-			ModelHash = p.ModelHash;
-			Text = (p.ModelHash ?? "<empty>") + " (" + (p.Model ?? "<no name>") + ") [" + p.Count + "]";
-		}
+        private ModelSummaryViewModel(int id, string text)
+        {
+            Id = id;
+            Text = text;
+        }
 
-		public int Id { get; }
-		public string? Model { get; }
-		public string? ModelHash { get; }
-		public int Count { get; }
-		public string Text { get; }
-	}
+        public ModelSummaryViewModel(ModelSummary p, int id)
+        {
+            Id = id;
+            Count = p.Count;
+            Model = p.Model;
+            ModelHash = p.ModelHash;
+            Text = (p.ModelHash ?? "<empty>") + " (" + (p.Model ?? "<no name>") + ") [" + p.Count + "]";
+        }
+
+        public int Id { get; }
+        public string? Model { get; }
+        public string? ModelHash { get; }
+        public int Count { get; }
+        public string Text { get; }
+    }
 }
diff --git a/SDMetaUI/Pages/Error.cshtml.cs b/SDMetaUI/Pages/Error.cshtml.cs
@@ -6,7 +6,7 @@ namespace SDMetaUI.Pages
 {
     [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
     [IgnoreAntiforgeryToken]
-    public class ErrorModel(ILogger<ErrorModel> logger) : PageModel
+    public class ErrorModel : PageModel
     {
         public string? RequestId { get; set; }
 
diff --git a/SDMetaUI/Pages/Index.razor b/SDMetaUI/Pages/Index.razor
@@ -29,7 +29,7 @@
 		<div class="row py-2 menu-bar">
 			<div class="col-md-3 col-xs-12 py-2 py-md-0">
 				<label class="visually-hidden" for="filterInput">Filter</label>
-				<input type="search" @oninput="onInputDebounced" class="form-control @(viewModel.FilterError ? "is-invalid" : string.IsNullOrWhiteSpace(viewModel.Filter) ? "" : "is-valid" )" id="filterInput" placeholder="filter" @bind-value=@FilterInput>
+				<input type="search" @oninput="onInputDebounced!" class="form-control @(viewModel.FilterError ? "is-invalid" : string.IsNullOrWhiteSpace(viewModel.Filter) ? "" : "is-valid" )" id="filterInput" placeholder="filter" @bind-value=@FilterInput>
 			</div>
 			<div class="col-md-3 col-xs-12 py-2 py-md-0">
 				<label class="visually-hidden" for="modelSelect">Models</label>
@@ -112,7 +112,7 @@
 	@if (viewModel.SelectedFile != null)
 	{
 		<div class="boffcanvas py-2">
-			<FilePanel selectedFile=@viewModel.SelectedFile onDelete="() => imageDelete()" onFullScreenView="(e) => fullScreenView.ShowAsync()" onClose="(e) => viewModel.SelectedFile = null" />
+			<FilePanel selectedFile=@viewModel.SelectedFile onDelete="() => imageDelete()" onFullScreenView="(e) => fullScreenView!.ShowAsync()" onClose="(e) => viewModel.SelectedFile = null" />
 		</div>
 		<FullScreenView @ref=@fullScreenView selectedFile=@viewModel.SelectedFile onLeft=@leftKey onRight=@rightKey />
 	}
diff --git a/SDMetaUI/Pages/Index.razor.cs b/SDMetaUI/Pages/Index.razor.cs
@@ -13,13 +13,13 @@ public partial class Index
         [SupplyParameterFromQuery(Name = "filter")]
         public string? Filter { get; set; }
 
-        private string FilterInput { get; set; }
+        private string? FilterInput { get; set; }
 
         private FullScreenView? fullScreenView;
 
-        Action<ChangeEventArgs> onInputDebounced;
+        Action<ChangeEventArgs>? onInputDebounced;
 
-        IList<ModelSummaryViewModel> modelsList;
+        IList<ModelSummaryViewModel> modelsList = [];
         private int Added => this.FileSystemObserver.AddedCount;
         private int Removed => this.FileSystemObserver.RemovedCount;
 
@@ -30,7 +30,7 @@ public partial class Index
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        void LocationChanged(object sender, LocationChangedEventArgs e)
+        void LocationChanged(object? sender, LocationChangedEventArgs e)
         {
             if (this.viewModel.Filter != this.Filter)
             {
@@ -50,7 +50,7 @@ protected override void OnInitialized()
 
         private float scanProgess = 0;
 
-        private void ProgressNotification(object sender, float i)
+        private void ProgressNotification(object? sender, float i)
         {
             this.InvokeAsync(() =>
             {
@@ -59,12 +59,9 @@ private void ProgressNotification(object sender, float i)
             });
         }
 
-        private void OnFileSystemChanged(object sender, FileSystemEventArgs e)
+        private void OnFileSystemChanged(object? sender, EventArgs e)
         {
-            this.InvokeAsync(() =>
-            {
-                this.StateHasChanged();
-            });
+            this.InvokeAsync(this.StateHasChanged);
         }
 
         protected async override Task OnAfterRenderAsync(bool firstRender)
@@ -75,7 +72,7 @@ protected async override Task OnAfterRenderAsync(bool firstRender)
                 {
                     this.InvokeAsync(() =>
                     {
-                        var updatedFilter = (string)e.Value;
+                        var updatedFilter = (string?)e.Value;
                         if (updatedFilter == string.Empty) updatedFilter = null;
                         viewModel.Filter = updatedFilter;
                         NavigationManager.NavigateTo(NavigationManager.GetUriWithQueryParameter("filter", updatedFilter));
@@ -116,9 +113,12 @@ private void LoadData()
 
         void OnSelectModel(ChangeEventArgs e)
         {
-            var selectedModelId = int.Parse(e.Value.ToString());
+            var selectedModelId = int.Parse(e.Value!.ToString()!);
             var model = modelsList.FirstOrDefault(p => p.Id == selectedModelId);
-            this.viewModel.ModelFilter = model.Id == 0 ? null : model;
+            if (model != null)
+            {
+                this.viewModel.ModelFilter = model.Id == 0 ? ModelSummaryViewModel.AllModels : model;
+            }
         }
 
         private void imageClickParent(ImageFileViewModel model)
@@ -130,7 +130,7 @@ private async void imageClick(ImageFileViewModel model)
         {
             if (model == viewModel.SelectedFile)
             {
-                if (fullScreenView.IsOpen == false)
+                if (fullScreenView != null && fullScreenView.IsOpen == false)
                 {
                     await fullScreenView.ShowAsync();
                 }
@@ -214,7 +214,7 @@ Action<T> Debounce<T>(Action<T> action, TimeSpan interval)
         }
         private void OnSelectSortBy(ChangeEventArgs e)
         {
-            var newOrder = Enum.Parse<QuerySortBy>(e.Value.ToString());
+            var newOrder = Enum.Parse<QuerySortBy>(e.Value!.ToString()!);
             viewModel.SortBy = newOrder;
         }
     }
diff --git a/SDMetaUI/Pages/Settings.razor b/SDMetaUI/Pages/Settings.razor
@@ -70,7 +70,7 @@
 
 @code {
 
-    private string dbPath;
+    private string? dbPath;
     private long? dbSize;
 
     protected override void OnInitialized()
diff --git a/SDMetaUI/RetryingFileLoader.cs b/SDMetaUI/RetryingFileLoader.cs
@@ -21,11 +21,10 @@ public class RetryingFileLoader(IImageFileLoader inner, ILogger<RetryingFileLoad
                 .AddTimeout(TimeSpan.FromSeconds(10))
                 .Build();
 
-        public async Task<ImageFile> GetImageFile(IFileInfo fileInfo)
+        public async Task<ImageFile?> GetImageFile(IFileInfo fileInfo)
         {
             try
             {
-
                 return await pipeline.ExecuteAsync(async p => await inner.GetImageFile(fileInfo));
             }
             catch (Exception ex)
diff --git a/SDMetaUI/Services/FileSystemObserver.cs b/SDMetaUI/Services/FileSystemObserver.cs
@@ -9,7 +9,7 @@ public FileSystemObserver(IImageDir configuration)
             watchers = configuration.GetPath().Select(p => GetWatcher(p)).ToList();
         }
 
-        public event FileSystemEventHandler? FileSystemChanged;
+        public event EventHandler? FileSystemChanged;
         private readonly List<string> added = [];
         private readonly List<string> removed = [];
         private readonly List<string> removedInAdvance = [];
@@ -111,7 +111,7 @@ public void Reset()
         {
             this.added.Clear();
             this.removed.Clear();
-            FileSystemChanged?.Invoke(this, null);
+            FileSystemChanged?.Invoke(this, EventArgs.Empty);
         }
     }
 }
diff --git a/SDMetaUI/Shared/FilePanel.razor b/SDMetaUI/Shared/FilePanel.razor
@@ -31,7 +31,7 @@
 		{
 			<hr style="margin-top: 4px; margin-bottom: 4px;" />
 			<div style="flex: 1 1 auto; overflow-y: auto;" class="scroll">
-				@foreach (var x in promptLines)
+				@foreach (var x in promptLines!)
 				{
 					<div class="preformatted">
 						@(
diff --git a/SDMetaUI/Shared/FilePanel.razor.cs b/SDMetaUI/Shared/FilePanel.razor.cs
diff --git a/SDMetaUI/Shared/FullScreenView.razor b/SDMetaUI/Shared/FullScreenView.razor
diff --git a/SDMetaUI/Shared/FullScreenView.razor.cs b/SDMetaUI/Shared/FullScreenView.razor.cs
diff --git a/SDMetaUI/Shared/Thumbnail.razor.cs b/SDMetaUI/Shared/Thumbnail.razor.cs

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public class CachedImageFileLoader(`
`8`	`8`	`IImageFileLoader inner,`
`9`	`9`	`IImageFileDataSource imageFileDataSource) : IImageFileLoader`
`10`	`10`	`{`
`11`		`- public async Task<ImageFile> GetImageFile(IFileInfo fileInfo)`
	`11`	`+ public async Task<ImageFile?> GetImageFile(IFileInfo fileInfo)`
`12`	`12`	`{`
`13`	`13`	`var imageFile = imageFileDataSource.ReadImageFile(fileInfo.FullName);`
`14`	`14`	`if (imageFile != null && imageFile.LastUpdated == fileInfo.LastWriteTime && imageFile.Exists)`
`@@ -18,8 +18,11 @@ public async Task<ImageFile> GetImageFile(IFileInfo fileInfo)`
`18`	`18`	`else`
`19`	`19`	`{`
`20`	`20`	`imageFile = await inner.GetImageFile(fileInfo);`
`21`		`- imageFile.Exists = true;`
`22`		`- imageFileDataSource.WriteImageFile(imageFile);`
	`21`	`+ if (imageFile != null)`
	`22`	`+ {`
	`23`	`+ imageFile.Exists = true;`
	`24`	`+ imageFileDataSource.WriteImageFile(imageFile);`
	`25`	`+ }`
`23`	`26`	`return imageFile;`
`24`	`27`	`}`
`25`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@ namespace SDMeta`
`5`	`5`	`{`
`6`	`6`	`public interface IImageFileLoader`
`7`	`7`	`{`
`8`		`- Task<ImageFile> GetImageFile(IFileInfo fileInfo);`
	`8`	`+ Task<ImageFile?> GetImageFile(IFileInfo fileInfo);`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace SDMeta`
`9`	`9`	`{`
`10`	`10`	`public class ImageFileLoader(ILogger<ImageFileLoader> logger) : IImageFileLoader`
`11`	`11`	`{`
`12`		`- public async Task<ImageFile> GetImageFile(IFileInfo fileInfo)`
	`12`	`+ public async Task<ImageFile?> GetImageFile(IFileInfo fileInfo)`
`13`	`13`	`{`
`14`	`14`	`logger.LogInformation("Indexing: {filename}", fileInfo.FullName);`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ Action postFilteringAction`
`13`	`13`
`14`	`14`	`public bool FilterError { get; private set; }`
`15`	`15`
`16`		`- private ModelSummaryViewModel modelFilter;`
	`16`	`+ private ModelSummaryViewModel modelFilter = ModelSummaryViewModel.AllModels;`
`17`	`17`	`public ModelSummaryViewModel ModelFilter`
`18`	`18`	`{`
`19`	`19`	`get`
`@@ -30,9 +30,9 @@ public ModelSummaryViewModel ModelFilter`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`33`		`- private string filter;`
	`33`	`+ private string? filter;`
`34`	`34`
`35`		`- public string Filter`
	`35`	`+ public string? Filter`
`36`	`36`	`{`
`37`	`37`	`get`
`38`	`38`	`{`
`@@ -80,7 +80,7 @@ public void RunFilter()`
`80`	`80`	`{`
`81`	`81`	`var queryParams = new QueryParams(`
`82`	`82`	`this.filter,`
`83`		`- this.modelFilter == null ? null : new ModelFilter(this.modelFilter.Model,this.modelFilter.ModelHash),`
	`83`	`+ this.modelFilter == ModelSummaryViewModel.AllModels ? null : new ModelFilter(this.modelFilter.Model, this.modelFilter.ModelHash),`
`84`	`84`	`sortBy`
`85`	`85`	`);`
`86`	`86`	`try`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public ModelSummaryViewModel ModelFilter`
`44`	`44`	`set => filteredList.ModelFilter = value;`
`45`	`45`	`}`
`46`	`46`
`47`		`- public string Filter`
	`47`	`+ public string? Filter`
`48`	`48`	`{`
`49`	`49`	`get => filteredList.Filter;`
`50`	`50`	`set => filteredList.Filter = value;`
`@@ -109,8 +109,11 @@ public void RemoveFile()`
`109`	`109`	`this.thumbnailService.Delete(filename);`
`110`	`110`	`File.Delete(filename);`
`111`	`111`	`var original = imageFileDataSource.ReadImageFile(filename);`
`112`		`- original.Exists = false;`
`113`		`- imageFileDataSource.WriteImageFile(original);`
	`112`	`+ if (original != null)`
	`113`	`+ {`
	`114`	`+ original.Exists = false;`
	`115`	`+ imageFileDataSource.WriteImageFile(original);`
	`116`	`+ }`
`114`	`117`
`115`	`118`	`var next = this.groupList.GetNext(this.SelectedFile);`
`116`	`119`	`if (next == this.SelectedFile) next = null;`
`@@ -122,15 +125,21 @@ public void RemoveFile()`
`122`	`125`
`123`	`126`	`public void MovePrevious()`
`124`	`127`	`{`
`125`		`- this.SelectedFile = this.groupList.GetPrevious(this.SelectedFile);`
	`128`	`+ if (this.SelectedFile != null)`
	`129`	`+ {`
	`130`	`+ this.SelectedFile = this.groupList.GetPrevious(this.SelectedFile);`
	`131`	`+ }`
`126`	`132`	`}`
`127`	`133`
`128`	`134`	`public void MoveNext()`
`129`	`135`	`{`
`130`		`- this.SelectedFile = this.groupList.GetNext(this.SelectedFile);`
	`136`	`+ if (this.SelectedFile != null)`
	`137`	`+ {`
	`138`	`+ this.SelectedFile = this.groupList.GetNext(this.SelectedFile);`
	`139`	`+ }`
`131`	`140`	`}`
`132`	`141`
`133`		`- public IList<GalleryRow> Rows { get; private set; }`
	`142`	`+ public IList<GalleryRow> Rows { get; private set; } = new List<GalleryRow>();`
`134`	`143`
`135`	`144`	`public void ToggleExpandedState(ImageFileViewModel model)`
`136`	`145`	`{`
`@@ -140,7 +149,7 @@ public void ToggleExpandedState(ImageFileViewModel model)`
`140`	`149`	`public IList<ModelSummaryViewModel> GetModelsList()`
`141`	`150`	`{`
`142`	`151`	`var modelsList = this.imageFileDataSource.GetModelSummaryList().Select((p, i) => new ModelSummaryViewModel(p, i + 1)).ToList();`
`143`		`- modelsList.Insert(0, new ModelSummaryViewModel());`
	`152`	`+ modelsList.Insert(0, ModelSummaryViewModel.AllModels);`
`144`	`153`	`return modelsList;`
`145`	`154`	`}`
`146`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`	`{`
`3`	`3`	`public class GroupedByPromptList : IGroupList, IExpandable`
`4`	`4`	`{`
`5`		`- private IList<ImageFileViewModel>? groupedFiles = null;`
`6`		`- private IDictionary<string, List<ImageFileViewModel>>? promptGroups = null;`
	`5`	`+ private IList<ImageFileViewModel> groupedFiles = new List<ImageFileViewModel>();`
	`6`	`+ private IDictionary<string, List<ImageFileViewModel>> promptGroups = new Dictionary<string, List<ImageFileViewModel>>();`
`7`	`7`	`private readonly FilteredList filteredList;`
`8`	`8`	`private readonly Action postGroupingAction;`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public class ImageFileViewModelBuilder(IFileSystem fileSystem)`
`7`	`7`	`{`
`8`	`8`	`public ImageFileViewModel BuildModel(ImageFileSummary p)`
`9`	`9`	`{`
`10`		`- return new ImageFileViewModel(p.FileName, p.FullPromptHash, fileSystem.Path.GetFileName);`
	`10`	`+ return new ImageFileViewModel(p.FileName, p.FullPromptHash ?? "", fileSystem.Path.GetFileName);`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`	`}`