fix multiple bugs with web server, gui interaction

Author: LeftofZen

AvaGui/Models/ObjectEditorModel.cs

@@ -227,7 +227,8 @@ public bool TryLoadObject(FileSystemItem filesystemItem, out UiLocoFile? uiLocoF
 				}
 				else
 				{
-					var obj = SawyerStreamReader.LoadFullObjectFromFile(filesystemItem.Filename, logger: Logger);
+					var filename = Path.Combine(Settings.ObjDataDirectory, filesystemItem.Filename);
+					var obj = SawyerStreamReader.LoadFullObjectFromFile(filename, logger: Logger);
 					if (obj != null)
 					{
 						fileInfo = obj.Value.DatFileInfo;
@@ -416,8 +417,8 @@ public async Task UploadDatToServer(ObjectIndexEntry dat)
 		{
 			Logger.Info($"Uploading {dat.Filename} to object repository");
 			var lastModifiedTime = File.GetLastWriteTimeUtc(dat.Filename); // this is the "Modified" time as shown in Windows
-
-			await Client.UploadDatFileAsync(WebClient, dat.Filename, await File.ReadAllBytesAsync(dat.Filename), lastModifiedTime, Logger);
+			var filename = Path.Combine(Settings.ObjDataDirectory, dat.Filename);
+			await Client.UploadDatFileAsync(WebClient, dat.Filename, await File.ReadAllBytesAsync(filename), lastModifiedTime, Logger);
 		}
 	}
 }

DatabaseSeeder/Program.cs

@@ -39,14 +39,14 @@ static void SeedDb(LocoDb db, bool deleteExisting)
 	{
 		Console.WriteLine("Clearing database");
 		_ = db.Objects.ExecuteDelete();
-		_ = db.Authors.ExecuteDelete();
 		_ = db.Tags.ExecuteDelete();
 		_ = db.Modpacks.ExecuteDelete();
+		_ = db.Authors.ExecuteDelete();
 		_ = db.Licences.ExecuteDelete();
 		_ = db.SaveChanges(); // not necessary since ExecuteDelete auto-saves
 	}
 
-	const string ObjDirectory = "Q:\\Games\\Locomotion\\Server";
+	const string ObjDirectory = "Q:\\Games\\Locomotion\\Server\\Objects";
 	var allDatFiles = SawyerStreamUtils.GetDatFilesInDirectory(ObjDirectory);
 
 	Console.WriteLine("Seeding");
@@ -122,13 +122,16 @@ static void SeedDb(LocoDb db, bool deleteExisting)
 		var objectMetadata = JsonSerializer.Deserialize<IEnumerable<ObjectMetadata>>(File.ReadAllText("Q:\\Games\\Locomotion\\Server\\objectMetadata.json"), jsonOptions);
 		var objectMetadataDict = objectMetadata!.ToDictionary(x => (x.ObjectName, x.Checksum), x => x);
 
+		var gameReleaseDate = new DateTimeOffset(2004, 09, 07, 0, 0, 0, TimeSpan.Zero);
+
 		foreach (var objIndex in index.Objects.DistinctBy(x => (x.ObjectName, x.Checksum)))
 		{
 			var metadataKey = (objIndex.ObjectName, objIndex.Checksum);
 			if (!objectMetadataDict.TryGetValue(metadataKey, out var meta))
 			{ }
 
-			var creationTime = File.GetLastWriteTimeUtc(objIndex.Filename); // this is the "Modified" time as shown in Windows
+			var fullPath = Path.Combine(ObjDirectory, objIndex.Filename);
+			var creationTime = objIndex.IsVanilla ? gameReleaseDate : File.GetLastWriteTimeUtc(fullPath); // this is the "Modified" time as shown in Windows
 
 			var authors = meta?.Authors == null ? null : db.Authors.Where(x => meta.Authors.Contains(x.Name)).ToList();
 			var tags = meta?.Tags == null ? null : db.Tags.Where(x => meta.Tags.Contains(x.Name)).ToList();
@@ -138,7 +141,7 @@ static void SeedDb(LocoDb db, bool deleteExisting)
 			var tblLocoObject = new TblLocoObject()
 			{
 				Name = $"{objIndex.ObjectName}_{objIndex.Checksum}",  // same as server upload name
-				PathOnDisk = Path.Combine(ObjDirectory, objIndex.Filename),
+				PathOnDisk = objIndex.Filename.Replace('\\', '/'), // make the path linux-compatible
 				OriginalName = objIndex.ObjectName,
 				OriginalChecksum = objIndex.Checksum,
 				IsVanilla = objIndex.IsVanilla,

Definitions/Migrations/20240829075742_InitialCreate.Designer.cs renamed to Definitions/Migrations/20240829143539_InitialCreate.Designer.cs

@@ -57,7 +57,8 @@ public static async Task UploadDatFileAsync(HttpClient client, string filename,
 		{
 			try
 			{
-				logger.Debug($"Posting {filename} to {client.BaseAddress}{Routes.UploadDat}");
+				var route = $"{client.BaseAddress}{Routes.UploadDat}".Replace("//", "'/");
+				logger.Debug($"Posting {filename} to {route}");
 				var request = new DtoUploadDat(Convert.ToBase64String(datFileBytes), creationDate);
 				var response = await client.PostAsJsonAsync(Routes.UploadDat, request);
 

Definitions/Migrations/20240829075742_InitialCreate.cs renamed to Definitions/Migrations/20240829143539_InitialCreate.cs

@@ -8,6 +8,9 @@
 
 var builder = WebApplication.CreateBuilder(args);
 
+builder.Logging.ClearProviders();
+builder.Logging.AddConsole();
+
 var connectionString = builder.Configuration.GetConnectionString("SQLiteConnection");
 
 // Add services to the container.
@@ -51,9 +54,6 @@
 builder.Services.AddSingleton<Server>();
 var serviceSettings = builder.Services.Configure<ObjectServiceSettings>(builder.Configuration.GetSection("ObjectService"));
 
-builder.Logging.ClearProviders();
-builder.Logging.AddConsole();
-
 var app = builder.Build();
 app.UseHttpLogging();
 app.UseRateLimiter();

Definitions/Web/Client.cs

@@ -1,3 +1,4 @@
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 using OpenLoco.Dat.Data;
@@ -37,7 +38,7 @@ await db.Objects
 					x.VehicleType)).ToListAsync());
 
 		// eg: https://localhost:7230/objects/getdat?objectName=114&checksum=123$returnObjBytes=false
-		public async Task<IResult> GetDat(string objectName, uint checksum, bool? returnObjBytes, LocoDb db)
+		public async Task<IResult> GetDat(string objectName, uint checksum, bool? returnObjBytes, LocoDb db, [FromServices] ILogger<Server> logger)
 		{
 			var eObj = await db.Objects
 				.Where(x => x.OriginalName == objectName && x.OriginalChecksum == checksum)
@@ -47,11 +48,11 @@ public async Task<IResult> GetDat(string objectName, uint checksum, bool? return
 
 			return eObj == null || eObj.Object == null
 				? Results.NotFound()
-				: Results.Ok(await PrepareLocoObject(eObj, settings.ObjectRootFolder, returnObjBytes ?? false));
+				: Results.Ok(await PrepareLocoObject(eObj, settings.ObjectRootFolder, returnObjBytes ?? false, logger));
 		}
 
 		// eg: https://localhost:7230/objects/getobject?uniqueObjectId=246263256&returnObjBytes=false
-		public async Task<IResult> GetObject(int uniqueObjectId, bool? returnObjBytes, LocoDb db)
+		public async Task<IResult> GetObject(int uniqueObjectId, bool? returnObjBytes, LocoDb db, [FromServices] ILogger<Server> logger)
 		{
 			Console.WriteLine($"Object [{uniqueObjectId}] requested");
 			var eObj = await db.Objects
@@ -62,7 +63,7 @@ public async Task<IResult> GetObject(int uniqueObjectId, bool? returnObjBytes, L
 
 			return eObj == null || eObj.Object == null
 				? Results.NotFound()
-				: Results.Ok(await PrepareLocoObject(eObj, settings.ObjectRootFolder, returnObjBytes ?? false));
+				: Results.Ok(await PrepareLocoObject(eObj, settings.ObjectRootFolder, returnObjBytes ?? false, logger));
 		}
 
 		// eg: https://localhost:7230/objects/originaldatfile?objectName=114&checksum=123
@@ -104,11 +105,12 @@ public async Task<IResult> GetObjectFile(int uniqueObjectId, LocoDb db)
 				: Results.NotFound();
 		}
 
-		internal static async Task<DtoLocoObject> PrepareLocoObject(ExpandedTblLocoObject eObj, string objectRootFolder, bool returnObjBytes)
+		internal static async Task<DtoLocoObject> PrepareLocoObject(ExpandedTblLocoObject eObj, string objectRootFolder, bool returnObjBytes, ILogger<Server> logger)
 		{
 			var obj = eObj!.Object;
 
-			var pathOnDisk = Path.Combine(objectRootFolder, obj.PathOnDisk);
+			var pathOnDisk = Path.Combine(objectRootFolder, obj.PathOnDisk.Replace('\\', '/')); // handle windows paths by replacing path separator
+			logger.LogInformation("Loading file from {0}", pathOnDisk);
 			var bytes = returnObjBytes && !obj.IsVanilla && File.Exists(pathOnDisk) ? Convert.ToBase64String(await File.ReadAllBytesAsync(pathOnDisk)) : null;
 
 			return new DtoLocoObject(
@@ -181,17 +183,17 @@ public async Task<IResult> UploadDat(DtoUploadDat request, LocoDb db)
 				return Results.Accepted($"Object already exists in the database. OriginalName={s5Header.Name} OriginalChecksum={s5Header.Checksum} UploadDate={existingObject!.UploadDate}");
 			}
 
-			const string SettingsPath = "Q:\\Games\\Locomotion\\Server\\CustomObjects";
 			const string UploadFolder = "UploadedObjects";
 			var uuid = Guid.NewGuid();
-			var saveFileName = Path.Combine(SettingsPath, UploadFolder, $"{uuid}.dat");
+			var saveFileName = Path.Combine(settings.ObjectRootFolder, UploadFolder, $"{uuid}.dat");
 			File.WriteAllBytes(saveFileName, datFileBytes);
 
 			Console.WriteLine($"File accepted OriginalName={s5Header.Name} OriginalChecksum={s5Header.Checksum} PathOnDisk={saveFileName}");
 
 			var locoTbl = new TblLocoObject()
 			{
 				Name = $"{s5Header.Name}_{s5Header.Checksum}", // same as DB seeder name
+				PathOnDisk = Path.Combine(UploadFolder, $"{uuid}.dat"),
 				OriginalName = s5Header.Name,
 				OriginalChecksum = s5Header.Checksum,
 				IsVanilla = false, // not possible to upload vanilla objects

ObjectService/Program.cs

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # example usage:
-# ./deploy.sh 1.2.3
+# ./build.sh 1.2.3
 
 # 1. Get the version from the first command-line argument
 if [ -z "$1" ]; then
@@ -12,27 +12,15 @@ version="$1"
 
 echo "Building version $version"
 
-# 2. Write the version to version.txt. This is purely to generate a commit on master for new version
-echo "$version" > AvaGui/version.txt
-
-# 3. Make a release commit
-git add AvaGui/version.txt
-git commit -m "prepare $version"
-git push
-
-## 4. Make a tag
-git tag -a "$version" -m "tag $version"
-git push --tags
-
-## 5. Build the project for different platforms
+## 2. Build the project for different platforms
 echo "Building"
 dotnet publish AvaGui/AvaGui.csproj -c Release -p:PublishSingleFile=true -p:Version=$version --self-contained --runtime win-x64
 dotnet publish AvaGui/AvaGui.csproj -c Release -p:PublishSingleFile=true -p:Version=$version --self-contained --runtime linux-x64
 dotnet publish AvaGui/AvaGui.csproj -c Release -p:PublishSingleFile=true -p:Version=$version --self-contained --runtime osx-x64
 
-dotnet publish ObjectService/ObjectService.csproj -c Release -p:PublishSingleFile=true -p:Version=$version --self-contained --runtime linux-x64
+# dotnet publish ObjectService/ObjectService.csproj -c Release -p:PublishSingleFile=true -p:Version=$version --self-contained --runtime linux-x64
 
-# 6. Create the ZIP and tar archives
+# 3. Create the ZIP and tar archives
 echo "Zipping"
 
 pushd "AvaGui/bin/Release/net8.0/"

ObjectService/Server.cs

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# example usage:
+# ./build.sh 1.2.3
+
+# 1. Get the version from the first command-line argument
+if [ -z "$1" ]; then
+    echo "Error: Please provide the version as the first argument."
+    exit 1
+fi
+version="$1"
+
+echo "Building version $version"
+
+dotnet publish ObjectService/ObjectService.csproj -c Release -p:PublishSingleFile=true -p:Version=$version --self-contained --runtime linux-x64
+
+echo "Build and packaging complete!"

deploy.sh renamed to build.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# example usage:
+# ./tag.sh 1.2.3
+
+# 1. Get the version from the first command-line argument
+if [ -z "$1" ]; then
+    echo "Error: Please provide the version as the first argument."
+    exit 1
+fi
+version="$1"
+
+echo "Building version $version"
+
+# 2. Write the version to version.txt. This is purely to generate a commit on master for new version
+echo "$version" > AvaGui/version.txt
+
+# 3. Make a release commit
+git add AvaGui/version.txt
+git commit -m "prepare $version"
+git push
+
+## 4. Make a tag
+git tag -a "$version" -m "tag $version"
+git push --tags
+
+echo "Tagging complete!"