Merge pull request #457 from github-for-unity/fixes/cache-date-time

StanleyGoldman · web-flow · commit f69471d3a048 · 2017-11-20T11:07:45.000-05:00
Serializing DateTimeOffset objects with ISO8601
diff --git a/src/GitHub.Api/Helpers/Constants.cs b/src/GitHub.Api/Helpers/Constants.cs
@@ -9,6 +9,7 @@ static class Constants
         public const string UsageFile = "usage.json";
         public const string GitInstallPathKey = "GitInstallPath";
         public const string TraceLoggingKey = "EnableTraceLogging";
+        public const string Iso8601Format = "o";
 
         public static readonly Version MinimumGitVersion = new Version(2, 11, 0);
         public static readonly Version MinimumGitLfsVersion = new Version(2, 3, 4);
diff --git a/src/GitHub.Api/OutputProcessors/LogEntryOutputProcessor.cs b/src/GitHub.Api/OutputProcessors/LogEntryOutputProcessor.cs
@@ -329,8 +329,8 @@ private void ReturnGitLogEntry()
                     Summary = summary,
                     Description = description,
                     CommitID = commitId,
-                    TimeString = time.Value.ToString(DateTimeFormatInfo.CurrentInfo),
-                    CommitTimeString = committerTime.Value.ToString(DateTimeFormatInfo.CurrentInfo)
+                    TimeString = time.Value.ToString(Constants.Iso8601Format),
+                    CommitTimeString = committerTime.Value.ToString(Constants.Iso8601Format)
                 });
             }
 
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
-using Octokit;
 using UnityEditor;
 using UnityEngine;
 using Application = UnityEngine.Application;
@@ -92,7 +92,6 @@ abstract class ManagedCacheBase<T> : ScriptObjectSingleton<T> where T : Scriptab
         private static readonly TimeSpan DataTimeout = TimeSpan.MaxValue;
 
         [NonSerialized] private DateTimeOffset? lastUpdatedAtValue;
-
         [NonSerialized] private DateTimeOffset? lastVerifiedAtValue;
 
         public event Action CacheInvalidated;
@@ -148,14 +147,22 @@ public DateTimeOffset LastUpdatedAt
             {
                 if (!lastUpdatedAtValue.HasValue)
                 {
-                    lastUpdatedAtValue = DateTimeOffset.Parse(LastUpdatedAtString);
+                    DateTimeOffset result;
+                    if (DateTimeOffset.TryParseExact(LastUpdatedAtString, Constants.Iso8601Format, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
+                    {
+                        lastUpdatedAtValue = result;
+                    }
+                    else
+                    {
+                        lastUpdatedAtValue = DateTimeOffset.MinValue;
+                    }
                 }
 
                 return lastUpdatedAtValue.Value;
             }
             set
             {
-                LastUpdatedAtString = value.ToString();
+                LastUpdatedAtString = value.ToString(Constants.Iso8601Format);
                 lastUpdatedAtValue = null;
             }
         }
@@ -166,14 +173,22 @@ public DateTimeOffset LastVerifiedAt
             {
                 if (!lastVerifiedAtValue.HasValue)
                 {
-                    lastVerifiedAtValue = DateTimeOffset.Parse(LastVerifiedAtString);
+                    DateTimeOffset result;
+                    if (DateTimeOffset.TryParseExact(LastVerifiedAtString, Constants.Iso8601Format, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
+                    {
+                        lastVerifiedAtValue = result;
+                    }
+                    else
+                    {
+                        lastVerifiedAtValue = DateTimeOffset.MinValue;
+                    }
                 }
 
                 return lastVerifiedAtValue.Value;
             }
             set
             {
-                LastVerifiedAtString = value.ToString();
+                LastVerifiedAtString = value.ToString(Constants.Iso8601Format);
                 lastVerifiedAtValue = null;
             }
         }
diff --git a/src/tests/IntegrationTests/Process/ProcessManagerIntegrationTests.cs b/src/tests/IntegrationTests/Process/ProcessManagerIntegrationTests.cs
@@ -57,8 +57,8 @@ public async Task LogEntriesTest()
                     CommitID = "018997938335742f8be694240a7c2b352ec0835f",
                     Description = "Moving project files where they should be kept",
                     Summary = "Moving project files where they should be kept",
-                    TimeString = firstCommitTime.ToString(DateTimeFormatInfo.CurrentInfo),
-                    CommitTimeString = firstCommitTime.ToString(DateTimeFormatInfo.CurrentInfo),
+                    TimeString = firstCommitTime.ToString(Constants.Iso8601Format),
+                    CommitTimeString = firstCommitTime.ToString(Constants.Iso8601Format),
                 },
                 new GitLogEntry
                 {
@@ -75,8 +75,8 @@ public async Task LogEntriesTest()
                     CommitID = "03939ffb3eb8486dba0259b43db00842bbe6eca1",
                     Description = "Initial Commit",
                     Summary = "Initial Commit",
-                    TimeString = secondCommitTime.ToString(DateTimeFormatInfo.CurrentInfo),
-                    CommitTimeString = secondCommitTime.ToString(DateTimeFormatInfo.CurrentInfo),
+                    TimeString = secondCommitTime.ToString(Constants.Iso8601Format),
+                    CommitTimeString = secondCommitTime.ToString(Constants.Iso8601Format),
                 },
             });
         }
@@ -110,8 +110,8 @@ public async Task RussianLogEntriesTest()
                     CommitID = "06d6451d351626894a30e9134f551db12c74254b",
                     Description = "Я люблю github",
                     Summary = "Я люблю github",
-                    TimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
-                    CommitTimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
+                    TimeString = commitTime.ToString(Constants.Iso8601Format),
+                    CommitTimeString = commitTime.ToString(Constants.Iso8601Format),
                 }
             });
         }
diff --git a/src/tests/UnitTests/IO/LogEntryOutputProcessorTests.cs b/src/tests/UnitTests/IO/LogEntryOutputProcessorTests.cs
@@ -58,8 +58,8 @@ public void ShouldParseSingleCommit()
                     },
                     Summary = "Rename RepositoryModelBase to RepositoryModel",
                     Description = "Rename RepositoryModelBase to RepositoryModel",
-                    TimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
-                    CommitTimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
+                    TimeString = commitTime.ToString(Constants.Iso8601Format),
+                    CommitTimeString = commitTime.ToString(Constants.Iso8601Format),
                 },
             };
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
	`3`	`+using System.Globalization;`
`3`	`4`	`using System.Linq;`
`4`		`-using Octokit;`
`5`	`5`	`using UnityEditor;`
`6`	`6`	`using UnityEngine;`
`7`	`7`	`using Application = UnityEngine.Application;`
`@@ -92,7 +92,6 @@ abstract class ManagedCacheBase<T> : ScriptObjectSingleton<T> where T : Scriptab`
`92`	`92`	`private static readonly TimeSpan DataTimeout = TimeSpan.MaxValue;`
`93`	`93`
`94`	`94`	`[NonSerialized] private DateTimeOffset? lastUpdatedAtValue;`
`95`		`-`
`96`	`95`	`[NonSerialized] private DateTimeOffset? lastVerifiedAtValue;`
`97`	`96`
`98`	`97`	`public event Action CacheInvalidated;`
`@@ -148,14 +147,22 @@ public DateTimeOffset LastUpdatedAt`
`148`	`147`	`{`
`149`	`148`	`if (!lastUpdatedAtValue.HasValue)`
`150`	`149`	`{`
`151`		`- lastUpdatedAtValue = DateTimeOffset.Parse(LastUpdatedAtString);`
	`150`	`+ DateTimeOffset result;`
	`151`	`+ if (DateTimeOffset.TryParseExact(LastUpdatedAtString, Constants.Iso8601Format, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))`
	`152`	`+ {`
	`153`	`+ lastUpdatedAtValue = result;`
	`154`	`+ }`
	`155`	`+ else`
	`156`	`+ {`
	`157`	`+ lastUpdatedAtValue = DateTimeOffset.MinValue;`
	`158`	`+ }`
`152`	`159`	`}`
`153`	`160`
`154`	`161`	`return lastUpdatedAtValue.Value;`
`155`	`162`	`}`
`156`	`163`	`set`
`157`	`164`	`{`
`158`		`- LastUpdatedAtString = value.ToString();`
	`165`	`+ LastUpdatedAtString = value.ToString(Constants.Iso8601Format);`
`159`	`166`	`lastUpdatedAtValue = null;`
`160`	`167`	`}`
`161`	`168`	`}`
`@@ -166,14 +173,22 @@ public DateTimeOffset LastVerifiedAt`
`166`	`173`	`{`
`167`	`174`	`if (!lastVerifiedAtValue.HasValue)`
`168`	`175`	`{`
`169`		`- lastVerifiedAtValue = DateTimeOffset.Parse(LastVerifiedAtString);`
	`176`	`+ DateTimeOffset result;`
	`177`	`+ if (DateTimeOffset.TryParseExact(LastVerifiedAtString, Constants.Iso8601Format, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))`
	`178`	`+ {`
	`179`	`+ lastVerifiedAtValue = result;`
	`180`	`+ }`
	`181`	`+ else`
	`182`	`+ {`
	`183`	`+ lastVerifiedAtValue = DateTimeOffset.MinValue;`
	`184`	`+ }`
`170`	`185`	`}`
`171`	`186`
`172`	`187`	`return lastVerifiedAtValue.Value;`
`173`	`188`	`}`
`174`	`189`	`set`
`175`	`190`	`{`
`176`		`- LastVerifiedAtString = value.ToString();`
	`191`	`+ LastVerifiedAtString = value.ToString(Constants.Iso8601Format);`
`177`	`192`	`lastVerifiedAtValue = null;`
`178`	`193`	`}`
`179`	`194`	`}`