From 09215a05ddc717b2eaf667737ac6baa724c5f2bc Mon Sep 17 00:00:00 2001 From: Alex-TIMEHACK Date: Sat, 14 Oct 2017 18:42:11 +0100 Subject: [PATCH] YOY terminal --- ShiftOS.Engine/ShiftOS.Engine.csproj | 4 ++ ShiftOS.Engine/Terminal/Commands/Hello.cs | 21 ++++++++++ ShiftOS.Engine/Terminal/TerminalBackend.cs | 46 ++++++++++++++++++++++ ShiftOS.Engine/Terminal/TerminalCommand.cs | 15 +++++++ ShiftOS.Main/ShiftOS/Apps/Terminal.cs | 5 ++- 5 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 ShiftOS.Engine/Terminal/Commands/Hello.cs create mode 100644 ShiftOS.Engine/Terminal/TerminalBackend.cs create mode 100644 ShiftOS.Engine/Terminal/TerminalCommand.cs diff --git a/ShiftOS.Engine/ShiftOS.Engine.csproj b/ShiftOS.Engine/ShiftOS.Engine.csproj index 71721bc..6740db1 100644 --- a/ShiftOS.Engine/ShiftOS.Engine.csproj +++ b/ShiftOS.Engine/ShiftOS.Engine.csproj @@ -52,6 +52,9 @@ True Resources.resx + + + UserControl @@ -93,5 +96,6 @@ + \ No newline at end of file diff --git a/ShiftOS.Engine/Terminal/Commands/Hello.cs b/ShiftOS.Engine/Terminal/Commands/Hello.cs new file mode 100644 index 0000000..daf8488 --- /dev/null +++ b/ShiftOS.Engine/Terminal/Commands/Hello.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShiftOS.Engine.Terminal.Commands +{ + public class Hello : TerminalCommand + { + public override string GetName() + { + return "Hello"; + } + + public override string Run(params string[] parameters) + { + return "Oh, HELLO," + parameters[0]; + } + } +} diff --git a/ShiftOS.Engine/Terminal/TerminalBackend.cs b/ShiftOS.Engine/Terminal/TerminalBackend.cs new file mode 100644 index 0000000..7103238 --- /dev/null +++ b/ShiftOS.Engine/Terminal/TerminalBackend.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; + +namespace ShiftOS.Engine.Terminal +{ + public static class TerminalBackend + { + // The line below gets all the terminal commands in... well... the entire ShiftOS.Engine + public static IEnumerable instances = from t in Assembly.GetExecutingAssembly().GetTypes() + where t.IsSubclassOf(typeof(TerminalCommand)) + && t.GetConstructor(Type.EmptyTypes) != null + select Activator.CreateInstance(t) as TerminalCommand; + + /// + /// Runs a terminal command. + /// + /// + /// Returns all the output from that command. + public static string RunCommand(string command) + { + string name; + try { name = command.Split(' ')[0]; } catch { name = command; } + + var theParams = new string[command.Split(' ').Length - 1]; + Array.Copy(command.Split(' '), 1, theParams, 0, command.Split(' ').Length - 1); + + foreach (TerminalCommand instance in instances) + { + if (instance.GetName() == name) + return instance.Run(theParams); + } + + return "The command cannot be found."; + } + + // An extra function ;) + private static Type[] GetTypesInNamespace(Assembly assembly, string nameSpace) + { + return assembly.GetTypes().Where(t => String.Equals(t.Namespace, nameSpace, StringComparison.Ordinal)).ToArray(); + } + } +} diff --git a/ShiftOS.Engine/Terminal/TerminalCommand.cs b/ShiftOS.Engine/Terminal/TerminalCommand.cs new file mode 100644 index 0000000..a344122 --- /dev/null +++ b/ShiftOS.Engine/Terminal/TerminalCommand.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShiftOS.Engine.Terminal +{ + public abstract class TerminalCommand + { + public abstract string GetName(); + + public abstract string Run(params string[] parameters); + } +} diff --git a/ShiftOS.Main/ShiftOS/Apps/Terminal.cs b/ShiftOS.Main/ShiftOS/Apps/Terminal.cs index cb5bed3..a9bd093 100644 --- a/ShiftOS.Main/ShiftOS/Apps/Terminal.cs +++ b/ShiftOS.Main/ShiftOS/Apps/Terminal.cs @@ -7,6 +7,8 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using ShiftOS.Engine; +using ShiftOS.Engine.Terminal; namespace ShiftOS.Main.ShiftOS.Apps { @@ -43,7 +45,8 @@ namespace ShiftOS.Main.ShiftOS.Apps // termmain.Paste(DataFormats.GetFormat(DataFormats.Text)); e.Handled = true; } else if (e.KeyCode == Keys.Enter) { - Print(RunCommand(termmain.Text.Substring(TrackingPosition, termmain.Text.Length - TrackingPosition))); // The most horrific line in the entire application! + Print(TerminalBackend.RunCommand(termmain.Text.Substring(TrackingPosition, termmain.Text.Length - TrackingPosition))); // The most horrific line in the entire application! + e.Handled = true; } }