diff options
| author | Shadowghost <Ghost_of_Stone@web.de> | 2026-05-24 18:25:12 +0200 |
|---|---|---|
| committer | Shadowghost <Ghost_of_Stone@web.de> | 2026-05-24 18:25:12 +0200 |
| commit | 11758461200c7b369dd23db5ac7c9f232a87cf21 (patch) | |
| tree | 59a9a8574531ed05fb09720eb51cec38741f8397 /Jellyfin.Server/ServerSetupApp | |
| parent | ea8f6c51fd1013b6c841fb74a7fcde532d57d8da (diff) | |
| parent | 31f4ce93a6c4eef9167bea9afb06d01e5597a64a (diff) | |
Merge remote-tracking branch 'upstream/master' into search-rebased
Diffstat (limited to 'Jellyfin.Server/ServerSetupApp')
| -rw-r--r-- | Jellyfin.Server/ServerSetupApp/SetupServer.cs | 10 | ||||
| -rw-r--r-- | Jellyfin.Server/ServerSetupApp/index.mstemplate.html | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/Jellyfin.Server/ServerSetupApp/SetupServer.cs b/Jellyfin.Server/ServerSetupApp/SetupServer.cs index 05975929db..37bb1abe71 100644 --- a/Jellyfin.Server/ServerSetupApp/SetupServer.cs +++ b/Jellyfin.Server/ServerSetupApp/SetupServer.cs @@ -91,6 +91,13 @@ public sealed class SetupServer : IDisposable _startupUiRenderer = (await ParserOptionsBuilder.New() .WithTemplate(fileTemplate) .WithFormatter( + (Version version, int arg) => + { + // version type does not for some stupid reason implement IFormattable which morestachio relies on for ToString support therefor we need to do it manually. + return version.ToString(arg); + }, + "ToString") + .WithFormatter( (StartupLogTopic logEntry, IEnumerable<StartupLogTopic> children) => { if (children.Any()) @@ -237,6 +244,7 @@ public sealed class SetupServer : IDisposable }); }); + var version = typeof(Emby.Server.Implementations.ApplicationHost).Assembly.GetName().Version!; app.Run(async (context) => { context.Response.StatusCode = (int)HttpStatusCode.ServiceUnavailable; @@ -250,7 +258,7 @@ public sealed class SetupServer : IDisposable { { "isInReportingMode", _isUnhealthy }, { "retryValue", retryAfterValue }, - { "version", typeof(Emby.Server.Implementations.ApplicationHost).Assembly.GetName().Version! }, + { "version", version }, { "logs", startupLogEntries }, { "networkManagerReady", networkManager is not null }, { "localNetworkRequest", networkManager is not null && context.Connection.RemoteIpAddress is not null && networkManager.IsInLocalNetwork(context.Connection.RemoteIpAddress) } diff --git a/Jellyfin.Server/ServerSetupApp/index.mstemplate.html b/Jellyfin.Server/ServerSetupApp/index.mstemplate.html index 890a77619d..5706ce1fac 100644 --- a/Jellyfin.Server/ServerSetupApp/index.mstemplate.html +++ b/Jellyfin.Server/ServerSetupApp/index.mstemplate.html @@ -173,9 +173,9 @@ <header class="flex-row"> {{^IF isInReportingMode}} - <p>Jellyfin Server {{version}} still starting. Please wait.</p> + <p>Jellyfin Server {{version.ToString(2)}} still starting. Please wait.</p> {{#ELSE}} - <p>Jellyfin Server has encountered an error and was not able to start.</p> + <p>Jellyfin Server {{version.ToString(2)}} has encountered an error and was not able to start.</p> {{/ELSE}} {{/IF}} |