Merge branch 'master' into 480-fix-pr-refresh-showing-create-form

Author: OlsonAndrewD

src/GitHub.App/Api/ApiClient.cs

@@ -18,6 +18,7 @@
 using Octokit.Internal;
 using System.Collections.Generic;
 using GitHub.Models;
+using GitHub.Extensions;
 
 namespace GitHub.Api
 {

src/GitHub.App/Caches/LoginCache.cs

@@ -4,6 +4,7 @@
 using System.Reactive;
 using System.Reactive.Linq;
 using Akavache;
+using GitHub.Extensions;
 using GitHub.Primitives;
 using NLog;
 

src/GitHub.App/Factories/SqlitePersistentBlobCacheFactory.cs

@@ -6,6 +6,7 @@
 using System.ComponentModel.Composition;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
+using GitHub.Extensions;
 
 namespace GitHub.Factories
 {

src/GitHub.App/GitHub.App.csproj

@@ -173,7 +173,7 @@
     <Compile Include="Models\DisconnectedRepositoryHosts.cs" />
     <Compile Include="Models\RepositoryHost.cs" />
     <Compile Include="Models\RepositoryHosts.cs" />
-    <Compile Include="Models\RepositoryModel.cs" />
+    <Compile Include="Models\RemoteRepositoryModel.cs" />
     <Compile Include="SampleData\SampleViewModels.cs" />
     <Compile Include="Api\ApiClient.cs" />
     <Compile Include="Factories\ApiClientFactory.cs" />

src/GitHub.App/Models/RemoteRepositoryModel.cs

@@ -0,0 +1,166 @@
+using GitHub.Primitives;
+using NullGuard;
+using System;
+using System.Globalization;
+
+namespace GitHub.Models
+{
+    /// <summary>
+    /// A repository read from the GitHub API.
+    /// </summary>
+    public class RemoteRepositoryModel : RepositoryModelBase, IRemoteRepositoryModel,
+        IEquatable<RemoteRepositoryModel>, IComparable<RemoteRepositoryModel>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RemoteRepositoryModel"/> class.
+        /// </summary>
+        /// <param name="id">The API ID of the repository.</param>
+        /// <param name="name">The repository name.</param>
+        /// <param name="cloneUrl">The repository's clone URL.</param>
+        /// <param name="isPrivate">Whether the repository is private.</param>
+        /// <param name="isFork">Whether the repository is a fork.</param>
+        /// <param name="ownerAccount">The repository owner account.</param>
+        public RemoteRepositoryModel(long id, string name, UriString cloneUrl, bool isPrivate, bool isFork,  IAccount ownerAccount)
+            : base(name, cloneUrl)
+        {
+            Id = id;
+            OwnerAccount = ownerAccount;
+            IsFork = isFork;
+            SetIcon(isPrivate, isFork);
+            // this is an assumption, we'd have to load the repo information from octokit to know for sure
+            // probably not worth it for this ctor
+            DefaultBranch = new BranchModel("master", this);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RemoteRepositoryModel"/> class.
+        /// </summary>
+        /// <param name="repository">The source octokit repository.</param>
+        public RemoteRepositoryModel(Octokit.Repository repository)
+            : base(repository.Name, repository.CloneUrl)
+        {
+            Id = repository.Id;
+            IsFork = repository.Fork;
+            SetIcon(repository.Private, IsFork);
+            OwnerAccount = new Account(repository.Owner);
+            DefaultBranch = new BranchModel(repository.DefaultBranch, this);
+            Parent = repository.Parent != null ? new RemoteRepositoryModel(repository.Parent) : null;
+            if (Parent != null)
+                Parent.DefaultBranch.DisplayName = Parent.DefaultBranch.Id;
+        }
+
+#region Equality Things
+        public void CopyFrom(IRemoteRepositoryModel other)
+        {
+            if (!Equals(other))
+                throw new ArgumentException("Instance to copy from doesn't match this instance. this:(" + this + ") other:(" + other + ")", nameof(other));
+            Icon = other.Icon;
+        }
+
+        public override int GetHashCode()
+        {
+            return Id.GetHashCode();
+        }
+
+        public override bool Equals([AllowNull]object obj)
+        {
+            if (ReferenceEquals(this, obj))
+                return true;
+            var other = obj as RemoteRepositoryModel;
+            return Equals(other);
+        }
+
+        public bool Equals([AllowNull]IRemoteRepositoryModel other)
+        {
+            if (ReferenceEquals(this, other))
+                return true;
+            return other != null && Id == other.Id;
+        }
+
+        public bool Equals([AllowNull]RemoteRepositoryModel other)
+        {
+            if (ReferenceEquals(this, other))
+                return true;
+            return other != null && Id == other.Id;
+        }
+
+        public int CompareTo([AllowNull]IRemoteRepositoryModel other)
+        {
+            return other != null ? UpdatedAt.CompareTo(other.UpdatedAt) : 1;
+        }
+
+        public int CompareTo([AllowNull]RemoteRepositoryModel other)
+        {
+            return other != null ? UpdatedAt.CompareTo(other.UpdatedAt) : 1;
+        }
+
+        public static bool operator >([AllowNull]RemoteRepositoryModel lhs, [AllowNull]RemoteRepositoryModel rhs)
+        {
+            if (ReferenceEquals(lhs, rhs))
+                return false;
+            return lhs?.CompareTo(rhs) > 0;
+        }
+
+        public static bool operator <([AllowNull]RemoteRepositoryModel lhs, [AllowNull]RemoteRepositoryModel rhs)
+        {
+            if (ReferenceEquals(lhs, rhs))
+                return false;
+            return (object)lhs == null || lhs.CompareTo(rhs) < 0;
+        }
+
+        public static bool operator ==([AllowNull]RemoteRepositoryModel lhs, [AllowNull]RemoteRepositoryModel rhs)
+        {
+            return ReferenceEquals(lhs, rhs);
+        }
+
+        public static bool operator !=([AllowNull]RemoteRepositoryModel lhs, [AllowNull]RemoteRepositoryModel rhs)
+        {
+            return !(lhs == rhs);
+        }
+#endregion
+
+        /// <summary>
+        /// Gets the account that is the ower of the repository.
+        /// </summary>
+        public IAccount OwnerAccount { get; }
+
+        /// <summary>
+        /// Gets the repository's API ID.
+        /// </summary>
+        public long Id { get; }
+
+        /// <summary>
+        /// Gets the date and time at which the repository was created.
+        /// </summary>
+        public DateTimeOffset CreatedAt { get; set; }
+
+        /// <summary>
+        /// Gets the repository's last update date and time.
+        /// </summary>
+        public DateTimeOffset UpdatedAt { get; set; }
+
+        /// <summary>
+        /// Gets a value indicating whether the repository is a fork.
+        /// </summary>
+        public bool IsFork { get; }
+
+        /// <summary>
+        /// Gets the repository from which this repository was forked, if any.
+        /// </summary>
+        [AllowNull] public IRemoteRepositoryModel Parent { [return: AllowNull] get; }
+
+        /// <summary>
+        /// Gets the default branch for the repository.
+        /// </summary>
+        public IBranch DefaultBranch { get; }
+
+        internal string DebuggerDisplay
+        {
+            get
+            {
+                return String.Format(CultureInfo.InvariantCulture,
+                    "{4}\tId: {0} Name: {1} CloneUrl: {2} Account: {3}", Id, Name, CloneUrl, Owner, GetHashCode());
+            }
+        }
+    }
+}

src/GitHub.App/Models/RepositoryHost.cs

@@ -17,6 +17,7 @@
 using System.Linq;
 using System.Reactive.Threading.Tasks;
 using System.Collections.Generic;
+using GitHub.Extensions;
 
 namespace GitHub.Models
 {

src/GitHub.App/Models/RepositoryModel.cs

@@ -14,13 +14,13 @@ public PullRequestCreationViewModelDesigner()
         {
             Branches = new List<IBranch>
             {
-                new BranchModel("master", new SimpleRepositoryModel("http://github.com/user/repo")),
-                new BranchModel("don/stub-ui", new SimpleRepositoryModel("http://github.com/user/repo")),
-                new BranchModel("feature/pr/views", new SimpleRepositoryModel("http://github.com/user/repo")),
-                new BranchModel("release-1.0.17.0", new SimpleRepositoryModel("http://github.com/user/repo")),
+                new BranchModel("master", new LocalRepositoryModel("http://github.com/user/repo")),
+                new BranchModel("don/stub-ui", new LocalRepositoryModel("http://github.com/user/repo")),
+                new BranchModel("feature/pr/views", new LocalRepositoryModel("http://github.com/user/repo")),
+                new BranchModel("release-1.0.17.0", new LocalRepositoryModel("http://github.com/user/repo")),
             }.AsReadOnly();
 
-            TargetBranch = new BranchModel("master", new SimpleRepositoryModel("http://github.com/user/repo"));
+            TargetBranch = new BranchModel("master", new LocalRepositoryModel("http://github.com/user/repo"));
             SourceBranch = Branches[2];
 
             SelectedAssignee = "Haacked (Phil Haack)";