Use latest quality of life changes in .NET 6 for the Terminal emulator

- Similar project changes to the kernal and resepctive assemblies will be taken more slowly
This commit is contained in:
Tony Bark 2023-01-06 19:15:54 -05:00
parent 3deec1773f
commit 7530f8500b
7 changed files with 63 additions and 68 deletions

View file

@ -1,6 +1,6 @@
# TOMAS # TOMAS
TOMAS (**To**ny's **Ma**naged Operating **S**ystem) is a operating system based on the [COSMOS](https://github.com/CosmosOS/Cosmos) framework. It comes with a respective terminal emulator. TOMAS (**To**ny's **Ma**naged Operating **S**ystem) is a hobby operating system based on the [COSMOS](https://github.com/CosmosOS/Cosmos) framework that comes with a respective terminal emulator.
## Requirements ## Requirements
@ -16,4 +16,4 @@ TOMAS (**To**ny's **Ma**naged Operating **S**ystem) is a operating system based
## License ## License
This project is licensed under the GPL 3.0 License - see the [LICENSE](LICENSE) file for details. This project is licensed under the BSD 3-Clause license - see the [LICENSE](LICENSE) file for details.

View file

@ -9,6 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig .editorconfig = .editorconfig
..\Changelog.md = ..\Changelog.md ..\Changelog.md = ..\Changelog.md
..\.github\workflows\dotnet.yml = ..\.github\workflows\dotnet.yml
..\LICENSE = ..\LICENSE ..\LICENSE = ..\LICENSE
..\README.md = ..\README.md ..\README.md = ..\README.md
TOMAS.sln.licenseheader = TOMAS.sln.licenseheader TOMAS.sln.licenseheader = TOMAS.sln.licenseheader

View file

@ -0,0 +1,2 @@
global using Tomas.Common.Programs;
global using Tomas.Interface;

View file

@ -1,42 +1,40 @@
// I license this project under the BSD 3-Clause license. // I license this project under the BSD 3-Clause license.
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System;
namespace Tomas.Terminal namespace Tomas.Terminal;
class Program
{ {
class Program static void Main()
{ {
static void Main() while (true)
{ {
while (true) var shell = new Shell();
{ var command = shell.ReadLine;
var shell = new Shell(); var programs = shell.Programs;
var command = shell.ReadLine;
var programs = shell.Programs;
if (!programs.TryGetValue(command, out var program)) if (!programs.TryGetValue(command, out var program))
{ {
Console.WriteLine("Command Not Found."); Console.WriteLine("Command Not Found.");
continue; continue;
} }
try try
{ {
var start = program.Run(shell); var start = program.Run(shell);
switch (start) switch (start)
{ {
case true: case true:
continue; continue;
case false: case false:
Console.WriteLine("Program closed unexpectedly."); Console.WriteLine("Program closed unexpectedly.");
continue; continue;
} }
}
catch (Exception err)
{
Console.WriteLine(err.Message);
}
}
} }
catch (Exception err)
{
Console.WriteLine(err.Message);
}
}
}
}
} }

View file

@ -1,12 +1,11 @@
// I license this project under the BSD 3-Clause license. // I license this project under the BSD 3-Clause license.
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System;
using Tomas.Common; using Tomas.Common;
using Tomas.Interface; using Tomas.Interface;
namespace Tomas.Terminal.Programs namespace Tomas.Terminal.Programs
{ {
public class About : IProgram public class About : IProgram
{ {
public bool Run(IShell shell) public bool Run(IShell shell)
{ {

View file

@ -1,33 +1,28 @@
// I license this project under the BSD 3-Clause license. // I license this project under the BSD 3-Clause license.
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System;
using System.Collections.Generic;
using Tomas.Common.Programs;
using Tomas.Interface;
using Tomas.Terminal.Programs; using Tomas.Terminal.Programs;
namespace Tomas.Terminal namespace Tomas.Terminal;
public class Shell : IShell
{ {
public class Shell : IShell const char SYMBOL = '$';
{
const char SYMBOL = '$';
public Dictionary<string, IProgram> Programs => new Dictionary<string, IProgram>() public Dictionary<string, IProgram> Programs => new()
{
{"about", new About()},
{"fensay", new FenSay()},
{"clear", new Clear()},
{"commands", new Commands()}
};
public string ReadLine
{
get
{ {
{"about", new About()}, Console.Write(SYMBOL);
{"fensay", new FenSay()}, var readl = Console.ReadLine();
{"clear", new Clear()}, return readl;
{"commands", new Commands()} }
}; }
public string ReadLine
{
get
{
Console.Write(SYMBOL);
var readl = Console.ReadLine();
return readl;
}
}
}
} }

View file

@ -3,13 +3,13 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<LangVersion>8</LangVersion> <Nullable>enable</Nullable>
<Nullable>warnings</Nullable> <ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Tomas.Common\Tomas.Common.csproj" /> <ProjectReference Include="..\Tomas.Common\Tomas.Common.csproj" />
<ProjectReference Include="..\Tomas.Interface\Tomas.Interface.csproj" /> <ProjectReference Include="..\Tomas.Interface\Tomas.Interface.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>