From 070cbeebbebc89de28b900a6cc5490f34111eaa7 Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Mon, 4 Feb 2019 20:44:47 +0100 Subject: [PATCH] Allow -suffix in PackageVersion and added that and PackageAuthor to the About page. --- frontend/src/System/Status/About/About.js | 12 +++++++ .../Configuration/DeploymentInfoProvider.cs | 36 ++++++++----------- src/Sonarr.Api.V3/System/SystemModule.cs | 2 ++ 3 files changed, 28 insertions(+), 22 deletions(-) diff --git a/frontend/src/System/Status/About/About.js b/frontend/src/System/Status/About/About.js index 0965baff4..7e9a54800 100644 --- a/frontend/src/System/Status/About/About.js +++ b/frontend/src/System/Status/About/About.js @@ -15,6 +15,8 @@ class About extends Component { render() { const { version, + packageVersion, + packageAuthor, isMonoRuntime, runtimeVersion, appData, @@ -33,6 +35,14 @@ class About extends Component { data={version} /> + { + packageVersion && + + } + { isMonoRuntime && (string fileData, string key, T defaultValue) where T : struct { - var value = ReadValue(fileData, key, null); + var value = ReadValue(fileData, key); if (value != null && Enum.TryParse(value, true, out var result)) { return result; @@ -92,22 +94,12 @@ namespace NzbDrone.Core.Configuration return defaultValue; } - private static Version ReadVersion(string fileData, string key, Version defaultValue = null) - { - var value = ReadValue(fileData, key, null); - if (value != null && Version.TryParse(value, out var result)) - { - return result; - } - - return defaultValue; - } - - public Version PackageVersion { get; private set; } + public string PackageVersion { get; private set; } + public string PackageAuthor { get; private set; } public string PackageBranch { get; private set; } public UpdateMechanism PackageUpdateMechanism { get; private set; } - public Version ReleaseVersion { get; set; } + public string ReleaseVersion { get; private set; } public string ReleaseBranch { get; set; } diff --git a/src/Sonarr.Api.V3/System/SystemModule.cs b/src/Sonarr.Api.V3/System/SystemModule.cs index b6dba4795..1b3ebf7e8 100644 --- a/src/Sonarr.Api.V3/System/SystemModule.cs +++ b/src/Sonarr.Api.V3/System/SystemModule.cs @@ -75,6 +75,8 @@ namespace Sonarr.Api.V3.System RuntimeVersion = _platformInfo.Version, RuntimeName = PlatformInfo.Platform, StartTime = _runtimeInfo.StartTime, + PackageVersion = _deploymentInfoProvider.PackageVersion, + PackageAuthor = _deploymentInfoProvider.PackageAuthor, PackageUpdateMechanism = _deploymentInfoProvider.PackageUpdateMechanism }.AsResponse(); }