瀏覽代碼

Visual Studio Reformat: Emby.Server.Implementations Part De-H

Erwin de Haan 6 年之前
父節點
當前提交
c5c7a3c4ee
共有 27 個文件被更改,包括 110 次插入126 次删除
  1. 16 17
      Emby.Server.Implementations/Devices/DeviceManager.cs
  2. 1 1
      Emby.Server.Implementations/Diagnostics/CommonProcess.cs
  3. 9 10
      Emby.Server.Implementations/Dto/DtoService.cs
  4. 7 7
      Emby.Server.Implementations/EntryPoints/AutomaticRestartEntryPoint.cs
  5. 2 2
      Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
  6. 6 7
      Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
  7. 3 3
      Emby.Server.Implementations/EntryPoints/RefreshUsersMetadata.cs
  8. 4 7
      Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
  9. 1 1
      Emby.Server.Implementations/EntryPoints/StartupWizard.cs
  10. 2 7
      Emby.Server.Implementations/EntryPoints/SystemEvents.cs
  11. 3 3
      Emby.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs
  12. 8 8
      Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
  13. 1 1
      Emby.Server.Implementations/EnvironmentInfo/EnvironmentInfo.cs
  14. 5 5
      Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs
  15. 2 2
      Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs
  16. 2 2
      Emby.Server.Implementations/HttpServer/FileWriter.cs
  17. 7 7
      Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
  18. 6 5
      Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
  19. 3 3
      Emby.Server.Implementations/HttpServer/IHttpListener.cs
  20. 2 2
      Emby.Server.Implementations/HttpServer/LoggerUtils.cs
  21. 1 1
      Emby.Server.Implementations/HttpServer/RangeRequestWriter.cs
  22. 2 2
      Emby.Server.Implementations/HttpServer/ResponseFilter.cs
  23. 3 5
      Emby.Server.Implementations/HttpServer/Security/AuthService.cs
  24. 3 5
      Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
  25. 2 3
      Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
  26. 2 3
      Emby.Server.Implementations/HttpServer/StreamWriter.cs
  27. 7 7
      Emby.Server.Implementations/HttpServer/WebSocketConnection.cs

+ 16 - 17
Emby.Server.Implementations/Devices/DeviceManager.cs

@@ -1,30 +1,29 @@
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Devices;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Devices;
-using MediaBrowser.Model.Events;
-using MediaBrowser.Model.Extensions;
-using Microsoft.Extensions.Logging;
-using MediaBrowser.Model.Net;
-using MediaBrowser.Model.Querying;
-using MediaBrowser.Model.Session;
-using MediaBrowser.Model.Users;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using MediaBrowser.Model.IO;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Entities;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Configuration;
+using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Plugins;
-using MediaBrowser.Model.Globalization;
 using MediaBrowser.Controller.Security;
+using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.Devices;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Events;
+using MediaBrowser.Model.Globalization;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Serialization;
-using MediaBrowser.Common.Extensions;
+using MediaBrowser.Model.Session;
+using MediaBrowser.Model.Users;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.Devices
 {

+ 1 - 1
Emby.Server.Implementations/Diagnostics/CommonProcess.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Model.Diagnostics;
-using System.Threading;
 
 namespace Emby.Server.Implementations.Diagnostics
 {

+ 9 - 10
Emby.Server.Implementations/Dto/DtoService.cs

@@ -1,3 +1,8 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
 using MediaBrowser.Common;
 using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Configuration;
@@ -11,21 +16,15 @@ using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Persistence;
+using MediaBrowser.Controller.Playlists;
 using MediaBrowser.Controller.Providers;
-using MediaBrowser.Controller.Sync;
 using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
-using Microsoft.Extensions.Logging;
-using MediaBrowser.Model.Querying;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Extensions;
-using MediaBrowser.Controller.Playlists;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Querying;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.Dto
 {

+ 7 - 7
Emby.Server.Implementations/EntryPoints/AutomaticRestartEntryPoint.cs

@@ -1,16 +1,16 @@
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Plugins;
-using MediaBrowser.Controller.Session;
-using Microsoft.Extensions.Logging;
-using MediaBrowser.Model.Tasks;
-using System;
+using System;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.LiveTv;
+using MediaBrowser.Controller.Plugins;
+using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.LiveTv;
+using MediaBrowser.Model.Tasks;
 using MediaBrowser.Model.Threading;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.EntryPoints
 {

+ 2 - 2
Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Net;
+using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller;
@@ -9,10 +10,9 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Events;
-using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Threading;
+using Microsoft.Extensions.Logging;
 using Mono.Nat;
-using System.Threading;
 
 namespace Emby.Server.Implementations.EntryPoints
 {

+ 6 - 7
Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs

@@ -1,21 +1,20 @@
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Plugins;
-using MediaBrowser.Controller.Session;
-using MediaBrowser.Model.Entities;
-using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Threading;
 using MediaBrowser.Controller.Channels;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
-using MediaBrowser.Controller.Entities.TV;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Controller.Providers;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.Threading;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.EntryPoints
 {

+ 3 - 3
Emby.Server.Implementations/EntryPoints/RefreshUsersMetadata.cs

@@ -1,12 +1,12 @@
 using System;
-using MediaBrowser.Controller.Library;
-using System.Threading;
-using MediaBrowser.Model.Tasks;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Tasks;
 using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.EntryPoints

+ 4 - 7
Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs

@@ -1,17 +1,14 @@
-using MediaBrowser.Common.Plugins;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using MediaBrowser.Common.Plugins;
 using MediaBrowser.Common.Updates;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Controller.Session;
-using MediaBrowser.Controller.Sync;
 using MediaBrowser.Model.Events;
-using MediaBrowser.Model.Sync;
-using System;
-using System.Collections.Generic;
-using System.Threading;
 using MediaBrowser.Model.Tasks;
 
 namespace Emby.Server.Implementations.EntryPoints

+ 1 - 1
Emby.Server.Implementations/EntryPoints/StartupWizard.cs

@@ -1,8 +1,8 @@
 using Emby.Server.Implementations.Browser;
 using MediaBrowser.Controller;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Plugins;
 using Microsoft.Extensions.Logging;
-using MediaBrowser.Controller.Configuration;
 
 namespace Emby.Server.Implementations.EntryPoints
 {

+ 2 - 7
Emby.Server.Implementations/EntryPoints/SystemEvents.cs

@@ -1,12 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using MediaBrowser.Model.System;
-using MediaBrowser.Controller.Plugins;
-using MediaBrowser.Common;
 using MediaBrowser.Controller;
+using MediaBrowser.Controller.Plugins;
+using MediaBrowser.Model.System;
 
 namespace Emby.Server.Implementations.EntryPoints
 {

+ 3 - 3
Emby.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs

@@ -1,10 +1,10 @@
 using System;
+using Emby.Server.Implementations.Udp;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Plugins;
-using Microsoft.Extensions.Logging;
-using MediaBrowser.Model.Serialization;
-using Emby.Server.Implementations.Udp;
 using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Serialization;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.EntryPoints
 {

+ 8 - 8
Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs

@@ -1,17 +1,17 @@
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Plugins;
-using MediaBrowser.Controller.Session;
-using MediaBrowser.Model.Entities;
-using Microsoft.Extensions.Logging;
-using MediaBrowser.Model.Session;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Plugins;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Extensions;
+using MediaBrowser.Model.Session;
 using MediaBrowser.Model.Threading;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.EntryPoints
 {

+ 1 - 1
Emby.Server.Implementations/EnvironmentInfo/EnvironmentInfo.cs

@@ -1,6 +1,6 @@
 using System;
-using MediaBrowser.Model.System;
 using System.Runtime.InteropServices;
+using MediaBrowser.Model.System;
 
 namespace Emby.Server.Implementations.EnvironmentInfo
 {

+ 5 - 5
Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs

@@ -1,11 +1,11 @@
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Model.IO;
-using Microsoft.Extensions.Logging;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Model.IO;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.FFMpeg
 {

+ 2 - 2
Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs

@@ -13,8 +13,8 @@ using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Model.IO;
-using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Net;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.HttpClientManager
 {
@@ -541,7 +541,7 @@ namespace Emby.Server.Implementations.HttpClientManager
 
             if (options.Progress == null)
             {
-                throw new ArgumentException("Options did not have a Progress value.",nameof(options));
+                throw new ArgumentException("Options did not have a Progress value.", nameof(options));
             }
 
             options.CancellationToken.ThrowIfCancellationRequested();

+ 2 - 2
Emby.Server.Implementations/HttpServer/FileWriter.cs

@@ -1,13 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Model.IO;
-using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Services;
-using System.Linq;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.HttpServer
 {

+ 7 - 7
Emby.Server.Implementations/HttpServer/HttpListenerHost.cs

@@ -1,27 +1,27 @@
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Net;
-using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Net.Sockets;
 using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Emby.Server.Implementations.Net;
 using Emby.Server.Implementations.Services;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Common.Security;
 using MediaBrowser.Controller;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Services;
 using MediaBrowser.Model.Text;
-using System.Net.Sockets;
-using Emby.Server.Implementations.Net;
-using MediaBrowser.Model.Events;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.HttpServer
 {

+ 6 - 5
Emby.Server.Implementations/HttpServer/HttpResultFactory.cs

@@ -1,7 +1,3 @@
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Controller.Net;
-using Microsoft.Extensions.Logging;
-using MediaBrowser.Model.Serialization;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -13,8 +9,12 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Xml;
 using Emby.Server.Implementations.Services;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Services;
+using Microsoft.Extensions.Logging;
 using IRequest = MediaBrowser.Model.Services.IRequest;
 using MimeTypes = MediaBrowser.Model.Net.MimeTypes;
 
@@ -115,7 +115,8 @@ namespace Emby.Server.Implementations.HttpServer
             string compressionType = null;
             bool isHeadRequest = false;
 
-            if (requestContext != null) {
+            if (requestContext != null)
+            {
                 compressionType = GetCompressionType(requestContext, content, contentType);
                 isHeadRequest = string.Equals(requestContext.Verb, "head", StringComparison.OrdinalIgnoreCase);
             }

+ 3 - 3
Emby.Server.Implementations/HttpServer/IHttpListener.cs

@@ -1,10 +1,10 @@
-using MediaBrowser.Controller.Net;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Model.Services;
 using Emby.Server.Implementations.Net;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Model.Services;
 
 namespace Emby.Server.Implementations.HttpServer
 {

+ 2 - 2
Emby.Server.Implementations/HttpServer/LoggerUtils.cs

@@ -1,7 +1,7 @@
-using Microsoft.Extensions.Logging;
-using System;
+using System;
 using System.Globalization;
 using MediaBrowser.Model.Services;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.HttpServer
 {

+ 1 - 1
Emby.Server.Implementations/HttpServer/RangeRequestWriter.cs

@@ -1,4 +1,3 @@
-using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -7,6 +6,7 @@ using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Model.Services;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.HttpServer
 {

+ 2 - 2
Emby.Server.Implementations/HttpServer/ResponseFilter.cs

@@ -1,8 +1,8 @@
-using Microsoft.Extensions.Logging;
-using System;
+using System;
 using System.Globalization;
 using System.Text;
 using MediaBrowser.Model.Services;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.HttpServer
 {

+ 3 - 5
Emby.Server.Implementations/HttpServer/Security/AuthService.cs

@@ -1,15 +1,13 @@
+using System;
+using System.Linq;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Connect;
-using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Security;
 using MediaBrowser.Controller.Session;
-using System;
-using System.Linq;
 using MediaBrowser.Model.Services;
-using MediaBrowser.Common.Net;
 
 namespace Emby.Server.Implementations.HttpServer.Security
 {

+ 3 - 5
Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs

@@ -1,12 +1,10 @@
-using MediaBrowser.Controller.Connect;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Controller.Security;
 using System;
 using System.Collections.Generic;
-using MediaBrowser.Model.Services;
 using System.Linq;
-using System.Threading;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Controller.Security;
+using MediaBrowser.Model.Services;
 
 namespace Emby.Server.Implementations.HttpServer.Security
 {

+ 2 - 3
Emby.Server.Implementations/HttpServer/Security/SessionContext.cs

@@ -1,11 +1,10 @@
-using MediaBrowser.Controller.Entities;
+using System;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Security;
 using MediaBrowser.Controller.Session;
-using System.Threading.Tasks;
 using MediaBrowser.Model.Services;
-using System;
 
 namespace Emby.Server.Implementations.HttpServer.Security
 {

+ 2 - 3
Emby.Server.Implementations/HttpServer/StreamWriter.cs

@@ -1,12 +1,11 @@
-using Microsoft.Extensions.Logging;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-
 using MediaBrowser.Model.Services;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.HttpServer
 {

+ 7 - 7
Emby.Server.Implementations/HttpServer/WebSocketConnection.cs

@@ -1,15 +1,15 @@
-using System.Text;
+using System;
+using System.Net.WebSockets;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Emby.Server.Implementations.Net;
 using MediaBrowser.Controller.Net;
-using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Serialization;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
 using MediaBrowser.Model.Services;
 using MediaBrowser.Model.Text;
-using System.Net.WebSockets;
-using Emby.Server.Implementations.Net;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.HttpServer
 {