remove index version, add more async methods

Author: LeftofZen

AvaGui/Models/ObjectEditorModel.cs

@@ -348,7 +348,7 @@ async Task LoadObjDirectoryAsyncCore(string directory, IProgress<float> progress
 
 				try
 				{
-					ObjectIndex = ObjectIndex.LoadIndex(IndexFilename) ?? ObjectIndex;
+					ObjectIndex = await ObjectIndex.LoadIndexAsync(IndexFilename) ?? ObjectIndex;
 				}
 				catch (Exception ex)
 				{

Dat/ObjectIndex.cs

@@ -2,15 +2,13 @@
 using OpenLoco.Dat.FileParsing;
 using OpenLoco.Dat.Objects;
 using System.Collections.Concurrent;
+using System.Text;
 using System.Text.Json;
 
 namespace Dat
 {
 	public class ObjectIndex
 	{
-		public const int JsonVersion = 1; // change this every time this format changes
-		public int Version => JsonVersion;
-
 		public required IList<ObjectIndexEntry> Objects { get; set; } = [];
 
 		public required IList<ObjectIndexFailedEntry> ObjectsFailed { get; set; } = [];
@@ -63,13 +61,24 @@ public void SaveIndex(string indexFile)
 		public void SaveIndex(string indexFile, JsonSerializerOptions options)
 			=> File.WriteAllText(indexFile, JsonSerializer.Serialize(this, options));
 
-		public static ObjectIndex LoadIndex(string indexFile)
+		public static ObjectIndex? LoadIndex(string indexFile)
 			=> JsonSerializer.Deserialize<ObjectIndex>(File.ReadAllText(indexFile));
 
-		public static ObjectIndex LoadIndex(string indexFile, JsonSerializerOptions options)
+		public static ObjectIndex? LoadIndex(string indexFile, JsonSerializerOptions options)
 			=> JsonSerializer.Deserialize<ObjectIndex>(File.ReadAllText(indexFile), options);
 
-		public static ObjectIndex LoadOrCreateIndex(string directory)
+		public static async Task<ObjectIndex?> LoadIndexAsync(string indexFile)
+		{
+			await using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(await File.ReadAllTextAsync(indexFile))))
+			{
+				return await JsonSerializer.DeserializeAsync<ObjectIndex>(stream);
+			}
+		}
+
+		public static ObjectIndex? LoadOrCreateIndex(string directory)
+			=> LoadOrCreateIndexAsync(directory).Result;
+
+		public static async Task<ObjectIndex?> LoadOrCreateIndexAsync(string directory)
 		{
 			var indexPath = Path.Combine(directory, "objectIndex.json");
 			ObjectIndex? index;
@@ -80,7 +89,7 @@ public static ObjectIndex LoadOrCreateIndex(string directory)
 			else
 			{
 				var fileArr = SawyerStreamUtils.GetDatFilesInDirectory(directory).ToArray();
-				index = CreateIndexAsync(directory, fileArr, null).Result;
+				index = await CreateIndexAsync(directory, fileArr, null);
 				index.SaveIndex(indexPath);
 			}
 

DatabaseSeeder/Program.cs

@@ -151,6 +151,7 @@ static void SeedDb(LocoDb db, bool deleteExisting)
 				Authors = authors ?? [],
 				CreationDate = creationTime,
 				LastEditDate = null,
+				UploadDate = DateTimeOffset.Now,
 				Tags = tags ?? [],
 				Modpacks = modpacks ?? [],
 				Availability = ObjectAvailability.NewGames,

WinGui/MainFormModel.cs

@@ -254,9 +254,10 @@ public void LoadObjDirectory(string directory, IProgress<float>? progress, bool
 
 			Settings.ObjDataDirectory = directory;
 			var allFiles = Directory.GetFiles(directory, "*.dat", SearchOption.AllDirectories);
-			if (useExistingIndex && File.Exists(Settings.GetObjDataFullPath(Settings.IndexFileName)))
+			var indexFileName = Settings.GetObjDataFullPath(Settings.IndexFileName);
+			if (useExistingIndex && File.Exists(indexFileName))
 			{
-				ObjectIndex = DeserialiseHeaderIndexFromFile(Settings.GetObjDataFullPath(Settings.IndexFileName)) ?? ObjectIndex;
+				ObjectIndex = ObjectIndex.LoadIndex(indexFileName) ?? ObjectIndex;
 
 				var filenames = ObjectIndex.Objects.Select(x => x.Filename).Concat(ObjectIndex.ObjectsFailed.Select(x => x.Filename));
 				var a = filenames.Except(allFiles);
@@ -354,17 +355,6 @@ static void SerialiseHeaderIndexToFile(string filename, ObjectIndex headerIndex,
 			headerIndex.SaveIndex(filename, options);
 		}
 
-		static ObjectIndex? DeserialiseHeaderIndexFromFile(string filename, ILogger? logger = null)
-		{
-			if (!File.Exists(filename))
-			{
-				logger?.Info($"Settings file {filename} does not exist");
-				return null;
-			}
-			logger?.Info($"Loading settings from {filename}");
-			return ObjectIndex.LoadIndex(filename);
-		}
-
 		public UiLocoObject? LoadAndCacheObject(string filename)
 		{
 			if (string.IsNullOrEmpty(filename) || !filename.EndsWith(".dat", StringComparison.InvariantCultureIgnoreCase) || !File.Exists(filename))