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

Merge branch '890-GetYourSwagOn' of https://github.com/tgstation/tgstation-server into 890-GetYourSwagOn

Browse Source
This commit is contained in:
Cyberboss
2020-01-12 17:29:24 -05:00
parent 48bc829bd9 0a0343cd64
commit 9f27402195
7 changed files with 97 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Client/Components/DreamMakerClient.cs
+1 -1
View File
@@ -35,7 +35,7 @@ namespace Tgstation.Server.Client.Components
public Task<Job> Compile(CancellationToken cancellationToken) => apiClient.Create<Job>(Routes.DreamMaker, instance.Id, cancellationToken);
/// <inheritdoc />
public Task<CompileJob> GetCompileJob(CompileJob compileJob, CancellationToken cancellationToken) => apiClient.Read<CompileJob>(Routes.SetID(Routes.DreamMaker, compileJob?.Id ?? throw new ArgumentNullException(nameof(compileJob))), instance.Id, cancellationToken);
public Task<CompileJob> GetCompileJob(EntityId compileJob, CancellationToken cancellationToken) => apiClient.Read<CompileJob>(Routes.SetID(Routes.DreamMaker, compileJob?.Id ?? throw new ArgumentNullException(nameof(compileJob))), instance.Id, cancellationToken);
/// <inheritdoc />
public Task<IReadOnlyList<EntityId>> GetJobIds(CancellationToken cancellationToken) => apiClient.Read<IReadOnlyList<EntityId>>(Routes.ListRoute(Routes.DreamMaker), instance.Id, cancellationToken);
src/Tgstation.Server.Client/Components/IDreamMakerClient.cs
+2 -2
View File
@@ -42,9 +42,9 @@ namespace Tgstation.Server.Client.Components
/// <summary>
/// Get a <paramref name="compileJob"/>
/// </summary>
/// <param name="compileJob">The <see cref="CompileJob"/> to get</param>
/// <param name="compileJob">The <see cref="CompileJob"/> <see cref="EntityId"/> to get</param>
/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation</param>
/// <returns>A <see cref="Task{TResult}"/> resulting in the <see cref="CompileJob"/></returns>
Task<CompileJob> GetCompileJob(CompileJob compileJob, CancellationToken cancellationToken);
Task<CompileJob> GetCompileJob(EntityId compileJob, CancellationToken cancellationToken);
}
}
src/Tgstation.Server.Client/Components/IJobsClient.cs
+2 -2
View File
@@ -27,10 +27,10 @@ namespace Tgstation.Server.Client.Components
/// <summary>
/// Get a <paramref name="job"/>
/// </summary>
/// <param name="job">The <see cref="Job"/> to get</param>
/// <param name="job">The <see cref="Job"/>'s <see cref="EntityId"/> to get</param>
/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation</param>
/// <returns>A <see cref="Task{TResult}"/> resulting in the <see cref="Job"/></returns>
Task<Job> GetId(Job job, CancellationToken cancellationToken);
Task<Job> GetId(EntityId job, CancellationToken cancellationToken);
/// <summary>
/// Cancels a <paramref name="job"/>
src/Tgstation.Server.Client/Components/JobsClient.cs
+1 -1
View File
@@ -41,6 +41,6 @@ namespace Tgstation.Server.Client.Components
public Task<IReadOnlyList<Job>> ListActive(CancellationToken cancellationToken) => apiClient.Read<IReadOnlyList<Job>>(Routes.Jobs, instance.Id, cancellationToken);
/// <inheritdoc />
public Task<Job> GetId(Job job, CancellationToken cancellationToken) => apiClient.Read<Job>(Routes.SetID(Routes.Jobs, job?.Id ?? throw new ArgumentNullException(nameof(job))), instance.Id, cancellationToken);
public Task<Job> GetId(EntityId job, CancellationToken cancellationToken) => apiClient.Read<Job>(Routes.SetID(Routes.Jobs, job?.Id ?? throw new ArgumentNullException(nameof(job))), instance.Id, cancellationToken);
}
}
src/Tgstation.Server.Host/Core/SetupWizard.cs
+46 -27
View File
@@ -638,41 +638,60 @@ namespace Tgstation.Server.Host.Core
}
var userConfigFileName = String.Format(CultureInfo.InvariantCulture, "appsettings.{0}.json", hostingEnvironment.EnvironmentName);
var exists = await ioManager.FileExists(userConfigFileName, cancellationToken).ConfigureAwait(false);
bool shouldRunBasedOnAutodetect;
if (exists)
async Task HandleSetupCancel()
{
var bytes = await ioManager.ReadAllBytes(userConfigFileName, cancellationToken).ConfigureAwait(false);
var contents = Encoding.UTF8.GetString(bytes);
var existingConfigIsEmpty = String.IsNullOrWhiteSpace(contents) || contents.Trim() == "{}";
logger.LogTrace("Configuration json detected. Empty: {0}", existingConfigIsEmpty);
shouldRunBasedOnAutodetect = existingConfigIsEmpty;
}
else
{
shouldRunBasedOnAutodetect = true;
logger.LogTrace("No configuration json detected");
await console.WriteAsync(String.Empty, true, default).ConfigureAwait(false);
await console.WriteAsync("Aborting setup!", true, default).ConfigureAwait(false);
}
if (!shouldRunBasedOnAutodetect)
{
if (forceRun)
// Link passed cancellationToken with cancel key press
Task finalTask = Task.CompletedTask;
using (var cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, console.CancelKeyPress))
using ((cancellationToken = cts.Token).Register(() => finalTask = HandleSetupCancel()))
try
{
logger.LogTrace("Asking user to bypass due to force run request...");
await console.WriteAsync(String.Format(CultureInfo.InvariantCulture, "The configuration settings are requesting the setup wizard be run, but you already appear to have a configuration file ({0})!", userConfigFileName), true, cancellationToken).ConfigureAwait(false);
var exists = await ioManager.FileExists(userConfigFileName, cancellationToken).ConfigureAwait(false);
forceRun = await PromptYesNo("Continue running setup wizard? (y/n): ", cancellationToken).ConfigureAwait(false);
bool shouldRunBasedOnAutodetect;
if (exists)
{
var bytes = await ioManager.ReadAllBytes(userConfigFileName, cancellationToken).ConfigureAwait(false);
var contents = Encoding.UTF8.GetString(bytes);
var existingConfigIsEmpty = String.IsNullOrWhiteSpace(contents) || contents.Trim() == "{}";
logger.LogTrace("Configuration json detected. Empty: {0}", existingConfigIsEmpty);
shouldRunBasedOnAutodetect = existingConfigIsEmpty;
}
else
{
shouldRunBasedOnAutodetect = true;
logger.LogTrace("No configuration json detected");
}
if (!shouldRunBasedOnAutodetect)
{
if (forceRun)
{
logger.LogTrace("Asking user to bypass due to force run request...");
await console.WriteAsync(String.Format(CultureInfo.InvariantCulture, "The configuration settings are requesting the setup wizard be run, but you already appear to have a configuration file ({0})!", userConfigFileName), true, cancellationToken).ConfigureAwait(false);
forceRun = await PromptYesNo("Continue running setup wizard? (y/n): ", cancellationToken).ConfigureAwait(false);
}
if (!forceRun)
return false;
}
// flush the logs to prevent console conflicts
await asyncDelayer.Delay(TimeSpan.FromSeconds(1), cancellationToken).ConfigureAwait(false);
await RunWizard(userConfigFileName, cancellationToken).ConfigureAwait(false);
}
finally
{
await finalTask.ConfigureAwait(false);
}
if (!forceRun)
return false;
}
// flush the logs to prevent console conflicts
await asyncDelayer.Delay(TimeSpan.FromSeconds(1), cancellationToken).ConfigureAwait(false);
await RunWizard(userConfigFileName, cancellationToken).ConfigureAwait(false);
return true;
}
}
src/Tgstation.Server.Host/IO/Console.cs
+40 -1
View File
@@ -6,11 +6,50 @@ using System.Threading.Tasks;
namespace Tgstation.Server.Host.IO
{
/// <inheritdoc />
sealed class Console : IConsole
sealed class Console : IConsole, IDisposable
{
/// <inheritdoc />
public bool Available => Environment.UserInteractive;
/// <inheritdoc />
public CancellationToken CancelKeyPress => cancelKeyCts.Token;
/// <summary>
/// The <see cref="CancellationTokenSource"/> for <see cref="CancelKeyPress"/>.
/// </summary>
readonly CancellationTokenSource cancelKeyCts;
/// <summary>
/// If the <see cref="Console"/> was disposed;
/// </summary>
bool disposed;
/// <summary>
/// Initializes a new instance of the <see cref="Console"/> <see langword="class"/>.
/// </summary>
public Console()
{
cancelKeyCts = new CancellationTokenSource();
System.Console.CancelKeyPress += (sender, e) =>
{
lock (cancelKeyCts)
{
if (!disposed)
cancelKeyCts.Cancel();
}
};
}
/// <inheritdoc />
public void Dispose()
{
lock (cancelKeyCts)
{
cancelKeyCts.Dispose();
disposed = true;
}
}
void CheckAvailable()
{
if (!Available)
src/Tgstation.Server.Host/IO/IConsole.cs
+5
View File
@@ -13,6 +13,11 @@ namespace Tgstation.Server.Host.IO
/// </summary>
bool Available { get; }
/// <summary>
/// Gets a <see cref="CancellationToken"/> that triggers if Crtl+C or an equivalent is pressed.
/// </summary>
CancellationToken CancelKeyPress { get; }
/// <summary>
/// Write some <paramref name="text"/> to the <see cref="IConsole"/>
/// </summary>