feat: Checking the return value of the "before script" close #376

VShawn · VShawn · commit e982d1ddb4e7 · 2023-03-18T22:40:26.000+08:00
diff --git a/Ui/Model/Protocol/Base/ProtocolBase.cs b/Ui/Model/Protocol/Base/ProtocolBase.cs
@@ -291,21 +291,24 @@ public ProtocolBase Clone()
             return clone;
         }
 
-        public void RunScriptBeforeConnect()
+        public int RunScriptBeforeConnect()
         {
+            int exitCode = 0;
             try
             {
                 if (!string.IsNullOrWhiteSpace(CommandBeforeConnected))
                 {
                     var tuple = WinCmdRunner.DisassembleOneLineScriptCmd(CommandBeforeConnected);
-                    WinCmdRunner.RunFile(tuple.Item1, arguments: tuple.Item2, isAsync: false, isHideWindow: HideCommandBeforeConnectedWindow);
+                    exitCode = WinCmdRunner.RunFile(tuple.Item1, arguments: tuple.Item2, isAsync: false, isHideWindow: HideCommandBeforeConnectedWindow);
                 }
             }
             catch (Exception e)
             {
+                exitCode = 1;
                 SimpleLogHelper.Error(e);
                 MessageBoxHelper.ErrorAlert(e.Message, IoC.Get<ILanguageService>().Translate("Script before connect"));
             }
+            return exitCode;
         }
 
         public void RunScriptAfterDisconnected()
diff --git a/Ui/Service/DataSource/DataSourceService.cs b/Ui/Service/DataSource/DataSourceService.cs
@@ -160,18 +160,26 @@ public static List<DataSourceBase> AdditionalSourcesLoadFromProfile(string path)
 
         public static void AdditionalSourcesSaveToProfile(string path, List<DataSourceBase> sources)
         {
-            if (sources.Count == 0)
+            try
             {
-                var fi = new FileInfo(path);
-                if (fi.Exists)
-                    fi.Delete();
+                if (sources.Count == 0)
+                {
+                    var fi = new FileInfo(path);
+                    if (fi.Exists)
+                        fi.Delete();
+                }
+                else
+                {
+                    var fi = new FileInfo(path);
+                    if (fi?.Directory?.Exists == false)
+                        fi.Directory.Create();
+                    if (IoPermissionHelper.HasWritePermissionOnFile(path))
+                        File.WriteAllText(path, JsonConvert.SerializeObject(sources, Formatting.Indented), Encoding.UTF8);
+                }
             }
-            else
+            finally
             {
-                var fi = new FileInfo(path);
-                if (fi?.Directory?.Exists == false)
-                    fi.Directory.Create();
-                File.WriteAllText(path, JsonConvert.SerializeObject(sources, Formatting.Indented), Encoding.UTF8);
+                
             }
         }
     }
diff --git a/Ui/Service/LanguageService.cs b/Ui/Service/LanguageService.cs
@@ -153,7 +153,7 @@ public bool SetLanguage(string code)
 #endif
             }
 
-            _applicationResourceDictionary?.ChangeLanguage(resource);
+            _applicationResourceDictionary.ChangeLanguage(resource);
             GlobalEventHelper.OnLanguageChanged?.Invoke();
             return true;
         }
@@ -166,11 +166,14 @@ public string Translate(Enum e)
 
         public string Translate(string key)
         {
+            if (string.IsNullOrEmpty(key) || _applicationResourceDictionary == null)
+                return key;
+
             key = key.Trim(new[] { '\'' });
             if (_applicationResourceDictionary.Contains(key))
                 return _applicationResourceDictionary[key].ToString() ?? key;
 
-            MsAppCenterHelper.Error(new DirectoryNotFoundException($"int {_languageCode}, key not found: {key}"));
+            MsAppCenterHelper.Error(new Exception($"int {_languageCode}, key not found: {key}"));
 #if DEBUG
             var tw = new StreamWriter("need translation " + _languageCode + ".txt", true);
             tw.WriteLine(key);
diff --git a/Ui/Service/SessionControlService_OpenConnection.cs b/Ui/Service/SessionControlService_OpenConnection.cs
@@ -5,6 +5,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
+using _1RM.Model.DAO.Dapper;
 using _1RM.Model.Protocol;
 using _1RM.Model.Protocol.Base;
 using _1RM.Model.ProtocolRunner;
@@ -196,7 +197,14 @@ private void Connect(in ProtocolBase protocol, in string fromView, in string ass
             }
 
             // run script before connected
-            protocolClone.RunScriptBeforeConnect();
+            {
+                int code = protocolClone.RunScriptBeforeConnect();
+                if (0 != code)
+                {
+                    MessageBoxHelper.ErrorAlert($"Script ExitCode = {code}, connection abort!");
+                    return;
+                }
+            }
 
             // dispatch for specified protocol
             if (protocolClone is RdpApp rdpApp)
diff --git a/Ui/Utils/MsAppCenterHelper.cs b/Ui/Utils/MsAppCenterHelper.cs
@@ -48,7 +48,10 @@ public static void Error(Exception e, IDictionary<string, string>? properties =
             properties ??= new Dictionary<string, string>();
             if(!properties.ContainsKey("Version"))
                 properties.Add("Version", AppVersion.Version);
-            Crashes.TrackError(e, properties, attachments?.ToArray());
+            if (attachments != null)
+                Crashes.TrackError(e, properties, attachments.ToArray());
+            else
+                Crashes.TrackError(e, properties);
 #endif
         }
 
diff --git a/Ui/View/Editor/ServerEditorPageViewModel.cs b/Ui/View/Editor/ServerEditorPageViewModel.cs
@@ -668,7 +668,11 @@ public RelayCommand CmdTestScript
                                     MessageBoxHelper.Info($"We will run: '{tuple.Item1}' with parameters '{tuple.Item2}'");
                                 else
                                     MessageBoxHelper.Info($"We will run: '{cmd}'");
-                                WinCmdRunner.RunFile(tuple.Item1, arguments: tuple.Item2, isHideWindow: false);
+                                var code = WinCmdRunner.RunFile(tuple.Item1, arguments: tuple.Item2, isHideWindow: false);
+                                if (code != 0)
+                                {
+                                    MessageBoxHelper.Info($"Exit code: {code}");
+                                }
                             }
                         }
                         catch (Exception ex)
diff --git a/Ui/View/Launcher/ServerSelectionsViewModel.cs b/Ui/View/Launcher/ServerSelectionsViewModel.cs
@@ -233,6 +233,7 @@ public void CalcVisibleByFilter()
             if (string.IsNullOrEmpty(keyword))
             {
                 RebuildVmServerList();
+                TagFilters = new List<TagFilter>();
                 return;
             }
 
diff --git a/readme.md b/readme.md
@@ -1,4 +1,4 @@
-# 1Remote.
+# 1Remote
 
 English | [中文](https://github.com/1Remote/1Remote/wiki/Intro-%E7%AE%80%E4%BD%93%E4%B8%AD%E6%96%87)
 
@@ -24,13 +24,12 @@ This App Will Rename to 1Remote in the feature..
 - Detailed connection configuration: tags, icons, colors, connection scripts etc.
 - Multiple languages, themes and tabbed interface
 - [Import connections from mRemoteNG](https://raw.githubusercontent.com/1Remote/PRemoteM/Doc/DocPic/Migrate.jpg)
-- [Password encryption via RSA](https://github.com/1Remote/1Remote/wiki/Security)
 - Customizable runners, in SFTP \ FTP \ VNC \ etc. protocols, you can replace the internal runner with your favourite tools.[wiki](https://github.com/1Remote/1Remote/wiki/%5BProtocol%5D--Protocol-Runners)
 - Portable - just unpack and run
 
 ## Installation
 
-Latest Version: 0.7.2.6
+Latest Version: 0.7.2.7
 
 Use one of the following methods to install the application:
 

Original file line number	Diff line number	Diff line change
`@@ -291,21 +291,24 @@ public ProtocolBase Clone()`
`291`	`291`	`return clone;`
`292`	`292`	`}`
`293`	`293`
`294`		`- public void RunScriptBeforeConnect()`
	`294`	`+ public int RunScriptBeforeConnect()`
`295`	`295`	`{`
	`296`	`+ int exitCode = 0;`
`296`	`297`	`try`
`297`	`298`	`{`
`298`	`299`	`if (!string.IsNullOrWhiteSpace(CommandBeforeConnected))`
`299`	`300`	`{`
`300`	`301`	`var tuple = WinCmdRunner.DisassembleOneLineScriptCmd(CommandBeforeConnected);`
`301`		`- WinCmdRunner.RunFile(tuple.Item1, arguments: tuple.Item2, isAsync: false, isHideWindow: HideCommandBeforeConnectedWindow);`
	`302`	`+ exitCode = WinCmdRunner.RunFile(tuple.Item1, arguments: tuple.Item2, isAsync: false, isHideWindow: HideCommandBeforeConnectedWindow);`
`302`	`303`	`}`
`303`	`304`	`}`
`304`	`305`	`catch (Exception e)`
`305`	`306`	`{`
	`307`	`+ exitCode = 1;`
`306`	`308`	`SimpleLogHelper.Error(e);`
`307`	`309`	`MessageBoxHelper.ErrorAlert(e.Message, IoC.Get<ILanguageService>().Translate("Script before connect"));`
`308`	`310`	`}`
	`311`	`+ return exitCode;`
`309`	`312`	`}`
`310`	`313`
`311`	`314`	`public void RunScriptAfterDisconnected()`
Original file line number	Diff line number	Diff line change
`@@ -160,18 +160,26 @@ public static List<DataSourceBase> AdditionalSourcesLoadFromProfile(string path)`
`160`	`160`
`161`	`161`	`public static void AdditionalSourcesSaveToProfile(string path, List<DataSourceBase> sources)`
`162`	`162`	`{`
`163`		`- if (sources.Count == 0)`
	`163`	`+ try`
`164`	`164`	`{`
`165`		`- var fi = new FileInfo(path);`
`166`		`- if (fi.Exists)`
`167`		`- fi.Delete();`
	`165`	`+ if (sources.Count == 0)`
	`166`	`+ {`
	`167`	`+ var fi = new FileInfo(path);`
	`168`	`+ if (fi.Exists)`
	`169`	`+ fi.Delete();`
	`170`	`+ }`
	`171`	`+ else`
	`172`	`+ {`
	`173`	`+ var fi = new FileInfo(path);`
	`174`	`+ if (fi?.Directory?.Exists == false)`
	`175`	`+ fi.Directory.Create();`
	`176`	`+ if (IoPermissionHelper.HasWritePermissionOnFile(path))`
	`177`	`+ File.WriteAllText(path, JsonConvert.SerializeObject(sources, Formatting.Indented), Encoding.UTF8);`
	`178`	`+ }`
`168`	`179`	`}`
`169`		`- else`
	`180`	`+ finally`
`170`	`181`	`{`
`171`		`- var fi = new FileInfo(path);`
`172`		`- if (fi?.Directory?.Exists == false)`
`173`		`- fi.Directory.Create();`
`174`		`- File.WriteAllText(path, JsonConvert.SerializeObject(sources, Formatting.Indented), Encoding.UTF8);`
	`182`	`+`
`175`	`183`	`}`
`176`	`184`	`}`
`177`	`185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -668,7 +668,11 @@ public RelayCommand CmdTestScript`
`668`	`668`	`MessageBoxHelper.Info($"We will run: '{tuple.Item1}' with parameters '{tuple.Item2}'");`
`669`	`669`	`else`
`670`	`670`	`MessageBoxHelper.Info($"We will run: '{cmd}'");`
`671`		`- WinCmdRunner.RunFile(tuple.Item1, arguments: tuple.Item2, isHideWindow: false);`
	`671`	`+ var code = WinCmdRunner.RunFile(tuple.Item1, arguments: tuple.Item2, isHideWindow: false);`
	`672`	`+ if (code != 0)`
	`673`	`+ {`
	`674`	`+ MessageBoxHelper.Info($"Exit code: {code}");`
	`675`	`+ }`
`672`	`676`	`}`
`673`	`677`	`}`
`674`	`678`	`catch (Exception ex)`
Original file line number	Diff line number	Diff line change
`@@ -233,6 +233,7 @@ public void CalcVisibleByFilter()`
`233`	`233`	`if (string.IsNullOrEmpty(keyword))`
`234`	`234`	`{`
`235`	`235`	`RebuildVmServerList();`
	`236`	`+ TagFilters = new List<TagFilter>();`
`236`	`237`	`return;`
`237`	`238`	`}`
`238`	`239`