From b7ad479eadda010926234318ddc7c1da1cf0e61d Mon Sep 17 00:00:00 2001 From: ntr Date: Wed, 30 Aug 2023 12:36:23 +1000 Subject: [PATCH] various bugfixes --- .../{testTrack.meta => sr_testtrack.meta} | 0 .../EmptyTrack.scenetemplate | 0 .../EmptyTrack.scenetemplate.meta | 0 .../sr_testtrack.unity} | 0 .../sr_testtrack.unity.meta} | 0 Assets/Src/LapService.cs | 43 ++++++++++--------- Assets/Src/Timing.cs | 2 +- ...{PbController.cs => LapTimesController.cs} | 8 ++-- .../20230829101729_InitSectors.Designer.cs | 6 +-- .../Migrations/20230829101729_InitSectors.cs | 6 +-- .../SpaceRaceDbContextModelSnapshot.cs | 6 +-- Server/Repositories/SpaceRaceDbContext.cs | 6 +-- 12 files changed, 39 insertions(+), 38 deletions(-) rename Assets/Scenes/{testTrack.meta => sr_testtrack.meta} (100%) rename Assets/Scenes/{testTrack => sr_testtrack}/EmptyTrack.scenetemplate (100%) rename Assets/Scenes/{testTrack => sr_testtrack}/EmptyTrack.scenetemplate.meta (100%) rename Assets/Scenes/{testTrack/TestTrack.unity => sr_testtrack/sr_testtrack.unity} (100%) rename Assets/Scenes/{testTrack/TestTrack.unity.meta => sr_testtrack/sr_testtrack.unity.meta} (100%) rename Server/Controllers/{PbController.cs => LapTimesController.cs} (74%) diff --git a/Assets/Scenes/testTrack.meta b/Assets/Scenes/sr_testtrack.meta similarity index 100% rename from Assets/Scenes/testTrack.meta rename to Assets/Scenes/sr_testtrack.meta diff --git a/Assets/Scenes/testTrack/EmptyTrack.scenetemplate b/Assets/Scenes/sr_testtrack/EmptyTrack.scenetemplate similarity index 100% rename from Assets/Scenes/testTrack/EmptyTrack.scenetemplate rename to Assets/Scenes/sr_testtrack/EmptyTrack.scenetemplate diff --git a/Assets/Scenes/testTrack/EmptyTrack.scenetemplate.meta b/Assets/Scenes/sr_testtrack/EmptyTrack.scenetemplate.meta similarity index 100% rename from Assets/Scenes/testTrack/EmptyTrack.scenetemplate.meta rename to Assets/Scenes/sr_testtrack/EmptyTrack.scenetemplate.meta diff --git a/Assets/Scenes/testTrack/TestTrack.unity b/Assets/Scenes/sr_testtrack/sr_testtrack.unity similarity index 100% rename from Assets/Scenes/testTrack/TestTrack.unity rename to Assets/Scenes/sr_testtrack/sr_testtrack.unity diff --git a/Assets/Scenes/testTrack/TestTrack.unity.meta b/Assets/Scenes/sr_testtrack/sr_testtrack.unity.meta similarity index 100% rename from Assets/Scenes/testTrack/TestTrack.unity.meta rename to Assets/Scenes/sr_testtrack/sr_testtrack.unity.meta diff --git a/Assets/Src/LapService.cs b/Assets/Src/LapService.cs index b708d8f..851dae5 100644 --- a/Assets/Src/LapService.cs +++ b/Assets/Src/LapService.cs @@ -30,38 +30,39 @@ public class LapService { LoadPlayerData(); } - public IEnumerator GetPb() { - string uri = $"localhost:40080/Pb?userId={_player.Id}&mapName={_mapName}"; + public IEnumerator GetLapTimes() { + string uri = $"localhost:40080/LapTimes?userId={_player.Id}&mapName={_mapName}"; using (UnityWebRequest req = UnityWebRequest.Get(uri)) { yield return req.SendWebRequest(); switch (req.result) { - case UnityWebRequest.Result.ConnectionError: - case UnityWebRequest.Result.DataProcessingError: - Debug.LogError("Error: " + req.error); - break; - case UnityWebRequest.Result.ProtocolError: - Debug.LogError("HTTP Error: " + req.error); - break; case UnityWebRequest.Result.Success: Debug.Log("Received: " + req.downloadHandler.text); - SetPb(req.downloadHandler.text); + SetLapTimes(req.downloadHandler.text); + break; + default: + Debug.LogError("Error: " + req.error); break; } } } - LapTimesDTO SetPb(string json) { - LapTimesDTO dto = JsonConvert.DeserializeObject(json); - _pb = dto.Pb; - _lr = dto.LapRecord; + void SetLapTimes(string json) { + try { + LapTimesDTO dto = JsonConvert.DeserializeObject(json); + _pb = dto.Pb; + _lr = dto.LapRecord; - PB = new Lap { - Map = _pb.Map, - Sectors = _pb.Sectors.Select((d, i) => new SectorTime { Sector = i + 1, Seconds = d }).ToList(), - }; - - return dto; + PB = new Lap { + Map = _pb.Map, + Sectors = _pb.Sectors.Select((d, i) => new SectorTime { Sector = i + 1, Seconds = d }).ToList(), + }; + } catch (Exception e) { + Debug.LogWarning($"Failed to set lap times {e}"); + _pb = null; + _lr = null; + PB = null; + } } public IEnumerator PostLap(Lap lap) { @@ -91,7 +92,7 @@ public class LapService { try { string json = File.ReadAllText(playerDataPath); _player = JsonConvert.DeserializeObject(json); - Debug.Log($"Loaded player data {_player}"); + Debug.Log($"Loaded player data {json}"); } catch { Debug.Log("No existing playerData.json"); CreatePlayerData(); diff --git a/Assets/Src/Timing.cs b/Assets/Src/Timing.cs index cb12bc1..64ec625 100644 --- a/Assets/Src/Timing.cs +++ b/Assets/Src/Timing.cs @@ -42,7 +42,7 @@ public class Timing: MonoBehaviour { } void Start() { - StartCoroutine(lapService.GetPb()); + StartCoroutine(lapService.GetLapTimes()); } void Update() { diff --git a/Server/Controllers/PbController.cs b/Server/Controllers/LapTimesController.cs similarity index 74% rename from Server/Controllers/PbController.cs rename to Server/Controllers/LapTimesController.cs index 27dafab..96eb924 100644 --- a/Server/Controllers/PbController.cs +++ b/Server/Controllers/LapTimesController.cs @@ -7,17 +7,17 @@ namespace Server.Controllers; [ApiController] [Route("[controller]")] -public class PbController : ControllerBase { - private readonly ILogger _logger; +public class LapTimesController : ControllerBase { + private readonly ILogger _logger; private SpaceRaceDbContext _db; - public PbController(ILogger logger, SpaceRaceDbContext db) { + public LapTimesController(ILogger logger, SpaceRaceDbContext db) { _logger = logger; _db = db; } [HttpGet()] - public LapTimesDTO Pb(Guid userId, string mapName) { + public LapTimesDTO LapTimes(Guid userId, string mapName) { _logger.LogInformation($"{userId} {mapName}"); PbDTO pb = _db.PbDTO diff --git a/Server/Migrations/20230829101729_InitSectors.Designer.cs b/Server/Migrations/20230829101729_InitSectors.Designer.cs index 337bbca..1e454bc 100644 --- a/Server/Migrations/20230829101729_InitSectors.Designer.cs +++ b/Server/Migrations/20230829101729_InitSectors.Designer.cs @@ -63,7 +63,7 @@ namespace Server.Migrations { Id = new Guid("589bfb11-59c1-4f7e-beef-973c301b8e08"), Created = new DateTimeOffset(new DateTime(2023, 8, 29, 10, 17, 29, 656, DateTimeKind.Unspecified).AddTicks(467), new TimeSpan(0, 0, 0, 0, 0)), - Map = "sr_TestTrack", + Map = "sr_testtrack", Sectors = new List { 64.0, 24.0, 24.0 }, Time = 128.0, UserId = new Guid("11111111-1111-1111-1111-111111111111") @@ -72,7 +72,7 @@ namespace Server.Migrations { Id = new Guid("67bda0f2-ecf8-4521-ba21-08d252d9ce59"), Created = new DateTimeOffset(new DateTime(2023, 8, 29, 10, 17, 29, 656, DateTimeKind.Unspecified).AddTicks(723), new TimeSpan(0, 0, 0, 0, 0)), - Map = "sr_TestTrack", + Map = "sr_testtrack", Sectors = new List { 64.0, 38.0, 24.0 }, Time = 132.0, UserId = new Guid("22222222-2222-2222-2222-222222222222") @@ -81,7 +81,7 @@ namespace Server.Migrations { Id = new Guid("678183de-9df4-4d98-9807-f288b54a7f3a"), Created = new DateTimeOffset(new DateTime(2023, 8, 29, 10, 17, 29, 656, DateTimeKind.Unspecified).AddTicks(745), new TimeSpan(0, 0, 0, 0, 0)), - Map = "sr_TestTrack", + Map = "sr_testtrack", Sectors = new List { 64.0, 64.0, 24.0 }, Time = 148.0, UserId = new Guid("33333333-3333-3333-3333-333333333333") diff --git a/Server/Migrations/20230829101729_InitSectors.cs b/Server/Migrations/20230829101729_InitSectors.cs index 4cbd042..57daade 100644 --- a/Server/Migrations/20230829101729_InitSectors.cs +++ b/Server/Migrations/20230829101729_InitSectors.cs @@ -35,9 +35,9 @@ namespace Server.Migrations columns: new[] { "Id", "Created", "Map", "Sectors", "Time", "UserId" }, values: new object[,] { - { new Guid("589bfb11-59c1-4f7e-beef-973c301b8e08"), new DateTimeOffset(new DateTime(2023, 8, 29, 10, 17, 29, 656, DateTimeKind.Unspecified).AddTicks(467), new TimeSpan(0, 0, 0, 0, 0)), "sr_TestTrack", new List { 64.0, 24.0, 24.0 }, 128.0, new Guid("11111111-1111-1111-1111-111111111111") }, - { new Guid("678183de-9df4-4d98-9807-f288b54a7f3a"), new DateTimeOffset(new DateTime(2023, 8, 29, 10, 17, 29, 656, DateTimeKind.Unspecified).AddTicks(745), new TimeSpan(0, 0, 0, 0, 0)), "sr_TestTrack", new List { 64.0, 64.0, 24.0 }, 148.0, new Guid("33333333-3333-3333-3333-333333333333") }, - { new Guid("67bda0f2-ecf8-4521-ba21-08d252d9ce59"), new DateTimeOffset(new DateTime(2023, 8, 29, 10, 17, 29, 656, DateTimeKind.Unspecified).AddTicks(723), new TimeSpan(0, 0, 0, 0, 0)), "sr_TestTrack", new List { 64.0, 38.0, 24.0 }, 132.0, new Guid("22222222-2222-2222-2222-222222222222") } + { new Guid("589bfb11-59c1-4f7e-beef-973c301b8e08"), new DateTimeOffset(new DateTime(2023, 8, 29, 10, 17, 29, 656, DateTimeKind.Unspecified).AddTicks(467), new TimeSpan(0, 0, 0, 0, 0)), "sr_testtrack", new List { 64.0, 24.0, 24.0 }, 128.0, new Guid("11111111-1111-1111-1111-111111111111") }, + { new Guid("678183de-9df4-4d98-9807-f288b54a7f3a"), new DateTimeOffset(new DateTime(2023, 8, 29, 10, 17, 29, 656, DateTimeKind.Unspecified).AddTicks(745), new TimeSpan(0, 0, 0, 0, 0)), "sr_testtrack", new List { 64.0, 64.0, 24.0 }, 148.0, new Guid("33333333-3333-3333-3333-333333333333") }, + { new Guid("67bda0f2-ecf8-4521-ba21-08d252d9ce59"), new DateTimeOffset(new DateTime(2023, 8, 29, 10, 17, 29, 656, DateTimeKind.Unspecified).AddTicks(723), new TimeSpan(0, 0, 0, 0, 0)), "sr_testtrack", new List { 64.0, 38.0, 24.0 }, 132.0, new Guid("22222222-2222-2222-2222-222222222222") } }); migrationBuilder.CreateIndex( diff --git a/Server/Migrations/SpaceRaceDbContextModelSnapshot.cs b/Server/Migrations/SpaceRaceDbContextModelSnapshot.cs index ca2d311..598e150 100644 --- a/Server/Migrations/SpaceRaceDbContextModelSnapshot.cs +++ b/Server/Migrations/SpaceRaceDbContextModelSnapshot.cs @@ -60,7 +60,7 @@ namespace Server.Migrations { Id = new Guid("589bfb11-59c1-4f7e-beef-973c301b8e08"), Created = new DateTimeOffset(new DateTime(2023, 8, 29, 10, 17, 29, 656, DateTimeKind.Unspecified).AddTicks(467), new TimeSpan(0, 0, 0, 0, 0)), - Map = "sr_TestTrack", + Map = "sr_testtrack", Sectors = new List { 64.0, 24.0, 24.0 }, Time = 128.0, UserId = new Guid("11111111-1111-1111-1111-111111111111") @@ -69,7 +69,7 @@ namespace Server.Migrations { Id = new Guid("67bda0f2-ecf8-4521-ba21-08d252d9ce59"), Created = new DateTimeOffset(new DateTime(2023, 8, 29, 10, 17, 29, 656, DateTimeKind.Unspecified).AddTicks(723), new TimeSpan(0, 0, 0, 0, 0)), - Map = "sr_TestTrack", + Map = "sr_testtrack", Sectors = new List { 64.0, 38.0, 24.0 }, Time = 132.0, UserId = new Guid("22222222-2222-2222-2222-222222222222") @@ -78,7 +78,7 @@ namespace Server.Migrations { Id = new Guid("678183de-9df4-4d98-9807-f288b54a7f3a"), Created = new DateTimeOffset(new DateTime(2023, 8, 29, 10, 17, 29, 656, DateTimeKind.Unspecified).AddTicks(745), new TimeSpan(0, 0, 0, 0, 0)), - Map = "sr_TestTrack", + Map = "sr_testtrack", Sectors = new List { 64.0, 64.0, 24.0 }, Time = 148.0, UserId = new Guid("33333333-3333-3333-3333-333333333333") diff --git a/Server/Repositories/SpaceRaceDbContext.cs b/Server/Repositories/SpaceRaceDbContext.cs index 9660c59..a9cef43 100644 --- a/Server/Repositories/SpaceRaceDbContext.cs +++ b/Server/Repositories/SpaceRaceDbContext.cs @@ -57,7 +57,7 @@ class SpaceRaceInitialiser { UserId = new Guid("11111111-1111-1111-1111-111111111111"), Time = 128f, Sectors = new List { 64f, 24f, 24f }, - Map = "sr_TestTrack", + Map = "sr_testtrack", }, new Lap { Created = DateTimeOffset.UtcNow, @@ -65,7 +65,7 @@ class SpaceRaceInitialiser { UserId = new Guid("22222222-2222-2222-2222-222222222222"), Time = 132f, Sectors = new List { 64f, 38f, 24f }, - Map = "sr_TestTrack", + Map = "sr_testtrack", }, new Lap { Created = DateTimeOffset.UtcNow, @@ -73,7 +73,7 @@ class SpaceRaceInitialiser { UserId = new Guid("33333333-3333-3333-3333-333333333333"), Time = 148f, Sectors = new List { 64f, 64f, 24f }, - Map = "sr_TestTrack", + Map = "sr_testtrack", } ); }