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

Nullify DmbProvider

Browse Source
This commit is contained in:
Jordan Dominion
2023-12-22 09:53:15 -05:00
parent 707d69d2e6
commit 083f7ca85e
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Deployment/DmbFactory.cs
+4 -1
View File
@@ -253,11 +253,14 @@ namespace Tgstation.Server.Host.Components.Deployment
.ThenInclude(x => x.MergedBy)
.FirstAsync(cancellationToken)); // can't wait to see that query
if (!EngineVersion.TryParse(compileJob.EngineVersion, out var engineVersion))
EngineVersion engineVersion;
if (!EngineVersion.TryParse(compileJob.EngineVersion, out var engineVersionNullable))
{
logger.LogWarning("Error loading compile job, bad engine version: {engineVersion}", compileJob.EngineVersion);
return null; // omae wa mou shinderu
}
else
engineVersion = engineVersionNullable!;
if (!compileJob.Job.StoppedAt.HasValue)
{
src/Tgstation.Server.Host/Components/Deployment/DmbProvider.cs
+3 -5
View File
@@ -5,15 +5,13 @@ using Tgstation.Server.Api.Models;
using Tgstation.Server.Api.Models.Internal;
using Tgstation.Server.Host.IO;
#nullable disable
namespace Tgstation.Server.Host.Components.Deployment
{
/// <inheritdoc />
sealed class DmbProvider : DmbProviderBase, IDmbProvider
{
/// <inheritdoc />
public override string Directory => ioManager.ResolvePath(CompileJob.DirectoryName.ToString() + directoryAppend);
public override string Directory => ioManager.ResolvePath(CompileJob.DirectoryName!.Value.ToString() + directoryAppend);
/// <inheritdoc />
public override Models.CompileJob CompileJob { get; }
@@ -34,7 +32,7 @@ namespace Tgstation.Server.Host.Components.Deployment
/// <summary>
/// The <see cref="Action"/> to run when <see cref="DisposeAsync"/> is called.
/// </summary>
Action onDispose;
Action? onDispose;
/// <summary>
/// Initializes a new instance of the <see cref="DmbProvider"/> class.
@@ -44,7 +42,7 @@ namespace Tgstation.Server.Host.Components.Deployment
/// <param name="ioManager">The value of <see cref="ioManager"/>.</param>
/// <param name="onDispose">The value of <see cref="onDispose"/>.</param>
/// <param name="directoryAppend">The optional value of <see cref="directoryAppend"/>.</param>
public DmbProvider(Models.CompileJob compileJob, EngineVersion engineVersion, IIOManager ioManager, Action onDispose, string directoryAppend = null)
public DmbProvider(Models.CompileJob compileJob, EngineVersion engineVersion, IIOManager ioManager, Action onDispose, string? directoryAppend = null)
{
CompileJob = compileJob ?? throw new ArgumentNullException(nameof(compileJob));
EngineVersion = engineVersion ?? throw new ArgumentNullException(nameof(engineVersion));