Merge branch 'dev' into cleanup

9 files changed, 393 insertions, 372 deletions

diff --git a/Jellyfin.Server/CoreAppHost.cs b/Jellyfin.Server/CoreAppHost.cs
index b54634387..64e03f22e 100644
--- a/Jellyfin.Server/CoreAppHost.cs
+++ b/Jellyfin.Server/CoreAppHost.cs
@@ -11,8 +11,8 @@ namespace Jellyfin.Server
 {
     public class CoreAppHost : ApplicationHost
     {
-        public CoreAppHost(ServerApplicationPaths applicationPaths, ILoggerFactory loggerFactory, StartupOptions options, IFileSystem fileSystem, IPowerManagement powerManagement, IEnvironmentInfo environmentInfo, MediaBrowser.Controller.Drawing.IImageEncoder imageEncoder, ISystemEvents systemEvents, MediaBrowser.Common.Net.INetworkManager networkManager)
-            : base(applicationPaths, loggerFactory, options, fileSystem, powerManagement, environmentInfo, imageEncoder, systemEvents, networkManager)
+        public CoreAppHost(ServerApplicationPaths applicationPaths, ILoggerFactory loggerFactory, StartupOptions options, IFileSystem fileSystem, IEnvironmentInfo environmentInfo, MediaBrowser.Controller.Drawing.IImageEncoder imageEncoder, ISystemEvents systemEvents, MediaBrowser.Common.Net.INetworkManager networkManager)
+            : base(applicationPaths, loggerFactory, options, fileSystem, environmentInfo, imageEncoder, systemEvents, networkManager)
         {
         }
 
diff --git a/Jellyfin.Server/Jellyfin.Server.csproj b/Jellyfin.Server/Jellyfin.Server.csproj
index 98c578e83..e7358e6a1 100644
--- a/Jellyfin.Server/Jellyfin.Server.csproj
+++ b/Jellyfin.Server/Jellyfin.Server.csproj
@@ -20,6 +20,13 @@
     <EmbeddedResource Include="Resources/Configuration/*" />
   </ItemGroup>
 
+  <!-- Code analysers-->
+  <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.3" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
+    <PackageReference Include="SerilogAnalyzer" Version="0.15.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
diff --git a/Jellyfin.Server/PowerManagement.cs b/Jellyfin.Server/PowerManagement.cs
deleted file mode 100644
index c27c51893..000000000
--- a/Jellyfin.Server/PowerManagement.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using MediaBrowser.Model.System;
-
-namespace Jellyfin.Server.Native
-{
-    public class PowerManagement : IPowerManagement
-    {
-        public void PreventSystemStandby()
-        {
-
-        }
-
-        public void AllowSystemStandby()
-        {
-
-        }
-
-        public void ScheduleWake(DateTime wakeTimeUtc, string displayName)
-        {
-
-        }
-    }
-}
diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs
index 03fdacb26..acbe5c714 100644
--- a/Jellyfin.Server/Program.cs
+++ b/Jellyfin.Server/Program.cs
@@ -1,331 +1,346 @@
-using System;

-using System.Diagnostics;

-using System.IO;

-using System.Linq;

-using System.Net;

-using System.Net.Security;

-using System.Reflection;

-using System.Runtime.InteropServices;

-using System.Threading.Tasks;

-using Emby.Drawing;

-using Emby.Drawing.Skia;

-using Emby.Server.Implementations;

-using Emby.Server.Implementations.EnvironmentInfo;

-using Emby.Server.Implementations.IO;

-using Emby.Server.Implementations.Networking;

-using Jellyfin.Server.Native;

-using MediaBrowser.Common.Configuration;

-using MediaBrowser.Common.Net;

-using MediaBrowser.Controller.Drawing;

-using MediaBrowser.Model.IO;

-using MediaBrowser.Model.Globalization;

-using MediaBrowser.Model.System;

-using Microsoft.Extensions.Configuration;

-using Microsoft.Extensions.Logging;

-using Serilog;

-using Serilog.AspNetCore;

-using ILogger = Microsoft.Extensions.Logging.ILogger;

-

-namespace Jellyfin.Server

-{

-    public static class Program

-    {

-        private static readonly TaskCompletionSource<bool> ApplicationTaskCompletionSource = new TaskCompletionSource<bool>();

-        private static ILoggerFactory _loggerFactory;

-        private static ILogger _logger;

-        private static bool _restartOnShutdown;

-

-        public static async Task<int> Main(string[] args)

-        {

-            StartupOptions options = new StartupOptions(args);

-            Version version = Assembly.GetEntryAssembly().GetName().Version;

-

-            if (options.ContainsOption("-v") || options.ContainsOption("--version"))

-            {

-                Console.WriteLine(version.ToString());

-                return 0;

-            }

-

-            ServerApplicationPaths appPaths = createApplicationPaths(options);

-            await createLogger(appPaths);

-            _loggerFactory = new SerilogLoggerFactory();

-            _logger = _loggerFactory.CreateLogger("Main");

-

-            AppDomain.CurrentDomain.UnhandledException += (sender, e) 

-                => _logger.LogCritical((Exception)e.ExceptionObject, "Unhandled Exception");

-

-            _logger.LogInformation("Jellyfin version: {Version}", version);

-

-            EnvironmentInfo environmentInfo = new EnvironmentInfo(getOperatingSystem());

-            ApplicationHost.LogEnvironmentInfo(_logger, appPaths, environmentInfo);

-

-            SQLitePCL.Batteries_V2.Init();

-

-            // Allow all https requests

-            ServicePointManager.ServerCertificateValidationCallback = new RemoteCertificateValidationCallback(delegate { return true; });

-

-            var fileSystem = new ManagedFileSystem(_loggerFactory.CreateLogger("FileSystem"), environmentInfo, null, appPaths.TempDirectory, true);

-

-            using (var appHost = new CoreAppHost(

-                appPaths,

-                _loggerFactory,

-                options,

-                fileSystem,

-                new PowerManagement(),

-                environmentInfo,

-                new NullImageEncoder(),

-                new SystemEvents(_loggerFactory.CreateLogger("SystemEvents")),

-                new NetworkManager(_loggerFactory.CreateLogger("NetworkManager"), environmentInfo)))

-            {

-                appHost.Init();

-

-                appHost.ImageProcessor.ImageEncoder = getImageEncoder(_logger, fileSystem, options, () => appHost.HttpClient, appPaths, environmentInfo, appHost.LocalizationManager);

-

-                _logger.LogInformation("Running startup tasks");

-

-                await appHost.RunStartupTasks();

-

-                // TODO: read input for a stop command

-                // Block main thread until shutdown

-                await ApplicationTaskCompletionSource.Task;

-

-                _logger.LogInformation("Disposing app host");

-            }

-

-            if (_restartOnShutdown)

-            {

-                StartNewInstance(options);

-            }

-

-            return 0;

-        }

-

-        private static ServerApplicationPaths createApplicationPaths(StartupOptions options)

-        {

-            string programDataPath = Environment.GetEnvironmentVariable("JELLYFIN_DATA_PATH");

-            if (string.IsNullOrEmpty(programDataPath))

-            {

-                if (options.ContainsOption("-programdata"))

-                {

-                    programDataPath = options.GetOption("-programdata");

-                }

-                else

-                {

-                    if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))

-                    {

-                        programDataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);

-                    }

-                    else

-                    {

-                        // $XDG_DATA_HOME defines the base directory relative to which user specific data files should be stored.

-                        programDataPath = Environment.GetEnvironmentVariable("XDG_DATA_HOME");

-                        // If $XDG_DATA_HOME is either not set or empty, $HOME/.local/share should be used.

-                        if (string.IsNullOrEmpty(programDataPath))

-                        {

-                            programDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".local", "share");

-                        }

-                    }

-                    programDataPath = Path.Combine(programDataPath, "jellyfin");

-                    // Ensure the dir exists

-                    Directory.CreateDirectory(programDataPath);

-                }

-            }

-

-            string configDir = Environment.GetEnvironmentVariable("JELLYFIN_CONFIG_DIR");

-            if (string.IsNullOrEmpty(configDir))

-            {

-                if (options.ContainsOption("-configdir"))

-                {

-                    configDir = options.GetOption("-configdir");

-                }

-                else

-                {

-                    if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))

-                    {

-                        configDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);

-                    }

-                    else

-                    {

-                        // $XDG_CONFIG_HOME defines the base directory relative to which user specific configuration files should be stored.

-                        configDir = Environment.GetEnvironmentVariable("XDG_CONFIG_HOME");

-                        // If $XDG_CONFIG_HOME is either not set or empty, $HOME/.config should be used.

-                        if (string.IsNullOrEmpty(configDir))

-                        {

-                            configDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".local", "share");

-                        }

-                    }

-                    configDir = Path.Combine(configDir, "jellyfin");

-                    // Ensure the dir exists

-                    Directory.CreateDirectory(configDir);

-                }

-            }

-

-            string logDir = Environment.GetEnvironmentVariable("JELLYFIN_LOG_DIR");

-            if (string.IsNullOrEmpty(logDir))

-            {

-                if (options.ContainsOption("-logdir"))

-                {

-                    logDir = options.GetOption("-logdir");

-                }

-                else

-                {

-                    logDir = Path.Combine(programDataPath, "logs");

-                    // Ensure the dir exists

-                    Directory.CreateDirectory(logDir);

-                }

-                // $JELLYFIN_LOG_DIR needs to be set for the logger configuration manager

-                Environment.SetEnvironmentVariable("JELLYFIN_LOG_DIR", logDir);

-            }

-

-            string appPath = AppContext.BaseDirectory;

-

-            return new ServerApplicationPaths(programDataPath, appPath, appPath, logDir, configDir);

-        }

-

-        private static async Task createLogger(IApplicationPaths appPaths)

-        {

-            try

-            {

-                string configPath = Path.Combine(appPaths.ConfigurationDirectoryPath, "logging.json");

-

-                if (!File.Exists(configPath))

-                {

-                    // For some reason the csproj name is used instead of the assembly name

-                    using (Stream rscstr = typeof(Program).Assembly

-                        .GetManifestResourceStream("Jellyfin.Server.Resources.Configuration.logging.json"))

-                    using (Stream fstr = File.Open(configPath, FileMode.CreateNew))

-                    {

-                        await rscstr.CopyToAsync(fstr);

-                    }

-                }

-                var configuration = new ConfigurationBuilder()

-                    .SetBasePath(appPaths.ConfigurationDirectoryPath)

-                    .AddJsonFile("logging.json")

-                    .AddEnvironmentVariables("JELLYFIN_")

-                    .Build();

-

-                // Serilog.Log is used by SerilogLoggerFactory when no logger is specified

-                Serilog.Log.Logger = new LoggerConfiguration()

-                    .ReadFrom.Configuration(configuration)

-                    .Enrich.FromLogContext()

-                    .CreateLogger();

-            }

-            catch (Exception ex)

-            {

-                Serilog.Log.Logger = new LoggerConfiguration()

-                    .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss}] [{Level:u3}] {Message:lj}{NewLine}{Exception}")

-                    .WriteTo.Async(x => x.File(

-                        Path.Combine(appPaths.LogDirectoryPath, "log_.log"),

-                        rollingInterval: RollingInterval.Day,

-                        outputTemplate: "[{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz}] [{Level:u3}] {Message}{NewLine}{Exception}"))

-                    .Enrich.FromLogContext()

-                    .CreateLogger();

-

-                Serilog.Log.Logger.Fatal(ex, "Failed to create/read logger configuration");

-            }

-        }

-

-        public static IImageEncoder getImageEncoder(

-            ILogger logger, 

-            IFileSystem fileSystem, 

-            StartupOptions startupOptions, 

-            Func<IHttpClient> httpClient,

-            IApplicationPaths appPaths,

-            IEnvironmentInfo environment,

-            ILocalizationManager localizationManager)

-        {

-            try

-            {

-                return new SkiaEncoder(logger, appPaths, httpClient, fileSystem, localizationManager);

-            }

-            catch (Exception ex)

-            {

-                logger.LogInformation(ex, "Skia not available. Will fallback to NullIMageEncoder. {0}");

-            }

-

-            return new NullImageEncoder();

-        }

-

-        private static MediaBrowser.Model.System.OperatingSystem getOperatingSystem() {

-            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:

-                default:

-                {

-                    string osDescription = RuntimeInformation.OSDescription;

-                    if (osDescription.Contains("linux", StringComparison.OrdinalIgnoreCase))

-                    {

-                        return MediaBrowser.Model.System.OperatingSystem.Linux;

-                    }

-                    else if (osDescription.Contains("darwin", StringComparison.OrdinalIgnoreCase))

-                    {

-                        return MediaBrowser.Model.System.OperatingSystem.OSX;

-                    }

-                    else if (osDescription.Contains("bsd", StringComparison.OrdinalIgnoreCase))

-                    {

-                        return MediaBrowser.Model.System.OperatingSystem.BSD;

-                    }

-                    throw new Exception($"Can't resolve OS with description: '{osDescription}'");

-                }

-            }

-        }

-

-        public static  void Shutdown()

-        {

-            ApplicationTaskCompletionSource.SetResult(true);

-        }

-

-        public static void Restart()

-        {

-            _restartOnShutdown = true;

-

-            Shutdown();

-        }

-

-        private static void StartNewInstance(StartupOptions startupOptions)

-        {

-            _logger.LogInformation("Starting new instance");

-

-            string module = startupOptions.GetOption("-restartpath");

-

-            if (string.IsNullOrWhiteSpace(module))

-            {

-                module = Environment.GetCommandLineArgs().First();

-            }

-

-            string commandLineArgsString;

-

-            if (startupOptions.ContainsOption("-restartargs"))

-            {

-                commandLineArgsString = startupOptions.GetOption("-restartargs") ?? string.Empty;

-            }

-            else

-            {

-                commandLineArgsString = string .Join(" ", 

-                    Environment.GetCommandLineArgs()

-                        .Skip(1)

-                        .Select(NormalizeCommandLineArgument)

-                    );

-            }

-

-            _logger.LogInformation("Executable: {0}", module);

-            _logger.LogInformation("Arguments: {0}", commandLineArgsString);

-

-            Process.Start(module, commandLineArgsString);

-        }

-

-        private static string NormalizeCommandLineArgument(string arg)

-        {

-            if (!arg.Contains(" ", StringComparison.OrdinalIgnoreCase))

-            {

-                return arg;

-            }

-

-            return "\"" + arg + "\"";

-        }

-    }

-}

+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Security;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Emby.Drawing;
+using Emby.Drawing.Skia;
+using Emby.Server.Implementations;
+using Emby.Server.Implementations.EnvironmentInfo;
+using Emby.Server.Implementations.IO;
+using Emby.Server.Implementations.Networking;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Drawing;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Globalization;
+using MediaBrowser.Model.System;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+using Serilog;
+using Serilog.AspNetCore;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
+
+namespace Jellyfin.Server
+{
+    public static class Program
+    {
+        private static readonly CancellationTokenSource _tokenSource = new CancellationTokenSource();
+        private static readonly ILoggerFactory _loggerFactory = new SerilogLoggerFactory();
+        private static ILogger _logger;
+        private static bool _restartOnShutdown;
+
+        public static async Task Main(string[] args)
+        {
+            StartupOptions options = new StartupOptions(args);
+            Version version = Assembly.GetEntryAssembly().GetName().Version;
+
+            if (options.ContainsOption("-v") || options.ContainsOption("--version"))
+            {
+                Console.WriteLine(version.ToString());
+            }
+
+            ServerApplicationPaths appPaths = createApplicationPaths(options);
+            // $JELLYFIN_LOG_DIR needs to be set for the logger configuration manager
+            Environment.SetEnvironmentVariable("JELLYFIN_LOG_DIR", appPaths.LogDirectoryPath);
+            await createLogger(appPaths);
+            _logger = _loggerFactory.CreateLogger("Main");
+
+            AppDomain.CurrentDomain.UnhandledException += (sender, e)
+                => _logger.LogCritical((Exception)e.ExceptionObject, "Unhandled Exception");
+
+            // Intercept Ctrl+C and Ctrl+Break
+            Console.CancelKeyPress += (sender, e) =>
+            {
+                if (_tokenSource.IsCancellationRequested)
+                {
+                    return; // Already shutting down
+                }
+                e.Cancel = true;
+                _logger.LogInformation("Ctrl+C, shutting down");
+                Environment.ExitCode = 128 + 2;
+                Shutdown();
+            };
+
+            // Register a SIGTERM handler
+            AppDomain.CurrentDomain.ProcessExit += (sender, e) =>
+            {
+                if (_tokenSource.IsCancellationRequested)
+                {
+                    return; // Already shutting down
+                }
+                _logger.LogInformation("Received a SIGTERM signal, shutting down");
+                Environment.ExitCode = 128 + 15;
+                Shutdown();
+            };
+
+            _logger.LogInformation("Jellyfin version: {Version}", version);
+
+            EnvironmentInfo environmentInfo = new EnvironmentInfo(getOperatingSystem());
+            ApplicationHost.LogEnvironmentInfo(_logger, appPaths, environmentInfo);
+
+            SQLitePCL.Batteries_V2.Init();
+
+            // Allow all https requests
+            ServicePointManager.ServerCertificateValidationCallback = new RemoteCertificateValidationCallback(delegate { return true; });
+
+            var fileSystem = new ManagedFileSystem(_loggerFactory.CreateLogger("FileSystem"), environmentInfo, null, appPaths.TempDirectory, true);
+
+            using (var appHost = new CoreAppHost(
+                appPaths,
+                _loggerFactory,
+                options,
+                fileSystem,
+                environmentInfo,
+                new NullImageEncoder(),
+                new SystemEvents(_loggerFactory.CreateLogger("SystemEvents")),
+                new NetworkManager(_loggerFactory.CreateLogger("NetworkManager"), environmentInfo)))
+            {
+                appHost.Init();
+
+                appHost.ImageProcessor.ImageEncoder = getImageEncoder(_logger, fileSystem, options, () => appHost.HttpClient, appPaths, environmentInfo, appHost.LocalizationManager);
+
+                _logger.LogInformation("Running startup tasks");
+
+                await appHost.RunStartupTasks();
+
+                // TODO: read input for a stop command
+
+                try
+                {
+                    // Block main thread until shutdown
+                    await Task.Delay(-1, _tokenSource.Token);
+                }
+                catch (TaskCanceledException)
+                {
+                    // Don't throw on cancellation
+                }
+
+                _logger.LogInformation("Disposing app host");
+            }
+
+            if (_restartOnShutdown)
+            {
+                StartNewInstance(options);
+            }
+        }
+
+        private static ServerApplicationPaths createApplicationPaths(StartupOptions options)
+        {
+            string programDataPath = Environment.GetEnvironmentVariable("JELLYFIN_DATA_PATH");
+            if (string.IsNullOrEmpty(programDataPath))
+            {
+                if (options.ContainsOption("-programdata"))
+                {
+                    programDataPath = options.GetOption("-programdata");
+                }
+                else
+                {
+                    if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                    {
+                        programDataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
+                    }
+                    else
+                    {
+                        // $XDG_DATA_HOME defines the base directory relative to which user specific data files should be stored.
+                        programDataPath = Environment.GetEnvironmentVariable("XDG_DATA_HOME");
+                        // If $XDG_DATA_HOME is either not set or empty, $HOME/.local/share should be used.
+                        if (string.IsNullOrEmpty(programDataPath))
+                        {
+                            programDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".local", "share");
+                        }
+                    }
+                    programDataPath = Path.Combine(programDataPath, "jellyfin");
+                    // Ensure the dir exists
+                    Directory.CreateDirectory(programDataPath);
+                }
+            }
+
+            string configDir = Environment.GetEnvironmentVariable("JELLYFIN_CONFIG_DIR");
+            if (string.IsNullOrEmpty(configDir))
+            {
+                if (options.ContainsOption("-configdir"))
+                {
+                    configDir = options.GetOption("-configdir");
+                }
+                else
+                {
+                    // Let BaseApplicationPaths set up the default value
+                    configDir = null;
+                }
+            }
+
+            string logDir = Environment.GetEnvironmentVariable("JELLYFIN_LOG_DIR");
+            if (string.IsNullOrEmpty(logDir))
+            {
+                if (options.ContainsOption("-logdir"))
+                {
+                    logDir = options.GetOption("-logdir");
+                }
+                else
+                {
+                    // Let BaseApplicationPaths set up the default value
+                    logDir = null;
+                }
+            }
+
+            string appPath = AppContext.BaseDirectory;
+
+            return new ServerApplicationPaths(programDataPath, appPath, appPath, logDir, configDir);
+        }
+
+        private static async Task createLogger(IApplicationPaths appPaths)
+        {
+            try
+            {
+                string configPath = Path.Combine(appPaths.ConfigurationDirectoryPath, "logging.json");
+
+                if (!File.Exists(configPath))
+                {
+                    // For some reason the csproj name is used instead of the assembly name
+                    using (Stream rscstr = typeof(Program).Assembly
+                        .GetManifestResourceStream("Jellyfin.Server.Resources.Configuration.logging.json"))
+                    using (Stream fstr = File.Open(configPath, FileMode.CreateNew))
+                    {
+                        await rscstr.CopyToAsync(fstr);
+                    }
+                }
+                var configuration = new ConfigurationBuilder()
+                    .SetBasePath(appPaths.ConfigurationDirectoryPath)
+                    .AddJsonFile("logging.json")
+                    .AddEnvironmentVariables("JELLYFIN_")
+                    .Build();
+
+                // Serilog.Log is used by SerilogLoggerFactory when no logger is specified
+                Serilog.Log.Logger = new LoggerConfiguration()
+                    .ReadFrom.Configuration(configuration)
+                    .Enrich.FromLogContext()
+                    .CreateLogger();
+            }
+            catch (Exception ex)
+            {
+                Serilog.Log.Logger = new LoggerConfiguration()
+                    .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss}] [{Level:u3}] {Message:lj}{NewLine}{Exception}")
+                    .WriteTo.Async(x => x.File(
+                        Path.Combine(appPaths.LogDirectoryPath, "log_.log"),
+                        rollingInterval: RollingInterval.Day,
+                        outputTemplate: "[{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz}] [{Level:u3}] {Message}{NewLine}{Exception}"))
+                    .Enrich.FromLogContext()
+                    .CreateLogger();
+
+                Serilog.Log.Logger.Fatal(ex, "Failed to create/read logger configuration");
+            }
+        }
+
+        public static IImageEncoder getImageEncoder(
+            ILogger logger,
+            IFileSystem fileSystem,
+            StartupOptions startupOptions,
+            Func<IHttpClient> httpClient,
+            IApplicationPaths appPaths,
+            IEnvironmentInfo environment,
+            ILocalizationManager localizationManager)
+        {
+            try
+            {
+                return new SkiaEncoder(logger, appPaths, httpClient, fileSystem, localizationManager);
+            }
+            catch (Exception ex)
+            {
+                logger.LogInformation(ex, "Skia not available. Will fallback to NullIMageEncoder. {0}");
+            }
+
+            return new NullImageEncoder();
+        }
+
+        private static MediaBrowser.Model.System.OperatingSystem getOperatingSystem() {
+            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:
+                default:
+                {
+                    string osDescription = RuntimeInformation.OSDescription;
+                    if (osDescription.Contains("linux", StringComparison.OrdinalIgnoreCase))
+                    {
+                        return MediaBrowser.Model.System.OperatingSystem.Linux;
+                    }
+                    else if (osDescription.Contains("darwin", StringComparison.OrdinalIgnoreCase))
+                    {
+                        return MediaBrowser.Model.System.OperatingSystem.OSX;
+                    }
+                    else if (osDescription.Contains("bsd", StringComparison.OrdinalIgnoreCase))
+                    {
+                        return MediaBrowser.Model.System.OperatingSystem.BSD;
+                    }
+                    throw new Exception($"Can't resolve OS with description: '{osDescription}'");
+                }
+            }
+        }
+
+        public static void Shutdown()
+        {
+            if (!_tokenSource.IsCancellationRequested)
+            {
+                _tokenSource.Cancel();
+            }
+        }
+
+        public static void Restart()
+        {
+            _restartOnShutdown = true;
+
+            Shutdown();
+        }
+
+        private static void StartNewInstance(StartupOptions startupOptions)
+        {
+            _logger.LogInformation("Starting new instance");
+
+            string module = startupOptions.GetOption("-restartpath");
+
+            if (string.IsNullOrWhiteSpace(module))
+            {
+                module = Environment.GetCommandLineArgs().First();
+            }
+
+            string commandLineArgsString;
+
+            if (startupOptions.ContainsOption("-restartargs"))
+            {
+                commandLineArgsString = startupOptions.GetOption("-restartargs") ?? string.Empty;
+            }
+            else
+            {
+                commandLineArgsString = string .Join(" ",
+                    Environment.GetCommandLineArgs()
+                        .Skip(1)
+                        .Select(NormalizeCommandLineArgument)
+                    );
+            }
+
+            _logger.LogInformation("Executable: {0}", module);
+            _logger.LogInformation("Arguments: {0}", commandLineArgsString);
+
+            Process.Start(module, commandLineArgsString);
+        }
+
+        private static string NormalizeCommandLineArgument(string arg)
+        {
+            if (!arg.Contains(" ", StringComparison.OrdinalIgnoreCase))
+            {
+                return arg;
+            }
+
+            return "\"" + arg + "\"";
+        }
+    }
+}
diff --git a/Jellyfin.Server/Properties/AssemblyInfo.cs b/Jellyfin.Server/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..1934b6bc1
--- /dev/null
+++ b/Jellyfin.Server/Properties/AssemblyInfo.cs
@@ -0,0 +1,21 @@
+using System.Reflection;
+using System.Resources;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Jellyfin.Server")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Jellyfin Project")]
+[assembly: AssemblyProduct("Jellyfin: The Free Software Media System")]
+[assembly: AssemblyCopyright("Copyright ©  2019 Jellyfin Contributors. Code released under the GNU General Public License Version 2")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: NeutralResourcesLanguage("en")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
diff --git a/Jellyfin.Server/SocketSharp/RequestMono.cs b/Jellyfin.Server/SocketSharp/RequestMono.cs
index 31f289497..4c3d8d1d5 100644
--- a/Jellyfin.Server/SocketSharp/RequestMono.cs
+++ b/Jellyfin.Server/SocketSharp/RequestMono.cs
@@ -97,12 +97,12 @@ namespace Jellyfin.SocketSharp
             }
 
 #if NET_4_0
-				if (validateRequestNewMode && !checked_form) {
-					// Setting this before calling the validator prevents
-					// possible endless recursion
-					checked_form = true;
-					ValidateNameValueCollection ("Form", query_string_nvc, RequestValidationSource.Form);
-				} else
+            if (validateRequestNewMode && !checked_form) {
+                // Setting this before calling the validator prevents
+                // possible endless recursion
+                checked_form = true;
+                ValidateNameValueCollection ("Form", query_string_nvc, RequestValidationSource.Form);
+            } else
 #endif
             if (validate_form && !checked_form)
             {
@@ -138,7 +138,7 @@ namespace Jellyfin.SocketSharp
             if (v.Length > 20)
                 v = v.Substring(0, 16) + "...\"";
 
-            string msg = String.Format("A potentially dangerous Request.{0} value was " +
+            string msg = string.Format("A potentially dangerous Request.{0} value was " +
                             "detected from the client ({1}={2}).", name, key, v);
 
             throw new Exception(msg);
@@ -328,13 +328,13 @@ namespace Jellyfin.SocketSharp
                 public override int Read(byte[] buffer, int dest_offset, int count)
                 {
                     if (buffer == null)
-                        throw new ArgumentNullException("buffer");
+                        throw new ArgumentNullException(nameof(buffer));
 
                     if (dest_offset < 0)
-                        throw new ArgumentOutOfRangeException("dest_offset", "< 0");
+                        throw new ArgumentOutOfRangeException(nameof(dest_offset), "< 0");
 
                     if (count < 0)
-                        throw new ArgumentOutOfRangeException("count", "< 0");
+                        throw new ArgumentOutOfRangeException(nameof(count), "< 0");
 
                     int len = buffer.Length;
                     if (dest_offset > len)
@@ -546,7 +546,7 @@ namespace Jellyfin.SocketSharp
 
             const byte HYPHEN = (byte)'-', LF = (byte)'\n', CR = (byte)'\r';
 
-            // See RFC 2046 
+            // See RFC 2046
             // In the case of multipart entities, in which one or more different
             // sets of data are combined in a single body, a "multipart" media type
             // field must appear in the entity's header.  The body must then contain
diff --git a/Jellyfin.Server/SocketSharp/SharpWebSocket.cs b/Jellyfin.Server/SocketSharp/SharpWebSocket.cs
index 77de50267..7101f83d9 100644
--- a/Jellyfin.Server/SocketSharp/SharpWebSocket.cs
+++ b/Jellyfin.Server/SocketSharp/SharpWebSocket.cs
@@ -29,12 +29,12 @@ namespace Jellyfin.SocketSharp
         {
             if (socket == null)
             {
-                throw new ArgumentNullException("socket");
+                throw new ArgumentNullException(nameof(socket));
             }
 
             if (logger == null)
             {
-                throw new ArgumentNullException("logger");
+                throw new ArgumentNullException(nameof(logger));
             }
 
             _logger = logger;
diff --git a/Jellyfin.Server/SocketSharp/WebSocketSharpListener.cs b/Jellyfin.Server/SocketSharp/WebSocketSharpListener.cs
index c360a8fce..468c4c5ca 100644
--- a/Jellyfin.Server/SocketSharp/WebSocketSharpListener.cs
+++ b/Jellyfin.Server/SocketSharp/WebSocketSharpListener.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading;
@@ -202,6 +202,7 @@ namespace Jellyfin.SocketSharp
             }
             catch (ObjectDisposedException)
             {
+                //TODO Investigate and properly fix.
             }
             catch (Exception ex)
             {
diff --git a/Jellyfin.Server/SocketSharp/WebSocketSharpRequest.cs b/Jellyfin.Server/SocketSharp/WebSocketSharpRequest.cs
index 7c9dc8f88..149842bd4 100644
--- a/Jellyfin.Server/SocketSharp/WebSocketSharpRequest.cs
+++ b/Jellyfin.Server/SocketSharp/WebSocketSharpRequest.cs
@@ -82,7 +82,7 @@ namespace Jellyfin.SocketSharp
         {
             get
             {
-                return String.IsNullOrEmpty(request.Headers["X-Forwarded-For"]) ? null : request.Headers["X-Forwarded-For"];
+                return string.IsNullOrEmpty(request.Headers["X-Forwarded-For"]) ? null : request.Headers["X-Forwarded-For"];
             }
         }
 
@@ -106,7 +106,7 @@ namespace Jellyfin.SocketSharp
         {
             get
             {
-                return String.IsNullOrEmpty(request.Headers["X-Real-IP"]) ? null : request.Headers["X-Real-IP"];
+                return string.IsNullOrEmpty(request.Headers["X-Real-IP"]) ? null : request.Headers["X-Real-IP"];
             }
         }