mirror of
https://github.com/tgstation/tgstation-server.git
synced 2026-08-29 08:00:19 +01:00
Massive sanity reorganization of project structure
Overall: - Removed all 'TG' prefixes on classes and enums Service: - TGStationServer => ServerInstance - TGServerService => Service - Moved all ServerInstance partial classes to a subfolder - Moved ChatProvider classes, delegate, and interface to a namespace - Moved EventID and ChatMessageType to their own .cs files - Moved SanitizeTopicString to Program - ServerService.cs => Service.cs - Fixed ProjectInstaller being in it's own namespace instead of TGServerService Interface: - Moved ExitCode enum to Command class - Moved all components to a namespace - Moved all component enums to Enumerations.cs - DDInteropCallHolder => DreamDaemonBridge - Move PullRequestInfo and DreamDaemonBridge to their own .cs files - Changes the type of ChannelFactory cache from Dictionary<Type, ChannelFactory> to IDictionary<Type, ChannelFactory>
This commit is contained in:
+12
-11
@@ -2,6 +2,7 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Threading;
|
||||
using TGServiceInterface;
|
||||
using TGServiceInterface.Components;
|
||||
|
||||
namespace TGCommandLine
|
||||
{
|
||||
@@ -29,13 +30,13 @@ namespace TGCommandLine
|
||||
{
|
||||
var DM = Server.GetComponent<ITGCompiler>();
|
||||
var stat = DM.GetStatus();
|
||||
if (stat != TGCompilerStatus.Initialized)
|
||||
if (stat != CompilerStatus.Initialized)
|
||||
{
|
||||
OutputProc("Error: Compiler is " + ((stat == TGCompilerStatus.Uninitialized) ? "unintialized!" : "busy with another task!"));
|
||||
OutputProc("Error: Compiler is " + ((stat == CompilerStatus.Uninitialized) ? "unintialized!" : "busy with another task!"));
|
||||
return ExitCode.ServerError;
|
||||
}
|
||||
|
||||
if (Server.GetComponent<ITGByond>().GetVersion(TGByondVersion.Installed) == null)
|
||||
if (Server.GetComponent<ITGByond>().GetVersion(ByondVersion.Installed) == null)
|
||||
{
|
||||
Console.Write("Error: BYOND is not installed!");
|
||||
return ExitCode.ServerError;
|
||||
@@ -55,7 +56,7 @@ namespace TGCommandLine
|
||||
do
|
||||
{
|
||||
Thread.Sleep(1000);
|
||||
} while (DM.GetStatus() == TGCompilerStatus.Compiling);
|
||||
} while (DM.GetStatus() == CompilerStatus.Compiling);
|
||||
var res = DM.CompileError();
|
||||
OutputProc(res ?? "Compilation successful");
|
||||
if (res != null)
|
||||
@@ -95,17 +96,17 @@ namespace TGCommandLine
|
||||
Console.Write("Compilier is currently: ");
|
||||
switch (DM.GetStatus())
|
||||
{
|
||||
case TGCompilerStatus.Compiling:
|
||||
case CompilerStatus.Compiling:
|
||||
OutputProc("Compiling...");
|
||||
break;
|
||||
case TGCompilerStatus.Initialized:
|
||||
case CompilerStatus.Initialized:
|
||||
OutputProc("Idle");
|
||||
ShowError();
|
||||
break;
|
||||
case TGCompilerStatus.Initializing:
|
||||
case CompilerStatus.Initializing:
|
||||
OutputProc("Setting up...");
|
||||
break;
|
||||
case TGCompilerStatus.Uninitialized:
|
||||
case CompilerStatus.Uninitialized:
|
||||
OutputProc("Uninitialized");
|
||||
ShowError();
|
||||
break;
|
||||
@@ -167,9 +168,9 @@ namespace TGCommandLine
|
||||
{
|
||||
var DM = Server.GetComponent<ITGCompiler>();
|
||||
var stat = DM.GetStatus();
|
||||
if (stat == TGCompilerStatus.Compiling || stat == TGCompilerStatus.Initializing)
|
||||
if (stat == CompilerStatus.Compiling || stat == CompilerStatus.Initializing)
|
||||
{
|
||||
OutputProc("Error: Compiler is " + ((stat == TGCompilerStatus.Initializing) ? "already initialized!" : " already running!"));
|
||||
OutputProc("Error: Compiler is " + ((stat == CompilerStatus.Initializing) ? "already initialized!" : " already running!"));
|
||||
return ExitCode.ServerError;
|
||||
}
|
||||
if (!DM.Initialize())
|
||||
@@ -186,7 +187,7 @@ namespace TGCommandLine
|
||||
do
|
||||
{
|
||||
Thread.Sleep(1000);
|
||||
} while (DM.GetStatus() == TGCompilerStatus.Initializing);
|
||||
} while (DM.GetStatus() == CompilerStatus.Initializing);
|
||||
var res = DM.CompileError();
|
||||
OutputProc(res ?? "Initialization successful");
|
||||
if (res != null)
|
||||
|
||||
Reference in New Issue
Block a user