Skip to content

Commit c1a5e98

Browse files
love-lingerlove-linger
committed
refactor: rewrite Open Local Repository feature
Signed-off-by: leo <longshuang@msn.cn>
1 parent 3db91ed commit c1a5e98

File tree

9 files changed

+274
-70
lines changed

9 files changed

+274
-70
lines changed

‎src/Resources/Locales/en_US.axaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,10 @@
594594
<x:String x:Key="Text.OpenAppDataDir" xml:space="preserve">Open Data Storage Directory</x:String>
595595
<x:String x:Key="Text.OpenFile" xml:space="preserve">Open File</x:String>
596596
<x:String x:Key="Text.OpenInExternalMergeTool" xml:space="preserve">Open in External Merge Tool</x:String>
597+
<x:String x:Key="Text.OpenLocalRepository" xml:space="preserve">Open Local Repository</x:String>
598+
<x:String x:Key="Text.OpenLocalRepository.Bookmark" xml:space="preserve">Bookmark:</x:String>
599+
<x:String x:Key="Text.OpenLocalRepository.Group" xml:space="preserve">Group:</x:String>
600+
<x:String x:Key="Text.OpenLocalRepository.Path" xml:space="preserve">Folder:</x:String>
597601
<x:String x:Key="Text.Optional" xml:space="preserve">Optional.</x:String>
598602
<x:String x:Key="Text.PageTabBar.New" xml:space="preserve">Create New Tab</x:String>
599603
<x:String x:Key="Text.PageTabBar.Tab.Close" xml:space="preserve">Close Tab</x:String>

‎src/Resources/Locales/zh_CN.axaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -598,6 +598,10 @@
598598
<x:String x:Key="Text.OpenAppDataDir" xml:space="preserve">浏览应用数据目录</x:String>
599599
<x:String x:Key="Text.OpenFile" xml:space="preserve">打开文件</x:String>
600600
<x:String x:Key="Text.OpenInExternalMergeTool" xml:space="preserve">使用外部对比工具查看</x:String>
601+
<x:String x:Key="Text.OpenLocalRepository" xml:space="preserve">打开本地仓库</x:String>
602+
<x:String x:Key="Text.OpenLocalRepository.Bookmark" xml:space="preserve">书签 ：</x:String>
603+
<x:String x:Key="Text.OpenLocalRepository.Group" xml:space="preserve">分组 ：</x:String>
604+
<x:String x:Key="Text.OpenLocalRepository.Path" xml:space="preserve">仓库位置 ：</x:String>
601605
<x:String x:Key="Text.Optional" xml:space="preserve">选填。</x:String>
602606
<x:String x:Key="Text.PageTabBar.New" xml:space="preserve">新建空白页</x:String>
603607
<x:String x:Key="Text.PageTabBar.Tab.Close" xml:space="preserve">关闭标签页</x:String>

‎src/Resources/Locales/zh_TW.axaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -598,6 +598,10 @@
598598
<x:String x:Key="Text.OpenAppDataDir" xml:space="preserve">瀏覽程式資料目錄</x:String>
599599
<x:String x:Key="Text.OpenFile" xml:space="preserve">開啟檔案</x:String>
600600
<x:String x:Key="Text.OpenInExternalMergeTool" xml:space="preserve">使用外部比對工具檢視</x:String>
601+
<x:String x:Key="Text.OpenLocalRepository" xml:space="preserve">開啟本機存放庫</x:String>
602+
<x:String x:Key="Text.OpenLocalRepository.Bookmark" xml:space="preserve">書籤:</x:String>
603+
<x:String x:Key="Text.OpenLocalRepository.Group" xml:space="preserve">群組:</x:String>
604+
<x:String x:Key="Text.OpenLocalRepository.Path" xml:space="preserve">存放庫位置:</x:String>
601605
<x:String x:Key="Text.Optional" xml:space="preserve">選填。</x:String>
602606
<x:String x:Key="Text.PageTabBar.New" xml:space="preserve">新增分頁</x:String>
603607
<x:String x:Key="Text.PageTabBar.Tab.Close" xml:space="preserve">關閉分頁</x:String>

‎src/ViewModels/OpenLocalRepository.cs‎

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.ComponentModel.DataAnnotations;
4+
using System.IO;
5+
using System.Threading.Tasks;
6+
7+
namespace SourceGit.ViewModels
8+
{
9+
public class OpenLocalRepository : Popup
10+
{
11+
[Required(ErrorMessage = "Repository folder is required")]
12+
[CustomValidation(typeof(OpenLocalRepository), nameof(ValidateRepoPath))]
13+
public string RepoPath
14+
{
15+
get => _repoPath;
16+
set => SetProperty(ref _repoPath, value, true);
17+
}
18+
19+
public List<RepositoryNode> Groups
20+
{
21+
get;
22+
}
23+
24+
public RepositoryNode Group
25+
{
26+
get => _group;
27+
set => SetProperty(ref _group, value);
28+
}
29+
30+
public List<int> Bookmarks
31+
{
32+
get;
33+
}
34+
35+
public int Bookmark
36+
{
37+
get => _bookmark;
38+
set => SetProperty(ref _bookmark, value);
39+
}
40+
41+
public OpenLocalRepository(string pageId, RepositoryNode group)
42+
{
43+
_pageId = pageId;
44+
_group = group;
45+
46+
Groups = new List<RepositoryNode>();
47+
CollectGroups(Groups, Preferences.Instance.RepositoryNodes);
48+
if (Groups.Count > 0 && _group == null)
49+
Group = Groups[0];
50+
51+
Bookmarks = new List<int>();
52+
for (var i = 0; i < Models.Bookmarks.Brushes.Length; i++)
53+
Bookmarks.Add(i);
54+
}
55+
56+
public static ValidationResult ValidateRepoPath(string folder, ValidationContext _)
57+
{
58+
if (!Directory.Exists(folder))
59+
return new ValidationResult("Given path can NOT be found");
60+
return ValidationResult.Success;
61+
}
62+
63+
public override async Task<bool> Sure()
64+
{
65+
var isBare = await new Commands.IsBareRepository(_repoPath).GetResultAsync();
66+
var repoRoot = _repoPath;
67+
if (!isBare)
68+
{
69+
var test = await new Commands.QueryRepositoryRootPath(_repoPath).GetResultAsync();
70+
if (test.IsSuccess && !string.IsNullOrWhiteSpace(test.StdOut))
71+
{
72+
repoRoot = test.StdOut.Trim();
73+
}
74+
else
75+
{
76+
var launcher = App.GetLauncher();
77+
foreach (var page in launcher.Pages)
78+
{
79+
if (page.Node.Id.Equals(_pageId, StringComparison.Ordinal))
80+
{
81+
page.Popup = new Init(page.Node.Id, _repoPath, _group, test.StdErr);
82+
break;
83+
}
84+
}
85+
86+
return false;
87+
}
88+
}
89+
90+
var node = Preferences.Instance.FindOrAddNodeByRepositoryPath(repoRoot, _group, true);
91+
node.Bookmark = _bookmark;
92+
await node.UpdateStatusAsync(false, null);
93+
Welcome.Instance.Refresh();
94+
node.Open();
95+
return true;
96+
}
97+
98+
private void CollectGroups(List<RepositoryNode> outs, List<RepositoryNode> collections)
99+
{
100+
foreach (var node in collections)
101+
{
102+
if (!node.IsRepository)
103+
{
104+
outs.Add(node);
105+
CollectGroups(outs, node.SubNodes);
106+
}
107+
}
108+
}
109+
110+
private string _pageId = string.Empty;
111+
private string _repoPath = string.Empty;
112+
private RepositoryNode _group = null;
113+
private int _bookmark = 0;
114+
}
115+
}

‎src/ViewModels/Welcome.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -128,19 +128,6 @@ public async Task<string> GetRepositoryRootAsync(string path)
128128
return rs.StdOut.Trim();
129129
}
130130

131-
public void InitRepository(string path, RepositoryNode parent, string reason)
132-
{
133-
if (!Preferences.Instance.IsGitConfigured())
134-
{
135-
Models.Notification.Send(null, App.Text("NotConfigured"), true);
136-
return;
137-
}
138-
139-
var activePage = App.GetLauncher().ActivePage;
140-
if (activePage != null && activePage.CanCreatePopup())
141-
activePage.Popup = new Init(activePage.Node.Id, path, parent, reason);
142-
}
143-
144131
public async Task AddRepositoryAsync(string path, RepositoryNode parent, bool moveNode, bool open)
145132
{
146133
var node = Preferences.Instance.FindOrAddNodeByRepositoryPath(path, parent, moveNode);
@@ -163,6 +150,19 @@ public void Clone()
163150
activePage.Popup = new Clone(activePage.Node.Id);
164151
}
165152

153+
public void OpenLocalRepository()
154+
{
155+
if (!Preferences.Instance.IsGitConfigured())
156+
{
157+
Models.Notification.Send(null, App.Text("NotConfigured"), true);
158+
return;
159+
}
160+
161+
var activePage = App.GetLauncher().ActivePage;
162+
if (activePage != null && activePage.CanCreatePopup())
163+
activePage.Popup = new OpenLocalRepository(activePage.Node.Id, null);
164+
}
165+
166166
public void OpenTerminal()
167167
{
168168
if (!Preferences.Instance.IsGitConfigured())

‎src/Views/OpenLocalRepository.axaml‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
<UserControl xmlns="https://github.com/avaloniaui"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
4+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+
xmlns:vm="using:SourceGit.ViewModels"
6+
xmlns:v="using:SourceGit.Views"
7+
xmlns:c="using:SourceGit.Converters"
8+
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
9+
x:Class="SourceGit.Views.OpenLocalRepository"
10+
x:DataType="vm:OpenLocalRepository">
11+
<StackPanel Orientation="Vertical" Margin="8,0,0,0">
12+
<StackPanel Orientation="Horizontal">
13+
<Path Width="16" Height="16"
14+
Margin="0,2,0,0"
15+
Data="{StaticResource Icons.Folder.Open}"/>
16+
17+
<TextBlock FontSize="18"
18+
Margin="8,0,0,0"
19+
Classes="bold"
20+
Text="{DynamicResource Text.OpenLocalRepository}"/>
21+
</StackPanel>
22+
23+
<Grid Margin="8,16,0,0" RowDefinitions="32,32,32" ColumnDefinitions="Auto,*">
24+
<TextBlock Grid.Row="0" Grid.Column="0"
25+
HorizontalAlignment="Right"
26+
Margin="0,0,8,0"
27+
Text="{DynamicResource Text.OpenLocalRepository.Path}"/>
28+
<TextBox Grid.Row="0" Grid.Column="1"
29+
Height="28"
30+
CornerRadius="3"
31+
Text="{Binding RepoPath, Mode=TwoWay}">
32+
<TextBox.InnerRightContent>
33+
<Button Classes="icon_button" Width="28" Height="28" Margin="4,0,0,0" Click="OnSelectRepositoryFolder">
34+
<Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
35+
</Button>
36+
</TextBox.InnerRightContent>
37+
</TextBox>
38+
39+
<TextBlock Grid.Row="1" Grid.Column="0"
40+
HorizontalAlignment="Right"
41+
Margin="0,0,8,0"
42+
Text="{DynamicResource Text.OpenLocalRepository.Group}"/>
43+
<ComboBox Grid.Row="1" Grid.Column="1"
44+
Height="28" Padding="8,0"
45+
VerticalAlignment="Center" HorizontalAlignment="Stretch"
46+
ItemsSource="{Binding Groups}"
47+
SelectedItem="{Binding Group, Mode=TwoWay}">
48+
<ComboBox.ItemTemplate>
49+
<DataTemplate DataType="vm:RepositoryNode">
50+
<TextBlock Text="{Binding Name, Mode=OneWay}"/>
51+
</DataTemplate>
52+
</ComboBox.ItemTemplate>
53+
</ComboBox>
54+
55+
<TextBlock Grid.Row="2" Grid.Column="0"
56+
HorizontalAlignment="Right"
57+
Margin="0,0,8,0"
58+
Text="{DynamicResource Text.OpenLocalRepository.Bookmark}"/>
59+
<ComboBox Grid.Row="2" Grid.Column="1"
60+
Height="28" Padding="8,0"
61+
VerticalAlignment="Center"
62+
ItemsSource="{Binding Bookmarks}"
63+
SelectedItem="{Binding Bookmark, Mode=TwoWay}">
64+
<ComboBox.ItemTemplate>
65+
<DataTemplate>
66+
<Grid Height="20">
67+
<Path Width="12" Height="12"
68+
Fill="{Binding Converter={x:Static c:IntConverters.ToBookmarkBrush}}"
69+
HorizontalAlignment="Center" VerticalAlignment="Center"
70+
Data="{StaticResource Icons.Bookmark}"/>
71+
</Grid>
72+
</DataTemplate>
73+
</ComboBox.ItemTemplate>
74+
</ComboBox>
75+
</Grid>
76+
</StackPanel>
77+
</UserControl>

‎src/Views/OpenLocalRepository.axaml.cs‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
using System;
2+
using System.IO;
3+
4+
using Avalonia.Controls;
5+
using Avalonia.Interactivity;
6+
using Avalonia.Platform.Storage;
7+
8+
namespace SourceGit.Views
9+
{
10+
public partial class OpenLocalRepository : UserControl
11+
{
12+
public OpenLocalRepository()
13+
{
14+
InitializeComponent();
15+
}
16+
17+
private async void OnSelectRepositoryFolder(object _1, RoutedEventArgs e)
18+
{
19+
if (DataContext is not ViewModels.OpenLocalRepository vm)
20+
return;
21+
22+
var topLevel = TopLevel.GetTopLevel(this);
23+
if (topLevel == null)
24+
return;
25+
26+
var preference = ViewModels.Preferences.Instance;
27+
var workspace = preference.GetActiveWorkspace();
28+
var initDir = workspace.DefaultCloneDir;
29+
if (string.IsNullOrEmpty(initDir) || !Directory.Exists(initDir))
30+
initDir = preference.GitDefaultCloneDir;
31+
32+
var options = new FolderPickerOpenOptions() { AllowMultiple = false };
33+
if (Directory.Exists(initDir))
34+
{
35+
var folder = await topLevel.StorageProvider.TryGetFolderFromPathAsync(initDir);
36+
options.SuggestedStartLocation = folder;
37+
}
38+
39+
try
40+
{
41+
var selected = await topLevel.StorageProvider.OpenFolderPickerAsync(options);
42+
if (selected.Count == 1)
43+
{
44+
var folder = selected[0];
45+
vm.RepoPath = folder is { Path: { IsAbsoluteUri: true } path } ? path.LocalPath : folder?.Path.ToString();
46+
}
47+
}
48+
catch (Exception exception)
49+
{
50+
Models.Notification.Send(null, $"Failed to open repository: {exception.Message}", true);
51+
}
52+
53+
e.Handled = true;
54+
}
55+
}
56+
}

‎src/Views/WelcomeToolbar.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<Path Width="16" Height="16" Data="{StaticResource Icons.Clone}" Margin="0,4,0,0"/>
2020
</Button>
2121

22-
<Button Classes="icon_button" Width="32" Click="OpenLocalRepository" ToolTip.Tip="{DynamicResource Text.Welcome.OpenOrInit}">
22+
<Button Classes="icon_button" Width="32" Command="{Binding OpenLocalRepository}" ToolTip.Tip="{DynamicResource Text.Welcome.OpenOrInit}">
2323
<Path Width="14" Height="14" Data="{StaticResource Icons.Folder.Open}" Margin="0,2,0,0"/>
2424
</Button>
2525

‎src/Views/WelcomeToolbar.axaml.cs‎

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
using System;
2-
using System.IO;
3-
41
using Avalonia.Controls;
5-
using Avalonia.Interactivity;
6-
using Avalonia.Platform.Storage;
72

83
namespace SourceGit.Views
94
{
@@ -13,56 +8,5 @@ public WelcomeToolbar()
138
{
149
InitializeComponent();
1510
}
16-
17-
private async void OpenLocalRepository(object _1, RoutedEventArgs e)
18-
{
19-
var activePage = App.GetLauncher().ActivePage;
20-
if (activePage == null || !activePage.CanCreatePopup())
21-
return;
22-
23-
var topLevel = TopLevel.GetTopLevel(this);
24-
if (topLevel == null)
25-
return;
26-
27-
var preference = ViewModels.Preferences.Instance;
28-
var workspace = preference.GetActiveWorkspace();
29-
var initDir = workspace.DefaultCloneDir;
30-
if (string.IsNullOrEmpty(initDir) || !Directory.Exists(initDir))
31-
initDir = preference.GitDefaultCloneDir;
32-
33-
var options = new FolderPickerOpenOptions() { AllowMultiple = false };
34-
if (Directory.Exists(initDir))
35-
{
36-
var folder = await topLevel.StorageProvider.TryGetFolderFromPathAsync(initDir);
37-
options.SuggestedStartLocation = folder;
38-
}
39-
40-
try
41-
{
42-
var selected = await topLevel.StorageProvider.OpenFolderPickerAsync(options);
43-
if (selected.Count == 1)
44-
{
45-
var folder = selected[0];
46-
var folderPath = folder is { Path: { IsAbsoluteUri: true } path } ? path.LocalPath : folder?.Path.ToString();
47-
var repoPath = await ViewModels.Welcome.Instance.GetRepositoryRootAsync(folderPath);
48-
if (!string.IsNullOrEmpty(repoPath))
49-
{
50-
await ViewModels.Welcome.Instance.AddRepositoryAsync(repoPath, null, false, true);
51-
ViewModels.Welcome.Instance.Refresh();
52-
}
53-
else if (Directory.Exists(folderPath))
54-
{
55-
var test = await new Commands.QueryRepositoryRootPath(folderPath).GetResultAsync();
56-
ViewModels.Welcome.Instance.InitRepository(folderPath, null, test.StdErr);
57-
}
58-
}
59-
}
60-
catch (Exception exception)
61-
{
62-
Models.Notification.Send(null, $"Failed to open repository: {exception.Message}", true);
63-
}
64-
65-
e.Handled = true;
66-
}
6711
}
6812
}

0 commit comments

Comments
 (0)