cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-30 08:33:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update ControlPanel to use the new IServerInterface

Browse Source
This commit is contained in:
Cyberboss
2017-12-08 12:47:13 -05:00
parent d20a79c3f9
commit 50a78b3193
11 changed files with 136 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGS.ControlPanel/ControlPanel/ServerPage.cs
+28 -28
View File
@@ -46,7 +46,7 @@ namespace TGS.ControlPanel
private void CompileCancelButton_Click(object sender, EventArgs e)
{
var res = Interface.GetComponent<ITGCompiler>().Cancel();
var res = Instance.Compiler.Cancel();
if (res != null)
MessageBox.Show(res);
LoadServerPage();
@@ -54,7 +54,7 @@ namespace TGS.ControlPanel
void LoadServerPage()
{
var RepoExists = Interface.GetComponent<ITGRepository>().Exists();
var RepoExists = Instance.Repository.Exists();
compileButton.Visible = RepoExists;
AutoUpdateCheckbox.Visible = RepoExists;
initializeButton.Visible = RepoExists;
@@ -83,16 +83,16 @@ namespace TGS.ControlPanel
if (updatingFields)
return;
var DM = Interface.GetComponent<ITGCompiler>();
var DD = Interface.GetComponent<ITGDreamDaemon>();
var Config = Interface.GetComponent<ITGConfig>();
var Repo = Interface.GetComponent<ITGRepository>();
var DM = Instance.Compiler;
var DD = Instance.DreamDaemon;
var Config = Instance.Config;
var Repo = Instance.Repository;
try
{
updatingFields = true;
ServerPathLabel.Text = "Server Path: " + Interface.GetComponent<ITGInstance>().ServerDirectory();
ServerPathLabel.Text = "Server Path: " + Instance.ServerDirectory();
SecuritySelector.SelectedIndex = (int)DD.SecurityLevel();
@@ -197,13 +197,13 @@ namespace TGS.ControlPanel
void UpdateProjectName()
{
if (!updatingFields)
Interface.GetComponent<ITGCompiler>().SetProjectName(projectNameText.Text);
Instance.Compiler.SetProjectName(projectNameText.Text);
}
private void PortSelector_ValueChanged(object sender, EventArgs e)
{
if (!updatingFields)
Interface.GetComponent<ITGDreamDaemon>().SetPort((ushort)PortSelector.Value);
Instance.DreamDaemon.SetPort((ushort)PortSelector.Value);
}
private void ServerPageRefreshButton_Click(object sender, EventArgs e)
@@ -213,13 +213,13 @@ namespace TGS.ControlPanel
private void InitializeButton_Click(object sender, EventArgs e)
{
if (!Interface.GetComponent<ITGCompiler>().Initialize())
if (!Instance.Compiler.Initialize())
MessageBox.Show("Unable to start initialization!");
LoadServerPage();
}
private void CompileButton_Click(object sender, EventArgs e)
{
if (!Interface.GetComponent<ITGCompiler>().Compile())
if (!Instance.Compiler.Compile())
MessageBox.Show("Unable to start compilation!");
LoadServerPage();
}
@@ -227,7 +227,7 @@ namespace TGS.ControlPanel
private void AutostartCheckbox_CheckedChanged(object sender, System.EventArgs e)
{
if (!updatingFields)
Interface.GetComponent<ITGDreamDaemon>().SetAutostart(AutostartCheckbox.Checked);
Instance.DreamDaemon.SetAutostart(AutostartCheckbox.Checked);
}
private void ServerStartButton_Click(object sender, System.EventArgs e)
{
@@ -239,7 +239,7 @@ namespace TGS.ControlPanel
{
try
{
e.Result = Interface.GetComponent<ITGDreamDaemon>().Start();
e.Result = Instance.DreamDaemon.Start();
}
catch (Exception ex)
{
@@ -252,7 +252,7 @@ namespace TGS.ControlPanel
var DialogResult = MessageBox.Show("This will immediately shut down the server. Continue?", "Confim", MessageBoxButtons.YesNo);
if (DialogResult == DialogResult.No)
return;
var res = Interface.GetComponent<ITGDreamDaemon>().Stop();
var res = Instance.DreamDaemon.Stop();
if (res != null)
MessageBox.Show(res);
}
@@ -262,7 +262,7 @@ namespace TGS.ControlPanel
var DialogResult = MessageBox.Show("This will immediately restart the server. Continue?", "Confim", MessageBoxButtons.YesNo);
if (DialogResult == DialogResult.No)
return;
var res = Interface.GetComponent<ITGDreamDaemon>().Restart();
var res = Instance.DreamDaemon.Restart();
if (res != null)
MessageBox.Show(res);
}
@@ -274,7 +274,7 @@ namespace TGS.ControlPanel
var DialogResult = MessageBox.Show("This will shut down the server when the current round ends. Continue?", "Confim", MessageBoxButtons.YesNo);
if (DialogResult == DialogResult.No)
return;
Interface.GetComponent<ITGDreamDaemon>().RequestStop();
Instance.DreamDaemon.RequestStop();
LoadServerPage();
}
@@ -283,7 +283,7 @@ namespace TGS.ControlPanel
var DialogResult = MessageBox.Show("This will restart the server when the current round ends. Continue?", "Confim", MessageBoxButtons.YesNo);
if (DialogResult == DialogResult.No)
return;
Interface.GetComponent<ITGDreamDaemon>().RequestRestart();
Instance.DreamDaemon.RequestRestart();
}
/// <summary>
@@ -293,7 +293,7 @@ namespace TGS.ControlPanel
/// <param name="e">The <see cref="EventArgs"/></param>
void TestMergeManagerButton_Click(object sender, System.EventArgs e)
{
using (var TMM = new TestMergeManager(Interface, ghclient))
using (var TMM = new TestMergeManager(Instance, ghclient))
TMM.ShowDialog();
LoadServerPage();
}
@@ -320,7 +320,7 @@ namespace TGS.ControlPanel
try
{
string res = null;
var repo = Interface.GetComponent<ITGRepository>();
var repo = Instance.Repository;
var pulls = await Task.Run(() => repo.MergedPullRequests(out res));
if (pulls == null)
@@ -364,7 +364,7 @@ namespace TGS.ControlPanel
pulls.RemoveAll(x => x.Number == I.Result.Number);
var mergeResults = await Task.Run(() => repo.MergePullRequests(pulls, true));
var compileStartResult = await Task.Run(() => Interface.GetComponent<ITGCompiler>().Compile(true));
var compileStartResult = await Task.Run(() => Instance.Compiler.Compile(true));
//Show any errors
for (var I = 0; I < mergeResults.Count(); ++I)
@@ -410,7 +410,7 @@ namespace TGS.ControlPanel
Enabled = false;
try
{
var repo = Interface.GetComponent<ITGRepository>();
var repo = Instance.Repository;
var res = await Task.Run(() => repo.Reset(true));
@@ -425,7 +425,7 @@ namespace TGS.ControlPanel
if (res != null)
MessageBox.Show(res, "Error generating changelog");
await Task.Run(() => Interface.GetComponent<ITGCompiler>().Compile(false));
await Task.Run(() => Instance.Compiler.Compile(false));
if (res != null)
MessageBox.Show(res, "Error starting compile!");
}
@@ -452,7 +452,7 @@ namespace TGS.ControlPanel
private void SecuritySelector_SelectedIndexChanged(object sender, EventArgs e)
{
if (!updatingFields)
if (!Interface.GetComponent<ITGDreamDaemon>().SetSecurityLevel((DreamDaemonSecurity)SecuritySelector.SelectedIndex))
if (!Instance.DreamDaemon.SetSecurityLevel((DreamDaemonSecurity)SecuritySelector.SelectedIndex))
MessageBox.Show("Security change will be applied after next server reboot.");
}
@@ -461,7 +461,7 @@ namespace TGS.ControlPanel
var msg = WorldAnnounceField.Text;
if (!String.IsNullOrWhiteSpace(msg))
{
var res = Interface.GetComponent<ITGDreamDaemon>().WorldAnnounce(msg);
var res = Instance.DreamDaemon.WorldAnnounce(msg);
if (res != null)
{
MessageBox.Show(res);
@@ -474,13 +474,13 @@ namespace TGS.ControlPanel
private void WebclientCheckBox_CheckedChanged(object sender, EventArgs e)
{
if (!updatingFields)
Interface.GetComponent<ITGDreamDaemon>().SetWebclient(WebclientCheckBox.Checked);
Instance.DreamDaemon.SetWebclient(WebclientCheckBox.Checked);
}
private void AutoUpdateInterval_ValueChanged(object sender, EventArgs e)
{
if (!updatingFields)
Interface.GetComponent<ITGRepository>().SetAutoUpdateInterval((ulong)AutoUpdateInterval.Value);
Instance.Repository.SetAutoUpdateInterval((ulong)AutoUpdateInterval.Value);
}
private void AutoUpdateCheckbox_CheckedChanged(object sender, EventArgs e)
@@ -491,9 +491,9 @@ namespace TGS.ControlPanel
AutoUpdateInterval.Visible = on;
AutoUpdateMLabel.Visible = on;
if (!on)
Interface.GetComponent<ITGRepository>().SetAutoUpdateInterval(0);
Instance.Repository.SetAutoUpdateInterval(0);
else
Interface.GetComponent<ITGRepository>().SetAutoUpdateInterval((ulong)AutoUpdateInterval.Value);
Instance.Repository.SetAutoUpdateInterval((ulong)AutoUpdateInterval.Value);
}
}
}