Code quality: Move Git operations to a different thread

src/Files.App/App.xaml.cs

@@ -369,6 +369,9 @@ await SafetyExtensions.IgnoreExceptions(async () =>
 			},
 			Logger);
 
+			// Dispose git operations' thread
+			GitHelpers.TryDispose();
+
 			// Destroy cached properties windows
 			FilePropertiesHelpers.DestroyCachedWindows();
 			AppModel.IsMainWindowClosed = true;

src/Files.App/Data/Models/CurrentInstanceViewModel.cs

@@ -165,27 +165,15 @@ public string? GitRepositoryPath
 			set
 			{
 				if (SetProperty(ref gitRepositoryPath, value))
-				{
 					OnPropertyChanged(nameof(IsGitRepository));
-					OnPropertyChanged(nameof(GitBranchName));
-				}
 			}
 		}
 
+		private string gitBranchName = string.Empty;
 		public string GitBranchName
 		{
-			get
-			{
-				if (IsGitRepository)
-					return GitHelpers.GetRepositoryHeadName(gitRepositoryPath);
-
-				return string.Empty;
-			}
-		}
-
-		public void UpdateCurrentBranchName()
-		{
-			OnPropertyChanged(nameof(GitBranchName));
+			get => gitBranchName;
+			set => SetProperty(ref gitBranchName, value);
 		}
 	}
 }

src/Files.App/Data/Models/DirectoryPropertiesViewModel.cs

@@ -18,6 +18,8 @@ public class DirectoryPropertiesViewModel : ObservableObject
 
 		private readonly ObservableCollection<string> _remoteBranches = new();
 
+		public bool IsBranchesFlyoutExpaned { get; set; } = false;
+
 		private string? _DirectoryItemCount;
 		public string? DirectoryItemCount
 		{
@@ -92,38 +94,46 @@ public DirectoryPropertiesViewModel()
 				=> GitHelpers.CreateNewBranchAsync(_gitRepositoryPath!, _localBranches[ACTIVE_BRANCH_INDEX]));
 		}
 
-		public void UpdateGitInfo(bool isGitRepository, string? repositoryPath, BranchItem[] branches)
+		public void UpdateGitInfo(bool isGitRepository, string? repositoryPath, BranchItem? head)
 		{
 			GitBranchDisplayName = isGitRepository &&
-								branches.Any() &&
-								!(ContentPageContext.ShellPage!.InstanceViewModel.IsPageTypeSearchResults)
-				? branches[ACTIVE_BRANCH_INDEX].Name
+								head is not null &&
+								!ContentPageContext.ShellPage!.InstanceViewModel.IsPageTypeSearchResults
+				? head.Name
 				: null;
 
 			_gitRepositoryPath = repositoryPath;
-			ShowLocals = true;
+
+			// Change ShowLocals value only if branches flyout is closed
+			if (!IsBranchesFlyoutExpaned)
+				ShowLocals = true;
 
-			var behind = branches.Any() ? branches[0].BehindBy ?? 0 : 0;
-			var ahead = branches.Any() ? branches[0].AheadBy ?? 0 : 0;
+			var behind = head is not null ? head.BehindBy ?? 0 : 0;
+			var ahead = head is not null ? head.AheadBy ?? 0 : 0;
 
 			ExtendedStatusInfo = string.Format("GitSyncStatusExtendedInfo".GetLocalizedResource(), ahead, behind);
 			StatusInfo = $"{ahead} / {behind}";
+		}
 
-			if (isGitRepository)
-			{
-				_localBranches.Clear();
-				_remoteBranches.Clear();
+		public async Task LoadBranches()
+		{
+			if (string.IsNullOrEmpty(_gitRepositoryPath))
+				return;
 
-				foreach (var branch in branches)
-				{
-					if (branch.IsRemote)
-						_remoteBranches.Add(branch.Name);
-					else
-						_localBranches.Add(branch.Name);
-				}
+			var branches = await GitHelpers.GetBranchesNames(_gitRepositoryPath);
+
+			_localBranches.Clear();
+			_remoteBranches.Clear();
 
-				SelectedBranchIndex = ACTIVE_BRANCH_INDEX;
+			foreach (var branch in branches)
+			{
+				if (branch.IsRemote)
+					_remoteBranches.Add(branch.Name);
+				else
+					_localBranches.Add(branch.Name);
 			}
+
+			SelectedBranchIndex = ShowLocals ? ACTIVE_BRANCH_INDEX : -1;
 		}
 	}
 }

src/Files.App/Data/Models/ItemViewModel.cs

@@ -77,19 +77,13 @@ public GitProperties EnabledGitProperties
 			{
 				if (SetProperty(ref _EnabledGitProperties, value) && value is not GitProperties.None)
 				{
-					filesAndFolders.ToList().ForEach(async item => {
+					filesAndFolders.ToList().ForEach(async item =>
+					{
 						if (item is GitItem gitItem &&
 							(!gitItem.StatusPropertiesInitialized && value is GitProperties.All or GitProperties.Status
 							|| !gitItem.CommitPropertiesInitialized && value is GitProperties.All or GitProperties.Commit))
 						{
-							try
-							{
-								await Task.Run(async () => await LoadGitPropertiesAsync(gitItem, loadPropsCTS));
-							}
-							catch (OperationCanceledException)
-							{
-								// Ignored
-							}
+								await LoadGitPropertiesAsync(gitItem);
 						}
 					});
 				}
@@ -169,7 +163,7 @@ public async Task SetWorkingDirectoryAsync(string? value)
 			}
 
 			GitDirectory = GitHelpers.GetGitRepositoryPath(WorkingDirectory, pathRoot);
-			IsValidGitDirectory = !string.IsNullOrEmpty(GitHelpers.GetRepositoryHeadName(GitDirectory));
+			IsValidGitDirectory = !string.IsNullOrEmpty((await GitHelpers.GetRepositoryHead(GitDirectory))?.Name);
 
 			OnPropertyChanged(nameof(WorkingDirectory));
 		}
@@ -1229,9 +1223,6 @@ await SafetyExtensions.IgnoreExceptions(() =>
 									gp.InitializeExtendedGroupHeaderInfoAsync();
 								}));
 						}
-
-						if (EnabledGitProperties != GitProperties.None && item is GitItem gitItem)
-							await LoadGitPropertiesAsync(gitItem, cts);
 					}
 				}, cts.Token);
 			}
@@ -1245,57 +1236,70 @@ await SafetyExtensions.IgnoreExceptions(() =>
 			}
 		}
 
-		private async Task LoadGitPropertiesAsync(GitItem gitItem, CancellationTokenSource cts)
+		public async Task LoadGitPropertiesAsync(GitItem gitItem)
 		{
 			var getStatus = EnabledGitProperties is GitProperties.All or GitProperties.Status && !gitItem.StatusPropertiesInitialized;
 			var getCommit = EnabledGitProperties is GitProperties.All or GitProperties.Commit && !gitItem.CommitPropertiesInitialized;
-
+			
 			if (!getStatus && !getCommit)
 				return;
 
-			if (GitHelpers.IsRepositoryEx(gitItem.ItemPath, out var repoPath) &&
-				!string.IsNullOrEmpty(repoPath))
-			{
-				cts.Token.ThrowIfCancellationRequested();
-
-				if (getStatus)
-					gitItem.StatusPropertiesInitialized = true;
-
-				if (getCommit)
-					gitItem.CommitPropertiesInitialized = true;
+			var cts = loadPropsCTS;
 
-				await SafetyExtensions.IgnoreExceptions(() =>
+			try
+			{
+				await Task.Run(async () =>
 				{
-					return dispatcherQueue.EnqueueOrInvokeAsync(() =>
+
+					if (GitHelpers.IsRepositoryEx(gitItem.ItemPath, out var repoPath) &&
+						!string.IsNullOrEmpty(repoPath))
 					{
-						var repo = new Repository(repoPath);
-						GitItemModel gitItemModel = GitHelpers.GetGitInformationForItem(repo, gitItem.ItemPath, getStatus, getCommit);
+						cts.Token.ThrowIfCancellationRequested();
 
 						if (getStatus)
-						{
-							gitItem.UnmergedGitStatusIcon = gitItemModel.Status switch
-							{
-								ChangeKind.Added => (Microsoft.UI.Xaml.Style)Microsoft.UI.Xaml.Application.Current.Resources["ColorIconGitAdded"],
-								ChangeKind.Deleted => (Microsoft.UI.Xaml.Style)Microsoft.UI.Xaml.Application.Current.Resources["ColorIconGitDeleted"],
-								ChangeKind.Modified => (Microsoft.UI.Xaml.Style)Microsoft.UI.Xaml.Application.Current.Resources["ColorIconGitModified"],
-								ChangeKind.Untracked => (Microsoft.UI.Xaml.Style)Microsoft.UI.Xaml.Application.Current.Resources["ColorIconGitUntracked"],
-								_ => null,
-							};
-							gitItem.UnmergedGitStatusName = gitItemModel.StatusHumanized;
-						}
+							gitItem.StatusPropertiesInitialized = true;
+
 						if (getCommit)
+							gitItem.CommitPropertiesInitialized = true;
+
+						await SafetyExtensions.IgnoreExceptions(() =>
 						{
-							gitItem.GitLastCommitDate = gitItemModel.LastCommit?.Author.When;
-							gitItem.GitLastCommitMessage = gitItemModel.LastCommit?.MessageShort;
-							gitItem.GitLastCommitAuthor = gitItemModel.LastCommit?.Author.Name;
-							gitItem.GitLastCommitSha = gitItemModel.LastCommit?.Sha.Substring(0, 7);
-							gitItem.GitLastCommitFullSha = gitItemModel.LastCommit?.Sha;
-						}
+							return dispatcherQueue.EnqueueOrInvokeAsync(() =>
+							{
+								var repo = new Repository(repoPath);
+								GitItemModel gitItemModel = GitHelpers.GetGitInformationForItem(repo, gitItem.ItemPath, getStatus, getCommit);
 
-						repo.Dispose();
-					},
-					Microsoft.UI.Dispatching.DispatcherQueuePriority.Low);
-				});
+								if (getStatus)
+								{
+									gitItem.UnmergedGitStatusIcon = gitItemModel.Status switch
+									{
+										ChangeKind.Added => (Microsoft.UI.Xaml.Style)Microsoft.UI.Xaml.Application.Current.Resources["ColorIconGitAdded"],
+										ChangeKind.Deleted => (Microsoft.UI.Xaml.Style)Microsoft.UI.Xaml.Application.Current.Resources["ColorIconGitDeleted"],
+										ChangeKind.Modified => (Microsoft.UI.Xaml.Style)Microsoft.UI.Xaml.Application.Current.Resources["ColorIconGitModified"],
+										ChangeKind.Untracked => (Microsoft.UI.Xaml.Style)Microsoft.UI.Xaml.Application.Current.Resources["ColorIconGitUntracked"],
+										_ => null,
+									};
+									gitItem.UnmergedGitStatusName = gitItemModel.StatusHumanized;
+								}
+								if (getCommit)
+								{
+									gitItem.GitLastCommitDate = gitItemModel.LastCommit?.Author.When;
+									gitItem.GitLastCommitMessage = gitItemModel.LastCommit?.MessageShort;
+									gitItem.GitLastCommitAuthor = gitItemModel.LastCommit?.Author.Name;
+									gitItem.GitLastCommitSha = gitItemModel.LastCommit?.Sha.Substring(0, 7);
+									gitItem.GitLastCommitFullSha = gitItemModel.LastCommit?.Sha;
+								}
+
+								repo.Dispose();
+							},
+							Microsoft.UI.Dispatching.DispatcherQueuePriority.Low);
+						});
+					}
+				}, cts.Token);
+			}
+			catch (OperationCanceledException)
+			{
+				// Ignored
 			}
 		}
 
@@ -1439,7 +1443,7 @@ private async Task RapidAddItemsToCollectionAsync(string? path, LibraryItem? lib
 						IsTypeCloudDrive = syncStatus != CloudDriveSyncStatus.NotSynced && syncStatus != CloudDriveSyncStatus.Unknown,
 						IsTypeGitRepository = IsValidGitDirectory
 					});
-          
+
 					if (!HasNoWatcher)
 						WatchForDirectoryChanges(path, syncStatus);
 					if (IsValidGitDirectory)

src/Files.App/Services/Settings/FoldersSettingsService.cs

@@ -197,7 +197,7 @@ public bool ShowSizeColumn
 
 		public bool ShowGitStatusColumn
 		{
-			get => Get(true);
+			get => Get(false);
 			set => Set(value);
 		}
 

src/Files.App/UserControls/StatusBarControl.xaml

@@ -296,7 +296,10 @@
 			</Button.Content>
 
 			<Button.Flyout>
-				<Flyout x:Name="BranchesFlyout" Opening="BranchesFlyout_Opening">
+				<Flyout
+					x:Name="BranchesFlyout"
+					Closing="BranchesFlyout_Closing"
+					Opening="BranchesFlyout_Opening">
 					<Grid
 						Width="300"
 						Height="340"

src/Files.App/UserControls/StatusBarControl.xaml.cs

@@ -45,18 +45,28 @@ public StatusBarControl()
 			InitializeComponent();
 		}
 
-		private void BranchesFlyout_Opening(object sender, object e)
+		private async void BranchesFlyout_Opening(object _, object e)
 		{
 			if (DirectoryPropertiesViewModel is null)
 				return;
 
+			DirectoryPropertiesViewModel.IsBranchesFlyoutExpaned = true;
 			DirectoryPropertiesViewModel.ShowLocals = true;
+			await DirectoryPropertiesViewModel.LoadBranches();
 			DirectoryPropertiesViewModel.SelectedBranchIndex = DirectoryPropertiesViewModel.ACTIVE_BRANCH_INDEX;
 		}
 
 		private void BranchesList_ItemClick(object sender, ItemClickEventArgs e)
 		{
 			BranchesFlyout.Hide();
 		}
+
+		private void BranchesFlyout_Closing(object _, object e)
+		{
+			if (DirectoryPropertiesViewModel is null)
+				return;
+
+			DirectoryPropertiesViewModel.IsBranchesFlyoutExpaned = false;
+		}
 	}
 }