Populating repository name and clone uri from cache

Author: StanleyGoldman

src/GitHub.Api/Git/Repository.cs

@@ -13,6 +13,8 @@ class Repository : IEquatable<Repository>, IRepository
     {
         private IRepositoryManager repositoryManager;
         private ICacheContainer cacheContainer;
+        private UriString cloneUrl;
+        private string name;
 
         public event Action<CacheUpdateEvent> GitStatusCacheUpdated;
         public event Action<CacheUpdateEvent> GitLogCacheUpdated;
@@ -23,22 +25,17 @@ class Repository : IEquatable<Repository>, IRepository
         /// <summary>
         /// Initializes a new instance of the <see cref="Repository"/> class.
         /// </summary>
-        /// <param name="name">The repository name.</param>
         /// <param name="localPath"></param>
         /// <param name="container"></param>
-        public Repository(string name, NPath localPath, ICacheContainer container)
+        public Repository(NPath localPath, ICacheContainer container)
         {
-            Guard.ArgumentNotNullOrWhiteSpace(name, nameof(name));
             Guard.ArgumentNotNull(localPath, nameof(localPath));
 
-            Name = name;
             LocalPath = localPath;
             User = new User();
 
             cacheContainer = container;
-
             cacheContainer.CacheInvalidated += CacheContainer_OnCacheInvalidated;
-
             cacheContainer.CacheUpdated += CacheContainer_OnCacheUpdated;
         }
 
@@ -533,9 +530,42 @@ public List<GitLock> CurrentLocks
             set { cacheContainer.GitLocksCache.GitLocks = value; }
         }
 
-        public UriString CloneUrl { get; private set; }
+        public UriString CloneUrl
+        {
+            get
+            {
+                if (cloneUrl == null)
+                {
+                    var currentRemote = CurrentRemote;
+                    if (currentRemote.HasValue && currentRemote.Value.Url != null)
+                    {
+                        cloneUrl = new UriString(currentRemote.Value.Url);
+                    }
+                }
+                return cloneUrl;
+            }
+            private set
+            {
+                cloneUrl = value;
+            }
+        }
 
-        public string Name { get; private set; }
+        public string Name
+        {
+            get
+            {
+                if (name == null)
+                {
+                    var url = CloneUrl;
+                    if (url != null)
+                    {
+                        name = url.RepositoryName;
+                    }
+                }
+                return name;
+            }
+            private set { name = value; }
+        }
 
         public NPath LocalPath { get; private set; }
 

src/GitHub.Api/Platform/DefaultEnvironment.cs

@@ -79,7 +79,7 @@ public void InitializeRepository(ICacheContainer cacheContainer, NPath expectedR
             {
                 Logger.Trace("Determined expectedRepositoryPath:{0}", expectedRepositoryPath);
                 RepositoryPath = expectedRepositoryPath;
-                Repository = new Repository(RepositoryPath.FileName, RepositoryPath, cacheContainer);
+                Repository = new Repository(RepositoryPath, cacheContainer);
             }
         }
 

src/tests/IntegrationTests/BaseGitEnvironmentTest.cs

@@ -33,7 +33,7 @@ protected async Task<IEnvironment> Initialize(NPath repoPath, NPath environmentP
 
             //TODO: Mock CacheContainer
             ICacheContainer cacheContainer = null;
-            Environment.Repository = new Repository("TestRepo", repoPath, cacheContainer);
+            Environment.Repository = new Repository(repoPath, cacheContainer);
             Environment.Repository.Initialize(RepositoryManager);
 
             RepositoryManager.Start();

src/tests/UnitTests/Git/RepositoryTests.cs

@@ -29,7 +29,7 @@ private static Repository LoadRepository()
 
             //TODO: Mock CacheContainer
             ICacheContainer cacheContainer = null;
-            return new Repository("TestRepo", @"C:\Repo".ToNPath(), cacheContainer);
+            return new Repository(@"C:\Repo".ToNPath(), cacheContainer);
         }
 
         private RepositoryEvents repositoryEvents;