- BridgeSettings IP now defaults to 127.0.0.1

- Improved path guessing in SourceControl

Author: Meychi

External/Plugins/BridgeSettings/Settings.cs

@@ -11,12 +11,13 @@ namespace BridgeSettings
     [Serializable]
     class Settings : IBridgeSettings
     {
-        const string DEFAULT_SHARED_DRIVE = "Y:\\";
         const int DEFAULT_PORT_NUM = 8009;
+        const string DEFAULT_IP = "127.0.0.1";
+        const string DEFAULT_SHARED_DRIVE = "Y:\\";
         static private string[] DEFAULT_EXTENSIONS = { ".exe", ".com", ".bat", ".cmd" };
 
         private bool active = false;
-        private string ip;
+        private string ip = DEFAULT_IP;
         private int port = DEFAULT_PORT_NUM;
         private bool targetRemoteIDE = true;
         private bool useRemoteExplorer = true;
@@ -33,7 +34,7 @@ public bool Active
         [DisplayName("Custom Bridge IP"), LocalizedDescription("BridgeSettings.Description.CustomBridgeIP"), DefaultValue("")]
         public string CustomIP
         {
-            get { return ip ?? ""; }
+            get { return ip ?? DEFAULT_IP; }
             set { ip = value; }
         }
 
@@ -65,7 +66,9 @@ public string SharedDrive
             set
             {
                 if (Regex.IsMatch(value ?? "", "[H-Z]:\\\\", RegexOptions.IgnoreCase))
+                {
                     sharedDrive = Char.ToUpper(value[0]) + ":\\";
+                }
             }
         }
 

External/Plugins/SourceControl/PluginMain.cs

@@ -327,19 +327,59 @@ public void LoadSettings()
                 Object obj = ObjectSerializer.Deserialize(this.settingFilename, settingObject);
                 settingObject = (Settings)obj;
             }
+
+            #region Detect Git
+
+            // Try to find git path from program files
+            if (settingObject.GITPath == "git.exe")
+            {
+                String programFiles = Environment.GetEnvironmentVariable("ProgramFiles");
+                String gitPath = Path.Combine(programFiles, @"Git\bin\git.exe");
+                if (File.Exists(gitPath)) settingObject.GITPath = gitPath;
+
+            }
+            // Try to find TortoiseProc path from program files
+            if (settingObject.TortoiseGITProcPath == "TortoiseGitProc.exe")
+            {
+                String programFiles = Environment.GetEnvironmentVariable("ProgramFiles");
+                String torProcPath = Path.Combine(programFiles, @"TortoiseGit\bin\TortoiseGitProc.exe");
+                if (File.Exists(torProcPath)) settingObject.TortoiseGITProcPath = torProcPath;
+            }
+
+            #endregion
+
+            #region Detect SVN
+
             // Try to find svn path from: Tools/sliksvn/
             if (settingObject.SVNPath == "svn.exe")
             {
                 String svnCmdPath = @"Tools\sliksvn\bin\svn.exe";
                 if (PathHelper.ResolvePath(svnCmdPath) != null) settingObject.SVNPath = svnCmdPath;
             }
+            // Try to find sliksvn path from program files
+            if (settingObject.SVNPath == "svn.exe")
+            {
+                String programFiles = Environment.GetEnvironmentVariable("ProgramFiles");
+                String slSvnPath = Path.Combine(programFiles, @"SlikSVN\bin\svn.exe");
+                if (File.Exists(slSvnPath)) settingObject.SVNPath = slSvnPath;
+            }
+            // Try to find svn from TortoiseSVN
+            if (settingObject.SVNPath == "svn.exe")
+            {
+                String programFiles = Environment.GetEnvironmentVariable("ProgramFiles");
+                String torSvnPath = Path.Combine(programFiles, @"TortoiseSVN\bin\svn.exe");
+                if (File.Exists(torSvnPath)) settingObject.SVNPath = torSvnPath;
+            }
             // Try to find TortoiseProc path from program files
             if (settingObject.TortoiseSVNProcPath == "TortoiseProc.exe")
             {
                 String programFiles = Environment.GetEnvironmentVariable("ProgramFiles");
                 String torProcPath = Path.Combine(programFiles, @"TortoiseSVN\bin\TortoiseProc.exe");
                 if (File.Exists(torProcPath)) settingObject.TortoiseSVNProcPath = torProcPath;
             }
+
+            #endregion
+
             CheckPathExists(settingObject.SVNPath, "TortoiseSVN (svn)");
             CheckPathExists(settingObject.TortoiseSVNProcPath, "TortoiseSVN (Proc)");
             CheckPathExists(settingObject.GITPath, "TortoiseGit (git)");