Remove EnvironmentInfo

This moved the last bit of usefulness of EnvironmentInfo into a static class.
2026-03-05 17:56:18 +00:00 · 2019-03-07 17:39:40 +01:00
parent 669c48cc8b
commit decaffed86
20 changed files with 144 additions and 225 deletions
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -115,6 +115,7 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using ServiceStack;
+using OperatingSystem = MediaBrowser.Common.System.OperatingSystem;

 namespace Emby.Server.Implementations
 {
@@ -143,12 +144,8 @@ namespace Emby.Server.Implementations
                    return false;
                }

-                if (EnvironmentInfo.OperatingSystem == MediaBrowser.Model.System.OperatingSystem.Windows)
-                {
-                    return true;
-                }
-
-                if (EnvironmentInfo.OperatingSystem == MediaBrowser.Model.System.OperatingSystem.OSX)
+                if (OperatingSystem.Id == OperatingSystemId.Windows
+                    || OperatingSystem.Id == OperatingSystemId.Darwin)
                {
                    return true;
                }
@@ -218,8 +215,6 @@ namespace Emby.Server.Implementations

        public IFileSystem FileSystemManager { get; set; }

-        protected IEnvironmentInfo EnvironmentInfo { get; set; }
-
        public PackageVersionClass SystemUpdateLevel
        {
            get
@@ -239,15 +234,6 @@ namespace Emby.Server.Implementations
        /// <value>The server configuration manager.</value>
        public IServerConfigurationManager ServerConfigurationManager => (IServerConfigurationManager)ConfigurationManager;

-        /// <summary>
-        /// Gets the configuration manager.
-        /// </summary>
-        /// <returns>IConfigurationManager.</returns>
-        protected IConfigurationManager GetConfigurationManager()
-        {
-            return new ServerConfigurationManager(ApplicationPaths, LoggerFactory, XmlSerializer, FileSystemManager);
-        }
-
        protected virtual IResourceFileManager CreateResourceFileManager()
        {
            return new ResourceFileManager(HttpResultFactory, LoggerFactory, FileSystemManager);
@@ -356,7 +342,6 @@ namespace Emby.Server.Implementations
            ILoggerFactory loggerFactory,
            IStartupOptions options,
            IFileSystem fileSystem,
-            IEnvironmentInfo environmentInfo,
            IImageEncoder imageEncoder,
            INetworkManager networkManager,
            IConfiguration configuration)
@@ -370,13 +355,12 @@ namespace Emby.Server.Implementations

            NetworkManager = networkManager;
            networkManager.LocalSubnetsFn = GetConfiguredLocalSubnets;
-            EnvironmentInfo = environmentInfo;

            ApplicationPaths = applicationPaths;
            LoggerFactory = loggerFactory;
            FileSystemManager = fileSystem;

-            ConfigurationManager = GetConfigurationManager();
+            ConfigurationManager = new ServerConfigurationManager(ApplicationPaths, LoggerFactory, XmlSerializer, FileSystemManager);

            Logger = LoggerFactory.CreateLogger("App");

@@ -532,7 +516,7 @@ namespace Emby.Server.Implementations
        /// <summary>
        /// Runs the startup tasks.
        /// </summary>
-        public async Task RunStartupTasks()
+        public async Task RunStartupTasksAsync()
        {
            Logger.LogInformation("Running startup tasks");

@@ -584,7 +568,7 @@ namespace Emby.Server.Implementations
            }
        }

-        public async Task Init(IServiceCollection serviceCollection)
+        public async Task InitAsync(IServiceCollection serviceCollection)
        {
            HttpPort = ServerConfigurationManager.Configuration.HttpServerPortNumber;
            HttpsPort = ServerConfigurationManager.Configuration.HttpsPortNumber;
@@ -706,8 +690,6 @@ namespace Emby.Server.Implementations
            serviceCollection.AddLogging();
            serviceCollection.AddSingleton(Logger);

-            serviceCollection.AddSingleton(EnvironmentInfo);
-
            serviceCollection.AddSingleton(FileSystemManager);
            serviceCollection.AddSingleton<TvDbClientManager>();

@@ -786,7 +768,7 @@ namespace Emby.Server.Implementations
            var musicManager = new MusicManager(LibraryManager);
            serviceCollection.AddSingleton<IMusicManager>(new MusicManager(LibraryManager));

-            LibraryMonitor = new LibraryMonitor(LoggerFactory, LibraryManager, ServerConfigurationManager, FileSystemManager, EnvironmentInfo);
+            LibraryMonitor = new LibraryMonitor(LoggerFactory, LibraryManager, ServerConfigurationManager, FileSystemManager);
            serviceCollection.AddSingleton(LibraryMonitor);

            serviceCollection.AddSingleton<ISearchEngine>(new SearchEngine(LoggerFactory, LibraryManager, UserManager));
@@ -907,7 +889,7 @@ namespace Emby.Server.Implementations

        public virtual string PackageRuntime => "netcore";

-        public static void LogEnvironmentInfo(ILogger logger, IApplicationPaths appPaths, EnvironmentInfo.EnvironmentInfo environmentInfo)
+        public static void LogEnvironmentInfo(ILogger logger, IApplicationPaths appPaths)
        {
            // Distinct these to prevent users from reporting problems that aren't actually problems
            var commandLineArgs = Environment
@@ -915,8 +897,9 @@ namespace Emby.Server.Implementations
                .Distinct();

            logger.LogInformation("Arguments: {Args}", commandLineArgs);
-            logger.LogInformation("Operating system: {OS} {OSVersion}", environmentInfo.OperatingSystemName, environmentInfo.OperatingSystemVersion);
-            logger.LogInformation("Architecture: {Architecture}", environmentInfo.SystemArchitecture);
+            // FIXME: @bond this logs the kernel version, not the OS version
+            logger.LogInformation("Operating system: {OS} {OSVersion}", OperatingSystem.Name, Environment.OSVersion.Version);
+            logger.LogInformation("Architecture: {Architecture}", RuntimeInformation.OSArchitecture);
            logger.LogInformation("64-Bit Process: {Is64Bit}", Environment.Is64BitProcess);
            logger.LogInformation("User Interactive: {IsUserInteractive}", Environment.UserInteractive);
            logger.LogInformation("Processor count: {ProcessorCount}", Environment.ProcessorCount);
@@ -1400,8 +1383,8 @@ namespace Emby.Server.Implementations
                HttpServerPortNumber = HttpPort,
                SupportsHttps = SupportsHttps,
                HttpsPortNumber = HttpsPort,
-                OperatingSystem = EnvironmentInfo.OperatingSystem.ToString(),
-                OperatingSystemDisplayName = EnvironmentInfo.OperatingSystemName,
+                OperatingSystem = OperatingSystem.Id.ToString(),
+                OperatingSystemDisplayName = OperatingSystem.Name,
                CanSelfRestart = CanSelfRestart,
                CanLaunchWebBrowser = CanLaunchWebBrowser,
                WanAddress = wanAddress,
@@ -1411,7 +1394,7 @@ namespace Emby.Server.Implementations
                LocalAddress = localAddress,
                SupportsLibraryMonitor = true,
                EncoderLocation = MediaEncoder.EncoderLocation,
-                SystemArchitecture = EnvironmentInfo.SystemArchitecture,
+                SystemArchitecture = RuntimeInformation.OSArchitecture,
                SystemUpdateLevel = SystemUpdateLevel,
                PackageName = StartupOptions.PackageName
            };
@@ -1435,7 +1418,7 @@ namespace Emby.Server.Implementations
            {
                Version = ApplicationVersion,
                Id = SystemId,
-                OperatingSystem = EnvironmentInfo.OperatingSystem.ToString(),
+                OperatingSystem = OperatingSystem.Id.ToString(),
                WanAddress = wanAddress,
                ServerName = FriendlyName,
                LocalAddress = localAddress
--- a/Emby.Server.Implementations/EnvironmentInfo/EnvironmentInfo.cs
+++ b/Emby.Server.Implementations/EnvironmentInfo/EnvironmentInfo.cs
@@ -1,36 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-using MediaBrowser.Model.System;
-
-namespace Emby.Server.Implementations.EnvironmentInfo
-{
-    public class EnvironmentInfo : IEnvironmentInfo
-    {
-        public EnvironmentInfo(MediaBrowser.Model.System.OperatingSystem operatingSystem)
-        {
-            OperatingSystem = operatingSystem;
-        }
-
-        public MediaBrowser.Model.System.OperatingSystem OperatingSystem { get; private set; }
-
-        public string OperatingSystemName
-        {
-            get
-            {
-                switch (OperatingSystem)
-                {
-                    case MediaBrowser.Model.System.OperatingSystem.Android: return "Android";
-                    case MediaBrowser.Model.System.OperatingSystem.BSD: return "BSD";
-                    case MediaBrowser.Model.System.OperatingSystem.Linux: return "Linux";
-                    case MediaBrowser.Model.System.OperatingSystem.OSX: return "macOS";
-                    case MediaBrowser.Model.System.OperatingSystem.Windows: return "Windows";
-                    default: throw new Exception($"Unknown OS {OperatingSystem}");
-                }
-            }
-        }
-
-        public string OperatingSystemVersion => Environment.OSVersion.Version.ToString() + " " + Environment.OSVersion.ServicePack.ToString();
-
-        public Architecture SystemArchitecture => RuntimeInformation.OSArchitecture;
-    }
-}
--- a/Emby.Server.Implementations/IO/LibraryMonitor.cs
+++ b/Emby.Server.Implementations/IO/LibraryMonitor.cs
@@ -10,8 +10,8 @@ using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.System;
-using MediaBrowser.Model.Tasks;
 using Microsoft.Extensions.Logging;
+using OperatingSystem = MediaBrowser.Common.System.OperatingSystem;

 namespace Emby.Server.Implementations.IO
 {
@@ -127,7 +127,6 @@ namespace Emby.Server.Implementations.IO
        private IServerConfigurationManager ConfigurationManager { get; set; }

        private readonly IFileSystem _fileSystem;
-        private readonly IEnvironmentInfo _environmentInfo;

        /// <summary>
        /// Initializes a new instance of the <see cref="LibraryMonitor" /> class.
@@ -136,14 +135,12 @@ namespace Emby.Server.Implementations.IO
            ILoggerFactory loggerFactory,
            ILibraryManager libraryManager,
            IServerConfigurationManager configurationManager,
-            IFileSystem fileSystem,
-            IEnvironmentInfo environmentInfo)
+            IFileSystem fileSystem)
        {
            LibraryManager = libraryManager;
            Logger = loggerFactory.CreateLogger(GetType().Name);
            ConfigurationManager = configurationManager;
            _fileSystem = fileSystem;
-            _environmentInfo = environmentInfo;
        }

        private bool IsLibraryMonitorEnabled(BaseItem item)
@@ -267,7 +264,7 @@ namespace Emby.Server.Implementations.IO
                return;
            }

-            if (_environmentInfo.OperatingSystem != MediaBrowser.Model.System.OperatingSystem.Windows)
+            if (OperatingSystem.Id != OperatingSystemId.Windows)
            {
                if (path.StartsWith("\\\\", StringComparison.OrdinalIgnoreCase) || path.StartsWith("smb://", StringComparison.OrdinalIgnoreCase))
                {
@@ -276,12 +273,6 @@ namespace Emby.Server.Implementations.IO
                }
            }

-            if (_environmentInfo.OperatingSystem == MediaBrowser.Model.System.OperatingSystem.Android)
-            {
-                // causing crashing
-                return;
-            }
-
            // Already being watched
            if (_fileSystemWatchers.ContainsKey(path))
            {
--- a/Emby.Server.Implementations/IO/ManagedFileSystem.cs
+++ b/Emby.Server.Implementations/IO/ManagedFileSystem.cs
@@ -8,6 +8,7 @@ using MediaBrowser.Common.Configuration;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.System;
 using Microsoft.Extensions.Logging;
+using OperatingSystem = MediaBrowser.Common.System.OperatingSystem;

 namespace Emby.Server.Implementations.IO
 {
@@ -24,22 +25,19 @@ namespace Emby.Server.Implementations.IO

        private readonly string _tempPath;

-        private readonly IEnvironmentInfo _environmentInfo;
        private readonly bool _isEnvironmentCaseInsensitive;

        public ManagedFileSystem(
            ILoggerFactory loggerFactory,
-            IEnvironmentInfo environmentInfo,
            IApplicationPaths applicationPaths)
        {
            Logger = loggerFactory.CreateLogger("FileSystem");
            _supportsAsyncFileStreams = true;
            _tempPath = applicationPaths.TempDirectory;
-            _environmentInfo = environmentInfo;

-            SetInvalidFileNameChars(environmentInfo.OperatingSystem == MediaBrowser.Model.System.OperatingSystem.Windows);
+            SetInvalidFileNameChars(OperatingSystem.Id == OperatingSystemId.Windows);

-            _isEnvironmentCaseInsensitive = environmentInfo.OperatingSystem == MediaBrowser.Model.System.OperatingSystem.Windows;
+            _isEnvironmentCaseInsensitive = OperatingSystem.Id == OperatingSystemId.Windows;
        }

        public virtual void AddShortcutHandler(IShortcutHandler handler)
@@ -468,7 +466,7 @@ namespace Emby.Server.Implementations.IO

        public virtual void SetHidden(string path, bool isHidden)
        {
-            if (_environmentInfo.OperatingSystem != MediaBrowser.Model.System.OperatingSystem.Windows)
+            if (OperatingSystem.Id != MediaBrowser.Model.System.OperatingSystemId.Windows)
            {
                return;
            }
@@ -492,7 +490,7 @@ namespace Emby.Server.Implementations.IO

        public virtual void SetReadOnly(string path, bool isReadOnly)
        {
-            if (_environmentInfo.OperatingSystem != MediaBrowser.Model.System.OperatingSystem.Windows)
+            if (OperatingSystem.Id != MediaBrowser.Model.System.OperatingSystemId.Windows)
            {
                return;
            }
@@ -516,7 +514,7 @@ namespace Emby.Server.Implementations.IO

        public virtual void SetAttributes(string path, bool isHidden, bool isReadOnly)
        {
-            if (_environmentInfo.OperatingSystem != MediaBrowser.Model.System.OperatingSystem.Windows)
+            if (OperatingSystem.Id != MediaBrowser.Model.System.OperatingSystemId.Windows)
            {
                return;
            }
@@ -801,7 +799,7 @@ namespace Emby.Server.Implementations.IO

        public virtual void SetExecutable(string path)
        {
-            if (_environmentInfo.OperatingSystem == MediaBrowser.Model.System.OperatingSystem.OSX)
+            if (OperatingSystem.Id == MediaBrowser.Model.System.OperatingSystemId.Darwin)
            {
                RunProcess("chmod", "+x \"" + path + "\"", Path.GetDirectoryName(path));
            }
--- a/Emby.Server.Implementations/Networking/NetworkManager.cs
+++ b/Emby.Server.Implementations/Networking/NetworkManager.cs
@@ -7,11 +7,11 @@ using System.Net.NetworkInformation;
 using System.Net.Sockets;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Net;
-using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Net;
 using MediaBrowser.Model.System;
 using Microsoft.Extensions.Logging;
+using OperatingSystem = MediaBrowser.Common.System.OperatingSystem;

 namespace Emby.Server.Implementations.Networking
 {
@@ -22,14 +22,12 @@ namespace Emby.Server.Implementations.Networking
        public event EventHandler NetworkChanged;
        public Func<string[]> LocalSubnetsFn { get; set; }

-        public NetworkManager(
-            ILoggerFactory loggerFactory,
-            IEnvironmentInfo environment)
+        public NetworkManager(ILoggerFactory loggerFactory)
        {
            Logger = loggerFactory.CreateLogger(nameof(NetworkManager));

            // In FreeBSD these events cause a crash
-            if (environment.OperatingSystem != MediaBrowser.Model.System.OperatingSystem.BSD)
+            if (OperatingSystem.Id != OperatingSystemId.BSD)
            {
                try
                {