shiftos-archive/ShiftOS_TheReturn
1
0
Fork 0
mirror of https://git.alee14.me/shiftos-archive/ShiftOS_TheReturn.git synced 2025-01-22 18:02:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a lot of bugs with terminal

Browse source
This commit is contained in:
Michael 2017-05-24 17:18:28 -04:00
parent fc12f2244f
commit 798f0e5920
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ShiftOS_TheReturn/TerminalBackend.cs
View file

@ -356,8 +356,11 @@ namespace ShiftOS.Engine
/// <param name="isRemote">Whether the command should be sent through Remote Terminal Session (RTS).</param>
public static void InvokeCommand(string text, bool isRemote = false)
{
var tw = new MemoryTextWriter();
Console.SetOut(tw);
try
{
if (string.IsNullOrWhiteSpace(text))
return;
@ -391,6 +394,10 @@ namespace ShiftOS.Engine
PrefixEnabled = true;
}
string buffer = tw.ToString();
Console.SetOut(new TerminalTextWriter());
Console.Write(buffer);
}
/// <summary>
@ -484,8 +491,6 @@ namespace ShiftOS.Engine
//Console.WriteLine(text + " " + "{" + string.Join(",", args.Select(kv => kv.Key + "=" + kv.Value).ToArray()) + "}" + " " + isRemote);
var tw = new MemoryTextWriter();
Console.SetOut(tw);
string[] split = text.Split('.');
var cmd = Commands.FirstOrDefault(x => x.NamespaceInfo.name == split[0] && x.CommandInfo.name == split[1]);
@ -493,11 +498,6 @@ namespace ShiftOS.Engine
return false;
if (!Shiftorium.UpgradeInstalled(cmd.Dependencies))
return false;
if(cmd.RequiredArguments.Count != args.Count)
{
Console.WriteLine("Command error: Argument count mismatch! You supplied " + args.Count + " arguments to a command that expects " + cmd.RequiredArguments.Count + ".");
return true;
}
bool res = false;
foreach (var arg in cmd.RequiredArguments)
{
@ -518,9 +518,6 @@ namespace ShiftOS.Engine
Console.WriteLine("Command error: " + ex.Message);
}
string buffer = tw.ToString();
Console.SetOut(new TerminalTextWriter());
Console.Write(buffer);
return true;
}