Script execution and error handling

TF2Maps · Oct 22, 2018 · 79a1f2d · 79a1f2d
1 parent c992701
commit 79a1f2d
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 27 deletions.
diff --git a/ApplicationInterfaces/ApplicationInterface.cs b/ApplicationInterfaces/ApplicationInterface.cs
@@ -146,7 +146,9 @@ public void StartTickThreadLoop()
                 try {
                     tick();
                 } catch (Exception e)
-                { }
+                {
+                    Console.WriteLine(e);
+                }
             }
         }
 

diff --git a/ApplicationInterfaces/HTTP_Discord/HttpInterface.cs b/ApplicationInterfaces/HTTP_Discord/HttpInterface.cs
@@ -65,7 +65,7 @@ public override void SendPrivateMessage(object sender, MessageEventArgs messaged
                 Username = prevusername;
             } catch (Exception e)
             {
-
+                Console.WriteLine(e);
             }
         }
 
@@ -112,7 +112,7 @@ public override void tick()
 
                 catch (Exception e)
                 {
-
+                    Console.WriteLine(e);
                 }
             }
         }
@@ -137,9 +137,9 @@ void GetLatestMessages(string chatroom)
                     Last_Message[chatroom] = ChannelMessages[0].id;
                 }
             }
-            catch
+            catch (Exception e)
             {
-
+                Console.WriteLine(e);
             }
         }
 
@@ -184,7 +184,7 @@ void SendMessageThroughWebhook(string message, string URL)
             }
             catch (Exception e)
             {
-
+                Console.WriteLine(e);
             }
         }
 
@@ -221,12 +221,15 @@ public List<MessageEventArgs> GetChannelMessages(Dictionary<string, string> all_
             {
                 try
                 {
+
                     foreach (var response in GetChannelMessages(channel.Key))
                     {
                         responses.Add(response);
                     }
                 }
-                catch { }
+                catch (Exception e) {
+                    Console.WriteLine(e);
+                }
             }
 
             return responses;
@@ -263,14 +266,15 @@ public bool CheckUserIsAdmin(string author) {
             }
             catch (Exception e)
             {
-
+                Console.WriteLine(e);
             }
             return false;
         }
 
         public List<MessageEventArgs> GetChannelMessages(string channel)
         {
             try {
+
                 System.Threading.Thread.Sleep(125);
                 var client = new RestClient("https://discordapp.com/api/v6/channels/" + channel + "/messages?after=" + Last_Message[channel]);
                 var request = new RestRequest(Method.GET);
@@ -308,6 +312,8 @@ public List<MessageEventArgs> GetChannelMessages(string channel)
             }
             catch (Exception e)
             {
+                Console.WriteLine("Channel: " + channel);
+                Console.WriteLine(e);
                 return new List<MessageEventArgs>();
             }
         } 

diff --git a/UserHandlers/VBot/VBot/Modules/AdminModule/AdminModule.cs b/UserHandlers/VBot/VBot/Modules/AdminModule/AdminModule.cs
@@ -69,8 +69,7 @@ public override void OnAllModulesLoaded()
                 filefromarray.Data = CommandList;
                 filefromarray.TableKey = module.GetType().Name.ToString();
                 HtmlHandler.HandleCommand(filefromarray);
-
-
+
             }
         }
 

diff --git a/UserHandlers/VBot/VBot/Modules/AdminModule/Commands/RunScript.cs b/UserHandlers/VBot/VBot/Modules/AdminModule/Commands/RunScript.cs
@@ -1,4 +1,6 @@
-using System.Diagnostics;
+using System;
+using System.Diagnostics;
+using System.IO;
 
 namespace SteamBotLite
 {
@@ -9,25 +11,54 @@ private class RunScript : BaseCommand
             // Command to query if a server is active
             private AdminModule module;
 
-            public RunScript(ModuleHandler bot, AdminModule module) : base(bot, "!RunUpdateScript")
+            public RunScript(ModuleHandler bot, AdminModule module) : base(bot, "!runscript")
             {
                 this.module = module;
             }
 
             protected override string exec(MessageEventArgs Msg, string param)
             {
-                Process proc = new Process
+                string filepath = System.AppDomain.CurrentDomain.BaseDirectory + "/scripts";
+                if (Directory.Exists(filepath) == false)
                 {
-                    StartInfo = new ProcessStartInfo
+                    try
                     {
-                        FileName = "../../update.sh"
+                        Directory.CreateDirectory(filepath);
+                        return "The directory didn't exist, so it has been created";
                     }
-                };
+                    catch (Exception e)
+                    {
+                        return "The directory doesn't exist, and trying to make it caused an error!";
+                    }
+                }
 
-                proc.Start();
+                if (param.ToLower().Equals("!runscript"))
+                {
+                    Console.WriteLine("Param is empty?");
+                    DirectoryInfo d = new DirectoryInfo(filepath);
 
-                Process.GetCurrentProcess().Kill();
-                return "Script should've ran";
+                    String output = "";
+                    foreach (var file in d.GetFiles("*.sh"))
+                    {
+                        output += file.Name + ", ";
+                    }
+                    output.Substring(0, output.Length - 2);
+                    return "Scripts allowed: " + output;
+                }
+                else
+                {
+                    Console.WriteLine("Not empty");
+                    Process proc = new Process
+                    {
+                        StartInfo = new ProcessStartInfo
+                        {
+                            FileName = filepath + '/' + param
+                        }
+                    };
+                    proc.Start();
+
+                    return "Executed script: " + param;
+                }
             }
         }
     }

diff --git a/UserHandlers/VBot/VBot/Modules/WebServerModule/WebServerHostingModule.cs b/UserHandlers/VBot/VBot/Modules/WebServerModule/WebServerHostingModule.cs
@@ -151,14 +151,21 @@ public override void OnAllModulesLoaded()
 
         public async void StartWebServer(string prefix)
         {
-            Console.WriteLine("Website Loding");
-            listener = new HttpListener();
-            listener.Prefixes.Add(prefix);
-            listener.Start();
-            while (true)
-            { 
-                var data = await listener.GetContextAsync();
-                ResponseMethod(data);
+            Console.WriteLine("Website Loading");
+            try
+            {
+                listener = new HttpListener();
+                listener.Prefixes.Add(prefix);
+                listener.Start();
+                while (true)
+                {
+                    var data = await listener.GetContextAsync();
+                    ResponseMethod(data);
+                }
+
+            } catch (Exception e)
+            {
+
             }
             Console.WriteLine("Website Loaded");