From ebc2fc6b91d9162bca425f0089c6c201733c3ae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <carter.li@eoitek.com>
Date: Tue, 7 Sep 2021 10:52:48 +0800
Subject: [PATCH] feature<Preference>: query git version after selecting git
 path

---
 src/Commands/Version.cs          | 18 ++++++++++++++
 src/Models/Preference.cs         |  4 +---
 src/Resources/Locales/en_US.xaml |  1 +
 src/Resources/Locales/zh_CN.xaml |  1 +
 src/Views/Preference.xaml        | 38 +++++++++++++++++++----------
 src/Views/Preference.xaml.cs     | 41 +++++++++++++++++++-------------
 6 files changed, 70 insertions(+), 33 deletions(-)
 create mode 100644 src/Commands/Version.cs

diff --git a/src/Commands/Version.cs b/src/Commands/Version.cs
new file mode 100644
index 00000000..1911f34a
--- /dev/null
+++ b/src/Commands/Version.cs
@@ -0,0 +1,18 @@
+using System;
+
+namespace SourceGit.Commands {
+    /// <summary>
+    ///     检测git是否可用，并获取git版本信息
+    /// </summary>
+    public class Version : Command {
+        const string GitVersionPrefix = "git version ";
+        public string Query() {
+            Args = $"--version";
+            var result = ReadToEnd();
+            if (!result.IsSuccess || string.IsNullOrEmpty(result.Output)) return null;
+            var version = result.Output.Trim();
+            if (!version.StartsWith(GitVersionPrefix, StringComparison.Ordinal)) return null;
+            return version.Substring(GitVersionPrefix.Length);
+        }
+    }
+}
diff --git a/src/Models/Preference.cs b/src/Models/Preference.cs
index 3c1c6837..66071940 100644
--- a/src/Models/Preference.cs
+++ b/src/Models/Preference.cs
@@ -198,9 +198,7 @@ namespace SourceGit.Models {
         /// </summary>
         [JsonIgnore]
         public bool IsReady {
-            get {
-                return !string.IsNullOrEmpty(Git.Path) && File.Exists(Git.Path);
-            }
+            get => File.Exists(Git.Path) && new Commands.Version().Query() != null;
         }
 
         #region DATA
diff --git a/src/Resources/Locales/en_US.xaml b/src/Resources/Locales/en_US.xaml
index 58713562..d332a421 100644
--- a/src/Resources/Locales/en_US.xaml
+++ b/src/Resources/Locales/en_US.xaml
@@ -364,6 +364,7 @@
     <sys:String x:Key="Text.Preference.Git">GIT SETTING</sys:String>
     <sys:String x:Key="Text.Preference.Git.Path">Install Path</sys:String>
     <sys:String x:Key="Text.Preference.Git.Path.Placeholder">Input path for git.exe</sys:String>
+    <sys:String x:Key="Text.Preference.Git.Version">Git version</sys:String>
     <sys:String x:Key="Text.Preference.Git.Dir">Default Clone Dir</sys:String>
     <sys:String x:Key="Text.Preference.Git.Dir.Placeholder">Default path to clone repo into</sys:String>
     <sys:String x:Key="Text.Preference.Git.User">User Name</sys:String>
diff --git a/src/Resources/Locales/zh_CN.xaml b/src/Resources/Locales/zh_CN.xaml
index 69212190..663db92e 100644
--- a/src/Resources/Locales/zh_CN.xaml
+++ b/src/Resources/Locales/zh_CN.xaml
@@ -363,6 +363,7 @@
     <sys:String x:Key="Text.Preference.Git">GIT配置</sys:String>
     <sys:String x:Key="Text.Preference.Git.Path">安装路径</sys:String>
     <sys:String x:Key="Text.Preference.Git.Path.Placeholder">填写git.exe所在位置</sys:String>
+    <sys:String x:Key="Text.Preference.Git.Version">Git 版本</sys:String>
     <sys:String x:Key="Text.Preference.Git.Dir">默认克隆路径</sys:String>
     <sys:String x:Key="Text.Preference.Git.Dir.Placeholder">默认的仓库本地存放位置</sys:String>
     <sys:String x:Key="Text.Preference.Git.User">用户名</sys:String>
diff --git a/src/Views/Preference.xaml b/src/Views/Preference.xaml
index 6b661f50..0fa7a85d 100644
--- a/src/Views/Preference.xaml
+++ b/src/Views/Preference.xaml
@@ -73,6 +73,7 @@
                 <RowDefinition Height="28"/>
                 <RowDefinition Height="28"/>
                 <RowDefinition Height="28"/>
+                <RowDefinition Height="28"/>
                 <RowDefinition Height="8"/>
                 <RowDefinition Height="36"/>
                 <RowDefinition Height="28"/>
@@ -230,13 +231,24 @@
                     Icon="{StaticResource Icon.Folder.Open}"/>
             </Grid>
 
-            <!-- Default Clone Dir -->
+            <!-- Git Version -->
             <TextBlock
                 Grid.Row="13" Grid.Column="0"
+                Text="{DynamicResource Text.Preference.Git.Version}"
+                HorizontalAlignment="Right"
+                Margin="0,0,8,0"/>
+            <TextBlock
+                Grid.Row="13" Grid.Column="1"
+                x:Name="textGitVersion"
+                Text="{Binding ElementName=me, Path=Version}"/>
+
+            <!-- Default Clone Dir -->
+            <TextBlock
+                Grid.Row="14" Grid.Column="0"
                 Text="{DynamicResource Text.Preference.Git.Dir}"
                 HorizontalAlignment="Right"
                 Margin="0,0,8,0"/>
-            <Grid Grid.Row="13" Grid.Column="1">
+            <Grid Grid.Row="14" Grid.Column="1">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*"/>
                     <ColumnDefinition Width="Auto"/>
@@ -259,12 +271,12 @@
 
             <!-- User -->
             <TextBlock
-                Grid.Row="14" Grid.Column="0"
+                Grid.Row="15" Grid.Column="0"
                 Text="{DynamicResource Text.Preference.Git.User}"
                 HorizontalAlignment="Right"
                 Margin="0,0,8,0"/>
             <controls:TextEdit
-                Grid.Row="14" Grid.Column="1"
+                Grid.Row="15" Grid.Column="1"
                 x:Name="editGitUser"
                 Height="24"
                 Text="{Binding ElementName=me, Path=User, Mode=TwoWay}"
@@ -272,12 +284,12 @@
 
             <!-- Email -->
             <TextBlock
-                Grid.Row="15" Grid.Column="0"
+                Grid.Row="16" Grid.Column="0"
                 Text="{DynamicResource Text.Preference.Git.Email}"
                 HorizontalAlignment="Right"
                 Margin="0,0,8,0"/>
             <controls:TextEdit
-                Grid.Row="15" Grid.Column="1"
+                Grid.Row="16" Grid.Column="1"
                 x:Name="editGitEmail"
                 Height="24"
                 Text="{Binding ElementName=me, Path=Email, Mode=TwoWay}"
@@ -285,12 +297,12 @@
 
             <!-- CRLF -->
             <TextBlock
-                Grid.Row="16" Grid.Column="0"
+                Grid.Row="17" Grid.Column="0"
                 Text="{DynamicResource Text.Preference.Git.CRLF}"
                 HorizontalAlignment="Right"
                 Margin="0,0,8,0"/>
             <ComboBox
-                Grid.Row="16" Grid.Column="1"
+                Grid.Row="17" Grid.Column="1"
                 x:Name="editGitCrlf"
                 Height="24"
                 ItemsSource="{Binding Source={x:Static models:CRLFOption.Supported}}"
@@ -308,19 +320,19 @@
 
             <!-- Merge Tool Group -->
             <TextBlock
-                Grid.Row="18" Grid.Column="0" Grid.ColumnSpan="2"
+                Grid.Row="19" Grid.Column="0" Grid.ColumnSpan="2"
                 Text="{DynamicResource Text.Preference.Merger}"
                 FontSize="17" FontWeight="DemiBold"
                 Foreground="{DynamicResource Brush.FG2}"/>
 
             <!-- Merge Tool Type -->
             <TextBlock
-                Grid.Row="19" Grid.Column="0"
+                Grid.Row="20" Grid.Column="0"
                 Text="{DynamicResource Text.Preference.Merger.Type}"
                 HorizontalAlignment="Right"
                 Margin="0,0,8,0"/>
             <ComboBox
-                Grid.Row="19" Grid.Column="1"
+                Grid.Row="20" Grid.Column="1"
                 Height="24"
                 ItemsSource="{Binding Source={x:Static models:MergeTool.Supported}}"
                 DisplayMemberPath="Name"
@@ -330,11 +342,11 @@
 
             <!-- Merge Tool Executable Path -->
             <TextBlock
-                Grid.Row="20" Grid.Column="0"
+                Grid.Row="21" Grid.Column="0"
                 Text="{DynamicResource Text.Preference.Merger.Path}"
                 HorizontalAlignment="Right"
                 Margin="0,0,8,0"/>
-            <Grid Grid.Row="20" Grid.Column="1">
+            <Grid Grid.Row="21" Grid.Column="1">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*"/>
                     <ColumnDefinition Width="Auto"/>
diff --git a/src/Views/Preference.xaml.cs b/src/Views/Preference.xaml.cs
index 6580e377..5cab241d 100644
--- a/src/Views/Preference.xaml.cs
+++ b/src/Views/Preference.xaml.cs
@@ -15,6 +15,7 @@ namespace SourceGit.Views {
         public string User { get; set; }
         public string Email { get; set; }
         public string CRLF { get; set; }
+        public string Version { get; set; }
 
         // https://docs.microsoft.com/en-us/windows/desktop/api/shlwapi/nf-shlwapi-pathfindonpathw
         // https://www.pinvoke.net/default.aspx/shlwapi.PathFindOnPath
@@ -24,11 +25,7 @@ namespace SourceGit.Views {
         public bool EnableWindowsTerminal { get; set; } = PathFindOnPath(new StringBuilder("wt.exe"), null);
 
         public Preference() {
-            if (!UpdateGitInfoIfReady()) {
-                User = "";
-                Email = "";
-                CRLF = "false";
-            }
+            UpdateGitInfo(false);
 
             if (!EnableWindowsTerminal) {
                 Models.Preference.Instance.General.UseWindowsTerminal = false;
@@ -37,13 +34,27 @@ namespace SourceGit.Views {
             InitializeComponent();
         }
 
-        private bool UpdateGitInfoIfReady() {
-            if (!Models.Preference.Instance.IsReady) return false;
-            User = new Commands.Config().Get("user.name");
-            Email = new Commands.Config().Get("user.email");
-            CRLF = new Commands.Config().Get("core.autocrlf");
-            if (string.IsNullOrEmpty(CRLF)) CRLF = "false";
-            return true;
+        private bool UpdateGitInfo(bool updateUi) {
+            var isReady = Models.Preference.Instance.IsReady;
+            if (isReady) {
+                User = new Commands.Config().Get("user.name");
+                Email = new Commands.Config().Get("user.email");
+                CRLF = new Commands.Config().Get("core.autocrlf");
+                Version = new Commands.Version().Query();
+                if (string.IsNullOrEmpty(CRLF)) CRLF = "false";
+            } else {
+                User = "";
+                Email = "";
+                CRLF = "false";
+                Version = "Unknown";
+            }
+            if (updateUi) {
+                editGitUser?.GetBindingExpression(TextBox.TextProperty).UpdateTarget();
+                editGitEmail?.GetBindingExpression(TextBox.TextProperty).UpdateTarget();
+                editGitCrlf?.GetBindingExpression(ComboBox.SelectedValueProperty).UpdateTarget();
+                textGitVersion?.GetBindingExpression(TextBlock.TextProperty).UpdateTarget();
+            }
+            return isReady;
         }
 
         #region EVENTS
@@ -69,11 +80,7 @@ namespace SourceGit.Views {
             if (dialog.ShowDialog() == true) {
                 Models.Preference.Instance.Git.Path = dialog.FileName;
                 editGitPath?.GetBindingExpression(TextBox.TextProperty).UpdateTarget();
-                if (UpdateGitInfoIfReady()) {
-                    editGitUser?.GetBindingExpression(TextBox.TextProperty).UpdateTarget();
-                    editGitEmail?.GetBindingExpression(TextBox.TextProperty).UpdateTarget();
-                    editGitCrlf?.GetBindingExpression(ComboBox.SelectedValueProperty).UpdateTarget();
-                }
+                UpdateGitInfo(true);
             }
         }