Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/GitHub.Api/Helpers/Constants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/GitHub.Api/OutputProcessors/LogEntryOutputProcessor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
});
}

Expand Down
27 changes: 21 additions & 6 deletions src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
}
Expand All @@ -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;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -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),
},
});
}
Expand Down Expand Up @@ -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),
}
});
}
Expand Down
4 changes: 2 additions & 2 deletions src/tests/UnitTests/IO/LogEntryOutputProcessorTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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),
},
};

Expand Down