EditorConfig reformat: Emby.XmlTv, Jellyfin.Server. MediaBrowser.Api, MediaBrowser.Common

Emby.XmlTv/Emby.XmlTv.Console/Program.cs

@@ -100,4 +100,4 @@ namespace Emby.XmlTv.Console
             return count;
         }
     }
-}
+}

Emby.XmlTv/Emby.XmlTv/Entities/XmlTvChannel.cs

@@ -47,4 +47,4 @@ namespace Emby.XmlTv.Entities
             return builder.ToString();
         }
     }
-}
+}

Emby.XmlTv/Emby.XmlTv/Entities/XmlTvCreditType.cs

@@ -14,4 +14,4 @@
         Commentator,
         Guest
     }
-}
+}

Jellyfin.Server/Program.cs

@@ -1,242 +1,242 @@
-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 MediaBrowser.Common.Configuration;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Drawing;
-using MediaBrowser.Model.Globalization;
-using MediaBrowser.Model.IO;
-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);
-            // $JELLYFIN_LOG_DIR needs to be set for the logger configuration manager
-            Environment.SetEnvironmentVariable("JELLYFIN_LOG_DIR", appPaths.LogDirectoryPath);
-            await createLogger(appPaths);
-            _loggerFactory = new SerilogLoggerFactory();
-            _logger = _loggerFactory.CreateLogger("Main");
-
+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 MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Drawing;
+using MediaBrowser.Model.Globalization;
+using MediaBrowser.Model.IO;
+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);
+            // $JELLYFIN_LOG_DIR needs to be set for the logger configuration manager
+            Environment.SetEnvironmentVariable("JELLYFIN_LOG_DIR", appPaths.LogDirectoryPath);
+            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,
-                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
-                {
-                    // 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(
+                => _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,
+                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
+                {
+                    // 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();
-        }
-
+            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:
+        {
+            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;
@@ -253,62 +253,62 @@ namespace Jellyfin.Server
                             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
-            {
+                    }
+            }
+        }
+
+        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 + "\"";
-        }
-    }
-}
+                    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 + "\"";
+        }
+    }
+}

Jellyfin.Server/Properties/AssemblyInfo.cs

@@ -2,7 +2,7 @@ using System.Reflection;
 using System.Resources;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// 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")]

MediaBrowser.Api/Playback/Progressive/VideoService.cs

@@ -97,4 +97,4 @@ namespace MediaBrowser.Api.Playback.Progressive
             return EncodingHelper.GetProgressiveVideoFullCommandLine(state, encodingOptions, outputPath, GetDefaultH264Preset());
         }
     }
-}
+}

MediaBrowser.Api/Session/SessionsService.cs

@@ -518,4 +518,4 @@ namespace MediaBrowser.Api.Session
             _sessionManager.ReportCapabilities(request.Id, request);
         }
     }
-}
+}

MediaBrowser.Common/Net/INetworkManager.cs

@@ -63,4 +63,4 @@ namespace MediaBrowser.Common.Net
 
         bool IsAddressInSubnets(string addressString, string[] subnets);
     }
-}
+}

MediaBrowser.Common/Plugins/IPlugin.cs

@@ -80,4 +80,4 @@ namespace MediaBrowser.Common.Plugins
 
         void SetStartupInfo(Action<string> directoryCreateFn);
     }
-}
+}

MediaBrowser.Common/Security/ISecurityManager.cs

@@ -29,4 +29,4 @@ namespace MediaBrowser.Common.Security
         Task RegisterAppStoreSale(string parameters);
         Task UpdateSupporterKey(string newValue);
     }
-}
+}

MediaBrowser.Common/Updates/IInstallationManager.cs

@@ -118,4 +118,4 @@ namespace MediaBrowser.Common.Updates
         /// <exception cref="System.ArgumentException"></exception>
         void UninstallPlugin(IPlugin plugin);
     }
-}
+}

MediaBrowser.Common/Updates/InstallationFailedEventArgs.cs

@@ -6,4 +6,4 @@ namespace MediaBrowser.Common.Updates
     {
         public Exception Exception { get; set; }
     }
-}
+}