order objects in the treeview alphabetically

Author: LeftofZen

AvaGui/Models/ObjectEditorModel.cs

@@ -17,6 +17,7 @@
 using OpenLoco.ObjectEditor;
 using System.Collections.ObjectModel;
 using ReactiveUI;
+using System.Reflection;
 
 namespace AvaGui.Models
 {
@@ -147,9 +148,21 @@ public bool TryLoadObject(string filename, out UiLocoFile? uiLocoFile)
 				return false;
 			}
 
-			(var fileInfo, var locoObject) = SawyerStreamReader.LoadFullObjectFromFile(filename, logger: Logger);
+			DatFileInfo? fileInfo;
+			ILocoObject? locoObject;
 
-			if (locoObject == null)
+			try
+			{
+				(fileInfo, locoObject) = SawyerStreamReader.LoadFullObjectFromFile(filename, logger: Logger);
+			}
+			catch (Exception ex)
+			{
+				Logger?.Error($"Unable to load {filename}", ex);
+				uiLocoFile = null;
+				return false;
+			}
+
+			if (locoObject == null || fileInfo == null)
 			{
 				Logger?.Error($"Unable to load {filename}. FileInfo={fileInfo}");
 				uiLocoFile = null;

AvaGui/ViewModels/FolderTreeViewModel.cs

@@ -104,7 +104,10 @@ IEnumerable<FileSystemItemBase> LoadObjDirectoryCore(string directory, bool useE
 								.GroupBy(o => o.Value.VehicleType)
 								.OrderBy(vg => vg.Key.ToString()))
 							{
-								var vehicleSubNodes = new ObservableCollection<FileSystemItemBase>(vg.Select(o => new FileSystemItem(o.Key, o.Value.Name.Trim(), o.Value.SourceGame)));
+								var vehicleSubNodes = new ObservableCollection<FileSystemItemBase>(
+									vg
+									.Select(o => new FileSystemItem(o.Key, o.Value.Name.Trim(), o.Value.SourceGame))
+									.OrderBy(o => o.Name));
 
 								if (vg.Key == null)
 								{
@@ -122,7 +125,9 @@ IEnumerable<FileSystemItemBase> LoadObjDirectoryCore(string directory, bool useE
 						else
 						{
 							subNodes = new ObservableCollection<FileSystemItemBase>(
-								objGroup.Select(o => new FileSystemItem(o.Key, o.Value.Name.Trim(), o.Value.SourceGame)));
+								objGroup
+								.Select(o => new FileSystemItem(o.Key, o.Value.Name.Trim(), o.Value.SourceGame))
+								.OrderBy(o => o.Name));
 						}
 
 						groups.Add(new FileSystemItemGroup(

AvaGui/ViewModels/MainWindowViewModel.cs

@@ -186,7 +186,7 @@ public async Task SelectNewFolder()
 			}
 
 			var dirPath = dir.Path.LocalPath;
-			if (Directory.Exists(dirPath) && Directory.EnumerateFiles(dirPath).Any() && !Model.Settings.ObjDataDirectories.Contains(dirPath))
+			if (Directory.Exists(dirPath) && !Model.Settings.ObjDataDirectories.Contains(dirPath))
 			{
 				await Model.LoadObjDirectoryAsync(dirPath, null, false);
 				var menuItem = new MenuItemModel(

Core/DatFileParsing/SawyerStreamReader.cs

@@ -64,7 +64,7 @@ public static byte[] LoadBytesFromFile(string filename, ILogger? logger = null)
 		public static (S5Header s5Header, ObjectHeader objHeader, byte[] decodedData) LoadAndDecodeFromFile(string filename, ILogger? logger = null)
 			=> LoadAndDecodeFromStream(LoadBytesFromFile(filename), logger);
 
-		public static (S5Header s5Header, ObjectHeader objHeader, byte[] decodedData) LoadAndDecodeFromStream(ReadOnlySpan<byte> fullData, ILogger? logger = null)
+		static (S5Header s5Header, ObjectHeader objHeader, byte[] decodedData) LoadAndDecodeFromStream(ReadOnlySpan<byte> fullData, ILogger? logger = null)
 		{
 			var s5Header = S5Header.Read(fullData[0..S5Header.StructLength]);
 			var remainingData = fullData[S5Header.StructLength..];
@@ -103,6 +103,12 @@ public static (DatFileInfo DatFileInfo, ILocoObject? LocoObject) LoadFullObjectF
 		{
 			logger?.Info($"Full-loading \"{filename}\" with loadExtra={loadExtra}");
 
+			if (data.Length < (S5Header.StructLength + ObjectHeader.StructLength))
+			{
+				logger?.Error($"{filename} didn't have enough data");
+				return new(new DatFileInfo(S5Header.NullHeader, ObjectHeader.NullHeader), null);
+			}
+
 			var (s5Header, objectHeader, decodedData) = LoadAndDecodeFromStream(data, logger);
 
 			if (decodedData.Length == 0)