Show uploading and rcon commands process while compiling

Hexer10 · Hexer10 · commit 68f9380ba697 · 2020-04-14T17:32:44.000+02:00
diff --git a/Interop/TranslationProvider.cs b/Interop/TranslationProvider.cs
@@ -286,12 +286,15 @@ private void FillToEnglishDefaults()
             language.Add("IndentationSize", "Indentation size");
             language.Add("FontFamily", "Font");
             language.Add("SyntaxHigh", "Syntax Highlighting");
-            language.Add("HighDeprecat", "Highlight deprecated (<1.7) syntax");
+            language.Add("HighDeprecat", "Highlight deprecated (<1.7) syntax - NOT SUPPORTED");
             language.Add("Compile", "Compile");
             language.Add("AutoSaveMin", "Auto save (min)");
             language.Add("OBTextFile", "File Dir.");
             language.Add("OBTextConfig", "Config Dir.");
             language.Add("OBTextItem", "Item Dir.");
-        }
+            language.Add("CopyingFiles", "Copying files");
+            language.Add("FTPUploading", "Uploading files");
+            language.Add("RCONCommand", "Seconding RCON Commands");
+		}
 	}
 }
diff --git a/Spedit.csproj b/Spedit.csproj
@@ -524,7 +524,7 @@
             md ".\sourcepawn\errorfiles"
             md ".\nsis-plugins"
             C:\Windows\system32\xcopy ".\..\..\Resources\Misc\Templates\*.*" ".\sourcepawn\templates\*.*" /e /y /q
-            C:\Windows\system32\xcopy ".\..\..\Resources\Misc\Configurations" ".\sourcepawn\configs" /e /y /q
+            C:\Windows\system32\xcopy ".\..\..\Resources\Misc\Configurations" ".\sourcepawn\configs" /e /y /q /d
             copy ".\..\..\Resources\lang_0_spedit.xml" ".\lang_0_spedit.xml" /y
             copy ".\..\..\Deploy\SPEdit.nsi" ".\SPEdit.nsi" /y
             copy ".\..\..\Deploy\Compress.ps1" ".\Compress.ps1" /y
diff --git a/Spedit.sln.DotSettings b/Spedit.sln.DotSettings
@@ -0,0 +1,2 @@
+﻿<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=RCON/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/UI/Components/EditorElement.xaml b/UI/Components/EditorElement.xaml
@@ -72,6 +72,7 @@
             </editor:TextEditor.ContextMenu>
         </editor:TextEditor>
         <CheckBox x:Name="CompileBox" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="2,0,0,0" Content="Compile" Foreground="{DynamicResource BlackColorBrush}" />
+        <TextBlock Name="StatusLine_Work" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="100,0,0,0" Text="HERE" Foreground="{DynamicResource BlackColorBrush}" IsHitTestVisible="False" />
         <TextBlock Name="StatusLine_FontSize" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="2" Text="14 pt" Foreground="{DynamicResource BlackColorBrush}" IsHitTestVisible="False" />
         <TextBlock Name="StatusLine_Coloumn" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="2,2,100,2" Text="Col 0" Foreground="{DynamicResource BlackColorBrush}" IsHitTestVisible="False" />
         <TextBlock Name="StatusLine_Line" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="2,2,200,2" Text="Ln 0" Foreground="{DynamicResource BlackColorBrush}" IsHitTestVisible="False" />
diff --git a/UI/Components/EditorElement.xaml.cs b/UI/Components/EditorElement.xaml.cs
@@ -494,15 +494,14 @@ public async void Close(bool ForcedToSave = false, bool CheckSavings = true)
                     {
                         var title = $"{Program.Translations.GetLanguage("SavingFile")} '" + Parent.Title.Trim('*') +
                                     "'";
-                        var msg = "";
-                        var Result = await Program.MainWindow.ShowMessageAsync(title, msg,
+                        var Result = await Program.MainWindow.ShowMessageAsync(title, "",
                             MessageDialogStyle.AffirmativeAndNegative, Program.MainWindow.MetroDialogOptions);
                         if (Result == MessageDialogResult.Affirmative) Save();
                     }
                 }
 
             Program.MainWindow.EditorsReferences.Remove(this);
-            var childs = Program.MainWindow.DockingPaneGroup.Children;
+            // var childs = Program.MainWindow.DockingPaneGroup.Children;
           //  foreach (var c in childs) (c as LayoutDocumentPane)?.Children.Remove(Parent);
 
             Parent = null; //to prevent a ring depency which disables the GC from work
diff --git a/UI/MainWindowSPCompiler.cs b/UI/MainWindowSPCompiler.cs
@@ -5,6 +5,7 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
+using System.Threading.Tasks;
 using System.Windows;
 using MahApps.Metro.Controls.Dialogs;
 using Spedit.Utils;
@@ -102,7 +103,7 @@ private async void Compile_SPScripts(bool All = true)
                         }
 
                         var file = filesToCompile[i];
-                        progressTask.SetMessage(file);
+                        progressTask.SetMessage($"{file} ({i}/{compileCount}) ");
                         ProcessUITasks();
                         var fileInfo = new FileInfo(file);
                         stringOutput.AppendLine(fileInfo.Name);
@@ -194,9 +195,30 @@ await this.ShowMessageAsync(Program.Translations.GetLanguage("SPCompNotStarted")
                     {
                         progressTask.SetProgress(1.0);
                         CompileOutput.Text = stringOutput.ToString();
-                        if (c.AutoCopy) Copy_Plugins(true);
-                        if (c.AutoUpload) FTPUpload_Plugins();
-                        if (c.AutoRCON) Server_Query();
+                        if (c.AutoCopy)
+                        {
+                            progressTask.SetTitle(Program.Translations.GetLanguage("CopyingFiles"));
+                            progressTask.SetIndeterminate();
+                            await Task.Run(() => Copy_Plugins(true));
+                            progressTask.SetProgress(1.0);
+                        }
+
+                        if (c.AutoUpload)
+                        {
+                            progressTask.SetTitle(Program.Translations.GetLanguage("FTPUploading"));
+                            progressTask.SetIndeterminate();
+                            await Task.Run(FTPUpload_Plugins);
+                            progressTask.SetProgress(1.0);
+                        }
+
+                        if (c.AutoRCON)
+                        {
+                            progressTask.SetTitle(Program.Translations.GetLanguage("RCONCommand"));
+                            progressTask.SetIndeterminate();
+                            await Task.Run(Server_Query);
+                            progressTask.SetProgress(1.0);
+                        }
+
                         if (CompileOutputRow.Height.Value < 11.0) CompileOutputRow.Height = new GridLength(200.0);
                     }
 
@@ -248,11 +270,14 @@ private void Copy_Plugins(bool OvertakeOutString = false)
                         }
 
                     if (copyCount == 0) stringOutput.AppendLine(Program.Translations.GetLanguage("NoFilesCopy"));
-                    if (OvertakeOutString)
-                        CompileOutput.AppendText(stringOutput.ToString());
-                    else
-                        CompileOutput.Text = stringOutput.ToString();
-                    if (CompileOutputRow.Height.Value < 11.0) CompileOutputRow.Height = new GridLength(200.0);
+                    Dispatcher.Invoke(() =>
+                    {
+                        if (OvertakeOutString)
+                            CompileOutput.AppendText(stringOutput.ToString());
+                        else
+                            CompileOutput.Text = stringOutput.ToString();
+                        if (CompileOutputRow.Height.Value < 11.0) CompileOutputRow.Height = new GridLength(200.0);
+                    });
                 }
             }
         }
@@ -297,8 +322,11 @@ private void FTPUpload_Plugins()
             }
 
             stringOutput.AppendLine(Program.Translations.GetLanguage("Done"));
-            CompileOutput.Text = stringOutput.ToString();
-            if (CompileOutputRow.Height.Value < 11.0) CompileOutputRow.Height = new GridLength(200.0);
+            Dispatcher.Invoke(() =>
+            {
+                CompileOutput.Text = stringOutput.ToString();
+                if (CompileOutputRow.Height.Value < 11.0) CompileOutputRow.Height = new GridLength(200.0);
+            });
         }
 
         private void Server_Start()
diff --git a/UI/MainWindowServerQuery.cs b/UI/MainWindowServerQuery.cs
@@ -1,8 +1,7 @@
 ﻿using System;
 using System.Text;
-using System.Windows;
 using System.Threading.Tasks;
-using Spedit.Interop;
+using System.Windows;
 using QueryMaster;
 
 namespace Spedit.UI
@@ -11,98 +10,87 @@ public partial class MainWindow
     {
         private void Server_Query()
         {
-            Config c = Program.Configs[Program.SelectedConfig];
-            if (string.IsNullOrWhiteSpace(c.RConIP) || string.IsNullOrWhiteSpace(c.RConCommands))
-            { return; }
-            StringBuilder stringOutput = new StringBuilder();
+            var c = Program.Configs[Program.SelectedConfig];
+            if (string.IsNullOrWhiteSpace(c.RConIP) || string.IsNullOrWhiteSpace(c.RConCommands)) return;
+            var stringOutput = new StringBuilder();
             try
             {
-                EngineType type = EngineType.GoldSource;
-                if (c.RConUseSourceEngine)
-                {
-                    type = EngineType.Source;
-                }
-                using (Server server = ServerQuery.GetServerInstance(type, c.RConIP, c.RConPort, null))
+                var type = EngineType.GoldSource;
+                if (c.RConUseSourceEngine) type = EngineType.Source;
+                using (var server = ServerQuery.GetServerInstance(type, c.RConIP, c.RConPort, null))
                 {
                     var serverInfo = server.GetInfo();
                     stringOutput.AppendLine(serverInfo.Name);
                     using (var rcon = server.GetControl(c.RConPassword))
                     {
-                        string[] cmds = ReplaceRconCMDVariables(c.RConCommands).Split('\n');
+                        var cmds = ReplaceRconCMDVariables(c.RConCommands).Split('\n');
                         foreach (var cmd in cmds)
                         {
-                            Task t = Task.Run(() =>
+                            var t = Task.Run(() =>
                             {
-                                string command = (cmd.Trim('\r')).Trim();
+                                var command = cmd.Trim('\r').Trim();
                                 if (!string.IsNullOrWhiteSpace(command))
-                                {
                                     stringOutput.AppendLine(rcon.SendCommand(command));
-                                }
                             });
                             t.Wait();
                         }
                     }
                 }
+
                 stringOutput.AppendLine("Done");
             }
             catch (Exception e)
             {
                 stringOutput.AppendLine("Error: " + e.Message);
             }
-            CompileOutput.Text = stringOutput.ToString();
-            if (CompileOutputRow.Height.Value < 11.0)
+
+            Dispatcher.Invoke(() =>
             {
-                CompileOutputRow.Height = new GridLength(200.0);
-            }
+                CompileOutput.Text = stringOutput.ToString();
+                if (CompileOutputRow.Height.Value < 11.0) CompileOutputRow.Height = new GridLength(200.0);
+            });
         }
 
         private string ReplaceRconCMDVariables(string input)
         {
-            if (compiledFileNames.Count < 1)
-            { return input; }
+            if (compiledFileNames.Count < 1) return input;
             if (input.IndexOf("{plugins_reload}", StringComparison.Ordinal) >= 0)
             {
-                StringBuilder replacement = new StringBuilder();
+                var replacement = new StringBuilder();
                 replacement.AppendLine();
                 foreach (var fileName in compiledFileNames)
-                {
                     replacement.Append("sm plugins reload " + StripSMXPostFix(fileName) + ";");
-                }
                 replacement.AppendLine();
                 input = input.Replace("{plugins_reload}", replacement.ToString());
             }
+
             if (input.IndexOf("{plugins_load}", StringComparison.Ordinal) >= 0)
             {
-                StringBuilder replacement = new StringBuilder();
+                var replacement = new StringBuilder();
                 replacement.AppendLine();
                 foreach (var fileName in compiledFileNames)
-                {
                     replacement.Append("sm plugins load " + StripSMXPostFix(fileName) + ";");
-                }
                 replacement.AppendLine();
                 input = input.Replace("{plugins_load}", replacement.ToString());
             }
+
             if (input.IndexOf("{plugins_unload}", StringComparison.Ordinal) >= 0)
             {
-                StringBuilder replacement = new StringBuilder();
+                var replacement = new StringBuilder();
                 replacement.AppendLine();
                 foreach (var fileName in compiledFileNames)
-                {
                     replacement.Append("sm plugins unload " + StripSMXPostFix(fileName) + ";");
-                }
                 replacement.AppendLine();
                 input = input.Replace("{plugins_unload}", replacement.ToString());
             }
+
             return input;
         }
 
         private string StripSMXPostFix(string fileName)
         {
-            if (fileName.EndsWith(".smx"))
-            {
-                return fileName.Substring(0, fileName.Length - 4);
-            }
+            if (fileName.EndsWith(".smx")) return fileName.Substring(0, fileName.Length - 4);
             return fileName;
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">`
	`2`	`+ <s:Boolean x:Key="/Default/UserDictionary/Words/=RCON/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>`
Original file line number	Diff line number	Diff line change
`@@ -494,15 +494,14 @@ public async void Close(bool ForcedToSave = false, bool CheckSavings = true)`
`494`	`494`	`{`
`495`	`495`	`var title = $"{Program.Translations.GetLanguage("SavingFile")} '" + Parent.Title.Trim('*') +`
`496`	`496`	`"'";`
`497`		`- var msg = "";`
`498`		`- var Result = await Program.MainWindow.ShowMessageAsync(title, msg,`
	`497`	`+ var Result = await Program.MainWindow.ShowMessageAsync(title, "",`
`499`	`498`	`MessageDialogStyle.AffirmativeAndNegative, Program.MainWindow.MetroDialogOptions);`
`500`	`499`	`if (Result == MessageDialogResult.Affirmative) Save();`
`501`	`500`	`}`
`502`	`501`	`}`
`503`	`502`
`504`	`503`	`Program.MainWindow.EditorsReferences.Remove(this);`
`505`		`- var childs = Program.MainWindow.DockingPaneGroup.Children;`
	`504`	`+ // var childs = Program.MainWindow.DockingPaneGroup.Children;`
`506`	`505`	`// foreach (var c in childs) (c as LayoutDocumentPane)?.Children.Remove(Parent);`
`507`	`506`
`508`	`507`	`Parent = null; //to prevent a ring depency which disables the GC from work`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Text;`
`3`		`-using System.Windows;`
`4`	`3`	`using System.Threading.Tasks;`
`5`		`-using Spedit.Interop;`
	`4`	`+using System.Windows;`
`6`	`5`	`using QueryMaster;`
`7`	`6`
`8`	`7`	`namespace Spedit.UI`
`@@ -11,98 +10,87 @@ public partial class MainWindow`
`11`	`10`	`{`
`12`	`11`	`private void Server_Query()`
`13`	`12`	`{`
`14`		`- Config c = Program.Configs[Program.SelectedConfig];`
`15`		`- if (string.IsNullOrWhiteSpace(c.RConIP) \|\| string.IsNullOrWhiteSpace(c.RConCommands))`
`16`		`- { return; }`
`17`		`- StringBuilder stringOutput = new StringBuilder();`
	`13`	`+ var c = Program.Configs[Program.SelectedConfig];`
	`14`	`+ if (string.IsNullOrWhiteSpace(c.RConIP) \|\| string.IsNullOrWhiteSpace(c.RConCommands)) return;`
	`15`	`+ var stringOutput = new StringBuilder();`
`18`	`16`	`try`
`19`	`17`	`{`
`20`		`- EngineType type = EngineType.GoldSource;`
`21`		`- if (c.RConUseSourceEngine)`
`22`		`- {`
`23`		`- type = EngineType.Source;`
`24`		`- }`
`25`		`- using (Server server = ServerQuery.GetServerInstance(type, c.RConIP, c.RConPort, null))`
	`18`	`+ var type = EngineType.GoldSource;`
	`19`	`+ if (c.RConUseSourceEngine) type = EngineType.Source;`
	`20`	`+ using (var server = ServerQuery.GetServerInstance(type, c.RConIP, c.RConPort, null))`
`26`	`21`	`{`
`27`	`22`	`var serverInfo = server.GetInfo();`
`28`	`23`	`stringOutput.AppendLine(serverInfo.Name);`
`29`	`24`	`using (var rcon = server.GetControl(c.RConPassword))`
`30`	`25`	`{`
`31`		`- string[] cmds = ReplaceRconCMDVariables(c.RConCommands).Split('\n');`
	`26`	`+ var cmds = ReplaceRconCMDVariables(c.RConCommands).Split('\n');`
`32`	`27`	`foreach (var cmd in cmds)`
`33`	`28`	`{`
`34`		`- Task t = Task.Run(() =>`
	`29`	`+ var t = Task.Run(() =>`
`35`	`30`	`{`
`36`		`- string command = (cmd.Trim('\r')).Trim();`
	`31`	`+ var command = cmd.Trim('\r').Trim();`
`37`	`32`	`if (!string.IsNullOrWhiteSpace(command))`
`38`		`- {`
`39`	`33`	`stringOutput.AppendLine(rcon.SendCommand(command));`
`40`		`- }`
`41`	`34`	`});`
`42`	`35`	`t.Wait();`
`43`	`36`	`}`
`44`	`37`	`}`
`45`	`38`	`}`
	`39`	`+`
`46`	`40`	`stringOutput.AppendLine("Done");`
`47`	`41`	`}`
`48`	`42`	`catch (Exception e)`
`49`	`43`	`{`
`50`	`44`	`stringOutput.AppendLine("Error: " + e.Message);`
`51`	`45`	`}`
`52`		`- CompileOutput.Text = stringOutput.ToString();`
`53`		`- if (CompileOutputRow.Height.Value < 11.0)`
	`46`	`+`
	`47`	`+ Dispatcher.Invoke(() =>`
`54`	`48`	`{`
`55`		`- CompileOutputRow.Height = new GridLength(200.0);`
`56`		`- }`
	`49`	`+ CompileOutput.Text = stringOutput.ToString();`
	`50`	`+ if (CompileOutputRow.Height.Value < 11.0) CompileOutputRow.Height = new GridLength(200.0);`
	`51`	`+ });`
`57`	`52`	`}`
`58`	`53`
`59`	`54`	`private string ReplaceRconCMDVariables(string input)`
`60`	`55`	`{`
`61`		`- if (compiledFileNames.Count < 1)`
`62`		`- { return input; }`
	`56`	`+ if (compiledFileNames.Count < 1) return input;`
`63`	`57`	`if (input.IndexOf("{plugins_reload}", StringComparison.Ordinal) >= 0)`
`64`	`58`	`{`
`65`		`- StringBuilder replacement = new StringBuilder();`
	`59`	`+ var replacement = new StringBuilder();`
`66`	`60`	`replacement.AppendLine();`
`67`	`61`	`foreach (var fileName in compiledFileNames)`
`68`		`- {`
`69`	`62`	`replacement.Append("sm plugins reload " + StripSMXPostFix(fileName) + ";");`
`70`		`- }`
`71`	`63`	`replacement.AppendLine();`
`72`	`64`	`input = input.Replace("{plugins_reload}", replacement.ToString());`
`73`	`65`	`}`
	`66`	`+`
`74`	`67`	`if (input.IndexOf("{plugins_load}", StringComparison.Ordinal) >= 0)`
`75`	`68`	`{`
`76`		`- StringBuilder replacement = new StringBuilder();`
	`69`	`+ var replacement = new StringBuilder();`
`77`	`70`	`replacement.AppendLine();`
`78`	`71`	`foreach (var fileName in compiledFileNames)`
`79`		`- {`
`80`	`72`	`replacement.Append("sm plugins load " + StripSMXPostFix(fileName) + ";");`
`81`		`- }`
`82`	`73`	`replacement.AppendLine();`
`83`	`74`	`input = input.Replace("{plugins_load}", replacement.ToString());`
`84`	`75`	`}`
	`76`	`+`
`85`	`77`	`if (input.IndexOf("{plugins_unload}", StringComparison.Ordinal) >= 0)`
`86`	`78`	`{`
`87`		`- StringBuilder replacement = new StringBuilder();`
	`79`	`+ var replacement = new StringBuilder();`
`88`	`80`	`replacement.AppendLine();`
`89`	`81`	`foreach (var fileName in compiledFileNames)`
`90`		`- {`
`91`	`82`	`replacement.Append("sm plugins unload " + StripSMXPostFix(fileName) + ";");`
`92`		`- }`
`93`	`83`	`replacement.AppendLine();`
`94`	`84`	`input = input.Replace("{plugins_unload}", replacement.ToString());`
`95`	`85`	`}`
	`86`	`+`
`96`	`87`	`return input;`
`97`	`88`	`}`
`98`	`89`
`99`	`90`	`private string StripSMXPostFix(string fileName)`
`100`	`91`	`{`
`101`		`- if (fileName.EndsWith(".smx"))`
`102`		`- {`
`103`		`- return fileName.Substring(0, fileName.Length - 4);`
`104`		`- }`
	`92`	`+ if (fileName.EndsWith(".smx")) return fileName.Substring(0, fileName.Length - 4);`
`105`	`93`	`return fileName;`
`106`	`94`	`}`
`107`	`95`	`}`
`108`		`-}`
	`96`	`+}`