diff options
Diffstat (limited to 'MediaBrowser.Server.Mono/Native/MonoApp.cs')
| -rw-r--r-- | MediaBrowser.Server.Mono/Native/MonoApp.cs | 146 |
1 files changed, 17 insertions, 129 deletions
diff --git a/MediaBrowser.Server.Mono/Native/MonoApp.cs b/MediaBrowser.Server.Mono/Native/MonoApp.cs index 6e7a677ae..8257a1b8d 100644 --- a/MediaBrowser.Server.Mono/Native/MonoApp.cs +++ b/MediaBrowser.Server.Mono/Native/MonoApp.cs @@ -12,7 +12,6 @@ using Emby.Server.Core; using Emby.Server.Core.Data; using Emby.Server.Core.FFMpeg; using MediaBrowser.Model.System; -using OperatingSystem = MediaBrowser.Server.Startup.Common.OperatingSystem; namespace MediaBrowser.Server.Mono.Native { @@ -20,11 +19,13 @@ namespace MediaBrowser.Server.Mono.Native { protected StartupOptions StartupOptions { get; private set; } protected ILogger Logger { get; private set; } + private readonly MonoEnvironmentInfo _environment; - public MonoApp(StartupOptions startupOptions, ILogger logger) + public MonoApp(StartupOptions startupOptions, ILogger logger, MonoEnvironmentInfo environment) { StartupOptions = startupOptions; Logger = logger; + _environment = environment; } /// <summary> @@ -77,11 +78,6 @@ namespace MediaBrowser.Server.Mono.Native { var list = new List<Assembly>(); - if (Environment.OperatingSystem == Startup.Common.OperatingSystem.Linux) - { - list.AddRange(GetLinuxAssemblies()); - } - list.Add(GetType().Assembly); return list; @@ -91,7 +87,7 @@ namespace MediaBrowser.Server.Mono.Native { var list = new List<Assembly>(); - list.Add(typeof(LinuxIsoManager).Assembly); + //list.Add(typeof(LinuxIsoManager).Assembly); return list; } @@ -100,12 +96,6 @@ namespace MediaBrowser.Server.Mono.Native { } - private NativeEnvironment _nativeEnvironment; - public NativeEnvironment Environment - { - get { return _nativeEnvironment ?? (_nativeEnvironment = GetEnvironmentInfo()); } - } - public bool SupportsRunningAsService { get @@ -122,14 +112,6 @@ namespace MediaBrowser.Server.Mono.Native } } - public bool SupportsLibraryMonitor - { - get - { - return Environment.OperatingSystem != Startup.Common.OperatingSystem.Osx; - } - } - public void ConfigureAutoRun(bool autorun) { } @@ -139,98 +121,31 @@ namespace MediaBrowser.Server.Mono.Native return new NetworkManager(logger); } - private NativeEnvironment GetEnvironmentInfo() + public FFMpegInstallInfo GetFfmpegInstallInfo() { - var info = new NativeEnvironment - { - OperatingSystem = Startup.Common.OperatingSystem.Linux - }; - - var uname = GetUnixName(); - - var sysName = uname.sysname ?? string.Empty; - - if (string.Equals(sysName, "Darwin", StringComparison.OrdinalIgnoreCase)) - { - info.OperatingSystem = Startup.Common.OperatingSystem.Osx; - } - else if (string.Equals(sysName, "Linux", StringComparison.OrdinalIgnoreCase)) - { - info.OperatingSystem = Startup.Common.OperatingSystem.Linux; - } - else if (string.Equals(sysName, "BSD", StringComparison.OrdinalIgnoreCase)) - { - info.OperatingSystem = Startup.Common.OperatingSystem.Bsd; - } + var info = new FFMpegInstallInfo(); - var archX86 = new Regex("(i|I)[3-6]86"); + // Windows builds: http://ffmpeg.zeranoe.com/builds/ + // Linux builds: http://johnvansickle.com/ffmpeg/ + // OS X builds: http://ffmpegmac.net/ + // OS X x64: http://www.evermeet.cx/ffmpeg/ - if (archX86.IsMatch(uname.machine)) - { - info.SystemArchitecture = Architecture.X86; - } - else if (string.Equals(uname.machine, "x86_64", StringComparison.OrdinalIgnoreCase)) - { - info.SystemArchitecture = Architecture.X64; - } - else if (uname.machine.StartsWith("arm", StringComparison.OrdinalIgnoreCase)) - { - info.SystemArchitecture = Architecture.Arm; - } - else if (System.Environment.Is64BitOperatingSystem) + if (_environment.IsBsd) { - info.SystemArchitecture = Architecture.X64; + } - else + else if (_environment.OperatingSystem == Model.System.OperatingSystem.Linux) { - info.SystemArchitecture = Architecture.X86; + info.ArchiveType = "7z"; + info.Version = "20160215"; } - info.OperatingSystemVersionString = string.IsNullOrWhiteSpace(sysName) ? - System.Environment.OSVersion.VersionString : - sysName; + // No version available - user requirement + info.DownloadUrls = new string[] { }; return info; } - private Uname _unixName; - - private Uname GetUnixName() - { - if (_unixName == null) - { - var uname = new Uname(); - try - { - Utsname utsname; - var callResult = Syscall.uname(out utsname); - if (callResult == 0) - { - uname.sysname = utsname.sysname ?? string.Empty; - uname.machine = utsname.machine ?? string.Empty; - } - - } - catch (Exception ex) - { - Logger.ErrorException("Error getting unix name", ex); - } - _unixName = uname; - } - return _unixName; - } - - public class Uname - { - public string sysname = string.Empty; - public string machine = string.Empty; - } - - public FFMpegInstallInfo GetFfmpegInstallInfo() - { - return GetInfo(Environment); - } - public void LaunchUrl(string url) { throw new NotImplementedException(); @@ -241,33 +156,6 @@ namespace MediaBrowser.Server.Mono.Native return new DbConnector(Logger); } - public static FFMpegInstallInfo GetInfo(NativeEnvironment environment) - { - var info = new FFMpegInstallInfo(); - - // Windows builds: http://ffmpeg.zeranoe.com/builds/ - // Linux builds: http://johnvansickle.com/ffmpeg/ - // OS X builds: http://ffmpegmac.net/ - // OS X x64: http://www.evermeet.cx/ffmpeg/ - - switch (environment.OperatingSystem) - { - case OperatingSystem.Osx: - case OperatingSystem.Bsd: - break; - case OperatingSystem.Linux: - - info.ArchiveType = "7z"; - info.Version = "20160215"; - break; - } - - // No version available - user requirement - info.DownloadUrls = new string[] { }; - - return info; - } - public void EnableLoopback(string appName) { |