Parse async seekless (#3)

* Remove CK2PlayerCharacterConverter * Rename PlayerCharacterData to CK2PlayerCharacterData * Remove CK2txt * Update CK2PlayerCharacter * Remove internal types * Use dead-simple serialization * Update tests * Update tests * Bump version
scorpdx · Oct 11, 2019 · dbe634b · dbe634b
1 parent 7e57926
commit dbe634b
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 158 deletions.
diff --git a/src/Chronicler/ChronicleCollection.cs b/src/Chronicler/ChronicleCollection.cs
@@ -1,7 +1,4 @@
 using Chronicler.Converters;
-using Chronicler.Converters.Internal;
-using Chronicler.Internal;
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text.Json;
@@ -16,14 +13,14 @@ public class ChronicleCollection
         [JsonPropertyName("chronicle")]
         public List<Chronicle> Chronicles { get; set; }
 
-        public static ChronicleCollection ParseJson(JsonDocument ck2json)
+        public static ChronicleCollection Parse(JsonDocument jsonDoc)
         {
-            var playerId = ck2json.RootElement
+            var playerId = jsonDoc.RootElement
                 .GetProperty("player")
                 .GetProperty("id")
                 .GetRawText();
 
-            var playerCharacterElement = ck2json.RootElement
+            var playerCharacterElement = jsonDoc.RootElement
                 .GetProperty("character")
                 .GetProperty(playerId);
 
@@ -34,53 +31,16 @@ public static ChronicleCollection ParseJson(JsonDocument ck2json)
             return new JsonElementSerializer(chronicleCollection).ToObject<ChronicleCollection>();
         }
 
-        public static async Task<ChronicleCollection> ParseJsonAsync(Stream jsonStream)
+        public static ChronicleCollection Parse(Stream jsonStream)
         {
-            static int ReadPIDFromHeader(ReadOnlySpan<byte> headerChunk)
-            {
-                var reader = new Utf8JsonReader(headerChunk);
-
-                while (reader.Read())
-                {
-                    switch (reader.TokenType)
-                    {
-                        case JsonTokenType.PropertyName when reader.ValueTextEquals("id"):
-                            if (reader.Read())
-                            {
-                                return reader.GetInt32();
-                            }
-                            goto fail;
-                    }
-                }
-
-            fail:
-                throw new JsonException("couldn't find player ID");
-            }
-
-            int pid;
-            {
-                var headerChunk = System.Buffers.ArrayPool<byte>.Shared.Rent(0x200);
-
-                var bytesRead = await jsonStream.ReadAsync(headerChunk, 0, headerChunk.Length);
-                if (bytesRead < headerChunk.Length)
-                    throw new InvalidOperationException("failed to read header");
-
-                pid = ReadPIDFromHeader(headerChunk);
-
-                System.Buffers.ArrayPool<byte>.Shared.Return(headerChunk);
-            }
-            jsonStream.Seek(0, SeekOrigin.Begin);
-
-            var ck2pcConverter = new CK2PlayerCharacterConverter
-            {
-                PlayerID = pid
-            };
+            using var reader = new StreamReader(jsonStream);
+            return Parse(reader.ReadToEnd());
+        }
 
-            var options = new JsonSerializerOptions();
-            options.Converters.Add(ck2pcConverter);
+        public static ChronicleCollection Parse(string jsonText)
+            => JsonSerializer.Deserialize<ChronicleCollection>(jsonText);
 
-            var ck = await JsonSerializer.DeserializeAsync<CK2txt>(jsonStream, options);
-            return ck.PlayerCharacter.PlayerCharacterData.ChronicleCollection;
-        }
+        public static ValueTask<ChronicleCollection> ParseAsync(Stream jsonStream)
+            => JsonSerializer.DeserializeAsync<ChronicleCollection>(jsonStream);
     }
 }
diff --git a/src/Chronicler/Chronicler.csproj b/src/Chronicler/Chronicler.csproj
@@ -8,7 +8,7 @@
     <Description>Chronicle parsing library for Crusader Kings II</Description>
     <PackageProjectUrl>https://github.com/scorpdx/chronicler</PackageProjectUrl>
     <RepositoryUrl>https://github.com/scorpdx/chronicler</RepositoryUrl>
-    <Version>0.2.0</Version>
+    <Version>0.3.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Chronicler/Converters/Internal/CK2PlayerCharacterConverter.cs b/src/Chronicler/Converters/Internal/CK2PlayerCharacterConverter.cs
diff --git a/src/Chronicler/Internal/CK2Player.cs b/src/Chronicler/Internal/CK2Player.cs
diff --git a/src/Chronicler/Internal/CK2PlayerCharacter.cs b/src/Chronicler/Internal/CK2PlayerCharacter.cs
diff --git a/src/Chronicler/Internal/CK2txt.cs b/src/Chronicler/Internal/CK2txt.cs
diff --git a/src/Chronicler/Internal/PlayerCharacterData.cs b/src/Chronicler/Internal/PlayerCharacterData.cs
diff --git a/test/ChroniclerTests/ChronicleCollectionTest.cs b/test/ChroniclerTests/ChronicleCollectionTest.cs
@@ -11,20 +11,36 @@ public class ChronicleCollectionTest
         private static string CK2JsonPath => Path.Combine("resources", "Ironman_West_Francia_HaR.json");
 
         private static Stream GetCK2JsonStream() => File.OpenRead(CK2JsonPath);
-        private static readonly JsonDocument CK2Json = JsonDocument.Parse(File.ReadAllText(CK2JsonPath));
+        private static readonly string CK2JsonText = File.ReadAllText(CK2JsonPath);
+        private static readonly JsonDocument CK2Json = JsonDocument.Parse(CK2JsonText);
 
         [Fact]
-        public void TestParseJson()
+        public void TestParseJsonDoc()
         {
-            var chronicleCollection = Chronicler.ChronicleCollection.ParseJson(CK2Json);
+            var chronicleCollection = Chronicler.ChronicleCollection.Parse(CK2Json);
             VerifyJson(chronicleCollection);
         }
 
         [Fact]
-        public async Task TestParseJsonAsync()
+        public void TestParseJsonText()
+        {
+            var chronicleCollection = Chronicler.ChronicleCollection.Parse(CK2JsonText);
+            VerifyJson(chronicleCollection);
+        }
+
+        [Fact]
+        public void TestParse()
         {
             using var stream = GetCK2JsonStream();
-            var chronicleCollection = await Chronicler.ChronicleCollection.ParseJsonAsync(stream);
+            var chronicleCollection = Chronicler.ChronicleCollection.Parse(stream);
+            VerifyJson(chronicleCollection);
+        }
+
+        [Fact]
+        public async Task TestParseAsync()
+        {
+            using var stream = GetCK2JsonStream();
+            var chronicleCollection = await Chronicler.ChronicleCollection.ParseAsync(stream);
             VerifyJson(chronicleCollection);
         }
 
@@ -40,6 +56,12 @@ private void VerifyJson(ChronicleCollection chronicleCollection)
                 chap => Assert.NotEmpty(chap.Entries),
                 chap => Assert.NotEmpty(chap.Entries));
             Assert.False(string.IsNullOrEmpty(chronicleCollection.Chronicles[0].Chapters[0].Entries[0].Text));
+
+            const int expectedCharacterId = 6392;
+            Assert.Equal(expectedCharacterId, chronicleCollection.Chronicles[0].Character);
+
+            const int expectedFirstYear = 769;
+            Assert.Equal(expectedFirstYear, chronicleCollection.Chronicles[0].Chapters[0].Year);
         }
     }
 }