misc fixes and renames

Author: LeftofZen

Dat/Objects/Sound/SoundObject.cs

@@ -12,7 +12,7 @@ namespace OpenLoco.Dat.Objects.Sound
 	public record SoundObject(
 		[property: LocoStructOffset(0x00), LocoString, Browsable(false)] string_id Name,
 		[property: LocoStructOffset(0x02), Browsable(false)] uint32_t SoundObjectDataPtr,
-		[property: LocoStructOffset(0x06)] uint8_t var_06,
+		[property: LocoStructOffset(0x06)] uint8_t LoopCount, // 0 means no loop, any other number means loop
 		[property: LocoStructOffset(0x07)] uint8_t var_07,
 		[property: LocoStructOffset(0x08)] uint32_t Volume
 		) : ILocoStruct, ILocoStructVariableData

Dat/Types/SCV5/S5File.cs

@@ -6,7 +6,7 @@ namespace OpenLoco.Dat.Types.SCV5
 	[TypeConverter(typeof(ExpandableObjectConverter))]
 	[LocoStructSize(StructLength)]
 	public record S5File(
-		[property: LocoStructOffset(0x00)] Header Header,
+		[property: LocoStructOffset(0x00)] S5FileHeader Header,
 		[property: LocoStructOffset(0x20)] LandscapeDetails? LandscapeOptions,
 		[property: LocoStructOffset(0x433A)] SaveDetails? SaveDetails,
 		[property: LocoStructOffset(0x10952), LocoArrayLength(859), Browsable(false)] List<S5Header> RequiredObjects,
@@ -21,7 +21,7 @@ public record S5File(
 
 		public static S5File Read(ReadOnlySpan<byte> data)
 		{
-			var header = SawyerStreamReader.ReadChunk<Header>(ref data);
+			var header = SawyerStreamReader.ReadChunk<S5FileHeader>(ref data);
 
 			SaveDetails? saveDetails = null;
 			LandscapeDetails? landscapeDetails = null;

Dat/Types/SCV5/Header.cs renamed to Dat/Types/SCV5/S5FileHeader.cs

@@ -5,7 +5,7 @@ namespace OpenLoco.Dat.Types.SCV5
 {
 	[TypeConverter(typeof(ExpandableObjectConverter))]
 	[LocoStructSize(StructLength)]
-	public record Header(
+	public record S5FileHeader(
 		[property: LocoStructOffset(0x00)] S5Type Type,
 		[property: LocoStructOffset(0x01)] HeaderFlags Flags,
 		[property: LocoStructOffset(0x02)] uint16_t NumPackedObjects,

DatabaseSeeder/Program.cs

@@ -169,9 +169,3 @@ static void SeedDb(LocoDb db, bool deleteExisting)
 
 	Console.WriteLine("Finished seeding");
 }
-
-static string? uint32_t_LittleToBigEndian(string input)
-{
-	var r = new string(input.Chunk(2).Reverse().SelectMany(x => x).ToArray());
-	return Convert.ToUInt32(r, 16).ToString();
-}

Gui/Models/MetadataModel.cs

@@ -6,19 +6,14 @@
 
 namespace OpenLoco.Gui.Models
 {
-	public class MetadataModel
+	public class MetadataModel(string uniqueName, string datName, uint datChecksum)
 	{
-		public MetadataModel(string uniqueName, string datName, uint datChecksum)
-		{
-			UniqueName = uniqueName;
-			DatName = datName;
-			DatChecksum = datChecksum;
-		}
+		public string UniqueName { get; init; } = uniqueName;
 
-		public string UniqueName { get; init; }
+		public string DatName { get; init; } = datName;
+
+		public uint DatChecksum { get; init; } = datChecksum;
 
-		public string DatName { get; init; }
-		public uint DatChecksum { get; init; }
 		public string? Description { get; set; }
 
 		[Browsable(false)]

Gui/Models/ObjectEditorModel.cs

@@ -92,7 +92,6 @@ void LoadSettings()
 			{
 				Logger.Error("Unable to validate settings file - please delete it and it will be recreated on next editor start-up.");
 			}
-
 		}
 
 		void InitialiseDownloadDirectory()
@@ -321,7 +320,7 @@ async Task LoadObjDirectoryAsyncCore(string directory, IProgress<float> progress
 
 			async Task RecreateIndex(string directory, IProgress<float> progress)
 			{
-				Logger.Info("Recreating index file");
+				Logger.Info($"Recreating index file for {directory}");
 				ObjectIndex = await ObjectIndex.CreateIndexAsync(directory, Logger, progress);
 				ObjectIndex?.SaveIndex(Settings.IndexFileName);
 			}

Gui/ViewModels/DatTypes/Objects/VehicleViewModel.cs

@@ -21,8 +21,8 @@ public class VehicleViewModel : ReactiveObject, IObjectViewModel<ILocoStruct>
 		[Reactive, Category("Stats")] public uint16_t ObsoleteYear { get; set; }
 		[Reactive, Category("Stats")] public uint8_t Reliability { get; set; }
 		[Reactive] public VehicleObjectFlags Flags { get; set; }
-		[Reactive] public S5Header TrackType { get; set; }
-		[Reactive] public S5Header RackRail { get; set; }
+		[Reactive] public S5Header? TrackType { get; set; }
+		[Reactive] public S5Header? RackRail { get; set; }
 		[Reactive, Length(0, 8)] public BindingList<S5Header> CompatibleVehicles { get; set; }
 		[Reactive, Length(0, 4)] public BindingList<S5Header> RequiredTrackExtras { get; set; }
 		[Reactive, Category("Cost"), Range(0, 32)] public uint8_t CostIndex { get; set; }
@@ -41,7 +41,7 @@ public class VehicleViewModel : ReactiveObject, IObjectViewModel<ILocoStruct>
 		[Reactive, Category("Cargo")] public BindingList<CargoCategory> CompatibleCargoCategories1 { get; set; }
 		[Reactive, Category("Cargo")] public BindingList<CargoCategory> CompatibleCargoCategories2 { get; set; }
 		[Reactive, Category("Cargo"), Length(0, 32)] public BindingList<CargoTypeSpriteOffset> CargoTypeSpriteOffsets { get; set; } // this is a dictionary type
-		[Reactive, Category("Sound")] public S5Header Sound { get; set; }
+		[Reactive, Category("Sound")] public S5Header? Sound { get; set; }
 		[Reactive, Category("Sound")] public DrivingSoundType SoundType { get; set; }
 		// SoundPropertiesData
 		// these next 3 properties are a union in the dat file

Gui/ViewModels/SubObjectTypes/ImageTableViewModel.cs

@@ -223,11 +223,12 @@ public async Task ImportImages()
 					{
 						// found blender folder
 						var offsets = JsonSerializer.Deserialize<ICollection<SpriteOffset>>(File.ReadAllText(offsetsFile)); // sprites.json is an unnamed array so we need ICollection here, not IEnumerable
+						ArgumentNullException.ThrowIfNull(offsets);
 						Logger.Debug("Found sprites.json file, using that");
 
-						if (offsets?.Count != G1Provider.G1Elements.Count)
+						if (offsets.Count != G1Provider.G1Elements.Count)
 						{
-							Logger.Warning($"Expected {G1Provider.G1Elements.Count} offsets, got {offsets?.Count} offsets. Continue at your peril.");
+							Logger.Warning($"Expected {G1Provider.G1Elements.Count} offsets, got {offsets.Count} offsets. Continue at your peril.");
 						}
 
 						foreach (var offset in offsets)

Gui/ViewModels/SubObjectTypes/SoundViewModel.cs

@@ -97,6 +97,11 @@ public void PlaySound()
 		public async Task ImportSound()
 		{
 			var fsi = await MainWindowViewModel.GetFileSystemItemFromUser(PlatformSpecific.WavFileTypes);
+			if (fsi == null)
+			{
+				return;
+			}
+
 			var (header, pcmData) = SawyerStreamReader.LoadWavFile(fsi.Filename);
 			Header = header;
 			Data = pcmData;

ObjectService/Program.cs

@@ -66,6 +66,7 @@
 }
 
 var objRoot = builder.Configuration["ObjectService:RootFolder"];
+ArgumentNullException.ThrowIfNull(objRoot);
 var server = new Server(new ServerSettings(objRoot) { RootFolder = objRoot! });
 
 // GET