Skip to content

Commit bf3b75a

Browse files
committed
feat: add option to skip repository status check in Welcome page
1 parent 63b432c commit bf3b75a

9 files changed

Lines changed: 93 additions & 16 deletions

File tree

‎src/Resources/Locales/en_US.axaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,7 @@
704704
<x:String x:Key="Text.Preferences.DiffMerge.Type" xml:space="preserve">Tool</x:String>
705705
<x:String x:Key="Text.Preferences.General" xml:space="preserve">GENERAL</x:String>
706706
<x:String x:Key="Text.Preferences.General.Check4UpdatesOnStartup" xml:space="preserve">Check for updates on startup</x:String>
707+
<x:String x:Key="Text.Preferences.General.CheckRepositoryStatusOnWelcome" xml:space="preserve">Check repository status when opening the Welcome page</x:String>
707708
<x:String x:Key="Text.Preferences.General.DateFormat" xml:space="preserve">Date Format</x:String>
708709
<x:String x:Key="Text.Preferences.General.EnableCompactFolders" xml:space="preserve">Enable compact folders in changes tree</x:String>
709710
<x:String x:Key="Text.Preferences.General.Locale" xml:space="preserve">Language</x:String>
@@ -1044,8 +1045,10 @@ Manually add a branch/tag history filter will disable this feature automatically
10441045
<x:String x:Key="Text.Welcome.OpenAllInNode" xml:space="preserve">Open All Repositories</x:String>
10451046
<x:String x:Key="Text.Welcome.OpenOrInit" xml:space="preserve">Open Repository</x:String>
10461047
<x:String x:Key="Text.Welcome.OpenTerminal" xml:space="preserve">Open Terminal</x:String>
1048+
<x:String x:Key="Text.Welcome.RefreshStatus" xml:space="preserve">Refresh Status</x:String>
10471049
<x:String x:Key="Text.Welcome.ScanDefaultCloneDir" xml:space="preserve">Rescan Repositories in Default Clone Dir</x:String>
10481050
<x:String x:Key="Text.Welcome.Search" xml:space="preserve">Search Repositories...</x:String>
1051+
<x:String x:Key="Text.Welcome.ToggleStatusCheck" xml:space="preserve">Check repository status when opening the Welcome page</x:String>
10491052
<x:String x:Key="Text.WorkingCopy" xml:space="preserve">Local Changes</x:String>
10501053
<x:String x:Key="Text.WorkingCopy.AddToGitIgnore" xml:space="preserve">Git Ignore</x:String>
10511054
<x:String x:Key="Text.WorkingCopy.AddToGitIgnore.Extension" xml:space="preserve">Ignore all *{0} files</x:String>

‎src/Resources/Locales/zh_CN.axaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -708,6 +708,7 @@
708708
<x:String x:Key="Text.Preferences.DiffMerge.Type" xml:space="preserve">工具</x:String>
709709
<x:String x:Key="Text.Preferences.General" xml:space="preserve">通用配置</x:String>
710710
<x:String x:Key="Text.Preferences.General.Check4UpdatesOnStartup" xml:space="preserve">启动时检测软件更新</x:String>
711+
<x:String x:Key="Text.Preferences.General.CheckRepositoryStatusOnWelcome" xml:space="preserve">打开起始页时检查仓库状态</x:String>
711712
<x:String x:Key="Text.Preferences.General.DateFormat" xml:space="preserve">日期时间格式</x:String>
712713
<x:String x:Key="Text.Preferences.General.EnableCompactFolders" xml:space="preserve">在变更列表树中启用紧凑文件夹模式</x:String>
713714
<x:String x:Key="Text.Preferences.General.Locale" xml:space="preserve">显示语言</x:String>
@@ -1048,8 +1049,10 @@
10481049
<x:String x:Key="Text.Welcome.OpenAllInNode" xml:space="preserve">打开所有包含仓库</x:String>
10491050
<x:String x:Key="Text.Welcome.OpenOrInit" xml:space="preserve">打开本地仓库</x:String>
10501051
<x:String x:Key="Text.Welcome.OpenTerminal" xml:space="preserve">打开终端</x:String>
1052+
<x:String x:Key="Text.Welcome.RefreshStatus" xml:space="preserve">刷新状态</x:String>
10511053
<x:String x:Key="Text.Welcome.ScanDefaultCloneDir" xml:space="preserve">重新扫描默认克隆路径下的仓库</x:String>
10521054
<x:String x:Key="Text.Welcome.Search" xml:space="preserve">快速查找仓库...</x:String>
1055+
<x:String x:Key="Text.Welcome.ToggleStatusCheck" xml:space="preserve">打开起始页时检查仓库状态</x:String>
10531056
<x:String x:Key="Text.WorkingCopy" xml:space="preserve">本地更改</x:String>
10541057
<x:String x:Key="Text.WorkingCopy.AddToGitIgnore" xml:space="preserve">添加至 .gitignore 忽略列表</x:String>
10551058
<x:String x:Key="Text.WorkingCopy.AddToGitIgnore.Extension" xml:space="preserve">忽略所有 *{0} 文件</x:String>

‎src/Resources/Locales/zh_TW.axaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -698,6 +698,7 @@
698698
<x:String x:Key="Text.Preferences.DiffMerge.Type" xml:space="preserve">工具</x:String>
699699
<x:String x:Key="Text.Preferences.General" xml:space="preserve">一般設定</x:String>
700700
<x:String x:Key="Text.Preferences.General.Check4UpdatesOnStartup" xml:space="preserve">啟動時檢查軟體更新</x:String>
701+
<x:String x:Key="Text.Preferences.General.CheckRepositoryStatusOnWelcome" xml:space="preserve">開啟起始頁時檢查存放庫狀態</x:String>
701702
<x:String x:Key="Text.Preferences.General.DateFormat" xml:space="preserve">日期時間格式</x:String>
702703
<x:String x:Key="Text.Preferences.General.EnableCompactFolders" xml:space="preserve">在樹狀變更目錄中啟用密集資料夾模式</x:String>
703704
<x:String x:Key="Text.Preferences.General.Locale" xml:space="preserve">顯示語言</x:String>
@@ -1033,8 +1034,10 @@
10331034
<x:String x:Key="Text.Welcome.OpenAllInNode" xml:space="preserve">開啟所有存放庫</x:String>
10341035
<x:String x:Key="Text.Welcome.OpenOrInit" xml:space="preserve">開啟本機存放庫</x:String>
10351036
<x:String x:Key="Text.Welcome.OpenTerminal" xml:space="preserve">開啟終端機</x:String>
1037+
<x:String x:Key="Text.Welcome.RefreshStatus" xml:space="preserve">重新整理狀態</x:String>
10361038
<x:String x:Key="Text.Welcome.ScanDefaultCloneDir" xml:space="preserve">重新掃描預設複製 (clone) 目錄下的存放庫</x:String>
10371039
<x:String x:Key="Text.Welcome.Search" xml:space="preserve">篩選存放庫...</x:String>
1040+
<x:String x:Key="Text.Welcome.ToggleStatusCheck" xml:space="preserve">開啟起始頁時檢查存放庫狀態</x:String>
10381041
<x:String x:Key="Text.WorkingCopy" xml:space="preserve">本機變更</x:String>
10391042
<x:String x:Key="Text.WorkingCopy.AddToGitIgnore" xml:space="preserve">加入至 .gitignore 忽略清單</x:String>
10401043
<x:String x:Key="Text.WorkingCopy.AddToGitIgnore.Extension" xml:space="preserve">忽略所有 *{0} 檔案</x:String>

‎src/ViewModels/Preferences.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,12 @@ public bool Check4UpdatesOnStartup
193193
set => SetProperty(ref _check4UpdatesOnStartup, value);
194194
}
195195

196+
public bool CheckRepositoryStatusOnWelcome
197+
{
198+
get => _checkRepositoryStatusOnWelcome;
199+
set => SetProperty(ref _checkRepositoryStatusOnWelcome, value);
200+
}
201+
196202
public string IgnoreUpdateTag
197203
{
198204
get => _ignoreUpdateTag;
@@ -808,6 +814,7 @@ private bool RemoveInvalidRepositoriesRecursive(List<RepositoryNode> collection)
808814
private bool _useCompactBranchNamesInGraph = true;
809815

810816
private bool _check4UpdatesOnStartup = true;
817+
private bool _checkRepositoryStatusOnWelcome = true;
811818
private double _lastCheckUpdateTime = 0;
812819
private string _ignoreUpdateTag = string.Empty;
813820

‎src/ViewModels/Welcome.cs‎

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.ComponentModel;
34
using System.Threading;
45
using System.Threading.Tasks;
56

@@ -28,9 +29,12 @@ public string SearchFilter
2829
}
2930
}
3031

32+
public CancellationToken StatusCheckCancellationToken => _statusCheckCancellation.Token;
33+
3134
public Welcome()
3235
{
3336
Refresh();
37+
Preferences.Instance.PropertyChanged += OnPreferencesPropertyChanged;
3438
}
3539

3640
public void Refresh()
@@ -59,14 +63,41 @@ public async Task UpdateStatusAsync(bool force, CancellationToken? token)
5963

6064
_isUpdatingStatus = true;
6165

62-
// avoid collection was modified while enumerating.
63-
var nodes = new List<RepositoryNode>();
64-
nodes.AddRange(Preferences.Instance.RepositoryNodes);
66+
try
67+
{
68+
// avoid collection was modified while enumerating.
69+
var nodes = new List<RepositoryNode>();
70+
nodes.AddRange(Preferences.Instance.RepositoryNodes);
6571

66-
foreach (var node in nodes)
67-
await node.UpdateStatusAsync(force, token);
72+
foreach (var node in nodes)
73+
await node.UpdateStatusAsync(force, token);
74+
}
75+
finally
76+
{
77+
_isUpdatingStatus = false;
78+
}
79+
}
6880

69-
_isUpdatingStatus = false;
81+
private async void OnPreferencesPropertyChanged(object sender, PropertyChangedEventArgs e)
82+
{
83+
if (e.PropertyName != nameof(Preferences.CheckRepositoryStatusOnWelcome))
84+
return;
85+
86+
if (Preferences.Instance.CheckRepositoryStatusOnWelcome)
87+
{
88+
while (_isUpdatingStatus)
89+
await Task.Delay(50);
90+
91+
if (!Preferences.Instance.CheckRepositoryStatusOnWelcome)
92+
return;
93+
94+
await UpdateStatusAsync(false, _statusCheckCancellation.Token);
95+
}
96+
else
97+
{
98+
_statusCheckCancellation.Cancel();
99+
_statusCheckCancellation = new CancellationTokenSource();
100+
}
70101
}
71102

72103
public void ToggleNodeIsExpanded(RepositoryNode node)
@@ -274,5 +305,6 @@ private void MakeTreeRows(List<RepositoryNode> rows, List<RepositoryNode> nodes,
274305

275306
private string _searchFilter = string.Empty;
276307
private bool _isUpdatingStatus = false;
308+
private CancellationTokenSource _statusCheckCancellation = new();
277309
}
278310
}

‎src/Views/Preferences.axaml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<TabItem.Header>
4848
<TextBlock Classes="tab_header" Text="{DynamicResource Text.Preferences.General}"/>
4949
</TabItem.Header>
50-
<Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32,32,32,32,32,32,Auto" ColumnDefinitions="Auto,*">
50+
<Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32,32,32,32,32,32,32,Auto" ColumnDefinitions="Auto,*">
5151
<TextBlock Grid.Row="0" Grid.Column="0"
5252
Text="{DynamicResource Text.Preferences.General.Locale}"
5353
HorizontalAlignment="Right"
@@ -181,6 +181,11 @@
181181
Content="{DynamicResource Text.Preferences.General.Check4UpdatesOnStartup}"
182182
IsVisible="{x:Static s:App.IsCheckForUpdateCommandVisible}"
183183
IsChecked="{Binding Check4UpdatesOnStartup, Mode=TwoWay}"/>
184+
185+
<CheckBox Grid.Row="13" Grid.Column="1"
186+
Height="32"
187+
Content="{DynamicResource Text.Preferences.General.CheckRepositoryStatusOnWelcome}"
188+
IsChecked="{Binding CheckRepositoryStatusOnWelcome, Mode=TwoWay}"/>
184189
</Grid>
185190
</TabItem>
186191

‎src/Views/Welcome.axaml.cs‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.IO;
3-
using System.Threading;
43

54
using Avalonia;
65
using Avalonia.Controls;
@@ -85,13 +84,8 @@ protected override async void OnLoaded(RoutedEventArgs e)
8584
{
8685
base.OnLoaded(e);
8786
SearchBox.Focus(NavigationMethod.Directional);
88-
await ViewModels.Welcome.Instance.UpdateStatusAsync(false, _cancellation.Token);
89-
}
90-
91-
protected override void OnUnloaded(RoutedEventArgs e)
92-
{
93-
_cancellation.Cancel();
94-
base.OnUnloaded(e);
87+
if (ViewModels.Preferences.Instance.CheckRepositoryStatusOnWelcome)
88+
await ViewModels.Welcome.Instance.UpdateStatusAsync(false, ViewModels.Welcome.Instance.StatusCheckCancellationToken);
9589
}
9690

9791
protected override void OnKeyDown(KeyEventArgs e)
@@ -150,6 +144,15 @@ private void OnTreeNodeContextRequested(object sender, ContextRequestedEventArgs
150144
{
151145
var menu = new ContextMenu();
152146

147+
var refreshStatus = new MenuItem();
148+
refreshStatus.Header = App.Text("Welcome.RefreshStatus");
149+
refreshStatus.Icon = this.CreateMenuIcon("Icons.Loading");
150+
refreshStatus.Click += async (_, e) =>
151+
{
152+
await node.UpdateStatusAsync(true, null);
153+
e.Handled = true;
154+
};
155+
153156
var edit = new MenuItem();
154157
edit.Header = App.Text("Welcome.Edit");
155158
edit.Icon = this.CreateMenuIcon("Icons.Edit");
@@ -191,6 +194,7 @@ private void OnTreeNodeContextRequested(object sender, ContextRequestedEventArgs
191194
};
192195

193196
menu.Items.Add(openAll);
197+
menu.Items.Add(refreshStatus);
194198
menu.Items.Add(new MenuItem() { Header = "-" });
195199
}
196200

@@ -239,6 +243,7 @@ private void OnTreeNodeContextRequested(object sender, ContextRequestedEventArgs
239243
};
240244

241245
menu.Items.Add(open);
246+
menu.Items.Add(refreshStatus);
242247
menu.Items.Add(new MenuItem() { Header = "-" });
243248
menu.Items.Add(explore);
244249
menu.Items.Add(terminal);
@@ -470,6 +475,5 @@ private void OnDoubleTappedTreeNode(object sender, TappedEventArgs e)
470475
private PointerPressedEventArgs _pressTreeNodeEvent = null;
471476
private bool _startDragTreeNode = false;
472477
private readonly DataFormat<string> _dndRepoNode = DataFormat.CreateStringApplicationFormat("sourcegit-dnd-repo-node");
473-
private CancellationTokenSource _cancellation = new CancellationTokenSource();
474478
}
475479
}

‎src/Views/WelcomeToolbar.axaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,19 @@
4343
</StackPanel>
4444

4545
<StackPanel Grid.Column="2" Orientation="Horizontal">
46+
<Button Classes="icon_button" Width="32"
47+
Padding="0"
48+
Background="Transparent"
49+
Click="OnToggleStatusCheckClicked"
50+
ToolTip.Tip="{DynamicResource Text.Welcome.ToggleStatusCheck}">
51+
<Panel>
52+
<Path Width="14" Height="14" Data="{StaticResource Icons.Eye}"
53+
IsVisible="{Binding CheckRepositoryStatusOnWelcome, Source={x:Static vm:Preferences.Instance}}"/>
54+
<Path Width="14" Height="14" Data="{StaticResource Icons.EyeClose}"
55+
IsVisible="{Binding !CheckRepositoryStatusOnWelcome, Source={x:Static vm:Preferences.Instance}}"/>
56+
</Panel>
57+
</Button>
58+
4659
<Button Classes="icon_button" Width="32" Command="{Binding AddRootNode}" ToolTip.Tip="{DynamicResource Text.Welcome.AddRootFolder}">
4760
<Path Width="14" Height="14" Margin="0,2,0,0" Data="{StaticResource Icons.Folder.Add}"/>
4861
</Button>

‎src/Views/WelcomeToolbar.axaml.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Avalonia.Controls;
2+
using Avalonia.Interactivity;
23

34
namespace SourceGit.Views
45
{
@@ -8,5 +9,11 @@ public WelcomeToolbar()
89
{
910
InitializeComponent();
1011
}
12+
13+
private void OnToggleStatusCheckClicked(object sender, RoutedEventArgs e)
14+
{
15+
var pref = ViewModels.Preferences.Instance;
16+
pref.CheckRepositoryStatusOnWelcome = !pref.CheckRepositoryStatusOnWelcome;
17+
}
1118
}
1219
}

0 commit comments

Comments
 (0)