Merge pull request #721 from github-for-unity/more-serialization-magic

Add more options to SimpleJson

Author: StanleyGoldman

script

@@ -311,4 +311,5 @@ sysinfo.txt
 
 # Builds
 *.apk
-*.unitypackage
+*.unitypackage
+UnityExtension/**/manifest.json

src/.gitignore

@@ -198,7 +198,7 @@ private void LoadConnectionsFromDisk()
                 var json = cachePath.ReadAllText();
                 try
                 {
-                    var conns = SimpleJson.DeserializeObject<Connection[]>(json);
+                    var conns = json.FromJson<Connection[]>();
                     UpdateConnections(conns);
                 }
                 catch (IOException ex)
@@ -219,7 +219,7 @@ private void SaveConnectionsToDisk(bool raiseChangedEvent = true)
             //logger.Trace("WriteCacheToDisk Count:{0} Path:{1}", connectionCache.Count, cachePath.ToString());
             try
             {
-                var json = SimpleJson.SerializeObject(connections.Values.ToArray());
+                var json = connections.Values.ToJson();
                 cachePath.WriteAllText(json);
             }
             catch (IOException ex)

src/GitHub.Api/Authentication/Keychain.cs

@@ -164,7 +164,7 @@ public DateTimeOffset UpdatedTime
                 if (!updatedTimeValue.HasValue)
                 {
                     DateTimeOffset result;
-                    if (DateTimeOffset.TryParseExact(updatedTimeString, Constants.Iso8601Format, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
+                    if (DateTimeOffset.TryParseExact(updatedTimeString, Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
                     {
                         updatedTimeValue = result;
                     }

src/GitHub.Api/Cache/CacheContainer.cs

@@ -82,7 +82,7 @@ public DateTimeOffset Time
                 if (!timeValue.HasValue)
                 {
                     DateTimeOffset result;
-                    if (DateTimeOffset.TryParseExact(TimeString, Constants.Iso8601Format, CultureInfo.InvariantCulture,DateTimeStyles.None, out result))
+                    if (DateTimeOffset.TryParseExact(TimeString, Constants.Iso8601Formats, CultureInfo.InvariantCulture,DateTimeStyles.None, out result))
                     {
                         timeValue = result;
                     }
@@ -109,7 +109,7 @@ public DateTimeOffset CommitTime
                 if (!commitTimeValue.HasValue)
                 {
                     DateTimeOffset result;
-                    if (DateTimeOffset.TryParseExact(CommitTimeString, Constants.Iso8601Format, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
+                    if (DateTimeOffset.TryParseExact(CommitTimeString, Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
                     {
                         commitTimeValue = result;
                     }

src/GitHub.Api/Git/GitLogEntry.cs

@@ -10,7 +10,12 @@ static class Constants
         public const string GitInstallPathKey = "GitInstallPath";
         public const string TraceLoggingKey = "EnableTraceLogging";
         public const string WebTimeoutKey = "WebTimeout";
-        public const string Iso8601Format = "yyyy-MM-ddTHH\\:mm\\:ss.fffffffzzz";
+        public const  string Iso8601Format = @"yyyy-MM-dd\THH\:mm\:ss.fffzzz";
+        public static readonly string[] Iso8601Formats = {
+            @"yyyy-MM-dd\THH\:mm\:ss.fffffffzzz",
+            @"yyyy-MM-dd\THH\:mm\:ss.fffzzz",
+            @"yyyy-MM-dd\THH\:mm\:sszzz"
+        };
 
         public static readonly Version MinimumGitVersion = new Version(2, 11, 0);
         public static readonly Version MinimumGitLfsVersion = new Version(2, 3, 4);