chillcog/SPT-Server-Build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change to using builtin SemVer type for AbstractModMetadata and ProgramStatistics.Generated (#536)

Browse Source 
* Change to using SemVer builtin type

* Remove SptVersion from config, remove redundant .ToString()

* Update test mod, fix watermark string conversion
This commit is contained in:
Cj
2025-08-09 16:40:25 -04:00
committed by GitHub
parent c16c988fda
commit 4d0eb4d4f3
35 changed files with 85 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/SPTarkov.Server.Core/Controllers/GameController.cs
+3 -3
View File
@@ -431,7 +431,7 @@ public class GameController(
{
if (
fullProfile.SptData.Mods.Any(m =>
m.Author == mod.ModMetadata.Author && m.Version == mod.ModMetadata.Version && m.Name == mod.ModMetadata.Name
m.Author == mod.ModMetadata.Author && m.Version == mod.ModMetadata.Version.ToString() && m.Name == mod.ModMetadata.Name
)
)
{
@@ -443,7 +443,7 @@ public class GameController(
new ModDetails
{
Author = mod.ModMetadata.Author,
Version = mod.ModMetadata.Version,
Version = mod.ModMetadata.Version.ToString(),
Name = mod.ModMetadata.Name,
Url = mod.ModMetadata.Url,
DateAdded = timeUtil.GetTimeStamp(),
@@ -496,7 +496,7 @@ public class GameController(
if (logger.IsLogEnabled(LogLevel.Debug))
{
logger.Debug($"Profile made with: {fullProfile.SptData?.Version}");
logger.Debug($"Server version: {ProgramStatics.SPT_VERSION() ?? _coreConfig.SptVersion} {ProgramStatics.COMMIT()}");
logger.Debug($"Server version: {ProgramStatics.SPT_VERSION()} {ProgramStatics.COMMIT()}");
logger.Debug($"Debug enabled: {ProgramStatics.DEBUG()}");
logger.Debug($"Mods enabled: {ProgramStatics.MODS()}");
}
Libraries/SPTarkov.Server.Core/Models/Spt/Config/CoreConfig.cs
-3
View File
@@ -9,9 +9,6 @@ public record CoreConfig : BaseConfig
[JsonPropertyName("kind")]
public override string Kind { get; set; } = "spt-core";
[JsonPropertyName("sptVersion")]
public required string SptVersion { get; set; }
[JsonPropertyName("projectName")]
public required string ProjectName { get; set; }
Libraries/SPTarkov.Server.Core/Models/Spt/Mod/AbstractModMetadata.cs
+16 -6
View File
@@ -1,4 +1,6 @@
namespace SPTarkov.Server.Core.Models.Spt.Mod;
using Version = SemanticVersioning.Version;
namespace SPTarkov.Server.Core.Models.Spt.Mod;
/// <summary>
/// Represents a collection of metadata used to determine things such as author, version,
@@ -31,14 +33,22 @@ public abstract record AbstractModMetadata
public abstract List<string>? Contributors { get; set; }
/// <summary>
/// Semantic version of this mod, this uses the semver standard
/// Semantic version of this mod, this uses the semver standard: https://semver.org/
/// <br/><br/>
/// Version = new Version("1.0.0"); is valid
/// <br/>
/// Version = new Version("1.0.0.0"); is not
/// </summary>
public abstract string Version { get; init; }
public abstract Version Version { get; }
/// <summary>
/// SPT version this mod was built for
/// SPT version this mod was built for, this uses the semver standard: https://semver.org/
/// <br/><br/>
/// Version = new Version("4.0.0"); is valid
/// <br/>
/// Version = new Version("4.0.0.0"); is not
/// </summary>
public abstract string SptVersion { get; init; }
public abstract Version SptVersion { get; }
/// <summary>
/// List of mods this mod should load before
@@ -60,7 +70,7 @@ public abstract record AbstractModMetadata
///
/// Mod dependency is the key, version is the value
/// </summary>
public abstract Dictionary<string, string>? ModDependencies { get; set; }
public abstract Dictionary<string, Version>? ModDependencies { get; set; }
/// <summary>
/// Link to this mod's mod page, or GitHub page
Libraries/SPTarkov.Server.Core/SPTarkov.Server.Core.csproj
+1 -1
View File
@@ -44,7 +44,7 @@
<Target Name="GenerateProgramStatics" BeforeTargets="CollectPackageReferences;CoreCompile">
<WriteLinesToFile
File="Utils/ProgramStatics.Generated.cs"
Lines="// &lt;auto-generated /&gt;&#xD;&#xA;// This file is automatically generated. Do not modify manually.&#xD;&#xA;// Any changes made to this file will be overwritten during the build process.&#xD;&#xA;&#xD;&#xA;using SPTarkov.Server.Core.Models.Enums%3B&#xD;&#xA;&#xD;&#xA;namespace SPTarkov.Server.Core.Utils%3B&#xD;&#xA;&#xD;&#xA;public static partial class ProgramStatics&#xD;&#xA;{&#xD;&#xA; private static string SptVersion { get%3B } = &quot;$(SptVersion)&quot;%3B&#xD;&#xA; private static string Commit { get%3B } = &quot;$(SptCommit)&quot;%3B&#xD;&#xA; private static double BuildTime { get%3B } = $(SptBuildTime)%3B&#xD;&#xA; private static EntryType BuildType { get%3B } = EntryType.$(SptBuildType)%3B&#xD;&#xA;}&#xD;&#xA;"
Lines="// &lt;auto-generated /&gt;&#xD;&#xA;// This file is automatically generated. Do not modify manually.&#xD;&#xA;// Any changes made to this file will be overwritten during the build process.&#xD;&#xA;&#xD;&#xA;using SPTarkov.Server.Core.Models.Enums%3B&#xD;&#xA;&#xD;&#xA;using Version = SemanticVersioning.Version%3B&#xD;&#xA;&#xD;&#xA;namespace SPTarkov.Server.Core.Utils%3B&#xD;&#xA;&#xD;&#xA;public static partial class ProgramStatics&#xD;&#xA;{&#xD;&#xA; private static Version SptVersion { get%3B } = new(&quot;$(SptVersion)&quot;)%3B&#xD;&#xA; private static string Commit { get%3B } = &quot;$(SptCommit)&quot;%3B&#xD;&#xA; private static double BuildTime { get%3B } = $(SptBuildTime)%3B&#xD;&#xA; private static EntryType BuildType { get%3B } = EntryType.$(SptBuildType)%3B&#xD;&#xA;}&#xD;&#xA;"
Overwrite="true"
/>
</Target>
Libraries/SPTarkov.Server.Core/Utils/App.cs
+1 -1
View File
@@ -39,7 +39,7 @@ public class App(
_logger.Debug($"Ran as admin: {Environment.IsPrivilegedProcess}");
_logger.Debug($"CPU cores: {Environment.ProcessorCount}");
_logger.Debug($"PATH: {(Environment.ProcessPath ?? "null returned").Encode(EncodeType.BASE64)}");
_logger.Debug($"Server: {ProgramStatics.SPT_VERSION() ?? _coreConfig.SptVersion}");
_logger.Debug($"Server: {ProgramStatics.SPT_VERSION()}");
// _logger.Debug($"RAM: {(os.totalmem() / 1024 / 1024 / 1024).toFixed(2)}GB");
Libraries/SPTarkov.Server.Core/Utils/ProgramStatics.cs
+2 -1
View File
@@ -1,5 +1,6 @@
using SPTarkov.Server.Core.Models.Enums;
using SPTarkov.Server.Core.Models.Logging;
using Version = SemanticVersioning.Version;
namespace SPTarkov.Server.Core.Utils;
@@ -68,7 +69,7 @@ public static partial class ProgramStatics
return _mods;
}
public static string SPT_VERSION()
public static Version SPT_VERSION()
{
return SptVersion;
}
Libraries/SPTarkov.Server.Core/Utils/Watermark.cs
+25 -25
View File
@@ -12,32 +12,32 @@ namespace SPTarkov.Server.Core.Utils;
public class WatermarkLocale(ServerLocalisationService serverLocalisationService)
{
public IReadOnlyList<string> Description { get; } =
[
serverLocalisationService.GetText("watermark-discord_url"),
"",
serverLocalisationService.GetText("watermark-free_of_charge"),
serverLocalisationService.GetText("watermark-paid_scammed"),
serverLocalisationService.GetText("watermark-commercial_use_prohibited"),
];
[
serverLocalisationService.GetText("watermark-discord_url"),
"",
serverLocalisationService.GetText("watermark-free_of_charge"),
serverLocalisationService.GetText("watermark-paid_scammed"),
serverLocalisationService.GetText("watermark-commercial_use_prohibited"),
];
public IReadOnlyList<string> Modding { get; } =
[
"",
serverLocalisationService.GetText("watermark-modding_disabled"),
"",
serverLocalisationService.GetText("watermark-not_an_issue"),
serverLocalisationService.GetText("watermark-do_not_report"),
];
[
"",
serverLocalisationService.GetText("watermark-modding_disabled"),
"",
serverLocalisationService.GetText("watermark-not_an_issue"),
serverLocalisationService.GetText("watermark-do_not_report"),
];
public IReadOnlyList<string> Warning { get; } =
[
"",
serverLocalisationService.GetText("watermark-testing_build"),
serverLocalisationService.GetText("watermark-no_support"),
"",
$"{serverLocalisationService.GetText("watermark-report_issues_to")}:",
serverLocalisationService.GetText("watermark-issue_tracker_url"),
"",
serverLocalisationService.GetText("watermark-use_at_own_risk"),
];
[
"",
serverLocalisationService.GetText("watermark-testing_build"),
serverLocalisationService.GetText("watermark-no_support"),
"",
$"{serverLocalisationService.GetText("watermark-report_issues_to")}:",
serverLocalisationService.GetText("watermark-issue_tracker_url"),
"",
serverLocalisationService.GetText("watermark-use_at_own_risk"),
];
}
[Injectable(TypePriority = OnLoadOrder.Watermark)]
@@ -93,7 +93,7 @@ public class Watermark(
/// <returns></returns>
public string GetVersionTag(bool withEftVersion = false)
{
var sptVersion = ProgramStatics.SPT_VERSION() ?? sptConfig.SptVersion;
var sptVersion = ProgramStatics.SPT_VERSION().ToString();
var versionTag = ProgramStatics.DEBUG() ? $"{sptVersion} - {serverLocalisationService.GetText("bleeding_edge_build")}" : sptVersion;
if (withEftVersion)