general cleanup

Author: LeftofZen

Gui/Models/Converters/EnumToMaterialIconConverter.cs

@@ -14,7 +14,8 @@ public class EnumToMaterialIconConverter : IValueConverter
 			return TryGetIcon(value, DatTypeMapping)
 				?? TryGetIcon(value, ObjectMapping)
 				?? TryGetIcon(value, VehicleMapping)
-				?? TryGetIcon(value, SourceGameMapping);
+				?? TryGetIcon(value, SourceGameMapping)
+				?? "CircleSmall";
 
 			static string? TryGetIcon<T>(object? value, Dictionary<T, string> mapping) where T : struct
 			{

Gui/ViewModels/FolderTreeViewModel.cs

@@ -155,21 +155,14 @@ public static int CountNodes(FileSystemItemBase fib)
 		{
 			if (fib.SubNodes == null || fib.SubNodes.Count == 0)
 			{
-				return 0;
+				return 1;
 			}
 
 			var count = 0;
 
 			foreach (var node in fib.SubNodes)
 			{
-				if (node is FileSystemItemBase)
-				{
-					count++;
-				}
-				else
-				{
-					count += CountNodes(node);
-				}
+				count += CountNodes(node);
 			}
 
 			return count;
@@ -238,7 +231,7 @@ void UpdateGrid(List<FileSystemItemBase> items)
 							}),
 						x => x.SubNodes),
 
-					new TextColumn<FileSystemItemBase, ObjectSource?>("Source", x => x.ObjectSource),
+					new TextColumn<FileSystemItemBase, string?>("Source", x => GetNiceObjectSource(x.ObjectSource)),
 					new TextColumn<FileSystemItemBase, FileLocation?>("Origin", x => x.FileLocation),
 					new TextColumn<FileSystemItemBase, string?>("Location", x => x.Filename),
 					new TextColumn<FileSystemItemBase, DateTimeOffset?>("Created", x => x.CreatedDate),
@@ -249,7 +242,18 @@ void UpdateGrid(List<FileSystemItemBase> items)
 			TreeDataGridSource.RowSelection!.SelectionChanged += SelectionChanged;
 
 			this.RaisePropertyChanged(nameof(TreeDataGridSource));
+
 		}
+		string GetNiceObjectSource(ObjectSource? os)
+			=> os switch
+			{
+				ObjectSource.Custom => "Custom",
+				ObjectSource.LocomotionSteam => "Steam",
+				ObjectSource.LocomotionGoG => "GoG",
+				ObjectSource.OpenLoco => "OpenLoco",
+				null => string.Empty,
+				_ => throw new NotImplementedException(),
+			};
 
 		void SelectionChanged(object? sender, TreeSelectionModelSelectionChangedEventArgs<FileSystemItemBase> e)
 		{

Gui/ViewModels/MainWindowViewModel.cs

@@ -94,9 +94,9 @@ public MainWindowViewModel()
 			_ = FolderTreeViewModel.WhenAnyValue(o => o.CurrentlySelectedObject)
 				.Subscribe((x) =>
 				{
-					if (x is FileSystemItemBase fsi && fsi?.SubNodes?.Count == 0)
+					if (x != null && (x.SubNodes == null || x.SubNodes?.Count == 0))
 					{
-						SetObjectViewModel(fsi);
+						SetObjectViewModel(x);
 					}
 				});
 
@@ -234,7 +234,7 @@ public async Task LoadSingleObject()
 			}
 		}
 
-		void SetObjectViewModel(FileSystemItemObject fsi)
+		void SetObjectViewModel(FileSystemItemBase fsi)
 		{
 			if (fsi != null && !CurrentTabModel.DocumentExistsWithFile(fsi))
 			{

Gui/ViewModels/TabViewPageViewModel.cs

@@ -80,7 +80,7 @@ void ClearDocumentsExcept(ILocoFileViewModel tabToKeep)
 			Documents.Add(tabToKeep);
 		}
 
-		public bool DocumentExistsWithFile(FileSystemItem fsi)
+		public bool DocumentExistsWithFile(FileSystemItemBase fsi)
 			=> Documents.Any(x => x.CurrentFile == fsi);
 	}
 }