소스 검색

Visual Studio Reformat: Jellyfin.Server

Erwin de Haan 6 년 전
부모
커밋
f0acc0446c

+ 1 - 1
Jellyfin.Server/CoreAppHost.cs

@@ -28,7 +28,7 @@ namespace Jellyfin.Server
         protected override void RestartInternal() => Program.Restart();
 
         protected override IEnumerable<Assembly> GetAssembliesWithPartsInternal()
-            => new [] { typeof(CoreAppHost).Assembly };
+            => new[] { typeof(CoreAppHost).Assembly };
 
         protected override void ShutdownInternal() => Program.Shutdown();
 

+ 24 - 23
Jellyfin.Server/Program.cs

@@ -16,8 +16,8 @@ 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.IO;
 using MediaBrowser.Model.System;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
@@ -52,7 +52,7 @@ namespace Jellyfin.Server
             _loggerFactory = new SerilogLoggerFactory();
             _logger = _loggerFactory.CreateLogger("Main");
 
-            AppDomain.CurrentDomain.UnhandledException += (sender, e) 
+            AppDomain.CurrentDomain.UnhandledException += (sender, e)
                 => _logger.LogCritical((Exception)e.ExceptionObject, "Unhandled Exception");
 
             _logger.LogInformation("Jellyfin version: {Version}", version);
@@ -208,9 +208,9 @@ namespace Jellyfin.Server
         }
 
         public static IImageEncoder getImageEncoder(
-            ILogger logger, 
-            IFileSystem fileSystem, 
-            StartupOptions startupOptions, 
+            ILogger logger,
+            IFileSystem fileSystem,
+            StartupOptions startupOptions,
             Func<IHttpClient> httpClient,
             IApplicationPaths appPaths,
             IEnvironmentInfo environment,
@@ -228,7 +228,8 @@ namespace Jellyfin.Server
             return new NullImageEncoder();
         }
 
-        private static MediaBrowser.Model.System.OperatingSystem getOperatingSystem() {
+        private static MediaBrowser.Model.System.OperatingSystem getOperatingSystem()
+        {
             switch (Environment.OSVersion.Platform)
             {
                 case PlatformID.MacOSX:
@@ -236,23 +237,23 @@ namespace Jellyfin.Server
                 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;
+                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}'");
                     }
-                    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}'");
-                }
             }
         }
 
@@ -287,7 +288,7 @@ namespace Jellyfin.Server
             }
             else
             {
-                commandLineArgsString = string .Join(" ", 
+                commandLineArgsString = string.Join(" ",
                     Environment.GetCommandLineArgs()
                         .Skip(1)
                         .Select(NormalizeCommandLineArgument)

+ 1 - 1
Jellyfin.Server/SocketSharp/SharpWebSocket.cs

@@ -1,7 +1,7 @@
 using System;
+using System.Net.WebSockets;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Net.WebSockets;
 using Emby.Server.Implementations.Net;
 using Microsoft.Extensions.Logging;
 

+ 1 - 1
Jellyfin.Server/SocketSharp/WebSocketSharpListener.cs

@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
-using Emby.Server.Implementations.Net;
 using Emby.Server.Implementations.HttpServer;
+using Emby.Server.Implementations.Net;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Cryptography;

+ 1 - 1
Jellyfin.Server/SocketSharp/WebSocketSharpRequest.cs

@@ -425,7 +425,7 @@ namespace Jellyfin.SocketSharp
                     cookies = new Dictionary<string, System.Net.Cookie>();
                     foreach (var cookie in this.request.Cookies)
                     {
-                        var httpCookie = (System.Net.Cookie) cookie;
+                        var httpCookie = (System.Net.Cookie)cookie;
                         cookies[httpCookie.Name] = new System.Net.Cookie(httpCookie.Name, httpCookie.Value, httpCookie.Path, httpCookie.Domain);
                     }
                 }