add better error message to client failing uploads

Author: LeftofZen

Definitions/Web/Client.cs

@@ -58,15 +58,24 @@ public static async Task UploadDatFileAsync(HttpClient client, string filename,
 		{
 			try
 			{
-				var route = $"{client.BaseAddress}{Routes.UploadDat}".Replace("//", "'/");
+				var route = $"{client.BaseAddress?.OriginalString}{Routes.UploadDat}";
 				logger.Debug($"Posting {filename} to {route}");
 				var request = new DtoUploadDat(Convert.ToBase64String(datFileBytes), creationDate);
 				var response = await client.PostAsJsonAsync(Routes.UploadDat, request);
 
 				if (!response.IsSuccessStatusCode)
 				{
 					var error = await response.Content.ReadAsStringAsync();
-					logger.Error($"Posting {filename} failed. Error={error}");
+
+					if (string.IsNullOrEmpty(error))
+					{
+
+						logger.Error($"Posting {filename} failed. StatusCode={response.StatusCode} ReasonPhrase={response.ReasonPhrase}");
+					}
+					else
+					{
+						logger.Error($"Posting {filename} failed. Error={error}");
+					}
 					return;
 				}
 

ObjectService/Server.cs

@@ -184,8 +184,10 @@ public async Task<IResult> GetScenario(int uniqueScenarioId, bool? returnObjByte
 		}
 
 		// eg: <todo>
-		public async Task<IResult> UploadDat(DtoUploadDat request, LocoDb db)
+		public async Task<IResult> UploadDat(DtoUploadDat request, LocoDb db, [FromServices] ILogger<Server> logger)
 		{
+			logger.LogInformation("Upload requested");
+
 			if (string.IsNullOrEmpty(request.DatBytesAsBase64))
 			{
 				return Results.BadRequest($"{nameof(request.DatBytesAsBase64)} cannot be null - it must contain the valid bytes of a loco dat object.");
@@ -211,8 +213,8 @@ public async Task<IResult> UploadDat(DtoUploadDat request, LocoDb db)
 				return Results.BadRequest("Unable to accept file sizes > 5MB");
 			}
 
-			var logger = new Logger();
-			if (!SawyerStreamReader.TryGetHeadersFromBytes(datFileBytes, out var hdrs, logger))
+			var ssrLogger = new Logger();
+			if (!SawyerStreamReader.TryGetHeadersFromBytes(datFileBytes, out var hdrs, ssrLogger))
 			{
 				return Results.BadRequest("Provided data had invalid dat file headers");
 			}