Merge pull request #373 from github/paladique/pick-dir-validation

[Backport] Add directory validation

Author: shana

src/GitHub.App/Extensions/ValidationExtensions.cs

@@ -117,7 +117,6 @@
     <Compile Include="Caches\ImageCache.cs" />
     <Compile Include="Extensions\AkavacheExtensions.cs" />
     <Compile Include="Extensions\EnvironmentExtensions.cs" />
-    <Compile Include="Extensions\ValidationExtensions.cs" />
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Infrastructure\LoggingConfiguration.cs" />
     <Compile Include="Models\PullRequestModel.cs" />
@@ -282,11 +281,11 @@
   </Target>
   <Import Project="..\..\packages\Fody.1.28.0\build\Fody.targets" Condition="Exists('..\..\packages\Fody.1.28.0\build\Fody.targets')" />
   <Import Project="..\..\packages\SQLitePCL.raw_basic.0.7.3.0-vs2012\build\net45\SQLitePCL.raw_basic.targets" Condition="Exists('..\..\packages\SQLitePCL.raw_basic.0.7.3.0-vs2012\build\net45\SQLitePCL.raw_basic.targets')" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

src/GitHub.App/GitHub.App.csproj

@@ -447,7 +447,11 @@ public RepositoryCloneViewModelDesigner()
                 x => x
             );
 
-            BaseRepositoryPathValidator = this.CreateBaseRepositoryPathValidator();
+            BaseRepositoryPathValidator = ReactivePropertyValidator.ForObservable(this.WhenAny(x => x.BaseRepositoryPath, x => x.Value))
+                .IfNullOrEmpty("Please enter a repository path")
+                .IfTrue(x => x.Length > 200, "Path too long")
+                .IfContainsInvalidPathChars("Path contains invalid characters")
+                .IfPathNotRooted("Please enter a valid path");
         }
 
         public IReactiveCommand<Unit> CloneCommand

src/GitHub.App/SampleData/SampleViewModels.cs

@@ -3,8 +3,11 @@
 using System.ComponentModel.Composition;
 using System.Diagnostics;
 using System.Globalization;
+using System.IO;
+using System.Linq;
 using System.Reactive;
 using System.Reactive.Linq;
+using System.Text.RegularExpressions;
 using System.Windows.Input;
 using GitHub.App;
 using GitHub.Exports;
@@ -80,7 +83,17 @@ public RepositoryCloneViewModel(
                 signalReset: filterResetSignal
             );
 
-            BaseRepositoryPathValidator = this.CreateBaseRepositoryPathValidator();
+            var baseRepositoryPath = this.WhenAny(
+                x => x.BaseRepositoryPath,
+                x => x.SelectedRepository,
+                (x, y) => x.Value);
+
+            BaseRepositoryPathValidator = ReactivePropertyValidator.ForObservable(baseRepositoryPath)
+                .IfNullOrEmpty("Please enter a repository path")
+                .IfTrue(x => x.Length > 200, "Path too long")
+                .IfContainsInvalidPathChars("Path contains invalid characters")
+                .IfPathNotRooted("Please enter a valid path")
+                .IfTrue(IsAlreadyRepoAtPath, Resources.RepositoryNameValidatorAlreadyExists);
 
             var canCloneObservable = this.WhenAny(
                 x => x.SelectedRepository,
@@ -140,6 +153,23 @@ IObservable<Unit> OnCloneRepository(object state)
             });
         }
 
+        bool IsAlreadyRepoAtPath(string path)
+        {
+            bool isAlreadyRepoAtPath = false;
+
+            if (SelectedRepository != null)
+            {
+                var validationResult = BaseRepositoryPathValidator.ValidationResult;
+                if (validationResult != null && validationResult.IsValid)
+                {
+                    string potentialPath = Path.Combine(path, SelectedRepository.Name);
+                    isAlreadyRepoAtPath = operatingSystem.Directory.Exists(potentialPath);
+                }
+            }
+
+            return isAlreadyRepoAtPath;
+        }
+
         /// <summary>
         /// Path to clone repositories into
         /// </summary>

src/GitHub.App/ViewModels/RepositoryCloneViewModel.cs

@@ -80,7 +80,11 @@ public RepositoryCreationViewModel(
 
             browseForDirectoryCommand.Subscribe(_ => ShowBrowseForDirectoryDialog());
 
-            BaseRepositoryPathValidator = this.CreateBaseRepositoryPathValidator();
+            BaseRepositoryPathValidator = ReactivePropertyValidator.ForObservable(this.WhenAny(x => x.BaseRepositoryPath, x => x.Value))
+                .IfNullOrEmpty("Please enter a repository path")
+                .IfTrue(x => x.Length > 200, "Path too long")
+                .IfContainsInvalidPathChars("Path contains invalid characters")
+                .IfPathNotRooted("Please enter a valid path");
 
             var nonNullRepositoryName = this.WhenAny(
                 x => x.RepositoryName,
@@ -253,23 +257,11 @@ bool IsAlreadyRepoAtPath(string potentialRepositoryName)
                 if (Path.GetInvalidPathChars().Any(chr => BaseRepositoryPath.Contains(chr)))
                     return false;
                 string potentialPath = Path.Combine(BaseRepositoryPath, safeRepositoryName);
-                isAlreadyRepoAtPath = IsGitRepo(potentialPath);
+                isAlreadyRepoAtPath = operatingSystem.Directory.Exists(potentialPath);
             }
             return isAlreadyRepoAtPath;
         }
 
-        bool IsGitRepo(string path)
-        {
-            try
-            {
-                return operatingSystem.File.Exists(Path.Combine(path, ".git", "HEAD"));
-            }
-            catch (PathTooLongException)
-            {
-                return false;
-            }
-        }
-
         IObservable<Unit> OnCreateRepository(object state)
         {
             var newRepository = GatherRepositoryInfo();

src/GitHub.App/ViewModels/RepositoryCreationViewModel.cs

@@ -103,7 +103,7 @@
                 </Grid.RowDefinitions>
 
                 <Label Grid.Column="0" Grid.Row="0" Target="{Binding ElementName=nameText}" Content="{x:Static prop:Resources.nameText}"/>
-                <ui:PromptTextBox x:Name="nameText" Grid.Column="1" Grid.Row="0" MaxLength="{x:Static GitHub:Constants.MaxRepositoryNameLength}"/>
+                <ui:PromptTextBox x:Name="nameText" Grid.Column="1" Grid.Row="0" MaxLength="{x:Static GitHub:Constants.MaxRepositoryNameLength}" Text="{Binding RepositoryName, UpdateSourceTrigger=PropertyChanged}" />
 
                 <StackPanel Grid.Column="1" Grid.Row="1">
                     <uirx:ValidationMessage
@@ -121,15 +121,15 @@
                 <Label Grid.Column="0" Grid.Row="2" Target="{Binding ElementName=description}" Content="{x:Static prop:Resources.descriptionText}"/>
                 <ui:PromptTextBox x:Name="description" Grid.Column="1" Grid.Row="2"/>
 
-                <Label Grid.Column="0" Grid.Row="3" Target="{Binding ElementName=localPathText}" Content="{x:Static prop:Resources.localPathText}"/>
+                <Label Grid.Column="0" Grid.Row="3" Target="{Binding ElementName=localPathText, UpdateSourceTrigger=PropertyChanged}" Content="{x:Static prop:Resources.localPathText}"/>
                 <Grid Grid.Column="1" Grid.Row="3">
 
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" />
                         <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
 
-                    <ui:PromptTextBox x:Name="localPathText" Grid.Column="0" Grid.Row="0" />
+                    <ui:PromptTextBox x:Name="localPathText" Grid.Column="0" Grid.Row="0" Text="{Binding BaseRepositoryPath, UpdateSourceTrigger=PropertyChanged}"/>
                     <Button
                         x:Name="browsePathButton"
                         Grid.Column="1"

src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCreationControl.xaml

@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using GitHub.Models;
 using GitHub.Services;
+using GitHub.Validation;
 using GitHub.ViewModels;
 using NSubstitute;
 using Rothko;
@@ -196,6 +197,33 @@ public void IsTrueIfLoadingReposFails()
         }
     }
 
+    public class TheBaseRepositoryPathValidator
+    {
+        [Fact]
+        public void IsInvalidWhenDestinationRepositoryExists()
+        {
+            var repo = Substitute.For<IRepositoryModel>();
+            repo.Name.Returns("bar");
+            var repositoryHost = Substitute.For<IRepositoryHost>();
+            repositoryHost.ModelService.GetRepositories().Returns(Observable.Return(new[] { repo }));
+            var cloneService = Substitute.For<IRepositoryCloneService>();
+            var os = Substitute.For<IOperatingSystem>();
+            var directories = Substitute.For<IDirectoryFacade>();
+            os.Directory.Returns(directories);
+            directories.Exists(@"c:\foo\bar").Returns(true);
+            var vm = new RepositoryCloneViewModel(
+                repositoryHost,
+                cloneService,
+                os,
+                Substitute.For<INotificationService>());
+
+            vm.BaseRepositoryPath = @"c:\foo";
+            vm.SelectedRepository = repo;
+
+            Assert.Equal(ValidationStatus.Invalid, vm.BaseRepositoryPathValidator.ValidationResult.Status);
+        }
+    }
+
     public class TheCloneCommand : TestBaseClass
     {
         [Fact]

src/UnitTests/GitHub.App/ViewModels/RepositoryCloneViewModelTests.cs

@@ -281,7 +281,7 @@ public void IsFalseWhenRepositoryAlreadyExists(bool exists, bool expected)
         {
             var provider = Substitutes.ServiceProvider;
             var operatingSystem = provider.GetOperatingSystem();
-            operatingSystem.File.Exists(@"c:\fake\foo\.git\HEAD").Returns(exists);
+            operatingSystem.Directory.Exists(@"c:\fake\foo").Returns(exists);
             var vm = GetMeAViewModel(provider);
             vm.BaseRepositoryPath = @"c:\fake\";