The Free Software Media System - Server Backend & API
Modernize version display in UI (#16862)
JPVenson49cc2f78990d
diff --git a/Jellyfin.Server/ServerSetupApp/SetupServer.cs b/Jellyfin.Server/ServerSetupApp/SetupServer.csindex 05975929db..37bb1abe71 100644--- a/Jellyfin.Server/ServerSetupApp/SetupServer.cs+++ b/Jellyfin.Server/ServerSetupApp/SetupServer.cs@@ -90,6 +90,13 @@ public sealed class SetupServer : IDisposablevar fileTemplate = await File.ReadAllTextAsync(Path.Combine(AppContext.BaseDirectory, "ServerSetupApp", "index.mstemplate.html")).ConfigureAwait(false);_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) =>{@@ -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.htmlindex 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}}