michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-24 20:57:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: try-catch OpenFolderPickerAsync to avoid crash when select a directory is NOT exist

Browse source
This commit is contained in:
Gadfly 2024-08-27 10:40:49 +08:00
parent 492f22fcfa
commit 80559ce199
No known key found for this signature in database
6 changed files with 66 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/ViewModels/CommitDetail.cs
View file

@ -390,12 +390,19 @@ namespace SourceGit.ViewModels
return; return;
var options = new FolderPickerOpenOptions() { AllowMultiple = false }; var options = new FolderPickerOpenOptions() { AllowMultiple = false };
try
{
var selected = await storageProvider.OpenFolderPickerAsync(options); var selected = await storageProvider.OpenFolderPickerAsync(options);
if (selected.Count == 1) if (selected.Count == 1)
{ {
var saveTo = Path.Combine(selected[0].Path.LocalPath, Path.GetFileName(file.Path)); var saveTo = Path.Combine(selected[0].Path.LocalPath, Path.GetFileName(file.Path));
Commands.SaveRevisionFile.Run(_repo.FullPath, _commit.SHA, file.Path, saveTo); Commands.SaveRevisionFile.Run(_repo.FullPath, _commit.SHA, file.Path, saveTo);
} }
}
catch (Exception e)
{
App.RaiseException(_repo.FullPath, $"Failed to save file: {e.Message}");
}
ev.Handled = true; ev.Handled = true;
}; };

7
src/ViewModels/Histories.cs
View file

@ -454,6 +454,8 @@ namespace SourceGit.ViewModels
return; return;
var options = new FolderPickerOpenOptions() { AllowMultiple = false }; var options = new FolderPickerOpenOptions() { AllowMultiple = false };
try
{
var selected = await storageProvider.OpenFolderPickerAsync(options); var selected = await storageProvider.OpenFolderPickerAsync(options);
if (selected.Count == 1) if (selected.Count == 1)
{ {
@ -461,6 +463,11 @@ namespace SourceGit.ViewModels
if (succ) if (succ)
App.SendNotification(_repo.FullPath, App.Text("SaveAsPatchSuccess")); App.SendNotification(_repo.FullPath, App.Text("SaveAsPatchSuccess"));
} }
}
catch (Exception exception)
{
App.RaiseException(_repo.FullPath, $"Failed to save as patch: {exception.Message}");
}
e.Handled = true; e.Handled = true;
}; };

8
src/Views/AddWorktree.axaml.cs
View file

@ -1,3 +1,4 @@
using System;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Interactivity; using Avalonia.Interactivity;
using Avalonia.Platform.Storage; using Avalonia.Platform.Storage;
@ -18,9 +19,16 @@ namespace SourceGit.Views
return; return;
var options = new FolderPickerOpenOptions() { AllowMultiple = false }; var options = new FolderPickerOpenOptions() { AllowMultiple = false };
try
{
var selected = await toplevel.StorageProvider.OpenFolderPickerAsync(options); var selected = await toplevel.StorageProvider.OpenFolderPickerAsync(options);
if (selected.Count == 1) if (selected.Count == 1)
TxtLocation.Text = selected[0].Path.LocalPath; TxtLocation.Text = selected[0].Path.LocalPath;
}
catch (Exception exception)
{
App.RaiseException(string.Empty, $"Failed to select location: {exception.Message}");
}
e.Handled = true; e.Handled = true;
} }

8
src/Views/Clone.axaml.cs
View file

@ -1,3 +1,4 @@
using System;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Interactivity; using Avalonia.Interactivity;
using Avalonia.Platform.Storage; using Avalonia.Platform.Storage;
@ -18,9 +19,16 @@ namespace SourceGit.Views
if (toplevel == null) if (toplevel == null)
return; return;
try
{
var selected = await toplevel.StorageProvider.OpenFolderPickerAsync(options); var selected = await toplevel.StorageProvider.OpenFolderPickerAsync(options);
if (selected.Count == 1) if (selected.Count == 1)
TxtParentFolder.Text = selected[0].Path.LocalPath; TxtParentFolder.Text = selected[0].Path.LocalPath;
}
catch (Exception exception)
{
App.RaiseException(string.Empty, $"Failed to select parent folder: {exception.Message}");
}
e.Handled = true; e.Handled = true;
} }

7
src/Views/Preference.axaml.cs
View file

@ -186,12 +186,19 @@ namespace SourceGit.Views
private async void SelectDefaultCloneDir(object _1, RoutedEventArgs _2) private async void SelectDefaultCloneDir(object _1, RoutedEventArgs _2)
{ {
var options = new FolderPickerOpenOptions() { AllowMultiple = false }; var options = new FolderPickerOpenOptions() { AllowMultiple = false };
try
{
var selected = await StorageProvider.OpenFolderPickerAsync(options); var selected = await StorageProvider.OpenFolderPickerAsync(options);
if (selected.Count == 1) if (selected.Count == 1)
{ {
ViewModels.Preference.Instance.GitDefaultCloneDir = selected[0].Path.LocalPath; ViewModels.Preference.Instance.GitDefaultCloneDir = selected[0].Path.LocalPath;
} }
} }
catch (Exception e)
{
App.RaiseException(string.Empty, $"Failed to select default clone directory: {e.Message}");
}
}
private async void SelectGPGExecutable(object _1, RoutedEventArgs _2) private async void SelectGPGExecutable(object _1, RoutedEventArgs _2)
{ {

8
src/Views/WelcomeToolbar.axaml.cs
View file

@ -1,3 +1,4 @@
using System;
using System.IO; using System.IO;
using Avalonia.Controls; using Avalonia.Controls;
@ -30,9 +31,16 @@ namespace SourceGit.Views
options.SuggestedStartLocation = folder; options.SuggestedStartLocation = folder;
} }
try
{
var selected = await topLevel.StorageProvider.OpenFolderPickerAsync(options); var selected = await topLevel.StorageProvider.OpenFolderPickerAsync(options);
if (selected.Count == 1) if (selected.Count == 1)
OpenOrInitRepository(selected[0].Path.LocalPath); OpenOrInitRepository(selected[0].Path.LocalPath);
}
catch (Exception exception)
{
App.RaiseException(string.Empty, $"Failed to open repository: {exception.Message}");
}
e.Handled = true; e.Handled = true;
} }