Cleanup

Author: yaira2

src/Files.App/Utils/Git/GitHelpers.cs

@@ -4,7 +4,6 @@
 using Files.App.Dialogs;
 using LibGit2Sharp;
 using Microsoft.Extensions.Logging;
-using Sentry;
 using System.Net.Http;
 using System.Net.Http.Json;
 using System.Text;
@@ -13,6 +12,8 @@ namespace Files.App.Utils.Git
 {
 	internal static class GitHelpers
 	{
+		private static readonly StatusCenterViewModel StatusCenterViewModel = Ioc.Default.GetRequiredService<StatusCenterViewModel>();
+
 		private const string GIT_RESOURCE_NAME = "Files:https://github.com";
 
 		private const string GIT_RESOURCE_USERNAME = "Personal Access Token";
@@ -878,5 +879,52 @@ public static bool IsValidRepoUrl(string url)
 		{
 			return !string.IsNullOrWhiteSpace(url) && url.Contains("github.com");
 		}
+
+		public static async Task CloneRepoAsync(string repoUrl, string repoName, string targetDirectory)
+		{
+			var banner = StatusCenterHelper.AddCard_GitClone(repoName.CreateEnumerable(), targetDirectory.CreateEnumerable(), ReturnResult.InProgress);
+			var fsProgress = new StatusCenterItemProgressModel(banner.ProgressEventSource, enumerationCompleted: true, FileSystemStatusCode.InProgress);
+
+			bool isSuccess = await Task.Run(() =>
+			{
+				try
+				{
+					var cloneOptions = new CloneOptions
+					{
+						FetchOptions =
+						{
+							OnTransferProgress = progress =>
+							{
+								banner.CancellationToken.ThrowIfCancellationRequested();
+								fsProgress.ItemsCount = progress.TotalObjects;
+								fsProgress.SetProcessedSize(progress.ReceivedBytes);
+								fsProgress.AddProcessedItemsCount(1);
+								fsProgress.Report((int)((progress.ReceivedObjects / (double)progress.TotalObjects) * 100));
+								return true;
+							},
+							OnProgress = _ => !banner.CancellationToken.IsCancellationRequested
+						},
+						OnCheckoutProgress = (path, completed, total) =>
+							banner.CancellationToken.ThrowIfCancellationRequested()
+					};
+
+					Repository.Clone(repoUrl, targetDirectory, cloneOptions);
+					return true;
+				}
+				catch
+				{
+					return false;
+				}
+			}, banner.CancellationToken);
+
+			StatusCenterViewModel.RemoveItem(banner);
+
+			StatusCenterHelper.AddCard_GitClone(
+				repoName.CreateEnumerable(),
+				targetDirectory.CreateEnumerable(),
+				isSuccess ? ReturnResult.Success :
+				banner.CancellationToken.IsCancellationRequested ? ReturnResult.Cancelled :
+				ReturnResult.Failed);
+		}
 	}
 }

src/Files.App/ViewModels/Dialogs/CloneRepoDialogViewModel.cs

@@ -9,8 +9,6 @@ namespace Files.App.ViewModels.Dialogs
 {
 	public sealed partial class CloneRepoDialogViewModel : ObservableObject
 	{
-		private readonly StatusCenterViewModel StatusCenterViewModel = Ioc.Default.GetRequiredService<StatusCenterViewModel>();
-
 		public bool CanCloneRepo
 		{
 			get
@@ -45,11 +43,11 @@ public string RepoName
 
 		}
 
-		private string workingDirectory;
-		public string WorkingDirectory
+		private string targetDirectory;
+		public string TargetDirectory
 		{
-			get => workingDirectory;
-			set => SetProperty(ref workingDirectory, value);
+			get => targetDirectory;
+			set => SetProperty(ref targetDirectory, value);
 
 		}
 
@@ -70,57 +68,14 @@ public CloneRepoDialogViewModel(string repoUrl, string workingDirectory)
 				RepoName = string.Empty;
 			}
 
-			WorkingDirectory = workingDirectory;
+			TargetDirectory = Path.Combine(workingDirectory, RepoName);
 
 			CloneRepoCommand = new AsyncRelayCommand(DoCloneRepo);
 		}
 
 		private async Task DoCloneRepo()
 		{
-			string targetDirectory = Path.Combine(WorkingDirectory, RepoName);
-			var banner = StatusCenterHelper.AddCard_GitClone(RepoName.CreateEnumerable(), targetDirectory.CreateEnumerable(), ReturnResult.InProgress);
-			var fsProgress = new StatusCenterItemProgressModel(banner.ProgressEventSource, enumerationCompleted: true, FileSystemStatusCode.InProgress);
-
-			bool isSuccess = await Task.Run(() =>
-			{
-				try
-				{
-					var cloneOptions = new CloneOptions
-					{
-						FetchOptions =
-						{
-							OnTransferProgress = progress =>
-							{
-								banner.CancellationToken.ThrowIfCancellationRequested();
-								fsProgress.ItemsCount = progress.TotalObjects;
-								fsProgress.SetProcessedSize(progress.ReceivedBytes);
-								fsProgress.AddProcessedItemsCount(1);
-								fsProgress.Report((int)((progress.ReceivedObjects / (double)progress.TotalObjects) * 100));
-								return true;
-							},
-							OnProgress = _ => !banner.CancellationToken.IsCancellationRequested
-						},
-						OnCheckoutProgress = (path, completed, total) =>
-							banner.CancellationToken.ThrowIfCancellationRequested()
-					};
-
-					Repository.Clone(RepoUrl, targetDirectory, cloneOptions);
-					return true;
-				}
-				catch
-				{
-					return false;
-				}
-			}, banner.CancellationToken);
-
-			StatusCenterViewModel.RemoveItem(banner);
-
-			StatusCenterHelper.AddCard_GitClone(
-				RepoName.CreateEnumerable(),
-				targetDirectory.CreateEnumerable(),
-				isSuccess ? ReturnResult.Success :
-				banner.CancellationToken.IsCancellationRequested ? ReturnResult.Cancelled :
-				ReturnResult.Failed);
+			await GitHelpers.CloneRepoAsync(RepoUrl, repoName, targetDirectory);
 		}
 	}
 }

src/Files.App/ViewModels/Layouts/BaseLayoutViewModel.cs

@@ -1,8 +1,6 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using Files.App.Actions;
-using LibGit2Sharp;
 using Microsoft.Extensions.Logging;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Input;