Merge pull request #819 from github-for-unity/fixes/fix-exception-on-date-parsing

TryParse throws if it gets a null value, and structs often have null values

Author: StanleyGoldman

src/GitHub.Api/Cache/CacheContainer.cs

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

src/GitHub.Api/Extensions/StringExtensions.cs

@@ -40,6 +40,11 @@ public static string ToNullIfEmpty(this string s)
             return String.IsNullOrEmpty(s) ? null : s;
         }
 
+        public static string ToEmptyIfNull(this string s)
+        {
+            return String.IsNullOrEmpty(s) ? String.Empty : s;
+        }
+
         public static bool StartsWith(this string s, char c)
         {
             if (String.IsNullOrEmpty(s)) return false;

src/GitHub.Api/Git/GitLock.cs

@@ -13,12 +13,13 @@ public struct GitLock
         public string path;
         public GitUser owner;
         [NotSerialized] public string lockedAtString;
+        private string LockedAtString { get { return lockedAtString != null ? lockedAtString : String.Empty; } }
         public DateTimeOffset locked_at
         {
             get
             {
                 DateTimeOffset dt;
-                if (!DateTimeOffset.TryParseExact(lockedAtString, Constants.Iso8601Formats,
+                if (!DateTimeOffset.TryParseExact(LockedAtString.ToEmptyIfNull(), Constants.Iso8601Formats,
                         CultureInfo.InvariantCulture, Constants.DateTimeStyle, out dt))
                 {
                     locked_at = DateTimeOffset.MinValue;

src/GitHub.Api/Git/GitLogEntry.cs

@@ -68,7 +68,7 @@ public DateTimeOffset Time
                 if (!timeValue.HasValue)
                 {
                     DateTimeOffset result;
-                    if (DateTimeOffset.TryParseExact(TimeString, Constants.Iso8601Formats, CultureInfo.InvariantCulture,DateTimeStyles.None, out result))
+                    if (DateTimeOffset.TryParseExact(TimeString.ToEmptyIfNull(), Constants.Iso8601Formats, CultureInfo.InvariantCulture,DateTimeStyles.None, out result))
                     {
                         timeValue = result;
                     }
@@ -95,7 +95,7 @@ public DateTimeOffset CommitTime
                 if (!commitTimeValue.HasValue)
                 {
                     DateTimeOffset result;
-                    if (DateTimeOffset.TryParseExact(CommitTimeString, Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
+                    if (DateTimeOffset.TryParseExact(CommitTimeString.ToEmptyIfNull(), Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
                     {
                         commitTimeValue = result;
                     }
@@ -216,4 +216,4 @@ public override string ToString()
             return sb.ToString();
         }
     }
-}
+}

src/GitHub.Api/Platform/Settings.cs

@@ -74,7 +74,7 @@ public override string Get(string key, string fallback = "")
                 if (typeof(T) == typeof(DateTimeOffset))
                 {
                     DateTimeOffset dt;
-                    if (DateTimeOffset.TryParseExact(value?.ToString(), Constants.Iso8601Formats,
+                    if (DateTimeOffset.TryParseExact(value?.ToString().ToEmptyIfNull(), Constants.Iso8601Formats,
                         CultureInfo.InvariantCulture, DateTimeStyles.None, out dt))
                     {
                         value = dt;

src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs

@@ -38,7 +38,7 @@ public DateTimeOffset FirstRunAt
                 if (!firstRunAtValue.HasValue)
                 {
                     DateTimeOffset dt;
-                    if (!DateTimeOffset.TryParseExact(firstRunAtString, Constants.Iso8601Formats,
+                    if (!DateTimeOffset.TryParseExact(firstRunAtString.ToEmptyIfNull(), Constants.Iso8601Formats,
                             CultureInfo.InvariantCulture, DateTimeStyles.None, out dt))
                     {
                         dt = DateTimeOffset.Now;
@@ -261,7 +261,7 @@ public DateTimeOffset LastUpdatedAt
                 if (!lastUpdatedAtValue.HasValue)
                 {
                     DateTimeOffset result;
-                    if (DateTimeOffset.TryParseExact(LastUpdatedAtString, Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
+                    if (DateTimeOffset.TryParseExact(LastUpdatedAtString.ToEmptyIfNull(), Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
                     {
                         lastUpdatedAtValue = result;
                     }
@@ -287,7 +287,7 @@ public DateTimeOffset InitializedAt
                 if (!initializedAtValue.HasValue)
                 {
                     DateTimeOffset result;
-                    if (DateTimeOffset.TryParseExact(InitializedAtString, Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
+                    if (DateTimeOffset.TryParseExact(InitializedAtString.ToEmptyIfNull(), Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
                     {
                         initializedAtValue = result;
                     }

src/tests/IntegrationTests/CachingClasses.cs

@@ -184,7 +184,7 @@ public DateTimeOffset LastUpdatedAt
                 if (!lastUpdatedAtValue.HasValue)
                 {
                     DateTimeOffset result;
-                    if (DateTimeOffset.TryParseExact(LastUpdatedAtString, Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
+                    if (DateTimeOffset.TryParseExact(LastUpdatedAtString.ToEmptyIfNull(), Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
                     {
                         lastUpdatedAtValue = result;
                     }
@@ -210,7 +210,7 @@ public DateTimeOffset InitializedAt
                 if (!initializedAtValue.HasValue)
                 {
                     DateTimeOffset result;
-                    if (DateTimeOffset.TryParseExact(InitializedAtString, Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
+                    if (DateTimeOffset.TryParseExact(InitializedAtString.ToEmptyIfNull(), Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
                     {
                         initializedAtValue = result;
                     }