Merge pull request #32 from github/shana/list-git-repos

Add list of repos to the connect page

Author: haacked

src/GitHub.App/Extensions/RepositoryModelExtensions.cs

@@ -0,0 +1,23 @@
+using GitHub.Models;
+using GitHub.VisualStudio;
+using Microsoft.VisualStudio.TeamFoundation.Git.Extensibility;
+using NullGuard;
+
+namespace GitHub.Extensions
+{
+    public static class RepositoryModelExtensions
+    {
+        /// <summary>
+        /// Create a SimpleRepositoryModel from a VS git repo object
+        /// </summary>
+        [return:AllowNull]
+        public static ISimpleRepositoryModel ToModel([AllowNull] this IGitRepositoryInfo repo)
+        {
+            if (repo == null)
+                return null;
+            var uri = repo.GetUriFromRepository();
+            var name = uri?.NameWithOwner;
+            return name != null ? new SimpleRepositoryModel(name, uri, repo.RepositoryPath) : null;
+        }
+    }
+}

src/GitHub.App/GitHub.App.csproj

@@ -58,6 +58,10 @@
       <HintPath>..\..\lib\Microsoft.TeamFoundation.Git.Controls.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="Microsoft.TeamFoundation.Git.Provider, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\lib\Microsoft.TeamFoundation.Git.Provider.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.ComponentModelHost, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0" />
@@ -122,6 +126,7 @@
     <Compile Include="Caches\ImageCache.cs" />
     <Compile Include="Extensions\AkavacheExtensions.cs" />
     <Compile Include="Extensions\EnvironmentExtensions.cs" />
+    <Compile Include="Extensions\RepositoryModelExtensions.cs" />
     <Compile Include="Extensions\ValidationExtensions.cs" />
     <Compile Include="Infrastructure\LoggingConfiguration.cs" />
     <Compile Include="Services\AvatarProvider.cs" />

src/GitHub.App/Models/RepositoryHosts.cs

@@ -52,7 +52,7 @@ public RepositoryHosts(
                 })
                 .WhereNotNull()
                 .Select(HostAddress.Create)
-                .Where(x => connectionManager.Connections.Any(c => c.HostAddress == x))
+                .Where(x => connectionManager.Connections.Any(c => c.HostAddress.Equals(x)))
                 .Select(repositoryHostFactory.Create)
                 .Do(x => EnterpriseHost = x)
                 .Do(disposables.Add)

src/GitHub.App/Models/RepositoryModel.cs

@@ -1,28 +1,47 @@
 using GitHub.Primitives;
-using GitHub.UI;
+using NullGuard;
+using System;
+using System.Globalization;
 
 namespace GitHub.Models
 {
-    public class RepositoryModel : IRepositoryModel
+    public class RepositoryModel : SimpleRepositoryModel, IRepositoryModel, IEquatable<RepositoryModel>
     {
-        public RepositoryModel(string name, string cloneUrl, bool isPrivate, bool isFork,  IAccount ownerAccount)
+        public RepositoryModel(string name, UriString cloneUrl, bool isPrivate, bool isFork,  IAccount ownerAccount)
+            : base(name, cloneUrl)
         {
-            Name = name;
             Owner = ownerAccount;
-            CloneUrl = cloneUrl;
-            Icon = isPrivate
-                ? Octicon.@lock
-                : isFork
-                    ? Octicon.repo_forked
-                    : Octicon.repo;
+            SetIcon(isPrivate, isFork);
         }
 
-        public string Name { get; private set; }
-
         public IAccount Owner { get; private set; }
+        public override int GetHashCode()
+        {
+            return (Owner?.GetHashCode() ?? 0) ^ base.GetHashCode();
+        }
+
+        public override bool Equals([AllowNull]object obj)
+        {
+            if (ReferenceEquals(this, obj))
+                return true;
+            var other = obj as RepositoryModel;
+            return other != null && Equals(Owner, other.Owner) && base.Equals(obj);
+        }
 
-        public UriString CloneUrl { get; private set; }
+        bool IEquatable<RepositoryModel>.Equals([AllowNull]RepositoryModel other)
+        {
+            if (ReferenceEquals(this, other))
+                return true;
+            return other != null && Equals(Owner, other.Owner) && base.Equals(other as SimpleRepositoryModel);
+        }
 
-        public Octicon Icon { get; private set; }
+        internal string DebuggerDisplay
+        {
+            get
+            {
+                return String.Format(CultureInfo.InvariantCulture,
+                    "{4}\tName: {0} CloneUrl: {1} LocalPath: {2} Account: {3}", Name, CloneUrl, LocalPath, Owner, GetHashCode());
+            }
+        }
     }
 }

src/GitHub.App/SampleData/SampleViewModels.cs

@@ -15,6 +15,8 @@
 using GitHub.ViewModels;
 using GitHub.VisualStudio.TeamExplorer.Home;
 using ReactiveUI;
+using GitHub.VisualStudio.TeamExplorer.Connect;
+using System.Collections.ObjectModel;
 
 namespace GitHub.SampleData
 {
@@ -199,6 +201,7 @@ class Conn : IConnection
             public HostAddress HostAddress { get; set; }
 
             public string Username { get; set; }
+            public ObservableCollection<ISimpleRepositoryModel> Repositories { get; set;  }
 
             public IObservable<IConnection> Login()
             {
@@ -208,6 +211,10 @@ public IObservable<IConnection> Login()
             public void Logout()
             {
             }
+
+            public void Dispose()
+            {
+            }
         }
 
         public RepositoryPublishViewModelDesigner()
@@ -398,12 +405,16 @@ public RepositoryModelDesigner(string name, string owner)
             Owner = new AccountDesigner { Login = owner };
         }
 
+        public void SetIcon(bool isPrivate, bool isFork)
+        {
+        }
+
+        public string Name { get; set; }
         public UriString CloneUrl { get; set; }
+        public string LocalPath { get; set; }
 
         public Octicon Icon { get; set; }
 
-        public string Name { get; set; }
-
         public IAccount Owner { get; set; }
     }
 
@@ -530,4 +541,46 @@ public string RepoUrl
             set;
         }
     }
+
+    public class GitHubConnectSectionDesigner : IGitHubConnectSection
+    {
+        public GitHubConnectSectionDesigner()
+        {
+            Repositories = new ObservableCollection<ISimpleRepositoryModel>();
+            Repositories.Add(new SimpleRepositoryModel("octokit", new UriString("https://github.com/octokit/octokit.net"), @"C:\Users\user\Source\Repos\octokit.net"));
+            Repositories.Add(new SimpleRepositoryModel("cefsharp", new UriString("https://github.com/cefsharp/cefsharp"), @"C:\Users\user\Source\Repos\cefsharp"));
+            Repositories.Add(new SimpleRepositoryModel("git-lfs", new UriString("https://github.com/github/git-lfs"), @"C:\Users\user\Source\Repos\git-lfs"));
+            Repositories.Add(new SimpleRepositoryModel("another octokit", new UriString("https://github.com/octokit/octokit.net"), @"C:\Users\user\Source\Repos\another-octokit.net"));
+            Repositories.Add(new SimpleRepositoryModel("some cefsharp", new UriString("https://github.com/cefsharp/cefsharp"), @"C:\Users\user\Source\Repos\something-else"));
+            Repositories.Add(new SimpleRepositoryModel("even more git-lfs", new UriString("https://github.com/github/git-lfs"), @"C:\Users\user\Source\Repos\A different path"));
+        }
+
+        public ObservableCollection<ISimpleRepositoryModel> Repositories
+        {
+            get; set;
+        }
+
+        public void DoClone()
+        {
+        }
+
+        public void DoCreate()
+        {
+        }
+
+        public void SignOut()
+        {
+        }
+
+        public void Login()
+        {
+        }
+
+        public bool OpenRepository()
+        {
+            return true;
+        }
+
+        public IConnection SectionConnection { get; }
+    }
 }

src/GitHub.App/Services/ModelService.cs

@@ -14,6 +14,7 @@
 using NLog;
 using NullGuard;
 using Octokit;
+using GitHub.Primitives;
 
 namespace GitHub.Services
 {
@@ -216,7 +217,7 @@ IRepositoryModel Create(RepositoryCacheItem repositoryCacheItem)
         {
             return new RepositoryModel(
                 repositoryCacheItem.Name,
-                repositoryCacheItem.CloneUrl,
+                new UriString(repositoryCacheItem.CloneUrl),
                 repositoryCacheItem.Private,
                 repositoryCacheItem.Fork,
                 Create(repositoryCacheItem.Owner));

src/GitHub.Exports/GitHub.Exports.csproj

@@ -84,6 +84,8 @@
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Management" />
+    <Reference Include="System.Management.Instrumentation" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq" />
@@ -97,12 +99,18 @@
     <None Include="..\..\script\Key.snk" Condition="$(Buildtype) == 'Internal'">
       <Link>Key.snk</Link>
     </None>
+    <Compile Include="Helpers\INotifyPropertySource.cs" />
+    <Compile Include="Helpers\PropertyNotifierExtensions.cs" />
     <Compile Include="Info\ApplicationInfo.cs" />
     <Compile Include="Models\IAccount.cs" />
     <Compile Include="Models\IConnectionManager.cs" />
     <Compile Include="Models\IExportFactoryProvider.cs" />
+    <Compile Include="Models\ISimpleRepositoryModel.cs" />
+    <Compile Include="Models\SimpleRepositoryModel.cs" />
+    <Compile Include="Helpers\NotificationAwareObject.cs" />
     <Compile Include="Services\Connection.cs" />
     <Compile Include="Services\ITeamExplorerServiceHolder.cs" />
+    <Compile Include="Services\Logger.cs" />
     <Compile Include="Services\Services.cs" />
     <Compile Include="Services\VSServices.cs" />
     <Compile Include="Models\IConnection.cs" />
@@ -116,6 +124,7 @@
     <Compile Include="Services\VSExtensions.cs" />
     <Compile Include="UI\IView.cs" />
     <Compile Include="UI\Octicon.cs" />
+    <Compile Include="ViewModels\IGitHubConnectSection.cs" />
     <Compile Include="ViewModels\IGitHubInvitationSection.cs" />
     <Compile Include="ViewModels\IGitHubHomeSection.cs" />
     <Compile Include="Models\IProgram.cs" />

…lStudio/Helpers/INotifyPropertySource.cs …Exports/Helpers/INotifyPropertySource.cssrc/GitHub.VisualStudio/Helpers/INotifyPropertySource.cs renamed to src/GitHub.Exports/Helpers/INotifyPropertySource.cs src/GitHub.VisualStudio/Helpers/INotifyPropertySource.cs renamed to src/GitHub.Exports/Helpers/INotifyPropertySource.cs

@@ -0,0 +1,14 @@
+using System.ComponentModel;
+
+namespace GitHub.Primitives
+{
+    public abstract class NotificationAwareObject : INotifyPropertyChanged
+    {
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        public void RaisePropertyChanged(string propertyName)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+    }
+}