starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-16 05:53:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Updates reported version in System/Info* set of endpoints.

Browse Source 
Added ProductName and ServerVersion to API.

Added build version and build step. Addressed issues wtih indentation.

Made the BuildVersion an actual object. This lets up link to the github page of that commit.

Fixed class method type and styled link.

Fixed languages and split out the information in the UI.

Moved update-version script and gave it executable permissions. Windows correctly finds the .bat file. And linux takes the one without extension.

Removed tempfiles from replace sessions from csproj.

Updated version generation scripts. Will also work with pre existing version files. (Source tarballs etc.)

Added simple replace for ssh github links.

Add execute rights to update-version.

Wrapped long line in ApplicationHost.cs

Fixed some small issues.

Fixed some small issues, and flipped some if's around.

Converted parameter names to camelBack casing.

Sealed the attribute class.

Removed MPLv2 license.

Fixed file headers.

Added newline.

Moved links in *.csproj files as well.

Fix issues caused by rebase auto merging.

Removed default constructor and added init values to properties, also hid the Remote value form API.
This commit is contained in:
Erwin de Haan
2019-01-08 01:57:01 +01:00
parent 55538764fa
commit bb8df8dfa0
35 changed files with 421 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Emby.Server.Implementations/ApplicationHost.cs
View File

@@ -47,6 +47,7 @@ using Emby.Server.Implementations.Threading;
using Emby.Server.Implementations.TV;
using Emby.Server.Implementations.Updates;
using Emby.Server.Implementations.Xml;
using Jellyfin.Versioning;
using MediaBrowser.Api;
using MediaBrowser.Common;
using MediaBrowser.Common.Configuration;
@@ -434,7 +435,30 @@ namespace Emby.Server.Implementations
/// Gets the current application version
/// </summary>
/// <value>The application version.</value>
public Version ApplicationVersion => _version ?? (_version = typeof(ApplicationHost).Assembly.GetName().Version);
public Version ApplicationVersion => _version ?? (_version = ApplicationExtendedVersion.ApiVersion);
private Version _serverVersion;
/// <summary>
/// Gets the current application server version
/// </summary>
/// <value>The application server version.</value>
public Version ApplicationServerVersion => _serverVersion ?? (_serverVersion = typeof(ApplicationHost).Assembly.GetName().Version);
private ExtendedVersion _extendedVersion;
/// <summary>
/// Gets the current application server version
/// </summary>
/// <value>The application server version.</value>
public ExtendedVersion ApplicationExtendedVersion => _extendedVersion ??
(_extendedVersion = typeof(ApplicationHost).Assembly.GetCustomAttributes(typeof(AssemblyExtendedVersion), false)
.Cast<AssemblyExtendedVersion>().FirstOrDefault().ExtendedVersion);
private string _productName;
/// <summary>
/// Gets the current application name
/// </summary>
/// <value>The application name.</value>
public string ApplicationProductName => _productName ?? (_productName = FileVersionInfo.GetVersionInfo(Assembly.GetEntryAssembly().Location).ProductName);
private DeviceId _deviceId;
public string SystemId
@@ -1826,6 +1850,9 @@ namespace Emby.Server.Implementations
HasPendingRestart = HasPendingRestart,
IsShuttingDown = IsShuttingDown,
Version = ApplicationVersion.ToString(),
ServerVersion = ApplicationServerVersion.ToString(),
ExtendedVersion = ApplicationExtendedVersion,
ProductName = ApplicationProductName,
WebSocketPortNumber = HttpPort,
CompletedInstallations = InstallationManager.CompletedInstallations.ToArray(),
Id = SystemId,
@@ -1872,6 +1899,8 @@ namespace Emby.Server.Implementations
return new PublicSystemInfo
{
Version = ApplicationVersion.ToString(),
ServerVersion = ApplicationServerVersion.ToString(),
ExtendedVersion = ApplicationExtendedVersion,
Id = SystemId,
OperatingSystem = EnvironmentInfo.OperatingSystem.ToString(),
WanAddress = wanAddress,