Using string over NPath; NPath is not serializable by Unity

Author: StanleyGoldman

src/GitHub.Api/Git/GitClient.cs

@@ -262,9 +262,10 @@ public interface IGitClient
         /// <summary>
         /// Executes `git log -- <file>` to get the history of a specific file.
         /// </summary>
+        /// <param name="file"></param>
         /// <param name="processor">A custom output processor instance</param>
         /// <returns><see cref="List&lt;T&gt;"/> of <see cref="GitLogEntry"/> output</returns>
-        ITask<List<GitLogEntry>> LogFile(NPath file, BaseOutputListProcessor<GitLogEntry> processor = null);
+        ITask<List<GitLogEntry>> LogFile(string file, BaseOutputListProcessor<GitLogEntry> processor = null);
 
         /// <summary>
         /// Executes `git --version` to get the git version.
@@ -358,7 +359,7 @@ public ITask<List<GitLogEntry>> Log(BaseOutputListProcessor<GitLogEntry> process
         }
 
         ///<inheritdoc/>
-        public ITask<List<GitLogEntry>> LogFile(NPath file, BaseOutputListProcessor<GitLogEntry> processor = null)
+        public ITask<List<GitLogEntry>> LogFile(string file, BaseOutputListProcessor<GitLogEntry> processor = null)
         {
             if (file == NPath.Default)
             {

src/GitHub.Api/Git/GitFileLog.cs

@@ -6,18 +6,18 @@ namespace GitHub.Unity
     [Serializable]
     public struct GitFileLog
     {
-        public static GitFileLog Default = new GitFileLog(NPath.Default, new List<GitLogEntry>(0));
+        public static GitFileLog Default = new GitFileLog(null, new List<GitLogEntry>(0));
 
-        public NPath path;
+        public string path;
         public List<GitLogEntry> logEntries;
 
-        public GitFileLog(NPath path, List<GitLogEntry> logEntries)
+        public GitFileLog(string path, List<GitLogEntry> logEntries)
         {
             this.path = path;
             this.logEntries = logEntries;
         }
 
-        public NPath Path
+        public string Path
         {
             get { return path; }
             set { path = value; }

src/GitHub.Api/Git/IRepository.cs

@@ -81,8 +81,8 @@ public interface IRepository : IEquatable<IRepository>, IDisposable, IBackedByCa
         ITask DeleteBranch(string branch, bool force);
         ITask CreateBranch(string branch, string baseBranch);
         ITask SwitchBranch(string branch);
+        ITask UpdateFileLog(string path);
         void Refresh(CacheType cacheType);
         event Action<IProgress> OnProgress;
-        ITask UpdateFileLog(NPath path);
     }
 }

src/GitHub.Api/Git/Repository.cs

@@ -25,7 +25,7 @@ sealed class Repository : IEquatable<Repository>, IRepository
         private HashSet<CacheType> cacheInvalidationRequests = new HashSet<CacheType>();
         private Dictionary<CacheType, Action<CacheUpdateEvent>> cacheUpdateEvents;
         private ProgressReporter progressReporter = new ProgressReporter();
-        private NPath lastFileLog = NPath.Default;
+        private string lastFileLog;
 
         public event Action<CacheUpdateEvent> LogChanged;
         public event Action<CacheUpdateEvent> FileLogChanged;
@@ -148,7 +148,7 @@ public ITask SetupRemote(string remote, string remoteUrl)
         public ITask DeleteBranch(string branch, bool force) => repositoryManager.DeleteBranch(branch, force);
         public ITask CreateBranch(string branch, string baseBranch) => repositoryManager.CreateBranch(branch, baseBranch);
         public ITask SwitchBranch(string branch) => repositoryManager.SwitchBranch(branch);
-        public ITask UpdateFileLog(NPath path)
+        public ITask UpdateFileLog(string path)
         {
             lastFileLog = path;
             return repositoryManager.UpdateFileLog(path);

src/GitHub.Api/Git/RepositoryManager.cs

@@ -45,7 +45,7 @@ public interface IRepositoryManager : IDisposable
         ITask UpdateLocks();
         ITask UpdateRepositoryInfo();
         ITask UpdateBranches();
-        ITask UpdateFileLog(NPath path);
+        ITask UpdateFileLog(string path);
 
 
         int WaitForEvents();
@@ -366,7 +366,7 @@ public ITask UpdateGitLog()
             return HookupHandlers(task, false);
         }
 
-        public ITask UpdateFileLog(NPath path)
+        public ITask UpdateFileLog(string path)
         {
             var task = GitClient.LogFile(path)
                                 .Then((success, logEntries) =>

src/GitHub.Api/Git/Tasks/GitLogTask.cs

@@ -16,15 +16,15 @@ public GitLogTask(IGitObjectFactory gitObjectFactory,
             arguments = baseArguments;
         }
 
-        public GitLogTask(NPath file,
+        public GitLogTask(string file,
             IGitObjectFactory gitObjectFactory,
             CancellationToken token, BaseOutputListProcessor<GitLogEntry> processor = null)
             : base(token, processor ?? new LogEntryOutputProcessor(gitObjectFactory))
         {
             Name = TaskName;
             arguments = baseArguments;
             arguments += " -- ";
-            arguments += " \"" + file.ToString(SlashMode.Forward) + "\"";
+            arguments += " \"" + file + "\"";
         }
 
         public override string ProcessArguments

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/FileHistoryWindow.cs

@@ -38,25 +38,28 @@ private static bool GitFileHistoryValidation()
         [SerializeField] private bool locked;
         [SerializeField] private FileHistoryView fileHistoryView = new FileHistoryView();
         [SerializeField] private UnityEngine.Object selectedObject;
-        [SerializeField] private NPath selectedObjectAssetPath;
+        [SerializeField] private string selectedObjectAssetPath;
+        [SerializeField] private string selectedObjectRepositoryPath;
 
-        public void SetSelectedPath(NPath assetPath)
+        public void SetSelectedPath(string assetPath)
         {
-            NPath repositoryPath = NPath.Default;
-
-            selectedObjectAssetPath = assetPath;
             selectedObject = null;
+            selectedObjectAssetPath = null;
+            selectedObjectRepositoryPath = null;
 
             if (selectedObjectAssetPath != NPath.Default)
             {
-                selectedObject = AssetDatabase.LoadMainAssetAtPath(selectedObjectAssetPath.ToString());
+                selectedObjectAssetPath = assetPath;
+                selectedObject = AssetDatabase.LoadMainAssetAtPath(selectedObjectAssetPath);
 
-                repositoryPath = Environment.GetRepositoryPath(assetPath);
+                selectedObjectRepositoryPath =
+                    Environment.GetRepositoryPath(assetPath.ToNPath())
+                               .ToString(SlashMode.Forward);
             }
 
             LoadSelectedIcon();
 
-            Repository.UpdateFileLog(repositoryPath)
+            Repository.UpdateFileLog(selectedObjectRepositoryPath)
                       .Start();
         }
 
@@ -124,14 +127,14 @@ public override void OnSelectionChange()
             if (!locked)
             {
                 selectedObject = Selection.activeObject;
-                selectedObjectAssetPath = NPath.Default;
+
+                string assetPath = null;
                 if (selectedObject != null)
                 {
-                    selectedObjectAssetPath = AssetDatabase.GetAssetPath(selectedObject)
-                                             .ToNPath();
-
-                    SetSelectedPath(selectedObjectAssetPath);
+                    assetPath = AssetDatabase.GetAssetPath(selectedObject);
                 }
+
+                SetSelectedPath(assetPath);
             }
         }
 
@@ -185,15 +188,15 @@ private void LoadSelectedIcon()
         {
             Texture nodeIcon = null;
 
-            if (selectedObjectAssetPath != NPath.Default)
+            if (!string.IsNullOrEmpty(selectedObjectAssetPath))
             {
-                if (selectedObjectAssetPath.DirectoryExists())
+                if (selectedObjectAssetPath.ToNPath().DirectoryExists())
                 {
                     nodeIcon = Styles.FolderIcon;
                 }
                 else
                 {
-                    nodeIcon = UnityEditorInternal.InternalEditorUtility.GetIconForFile(selectedObjectAssetPath.ToString());
+                    nodeIcon = UnityEditorInternal.InternalEditorUtility.GetIconForFile(selectedObjectAssetPath);
                 }
 
                 nodeIcon.hideFlags = HideFlags.HideAndDontSave;