Also log short summary of first two errors to player if /compile or /…

…pcompile fails
ClassiCube · Mar 5, 2020 · 005f395 · 005f395
1 parent 84cf737
commit 005f395
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/MCGalaxy/Commands/Scripting/CmdCompile.cs b/MCGalaxy/Commands/Scripting/CmdCompile.cs
@@ -44,7 +44,7 @@ public sealed class CmdCompile : Command2 {
 
             if (!File.Exists(srcPath)) {
                 p.Message("File &9{0} %Snot found.", srcPath);
-            } else if (engine.Compile(srcPath, dstPath)) {
+            } else if (engine.Compile(srcPath, dstPath, p)) {
                 p.Message("Command compiled successfully.");
             } else {
                 p.Message("%WCompilation error. See " + IScripting.ErrorPath + " for more information.");

diff --git a/MCGalaxy/Commands/Scripting/CmdPlugin.cs b/MCGalaxy/Commands/Scripting/CmdPlugin.cs
@@ -61,7 +61,7 @@ public sealed class CmdPlugin : Command2 {
 
             if (!File.Exists(srcPath)) {
                 p.Message("File &9{0} %Snot found.", srcPath);
-            } else if (engine.Compile(srcPath, dstPath)) {
+            } else if (engine.Compile(srcPath, dstPath, p)) {
                 p.Message("Plugin compiled successfully.");
             } else {
                 p.Message("%WCompilation error. See " + IScripting.ErrorPath + " for more information.");

diff --git a/MCGalaxy/Scripting/Scripting.cs b/MCGalaxy/Scripting/Scripting.cs
@@ -72,7 +72,8 @@ public abstract class IScripting {
             }
         }
 
-        public bool Compile(string srcPath, string dstPath) {
+        const int maxLog = 2;
+        public bool Compile(string srcPath, string dstPath, Player p) {
             CompilerParameters args = new CompilerParameters();
             args.GenerateExecutable = false;
             args.OutputAssembly = dstPath;
@@ -100,10 +101,20 @@ public abstract class IScripting {
                 sb.AppendLine();
             }
 
+            int logged = 0;
+            foreach (CompilerError err in results.Errors) {
+                string type = err.IsWarning ? "Warning" : "Error";
+                p.Message("%W{0} #{1} on line {2} - {3}", type, err.ErrorNumber, err.Line, err.ErrorText);
+
+                logged++;
+                if (logged >= maxLog) break;
+            }
+            if (results.Errors.Count > maxLog) p.Message(" %W.. and {0} more", results.Errors.Count - maxLog);
+
             using (StreamWriter w = new StreamWriter(ErrorPath, true)) {
                 w.Write(sb.ToString());
             }
-            return !results.Errors.HasErrors;
+            return false;
         }
 
         List<string> ReadSource(string path, CompilerParameters args) {

diff --git a/MCGalaxy/Server/Maintenance/Updater.cs b/MCGalaxy/Server/Maintenance/Updater.cs
@@ -90,6 +90,9 @@ public static class Updater {
                 Player[] players = PlayerInfo.Online.Items;
                 foreach (Player pl in players) pl.save();
 
+                // Although Process.Start checks path exists, that won't work correctly when running from mono
+                //  (since 'mono' exists but Updater.exe might not)
+                // So always explicitly check that Updater.exe exists here
                 string path = Path.Combine(Utils.FolderPath, "Updater.exe");
                 if (!File.Exists(path)) throw new FileNotFoundException("Unable to find " + path);