refactor: move I/O operations out of constructors

src/Commands/Command.cs

@@ -32,7 +32,7 @@ public enum EditorType
         public bool RaiseError { get; set; } = true;
         public Models.ICommandLog Log { get; set; } = null;
 
-        public bool Exec()
+        public virtual bool Exec()
         {
             Log?.AppendLine($"$ git {Args}\n");
 

src/Commands/Fetch.cs

@@ -6,7 +6,7 @@ public Fetch(string repo, string remote, bool noTags, bool force)
         {
             WorkingDirectory = repo;
             Context = repo;
-            SSHKey = new Config(repo).Get($"remote.{remote}.sshkey");
+            _remote = remote;
             Args = "fetch --progress --verbose ";
 
             if (noTags)
@@ -24,8 +24,16 @@ public Fetch(string repo, Models.Branch local, Models.Branch remote)
         {
             WorkingDirectory = repo;
             Context = repo;
-            SSHKey = new Config(repo).Get($"remote.{remote.Remote}.sshkey");
+            _remote = remote.Remote;
             Args = $"fetch --progress --verbose {remote.Remote} {remote.Name}:{local.Name}";
         }
+
+        public override bool Exec()
+        {
+            SSHKey = new Config(Context).Get($"remote.{_remote}.sshkey");
+            return base.Exec();
+        }
+
+        private readonly string _remote;
     }
 }

src/Commands/Pull.cs

@@ -6,13 +6,21 @@ public Pull(string repo, string remote, string branch, bool useRebase)
         {
             WorkingDirectory = repo;
             Context = repo;
-            SSHKey = new Config(repo).Get($"remote.{remote}.sshkey");
+            _remote = remote;
             Args = "pull --verbose --progress ";
 
             if (useRebase)
                 Args += "--rebase=true ";
 
             Args += $"{remote} {branch}";
         }
+
+        public override bool Exec()
+        {
+            SSHKey = new Config(Context).Get($"remote.{_remote}.sshkey");
+            return base.Exec();
+        }
+
+        private readonly string _remote;
     }
 }

src/Commands/Push.cs

@@ -6,7 +6,7 @@ public Push(string repo, string local, string remote, string remoteBranch, bool
         {
             WorkingDirectory = repo;
             Context = repo;
-            SSHKey = new Config(repo).Get($"remote.{remote}.sshkey");
+            _remote = remote;
             Args = "push --progress --verbose ";
 
             if (withTags)
@@ -25,13 +25,21 @@ public Push(string repo, string remote, string refname, bool isDelete)
         {
             WorkingDirectory = repo;
             Context = repo;
-            SSHKey = new Config(repo).Get($"remote.{remote}.sshkey");
+            _remote = remote;
             Args = "push ";
 
             if (isDelete)
                 Args += "--delete ";
 
             Args += $"{remote} {refname}";
         }
+
+        public override bool Exec()
+        {
+            SSHKey = new Config(Context).Get($"remote.{_remote}.sshkey");
+            return base.Exec();
+        }
+
+        private readonly string _remote;
     }
 }

src/ViewModels/AIAssistant.cs

@@ -30,8 +30,6 @@ public AIAssistant(Repository repo, Models.OpenAIService service, List<Models.Ch
             _changes = changes;
             _onApply = onApply;
             _cancel = new CancellationTokenSource();
-
-            Gen();
         }
 
         public void Regen()
@@ -52,7 +50,7 @@ public void Cancel()
             _cancel?.Cancel();
         }
 
-        private void Gen()
+        public void Gen()
         {
             Text = string.Empty;
             IsGenerating = true;

src/ViewModels/AssumeUnchangedManager.cs

@@ -13,7 +13,10 @@ public AssumeUnchangedManager(Repository repo)
         {
             _repo = repo;
             Files = new AvaloniaList<string>();
+        }
 
+        public void Load()
+        {
             Task.Run(() =>
             {
                 var collect = new Commands.QueryAssumeUnchangedFiles(_repo.FullPath).Result();

src/ViewModels/BranchCompare.cs

@@ -80,8 +80,6 @@ public BranchCompare(string repo, Models.Branch baseBranch, Models.Branch toBran
             _repo = repo;
             _based = baseBranch;
             _to = toBranch;
-
-            Refresh();
         }
 
         public void NavigateTo(string commitSHA)
@@ -176,7 +174,7 @@ public ContextMenu CreateChangeContextMenu()
             return menu;
         }
 
-        private void Refresh()
+        public void Refresh()
         {
             Task.Run(() =>
             {

src/ViewModels/Clone.cs

@@ -67,7 +67,10 @@ public Clone(string pageId)
             _parentFolder = activeWorkspace?.DefaultCloneDir;
             if (string.IsNullOrEmpty(ParentFolder))
                 _parentFolder = Preferences.Instance.GitDefaultCloneDir;
+        }
 
+        public void Load()
+        {
             Task.Run(async () =>
             {
                 try

src/ViewModels/Conflict.cs

@@ -15,11 +15,11 @@ public ConflictSourceBranch(string name, string head, Models.Commit revision)
             Revision = revision;
         }
 
-        public ConflictSourceBranch(Repository repo, Models.Branch branch)
+        public ConflictSourceBranch(Models.Branch branch, Models.Commit revision)
         {
             Name = branch.Name;
             Head = branch.Head;
-            Revision = new Commands.QuerySingleCommit(repo.FullPath, branch.Head).Result() ?? new Models.Commit() { SHA = branch.Head };
+            Revision = revision ?? new Models.Commit() { SHA = branch.Head };
         }
     }
 
@@ -61,25 +61,31 @@ public bool CanUseExternalMergeTool
 
         public Conflict(Repository repo, WorkingCopy wc, Models.Change change)
         {
+            _repo = repo;
             _wc = wc;
             _change = change;
+        }
 
-            var isSubmodule = repo.Submodules.Find(x => x.Path.Equals(change.Path, StringComparison.Ordinal)) != null;
+        public void Load()
+        {
+            var isSubmodule = _repo.Submodules.Find(x => x.Path.Equals(_change.Path, StringComparison.Ordinal)) != null;
             if (!isSubmodule && (_change.ConflictReason == Models.ConflictReason.BothAdded || _change.ConflictReason == Models.ConflictReason.BothModified))
             {
                 CanUseExternalMergeTool = true;
-                IsResolved = new Commands.IsConflictResolved(repo.FullPath, change).Result();
+                IsResolved = new Commands.IsConflictResolved(_repo.FullPath, _change).Result();
             }
 
-            var context = wc.InProgressContext;
+            var context = _wc.InProgressContext;
+            var revision = new Commands.QuerySingleCommit(_repo.FullPath, _repo.CurrentBranch.Head).Result();
+            var mine = new ConflictSourceBranch(_repo.CurrentBranch, revision);
             if (context is CherryPickInProgress cherryPick)
             {
                 Theirs = cherryPick.Head;
-                Mine = new ConflictSourceBranch(repo, repo.CurrentBranch);
+                Mine = mine;
             }
             else if (context is RebaseInProgress rebase)
             {
-                var b = repo.Branches.Find(x => x.IsLocal && x.Name == rebase.HeadName);
+                var b = _repo.Branches.Find(x => x.IsLocal && x.Name == rebase.HeadName);
                 if (b != null)
                     Theirs = new ConflictSourceBranch(b.Name, b.Head, rebase.StoppedAt);
                 else
@@ -90,17 +96,17 @@ public Conflict(Repository repo, WorkingCopy wc, Models.Change change)
             else if (context is RevertInProgress revert)
             {
                 Theirs = revert.Head;
-                Mine = new ConflictSourceBranch(repo, repo.CurrentBranch);
+                Mine = mine;
             }
             else if (context is MergeInProgress merge)
             {
                 Theirs = merge.Source;
-                Mine = new ConflictSourceBranch(repo, repo.CurrentBranch);
+                Mine = mine;
             }
             else
             {
                 Theirs = "Stash or Patch";
-                Mine = new ConflictSourceBranch(repo, repo.CurrentBranch);
+                Mine = mine;
             }
         }
 
@@ -119,6 +125,7 @@ public void OpenExternalMergeTool()
             _wc.UseExternalMergeTool(_change);
         }
 
+        private readonly Repository _repo;
         private WorkingCopy _wc = null;
         private Models.Change _change = null;
     }

src/ViewModels/CreateTag.cs

@@ -51,7 +51,6 @@ public CreateTag(Repository repo, Models.Branch branch)
             _basedOn = branch.Head;
 
             BasedOn = branch;
-            SignTag = new Commands.Config(repo.FullPath).Get("tag.gpgsign").Equals("true", StringComparison.OrdinalIgnoreCase);
         }
 
         public CreateTag(Repository repo, Models.Commit commit)
@@ -60,7 +59,11 @@ public CreateTag(Repository repo, Models.Commit commit)
             _basedOn = commit.SHA;
 
             BasedOn = commit;
-            SignTag = new Commands.Config(repo.FullPath).Get("tag.gpgsign").Equals("true", StringComparison.OrdinalIgnoreCase);
+        }
+
+        public void Load()
+        {
+            SignTag = new Commands.Config(_repo.FullPath).Get("tag.gpgsign").Equals("true", StringComparison.OrdinalIgnoreCase);
         }
 
         public static ValidationResult ValidateTagName(string name, ValidationContext ctx)

src/ViewModels/EditRemote.cs

@@ -51,10 +51,13 @@ public EditRemote(Repository repo, Models.Remote remote)
             _name = remote.Name;
             _url = remote.URL;
             _useSSH = Models.Remote.IsSSH(remote.URL);
+        }
 
+        public void Load()
+        {
             if (_useSSH)
             {
-                SSHKey = new Commands.Config(repo.FullPath).Get($"remote.{remote.Name}.sshkey");
+                SSHKey = new Commands.Config(_repo.FullPath).Get($"remote.{_remote.Name}.sshkey");
             }
         }
 

src/ViewModels/FileHistories.cs

@@ -34,15 +34,20 @@ public object ViewContent
             set => SetProperty(ref _viewContent, value);
         }
 
-        public FileHistoriesSingleRevision(Repository repo, string file, Models.Commit revision, bool prevIsDiffMode)
+        public static FileHistoriesSingleRevision Create(Repository repo, string file, Models.Commit revision, bool prevIsDiffMode)
+        {
+            var obj = new FileHistoriesSingleRevision(repo, file, revision, prevIsDiffMode);
+            obj.RefreshViewContent();
+            return obj;
+        }
+
+        private FileHistoriesSingleRevision(Repository repo, string file, Models.Commit revision, bool prevIsDiffMode)
         {
             _repo = repo;
             _file = file;
             _revision = revision;
             _isDiffMode = prevIsDiffMode;
             _viewContent = null;
-
-            RefreshViewContent();
         }
 
         public Task<bool> ResetToSelectedRevision()
@@ -188,13 +193,19 @@ public DiffContext ViewContent
             set => SetProperty(ref _viewContent, value);
         }
 
-        public FileHistoriesCompareRevisions(Repository repo, string file, Models.Commit start, Models.Commit end)
+        public static FileHistoriesCompareRevisions Create(Repository repo, string file, Models.Commit start, Models.Commit end)
+        {
+            var obj = new FileHistoriesCompareRevisions(repo, file, start, end);
+            obj.RefreshViewContent();
+            return obj;
+        }
+
+        private FileHistoriesCompareRevisions(Repository repo, string file, Models.Commit start, Models.Commit end)
         {
             _repo = repo;
             _file = file;
             _startPoint = start;
             _endPoint = end;
-            RefreshViewContent();
         }
 
         public void Swap()
@@ -275,11 +286,16 @@ public FileHistories(Repository repo, string file, string commit = null)
                 Title = file;
 
             _repo = repo;
+            _file = file;
+            _commit = commit;
+        }
 
+        public void Load()
+        {
             Task.Run(() =>
             {
-                var based = commit ?? string.Empty;
-                var commits = new Commands.QueryCommits(_repo.FullPath, $"--date-order -n 10000 {based} -- \"{file}\"", false).Result();
+                var based = _commit ?? string.Empty;
+                var commits = new Commands.QueryCommits(_repo.FullPath, $"--date-order -n 10000 {based} -- \"{_file}\"", false).Result();
                 Dispatcher.UIThread.Invoke(() =>
                 {
                     IsLoading = false;
@@ -296,8 +312,8 @@ public FileHistories(Repository repo, string file, string commit = null)
 
                 ViewContent = SelectedCommits.Count switch
                 {
-                    1 => new FileHistoriesSingleRevision(_repo, file, SelectedCommits[0], _prevIsDiffMode),
-                    2 => new FileHistoriesCompareRevisions(_repo, file, SelectedCommits[0], SelectedCommits[1]),
+                    1 => FileHistoriesSingleRevision.Create(_repo, _file, SelectedCommits[0], _prevIsDiffMode),
+                    2 => FileHistoriesCompareRevisions.Create(_repo, _file, SelectedCommits[0], SelectedCommits[1]),
                     _ => SelectedCommits.Count,
                 };
             };
@@ -320,6 +336,8 @@ public string GetCommitFullMessage(Models.Commit commit)
         }
 
         private readonly Repository _repo = null;
+        private readonly string _file;
+        private readonly string _commit;
         private bool _isLoading = true;
         private bool _prevIsDiffMode = true;
         private List<Models.Commit> _commits = null;