Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Simplify git validation code #670

Merged
shana merged 1 commit into from
Apr 5, 2018
Merged

Simplify git validation code #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 11 additions & 21 deletions src/GitHub.Api/Git/GitClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,6 @@ public GitClient(IEnvironment environment, IProcessManager processManager, Cance

public ITask<ValidateGitInstallResult> ValidateGitInstall(NPath path)
{
if (!path.FileExists())
{
return new FuncTask<ValidateGitInstallResult>(TaskEx.FromResult(new ValidateGitInstallResult(false, null, null)));
}

Version gitVersion = null;
Version gitLfsVersion = null;

Expand All @@ -125,23 +120,18 @@ public ITask<ValidateGitInstallResult> ValidateGitInstall(NPath path)
gitVersion?.CompareTo(Constants.MinimumGitVersion) >= 0 &&
gitLfsVersion?.CompareTo(Constants.MinimumGitLfsVersion) >= 0,
gitVersion, gitLfsVersion));

var gitLfsVersionTask = new GitLfsVersionTask(cancellationToken).Configure(processManager, path);

gitLfsVersionTask
.Then((result, version) => {return gitLfsVersion = version;})
.Then(endTask, taskIsTopOfChain: true);

gitLfsVersionTask.Then(endTask, TaskRunOptions.OnFailure, taskIsTopOfChain:true);

var gitVersionTask = new GitVersionTask(cancellationToken).Configure(processManager, path);

gitVersionTask
.Then((result, version) => { return gitVersion = version; })
.Then(gitLfsVersionTask, taskIsTopOfChain: true);

gitVersionTask.Then(endTask, TaskRunOptions.OnFailure, taskIsTopOfChain:true);

if (path.FileExists())
{
var gitLfsVersionTask = new GitLfsVersionTask(cancellationToken).Configure(processManager, path);
gitLfsVersionTask.OnEnd += (t, v, _, __) => gitLfsVersion = v;
var gitVersionTask = new GitVersionTask(cancellationToken).Configure(processManager, path);
gitVersionTask.OnEnd += (t, v, _, __) => gitVersion = v;

gitVersionTask
.Then(gitLfsVersionTask)
.Finally(endTask);
}
return endTask;
}

Expand Down
2 changes: 1 addition & 1 deletion src/UnityExtension/Assets/Editor/GitHub.Unity/UI/GitPathView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ private void ValidateAndSetGitInstallPath(string value)
gitVersionErrorMessage = null;

GitClient.ValidateGitInstall(value.ToNPath())
.FinallyInUI((success, exception, result) =>
.ThenInUI((success, result) =>
{
if (!success)
{
Expand Down