Command theming complete

2 files changed, 47 insertions, 23 deletions

diff --git a/ShiftOS.Server/Core.cs b/ShiftOS.Server/Core.cs
index 4ec421d..e14ca27 100644
--- a/ShiftOS.Server/Core.cs
+++ b/ShiftOS.Server/Core.cs
@@ -96,10 +96,11 @@ namespace ShiftOS.Server
                     {
                         Name = "run",
                         GUID = "Server",
-                        Contents = $@"{{
-    script:""{File.ReadAllText($"scripts/{user}/{script}.lua").Replace("\"", "\\\"")}"",
-							args:""{sArgs}""
-							}}"
+                        Contents = JsonConvert.SerializeObject(new
+                        {
+                            script = File.ReadAllText($"scripts/{user}/{script}.lua"),
+                            args = sArgs
+                        })
                     }));
                 }
                 else
@@ -115,7 +116,7 @@ namespace ShiftOS.Server
                     {
                         Name = "Error",
                         GUID = "Server",
-                        Contents = JsonConvert.SerializeObject(new MudException("Command parse error"))
+                        Contents = JsonConvert.SerializeObject(new MudException("<script_runner> Script not found or script error detected."))
                     }));
                 }
                 catch
@@ -126,6 +127,17 @@ namespace ShiftOS.Server
 
         }
 
+        [MudRequest("diag_log", typeof(string))]
+        public static void Diagnostic(string guid, string line)
+        {
+            List<string> lines = new List<string>();
+            if (File.Exists("diagnostics.log"))
+                lines = new List<string>(File.ReadAllLines("diagnostics.log"));
+
+            lines.Add(line);
+            File.WriteAllLines("diagnostics.log", lines.ToArray());
+        }
+
         [MudRequest("getusers", typeof(string))]
         public static void GetAllUsers(string guid, string contents)
         {
@@ -182,8 +194,8 @@ namespace ShiftOS.Server
                             GUID = "server",
                             Contents = JsonConvert.SerializeObject(saveFile)
                         }));
+                        return;
                     }
-                    return;
                 }
             }
             foreach (var sve in Directory.GetFiles("saves"))
@@ -199,8 +211,8 @@ namespace ShiftOS.Server
                             GUID = "server",
                             Contents = JsonConvert.SerializeObject(saveFile)
                         }));
+                        return;
                     }
-                    return;
                 }
             }
 
diff --git a/ShiftOS.Server/ShiftnetBackend.cs b/ShiftOS.Server/ShiftnetBackend.cs
index 60b3aa4..c7bf0e8 100644
--- a/ShiftOS.Server/ShiftnetBackend.cs
+++ b/ShiftOS.Server/ShiftnetBackend.cs
@@ -43,37 +43,49 @@ namespace ShiftOS.Server
             string url = contents as string;
             if (!url.StartsWith("shiftnet/"))
             {
-                server.DispatchTo(new Guid(guid), new NetObject("shiftnet_got", new ServerMessage
+                try
                 {
-                    Name = "shiftnet_file",
-                    GUID = "server",
-                    Contents = (File.Exists("badrequest.md") == true) ? File.ReadAllText("badrequest.md") : @"# Bad request.
+
+                    server.DispatchTo(new Guid(guid), new NetObject("shiftnet_got", new ServerMessage
+                    {
+                        Name = "shiftnet_file",
+                        GUID = "server",
+                        Contents = (File.Exists("badrequest.md") == true) ? File.ReadAllText("badrequest.md") : @"# Bad request.
 
 You have sent a bad request to the multi-user domain. Please try again."
-                }));
+                    }));
+                }
+                catch { }
                 return;
             }
 
             if (File.Exists(url))
             {
-                server.DispatchTo(new Guid(guid), new NetObject("download", new ServerMessage
+                try
                 {
-                    Name = "download_meta",
-                    GUID = "server",
-                    Contents = JsonConvert.SerializeObject(File.ReadAllBytes(url))
-                }));
+                    server.DispatchTo(new Guid(guid), new NetObject("download", new ServerMessage
+                    {
+                        Name = "download_meta",
+                        GUID = "server",
+                        Contents = JsonConvert.SerializeObject(File.ReadAllBytes(url))
+                    }));
+                }
+                catch { }
             }
             else
             {
-                server.DispatchTo(new Guid(guid), new NetObject("shiftnet_got", new ServerMessage
+                try
                 {
-                    Name = "shiftnet_file",
-                    GUID = "server",
-                    Contents = (File.Exists("notfound.md") == true) ? File.ReadAllText("notfound.md") : @"# Not found.
+                    server.DispatchTo(new Guid(guid), new NetObject("shiftnet_got", new ServerMessage
+                    {
+                        Name = "shiftnet_file",
+                        GUID = "server",
+                        Contents = (File.Exists("notfound.md") == true) ? File.ReadAllText("notfound.md") : @"# Not found.
 
 The page you requested at was not found on this multi-user domain."
-                }));
-
+                    }));
+                }
+                catch { }
             }
 
         }