Code cleanup; Restoring funcitonality to load icons optionally

Author: StanleyGoldman

src/GitHub.Api/GitHub.Api.csproj

@@ -221,7 +221,6 @@
     <Compile Include="Extensions\UriExtensions.cs" />
     <Compile Include="Platform\Platform.cs" />
     <Compile Include="Git\GitCredentialManager.cs" />
-    <Compile Include="UI\CommitState.cs" />
     <Compile Include="UI\FileTreeNode.cs" />
     <Compile Include="UI\GitCommitTarget.cs" />
     <Compile Include="UI\TreeBuilder.cs" />

src/GitHub.Api/UI/CommitState.cs

@@ -4,6 +4,13 @@
 
 namespace GitHub.Unity
 {
+    enum CommitState
+    {
+        None,
+        Some,
+        All
+    }
+
     class FileTreeNode
     {
         private readonly Action<FileTreeNode> stateChangeCallback;

src/GitHub.Api/UI/FileTreeNode.cs

@@ -1,139 +1,141 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using GitHub.Unity;
 
-static class TreeBuilder
+namespace GitHub.Unity
 {
-    internal static void BuildChildNode(FileTreeNode parent, FileTreeNode node, List<string> foldedTreeEntries1, Action<FileTreeNode> stateChangeCallback1)
+    static class TreeBuilder
     {
-        if (String.IsNullOrEmpty(node.Label))
+        internal static void BuildChildNode(FileTreeNode parent, FileTreeNode node, List<string> foldedTreeEntries1, Action<FileTreeNode> stateChangeCallback1)
         {
-            // TODO: We should probably reassign this target onto the parent? Depends on how we want to handle .meta files for folders
-            return;
-        }
+            if (String.IsNullOrEmpty(node.Label))
+            {
+                // TODO: We should probably reassign this target onto the parent? Depends on how we want to handle .meta files for folders
+                return;
+            }
 
-        node.RepositoryPath = parent.RepositoryPath.ToNPath().Combine(node.Label);
-        parent.Open = !foldedTreeEntries1.Contains(parent.RepositoryPath);
+            node.RepositoryPath = parent.RepositoryPath.ToNPath().Combine(node.Label);
+            parent.Open = !foldedTreeEntries1.Contains(parent.RepositoryPath);
 
-        // Is this node inside a folder?
-        var nodePath = node.Label.ToNPath();
-        if (nodePath.Elements.Count() > 1)
-        {
-            // Figure out what the root folder is and chop it from the path
-            var root = nodePath.Elements.First();
-            node.Label = new NPath("").Combine(nodePath.Elements.Skip(1).ToArray());
-
-            // Look for a branch matching our root in the existing children
-            var found = false;
-            foreach (var child in parent.Children)
+            // Is this node inside a folder?
+            var nodePath = node.Label.ToNPath();
+            if (nodePath.Elements.Count() > 1)
             {
-                // If we found the branch, continue building from that branch
-                if (child.Label.Equals(root))
+                // Figure out what the root folder is and chop it from the path
+                var root = nodePath.Elements.First();
+                node.Label = new NPath("").Combine(nodePath.Elements.Skip(1).ToArray());
+
+                // Look for a branch matching our root in the existing children
+                var found = false;
+                foreach (var child in parent.Children)
                 {
-                    found = true;
-                    BuildChildNode(child, node, foldedTreeEntries1, stateChangeCallback1);
-                    break;
+                    // If we found the branch, continue building from that branch
+                    if (child.Label.Equals(root))
+                    {
+                        found = true;
+                        BuildChildNode(child, node, foldedTreeEntries1, stateChangeCallback1);
+                        break;
+                    }
                 }
-            }
 
-            // No existing branch - we will have to add a new one to build from
-            if (!found)
-            {
-                var p = parent.RepositoryPath.ToNPath().Combine(root);
-                BuildChildNode(parent.Add(new FileTreeNode(root, stateChangeCallback1) { RepositoryPath = p }), node, foldedTreeEntries1, stateChangeCallback1);
+                // No existing branch - we will have to add a new one to build from
+                if (!found)
+                {
+                    var p = parent.RepositoryPath.ToNPath().Combine(root);
+                    BuildChildNode(parent.Add(new FileTreeNode(root, stateChangeCallback1) { RepositoryPath = p }), node, foldedTreeEntries1, stateChangeCallback1);
+                }
             }
-        }
-        else if (nodePath.ExtensionWithDot == ".meta")
-        {
-            // Look for a branch matching our root in the existing children
-            var found = false;
-            foreach (var child in parent.Children)
+            else if (nodePath.ExtensionWithDot == ".meta")
             {
-                // If we found the branch, continue building from that branch
-                if (child.Label.Equals(nodePath.Parent.Combine(nodePath.FileNameWithoutExtension)))
+                // Look for a branch matching our root in the existing children
+                var found = false;
+                foreach (var child in parent.Children)
                 {
-                    found = true;
-                    BuildChildNode(child, node, foldedTreeEntries1, stateChangeCallback1);
-                    break;
+                    // If we found the branch, continue building from that branch
+                    if (child.Label.Equals(nodePath.Parent.Combine(nodePath.FileNameWithoutExtension)))
+                    {
+                        found = true;
+                        BuildChildNode(child, node, foldedTreeEntries1, stateChangeCallback1);
+                        break;
+                    }
+                }
+                if (!found)
+                {
+                    parent.Add(node);
                 }
             }
-            if (!found)
+            // Not inside a folder - just add this node right here
+            else
             {
                 parent.Add(node);
             }
         }
-        // Not inside a folder - just add this node right here
-        else
-        {
-            parent.Add(node);
-        }
-    }
-
-    internal static FileTreeNode BuildTreeRoot(IList<GitStatusEntry> newEntries, List<GitStatusEntry> gitStatusEntries, List<GitCommitTarget> gitCommitTargets, List<string> foldedTreeEntries, Action<FileTreeNode> stateChangeCallback)
-    {
-        Guard.ArgumentNotNullOrEmpty(newEntries, "newEntries");
 
-        // Remove what got nuked
-        for (var index = 0; index < gitStatusEntries.Count;)
+        internal static FileTreeNode BuildTreeRoot(IList<GitStatusEntry> newEntries, List<GitStatusEntry> gitStatusEntries, List<GitCommitTarget> gitCommitTargets, List<string> foldedTreeEntries, Action<FileTreeNode> stateChangeCallback, Func<string, object> iconLoaderFunc = null)
         {
-            if (!newEntries.Contains(gitStatusEntries[index]))
-            {
-                gitStatusEntries.RemoveAt(index);
-                gitCommitTargets.RemoveAt(index);
-            }
-            else
-            {
-                index++;
-            }
-        }
+            Guard.ArgumentNotNullOrEmpty(newEntries, "newEntries");
 
-        // Remove folding state of nuked items
-        for (var index = 0; index < foldedTreeEntries.Count;)
-        {
-            if (!newEntries.Any(e => e.Path.IndexOf(foldedTreeEntries[index]) == 0))
+            // Remove what got nuked
+            for (var index = 0; index < gitStatusEntries.Count;)
             {
-                foldedTreeEntries.RemoveAt(index);
+                if (!newEntries.Contains(gitStatusEntries[index]))
+                {
+                    gitStatusEntries.RemoveAt(index);
+                    gitCommitTargets.RemoveAt(index);
+                }
+                else
+                {
+                    index++;
+                }
             }
-            else
+
+            // Remove folding state of nuked items
+            for (var index = 0; index < foldedTreeEntries.Count;)
             {
-                index++;
+                if (!newEntries.Any(e => e.Path.IndexOf(foldedTreeEntries[index]) == 0))
+                {
+                    foldedTreeEntries.RemoveAt(index);
+                }
+                else
+                {
+                    index++;
+                }
             }
-        }
 
-        // Add new stuff
-        for (var index = 0; index < newEntries.Count; ++index)
-        {
-            var entry = newEntries[index];
-            if (!gitStatusEntries.Contains(entry))
+            // Add new stuff
+            for (var index = 0; index < newEntries.Count; ++index)
             {
-                gitStatusEntries.Add(entry);
-                gitCommitTargets.Add(new GitCommitTarget());
+                var entry = newEntries[index];
+                if (!gitStatusEntries.Contains(entry))
+                {
+                    gitStatusEntries.Add(entry);
+                    gitCommitTargets.Add(new GitCommitTarget());
+                }
             }
-        }
-
-        // TODO: Filter .meta files - consider adding them as children of the asset or folder they're supporting
-        // TODO: In stead of completely rebuilding the tree structure, figure out a way to migrate open/closed states from the old tree to the new
-        // Build tree structure
 
-        var tree = new FileTreeNode(FileSystemHelpers.FindCommonPath(gitStatusEntries.Select(e => e.Path)), stateChangeCallback);
-        tree.RepositoryPath = tree.Path;
+            // TODO: Filter .meta files - consider adding them as children of the asset or folder they're supporting
+            // TODO: In stead of completely rebuilding the tree structure, figure out a way to migrate open/closed states from the old tree to the new
+            // Build tree structure
 
-        for (var index1 = 0; index1 < gitStatusEntries.Count; index1++)
-        {
-            GitStatusEntry gitStatusEntry = gitStatusEntries[index1];
-            var entryPath = gitStatusEntry.Path.ToNPath();
-            if (entryPath.IsChildOf(tree.Path)) entryPath = entryPath.RelativeTo(tree.Path.ToNPath());
+            var tree = new FileTreeNode(FileSystemHelpers.FindCommonPath(gitStatusEntries.Select(e => e.Path)), stateChangeCallback);
+            tree.RepositoryPath = tree.Path;
 
-            var node = new FileTreeNode(entryPath, stateChangeCallback) { Target = gitCommitTargets[index1] };
-            if (!String.IsNullOrEmpty(gitStatusEntry.ProjectPath))
+            for (var index1 = 0; index1 < gitStatusEntries.Count; index1++)
             {
-                //node.Icon = AssetDatabase.GetCachedIcon(gitStatusEntry.ProjectPath);
+                GitStatusEntry gitStatusEntry = gitStatusEntries[index1];
+                var entryPath = gitStatusEntry.Path.ToNPath();
+                if (entryPath.IsChildOf(tree.Path)) entryPath = entryPath.RelativeTo(tree.Path.ToNPath());
+
+                var node = new FileTreeNode(entryPath, stateChangeCallback) { Target = gitCommitTargets[index1] };
+                if (!String.IsNullOrEmpty(gitStatusEntry.ProjectPath))
+                {
+                    node.Icon = iconLoaderFunc.Invoke(gitStatusEntry.ProjectPath);
+                }
+
+                TreeBuilder.BuildChildNode(tree, node, foldedTreeEntries, stateChangeCallback);
             }
 
-            TreeBuilder.BuildChildNode(tree, node, foldedTreeEntries, stateChangeCallback);
+            return tree;
         }
-
-        return tree;
     }
 }

src/GitHub.Api/UI/TreeBuilder.cs

@@ -230,7 +230,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- 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.

src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj

@@ -109,7 +109,7 @@ public void UpdateEntries(IList<GitStatusEntry> newEntries)
                 return;
             }
 
-            tree = TreeBuilder.BuildTreeRoot(newEntries, entries, entryCommitTargets, foldedTreeEntries, stateChangeCallback);
+            tree = TreeBuilder.BuildTreeRoot(newEntries, entries, entryCommitTargets, foldedTreeEntries, stateChangeCallback, AssetDatabase.GetCachedIcon);
 
             OnCommitTreeChange();
         }