lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up EnvironmentInfo

Browse Source
This commit is contained in:
Bond_009 2019-01-02 00:41:47 +01:00 committed by Vasily
parent a445233192
commit 6643ac3ea4
2 changed files with 6 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Emby.Server.Implementations/EnvironmentInfo/EnvironmentInfo.cs
View File

@ -8,35 +8,13 @@ namespace Emby.Server.Implementations.EnvironmentInfo
// TODO: Rework @bond
public class EnvironmentInfo : IEnvironmentInfo
{
private MediaBrowser.Model.System.OperatingSystem? _customOperatingSystem;
public virtual MediaBrowser.Model.System.OperatingSystem OperatingSystem
public EnvironmentInfo(MediaBrowser.Model.System.OperatingSystem operatingSystem)
{
get
{
if (_customOperatingSystem.HasValue)
{
return _customOperatingSystem.Value;
}
switch (Environment.OSVersion.Platform)
{
case PlatformID.MacOSX:
return MediaBrowser.Model.System.OperatingSystem.OSX;
case PlatformID.Win32NT:
return MediaBrowser.Model.System.OperatingSystem.Windows;
case PlatformID.Unix:
return MediaBrowser.Model.System.OperatingSystem.Linux;
}
return MediaBrowser.Model.System.OperatingSystem.Windows;
}
set
{
_customOperatingSystem = value;
}
OperatingSystem = operatingSystem;
}
public MediaBrowser.Model.System.OperatingSystem OperatingSystem { get; private set; }
public string OperatingSystemName
{
get
@ -69,7 +47,7 @@ namespace Emby.Server.Implementations.EnvironmentInfo
}
}
public Architecture SystemArchitecture { get; set; }
public Architecture SystemArchitecture { get { return RuntimeInformation.OSArchitecture; } }
public string GetEnvironmentVariable(string name)
{

9
Jellyfin.Server/Program.cs
View File

@ -57,7 +57,7 @@ namespace Jellyfin.Server
_logger.LogInformation("Jellyfin version: {Version}", version);
EnvironmentInfo environmentInfo = getEnvironmentInfo();
EnvironmentInfo environmentInfo = new EnvironmentInfo(getOperatingSystem());
ApplicationHost.LogEnvironmentInfo(_logger, appPaths, environmentInfo);
SQLitePCL.Batteries_V2.Init();
@ -220,13 +220,6 @@ namespace Jellyfin.Server
return new NullImageEncoder();
}
private static EnvironmentInfo getEnvironmentInfo()
=> new EnvironmentInfo()
{
SystemArchitecture = RuntimeInformation.OSArchitecture,
OperatingSystem = getOperatingSystem()
};
private static MediaBrowser.Model.System.OperatingSystem getOperatingSystem() {
switch (Environment.OSVersion.Platform)
{