Преглед изворни кода

Visual Studio Reformat: Emby.Server.Implementations Part S-S

Erwin de Haan пре 6 година
родитељ
комит
0efc699e3d
45 измењених фајлова са 96 додато и 123 уклоњено
  1. 9 11
      Emby.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs
  2. 1 2
      Emby.Server.Implementations/ScheduledTasks/DailyTrigger.cs
  3. 1 2
      Emby.Server.Implementations/ScheduledTasks/IntervalTrigger.cs
  4. 1 1
      Emby.Server.Implementations/ScheduledTasks/PeopleValidationTask.cs
  5. 3 3
      Emby.Server.Implementations/ScheduledTasks/RefreshMediaLibraryTask.cs
  6. 2 2
      Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
  7. 1 2
      Emby.Server.Implementations/ScheduledTasks/StartupTrigger.cs
  8. 1 2
      Emby.Server.Implementations/ScheduledTasks/SystemEventTrigger.cs
  9. 2 2
      Emby.Server.Implementations/ScheduledTasks/TaskManager.cs
  10. 1 1
      Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs
  11. 1 1
      Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs
  12. 1 2
      Emby.Server.Implementations/ScheduledTasks/WeeklyTrigger.cs
  13. 3 6
      Emby.Server.Implementations/Security/AuthenticationRepository.cs
  14. 1 1
      Emby.Server.Implementations/Security/EncryptionManager.cs
  15. 1 4
      Emby.Server.Implementations/Security/PluginSecurityManager.cs
  16. 2 2
      Emby.Server.Implementations/Serialization/JsonSerializer.cs
  17. 1 1
      Emby.Server.Implementations/Serialization/XmlSerializer.cs
  18. 1 1
      Emby.Server.Implementations/Services/RequestHelper.cs
  19. 0 1
      Emby.Server.Implementations/Services/ServiceController.cs
  20. 0 1
      Emby.Server.Implementations/Services/ServiceExec.cs
  21. 1 1
      Emby.Server.Implementations/Services/ServiceHandler.cs
  22. 0 2
      Emby.Server.Implementations/Services/ServicePath.cs
  23. 2 2
      Emby.Server.Implementations/Services/StringMapTypeDeserializer.cs
  24. 6 8
      Emby.Server.Implementations/Session/HttpSessionController.cs
  25. 12 13
      Emby.Server.Implementations/Session/SessionManager.cs
  26. 3 7
      Emby.Server.Implementations/Session/SessionWebSocketListener.cs
  27. 6 9
      Emby.Server.Implementations/Session/WebSocketController.cs
  28. 1 1
      Emby.Server.Implementations/Sorting/AiredEpisodeOrderComparer.cs
  29. 1 1
      Emby.Server.Implementations/Sorting/AlbumArtistComparer.cs
  30. 2 2
      Emby.Server.Implementations/Sorting/AlbumComparer.cs
  31. 2 2
      Emby.Server.Implementations/Sorting/ArtistComparer.cs
  32. 2 2
      Emby.Server.Implementations/Sorting/CommunityRatingComparer.cs
  33. 2 2
      Emby.Server.Implementations/Sorting/DateCreatedComparer.cs
  34. 1 1
      Emby.Server.Implementations/Sorting/DateLastMediaAddedComparer.cs
  35. 2 2
      Emby.Server.Implementations/Sorting/DatePlayedComparer.cs
  36. 2 2
      Emby.Server.Implementations/Sorting/GameSystemComparer.cs
  37. 2 2
      Emby.Server.Implementations/Sorting/NameComparer.cs
  38. 2 2
      Emby.Server.Implementations/Sorting/OfficialRatingComparer.cs
  39. 2 2
      Emby.Server.Implementations/Sorting/PremiereDateComparer.cs
  40. 2 2
      Emby.Server.Implementations/Sorting/RandomComparer.cs
  41. 2 2
      Emby.Server.Implementations/Sorting/RuntimeComparer.cs
  42. 1 1
      Emby.Server.Implementations/Sorting/SeriesSortNameComparer.cs
  43. 2 2
      Emby.Server.Implementations/Sorting/SortNameComparer.cs
  44. 2 2
      Emby.Server.Implementations/Sorting/StartDateComparer.cs
  45. 3 3
      Emby.Server.Implementations/Sorting/StudioComparer.cs

+ 9 - 11
Emby.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs

@@ -1,22 +1,20 @@
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaEncoding;
-using MediaBrowser.Controller.Persistence;
-using Microsoft.Extensions.Logging;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.IO;
 using System.IO;
 using System.Linq;
 using System.Linq;
 using System.Threading;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
+using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Dto;
-using MediaBrowser.Controller.IO;
-using MediaBrowser.Model.IO;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Controller.Persistence;
+using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Tasks;
 using MediaBrowser.Model.Tasks;
-using MediaBrowser.Model.Extensions;
-using MediaBrowser.Controller.Providers;
+using Microsoft.Extensions.Logging;
 
 
 namespace Emby.Server.Implementations.ScheduledTasks
 namespace Emby.Server.Implementations.ScheduledTasks
 {
 {

+ 1 - 2
Emby.Server.Implementations/ScheduledTasks/DailyTrigger.cs

@@ -1,9 +1,8 @@
 using System;
 using System;
 using System.Globalization;
 using System.Globalization;
 using System.Threading;
 using System.Threading;
-using MediaBrowser.Model.Events;
-using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Tasks;
 using MediaBrowser.Model.Tasks;
+using Microsoft.Extensions.Logging;
 
 
 namespace Emby.Server.Implementations.ScheduledTasks
 namespace Emby.Server.Implementations.ScheduledTasks
 {
 {

+ 1 - 2
Emby.Server.Implementations/ScheduledTasks/IntervalTrigger.cs

@@ -1,9 +1,8 @@
 using System;
 using System;
 using System.Linq;
 using System.Linq;
 using System.Threading;
 using System.Threading;
-using MediaBrowser.Model.Events;
-using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Tasks;
 using MediaBrowser.Model.Tasks;
+using Microsoft.Extensions.Logging;
 
 
 namespace Emby.Server.Implementations.ScheduledTasks
 namespace Emby.Server.Implementations.ScheduledTasks
 {
 {

+ 1 - 1
Emby.Server.Implementations/ScheduledTasks/PeopleValidationTask.cs

@@ -1,9 +1,9 @@
-using MediaBrowser.Controller.Library;
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller;
+using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Tasks;
 using MediaBrowser.Model.Tasks;
 
 
 namespace Emby.Server.Implementations.ScheduledTasks
 namespace Emby.Server.Implementations.ScheduledTasks

+ 3 - 3
Emby.Server.Implementations/ScheduledTasks/RefreshMediaLibraryTask.cs

@@ -1,10 +1,10 @@
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Library;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 using Emby.Server.Implementations.Library;
 using Emby.Server.Implementations.Library;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Tasks;
 using MediaBrowser.Model.Tasks;
 
 
 namespace Emby.Server.Implementations.ScheduledTasks
 namespace Emby.Server.Implementations.ScheduledTasks

+ 2 - 2
Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs

@@ -9,10 +9,10 @@ using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Progress;
 using MediaBrowser.Common.Progress;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.IO;
-using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.System;
 using MediaBrowser.Model.System;
 using MediaBrowser.Model.Tasks;
 using MediaBrowser.Model.Tasks;
+using Microsoft.Extensions.Logging;
 
 
 namespace Emby.Server.Implementations.ScheduledTasks
 namespace Emby.Server.Implementations.ScheduledTasks
 {
 {
@@ -718,7 +718,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
             {
             {
                 if (!info.TimeOfDayTicks.HasValue)
                 if (!info.TimeOfDayTicks.HasValue)
                 {
                 {
-                    throw new ArgumentException("Info did not contain a TimeOfDayTicks.",nameof(info));
+                    throw new ArgumentException("Info did not contain a TimeOfDayTicks.", nameof(info));
                 }
                 }
 
 
                 return new DailyTrigger
                 return new DailyTrigger

+ 1 - 2
Emby.Server.Implementations/ScheduledTasks/StartupTrigger.cs

@@ -1,8 +1,7 @@
 using System;
 using System;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
-using MediaBrowser.Model.Events;
-using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Tasks;
 using MediaBrowser.Model.Tasks;
+using Microsoft.Extensions.Logging;
 
 
 namespace Emby.Server.Implementations.ScheduledTasks
 namespace Emby.Server.Implementations.ScheduledTasks
 {
 {

+ 1 - 2
Emby.Server.Implementations/ScheduledTasks/SystemEventTrigger.cs

@@ -1,9 +1,8 @@
 using System;
 using System;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
-using MediaBrowser.Model.Events;
-using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.System;
 using MediaBrowser.Model.System;
 using MediaBrowser.Model.Tasks;
 using MediaBrowser.Model.Tasks;
+using Microsoft.Extensions.Logging;
 
 
 namespace Emby.Server.Implementations.ScheduledTasks
 namespace Emby.Server.Implementations.ScheduledTasks
 {
 {

+ 2 - 2
Emby.Server.Implementations/ScheduledTasks/TaskManager.cs

@@ -7,10 +7,10 @@ using System.Threading.Tasks;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.IO;
-using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.System;
 using MediaBrowser.Model.System;
 using MediaBrowser.Model.Tasks;
 using MediaBrowser.Model.Tasks;
+using Microsoft.Extensions.Logging;
 
 
 namespace Emby.Server.Implementations.ScheduledTasks
 namespace Emby.Server.Implementations.ScheduledTasks
 {
 {
@@ -94,7 +94,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
 
 
             try
             try
             {
             {
-                lines = _fileSystem.ReadAllLines(path).ToList() ;
+                lines = _fileSystem.ReadAllLines(path).ToList();
             }
             }
             catch
             catch
             {
             {

+ 1 - 1
Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs

@@ -6,8 +6,8 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.IO;
-using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Tasks;
 using MediaBrowser.Model.Tasks;
+using Microsoft.Extensions.Logging;
 
 
 namespace Emby.Server.Implementations.ScheduledTasks.Tasks
 namespace Emby.Server.Implementations.ScheduledTasks.Tasks
 {
 {

+ 1 - 1
Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs

@@ -65,7 +65,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
 
 
             foreach (var file in filesToDelete)
             foreach (var file in filesToDelete)
             {
             {
-                double percent = index / (double) filesToDelete.Count;
+                double percent = index / (double)filesToDelete.Count;
 
 
                 progress.Report(100 * percent);
                 progress.Report(100 * percent);
 
 

+ 1 - 2
Emby.Server.Implementations/ScheduledTasks/WeeklyTrigger.cs

@@ -1,8 +1,7 @@
 using System;
 using System;
 using System.Threading;
 using System.Threading;
-using MediaBrowser.Model.Events;
-using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Tasks;
 using MediaBrowser.Model.Tasks;
+using Microsoft.Extensions.Logging;
 
 
 namespace Emby.Server.Implementations.ScheduledTasks
 namespace Emby.Server.Implementations.ScheduledTasks
 {
 {

+ 3 - 6
Emby.Server.Implementations/Security/AuthenticationRepository.cs

@@ -3,16 +3,13 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Globalization;
 using System.IO;
 using System.IO;
 using System.Linq;
 using System.Linq;
-using System.Threading;
 using Emby.Server.Implementations.Data;
 using Emby.Server.Implementations.Data;
-using MediaBrowser.Controller;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Security;
 using MediaBrowser.Controller.Security;
-using Microsoft.Extensions.Logging;
+using MediaBrowser.Model.Devices;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Querying;
+using Microsoft.Extensions.Logging;
 using SQLitePCL.pretty;
 using SQLitePCL.pretty;
-using MediaBrowser.Model.Extensions;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Model.Devices;
 
 
 namespace Emby.Server.Implementations.Security
 namespace Emby.Server.Implementations.Security
 {
 {

+ 1 - 1
Emby.Server.Implementations/Security/EncryptionManager.cs

@@ -1,6 +1,6 @@
-using MediaBrowser.Controller.Security;
 using System;
 using System;
 using System.Text;
 using System.Text;
+using MediaBrowser.Controller.Security;
 
 
 namespace Emby.Server.Implementations.Security
 namespace Emby.Server.Implementations.Security
 {
 {

+ 1 - 4
Emby.Server.Implementations/Security/PluginSecurityManager.cs

@@ -1,8 +1,5 @@
 using System;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.IO;
-using System.Linq;
-using System.Net;
 using System.Threading;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Configuration;
@@ -12,9 +9,9 @@ using MediaBrowser.Controller;
 using MediaBrowser.Model.Cryptography;
 using MediaBrowser.Model.Cryptography;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.IO;
-using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Serialization;
+using Microsoft.Extensions.Logging;
 
 
 namespace Emby.Server.Implementations.Security
 namespace Emby.Server.Implementations.Security
 {
 {

+ 2 - 2
Emby.Server.Implementations/Serialization/JsonSerializer.cs

@@ -1,9 +1,9 @@
 using System;
 using System;
 using System.IO;
 using System.IO;
+using System.Threading.Tasks;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.IO;
-using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Serialization;
-using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
 
 
 namespace Emby.Common.Implementations.Serialization
 namespace Emby.Common.Implementations.Serialization
 {
 {

+ 1 - 1
Emby.Server.Implementations/Serialization/XmlSerializer.cs

@@ -4,8 +4,8 @@ using System.IO;
 using System.Xml;
 using System.Xml;
 using System.Xml.Serialization;
 using System.Xml.Serialization;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.IO;
-using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Serialization;
+using Microsoft.Extensions.Logging;
 
 
 namespace Emby.Server.Implementations.Serialization
 namespace Emby.Server.Implementations.Serialization
 {
 {

+ 1 - 1
Emby.Server.Implementations/Services/RequestHelper.cs

@@ -1,7 +1,7 @@
 using System;
 using System;
 using System.IO;
 using System.IO;
-using Emby.Server.Implementations.HttpServer;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
+using Emby.Server.Implementations.HttpServer;
 
 
 namespace Emby.Server.Implementations.Services
 namespace Emby.Server.Implementations.Services
 {
 {

+ 0 - 1
Emby.Server.Implementations/Services/ServiceController.cs

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

+ 0 - 1
Emby.Server.Implementations/Services/ServiceExec.cs

@@ -5,7 +5,6 @@ using System.Linq.Expressions;
 using System.Reflection;
 using System.Reflection;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 using MediaBrowser.Model.Services;
 using MediaBrowser.Model.Services;
-using MediaBrowser.Model.Extensions;
 
 
 namespace Emby.Server.Implementations.Services
 namespace Emby.Server.Implementations.Services
 {
 {

+ 1 - 1
Emby.Server.Implementations/Services/ServiceHandler.cs

@@ -4,8 +4,8 @@ using System.Reflection;
 using System.Threading;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 using Emby.Server.Implementations.HttpServer;
 using Emby.Server.Implementations.HttpServer;
-using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Services;
 using MediaBrowser.Model.Services;
+using Microsoft.Extensions.Logging;
 
 
 namespace Emby.Server.Implementations.Services
 namespace Emby.Server.Implementations.Services
 {
 {

+ 0 - 2
Emby.Server.Implementations/Services/ServicePath.cs

@@ -4,8 +4,6 @@ using System.IO;
 using System.Linq;
 using System.Linq;
 using System.Reflection;
 using System.Reflection;
 using System.Text;
 using System.Text;
-using Microsoft.Extensions.Logging;
-using MediaBrowser.Model.Extensions;
 
 
 namespace Emby.Server.Implementations.Services
 namespace Emby.Server.Implementations.Services
 {
 {

+ 2 - 2
Emby.Server.Implementations/Services/StringMapTypeDeserializer.cs

@@ -11,14 +11,14 @@ namespace Emby.Server.Implementations.Services
     {
     {
         internal class PropertySerializerEntry
         internal class PropertySerializerEntry
         {
         {
-            public PropertySerializerEntry(Action<object,object> propertySetFn, Func<string, object> propertyParseStringFn)
+            public PropertySerializerEntry(Action<object, object> propertySetFn, Func<string, object> propertyParseStringFn)
             {
             {
                 PropertySetFn = propertySetFn;
                 PropertySetFn = propertySetFn;
                 PropertyParseStringFn = propertyParseStringFn;
                 PropertyParseStringFn = propertyParseStringFn;
             }
             }
 
 
             public Action<object, object> PropertySetFn;
             public Action<object, object> PropertySetFn;
-            public Func<string,object> PropertyParseStringFn;
+            public Func<string, object> PropertyParseStringFn;
             public Type PropertyType;
             public Type PropertyType;
         }
         }
 
 

+ 6 - 8
Emby.Server.Implementations/Session/HttpSessionController.cs

@@ -1,16 +1,14 @@
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Session;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Serialization;
-using MediaBrowser.Model.Session;
-using MediaBrowser.Model.System;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Globalization;
 using System.Linq;
 using System.Linq;
 using System.Net;
 using System.Net;
 using System.Threading;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Serialization;
+using MediaBrowser.Model.Session;
 
 
 namespace Emby.Server.Implementations.Session
 namespace Emby.Server.Implementations.Session
 {
 {
@@ -107,7 +105,7 @@ namespace Emby.Server.Implementations.Session
             return SendMessage(command.Command.ToString(), messageId, args, cancellationToken);
             return SendMessage(command.Command.ToString(), messageId, args, cancellationToken);
         }
         }
 
 
-        private string[] _supportedMessages = new string[] {  };
+        private string[] _supportedMessages = new string[] { };
         public Task SendMessage<T>(string name, string messageId, T data, ISessionController[] allControllers, CancellationToken cancellationToken)
         public Task SendMessage<T>(string name, string messageId, T data, ISessionController[] allControllers, CancellationToken cancellationToken)
         {
         {
             if (!IsSessionActive)
             if (!IsSessionActive)

+ 12 - 13
Emby.Server.Implementations/Session/SessionManager.cs

@@ -1,13 +1,22 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using MediaBrowser.Common.Events;
 using MediaBrowser.Common.Events;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller;
+using MediaBrowser.Controller.Authentication;
 using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Security;
 using MediaBrowser.Controller.Security;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Devices;
 using MediaBrowser.Model.Devices;
@@ -15,21 +24,11 @@ using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Library;
 using MediaBrowser.Model.Library;
-using Microsoft.Extensions.Logging;
+using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Session;
 using MediaBrowser.Model.Session;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Threading;
 using MediaBrowser.Model.Threading;
-using MediaBrowser.Model.Extensions;
-using MediaBrowser.Controller.Authentication;
+using Microsoft.Extensions.Logging;
 
 
 namespace Emby.Server.Implementations.Session
 namespace Emby.Server.Implementations.Session
 {
 {
@@ -798,7 +797,7 @@ namespace Emby.Server.Implementations.Session
 
 
             if (info.PositionTicks.HasValue && info.PositionTicks.Value < 0)
             if (info.PositionTicks.HasValue && info.PositionTicks.Value < 0)
             {
             {
-                throw new ArgumentOutOfRangeException(nameof(info),"The PlaybackStopInfo's PositionTicks was negative.");
+                throw new ArgumentOutOfRangeException(nameof(info), "The PlaybackStopInfo's PositionTicks was negative.");
             }
             }
 
 
             var session = GetSession(info.SessionId);
             var session = GetSession(info.SessionId);

+ 3 - 7
Emby.Server.Implementations/Session/SessionWebSocketListener.cs

@@ -1,15 +1,11 @@
+using System;
+using System.Threading.Tasks;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Events;
-using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Serialization;
-using MediaBrowser.Model.Session;
-using System;
-using System.Collections.Specialized;
-using System.Globalization;
-using System.Linq;
-using System.Threading.Tasks;
 using MediaBrowser.Model.Services;
 using MediaBrowser.Model.Services;
+using Microsoft.Extensions.Logging;
 
 
 namespace Emby.Server.Implementations.Session
 namespace Emby.Server.Implementations.Session
 {
 {

+ 6 - 9
Emby.Server.Implementations/Session/WebSocketController.cs

@@ -1,16 +1,13 @@
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Controller.Session;
-using MediaBrowser.Model.Entities;
-using Microsoft.Extensions.Logging;
-using MediaBrowser.Model.Net;
-using MediaBrowser.Model.Session;
-using MediaBrowser.Model.System;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq;
+using System.Net.WebSockets;
 using System.Threading;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
-using System.Net.WebSockets;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Net;
+using Microsoft.Extensions.Logging;
 
 
 namespace Emby.Server.Implementations.Session
 namespace Emby.Server.Implementations.Session
 {
 {

+ 1 - 1
Emby.Server.Implementations/Sorting/AiredEpisodeOrderComparer.cs

@@ -1,8 +1,8 @@
+using System;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Querying;
-using System;
 
 
 namespace Emby.Server.Implementations.Sorting
 namespace Emby.Server.Implementations.Sorting
 {
 {

+ 1 - 1
Emby.Server.Implementations/Sorting/AlbumArtistComparer.cs

@@ -1,9 +1,9 @@
+using System;
 using System.Linq;
 using System.Linq;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Querying;
-using System;
 
 
 namespace Emby.Server.Implementations.Sorting
 namespace Emby.Server.Implementations.Sorting
 {
 {

+ 2 - 2
Emby.Server.Implementations/Sorting/AlbumComparer.cs

@@ -1,8 +1,8 @@
-using MediaBrowser.Controller.Entities;
+using System;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Querying;
-using System;
 
 
 namespace Emby.Server.Implementations.Sorting
 namespace Emby.Server.Implementations.Sorting
 {
 {

+ 2 - 2
Emby.Server.Implementations/Sorting/ArtistComparer.cs

@@ -1,8 +1,8 @@
-using MediaBrowser.Controller.Entities;
+using System;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Querying;
-using System;
 
 
 namespace Emby.Server.Implementations.Sorting
 namespace Emby.Server.Implementations.Sorting
 {
 {

+ 2 - 2
Emby.Server.Implementations/Sorting/CommunityRatingComparer.cs

@@ -1,7 +1,7 @@
-using MediaBrowser.Controller.Entities;
+using System;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Querying;
-using System;
 
 
 namespace Emby.Server.Implementations.Sorting
 namespace Emby.Server.Implementations.Sorting
 {
 {

+ 2 - 2
Emby.Server.Implementations/Sorting/DateCreatedComparer.cs

@@ -1,7 +1,7 @@
-using MediaBrowser.Controller.Entities;
+using System;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Querying;
-using System;
 
 
 namespace Emby.Server.Implementations.Sorting
 namespace Emby.Server.Implementations.Sorting
 {
 {

+ 1 - 1
Emby.Server.Implementations/Sorting/DateLastMediaAddedComparer.cs

@@ -1,8 +1,8 @@
+using System;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Querying;
-using System;
 
 
 namespace Emby.Server.Implementations.Sorting
 namespace Emby.Server.Implementations.Sorting
 {
 {

+ 2 - 2
Emby.Server.Implementations/Sorting/DatePlayedComparer.cs

@@ -1,8 +1,8 @@
-using MediaBrowser.Controller.Entities;
+using System;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Querying;
-using System;
 
 
 namespace Emby.Server.Implementations.Sorting
 namespace Emby.Server.Implementations.Sorting
 {
 {

+ 2 - 2
Emby.Server.Implementations/Sorting/GameSystemComparer.cs

@@ -1,7 +1,7 @@
-using MediaBrowser.Controller.Entities;
+using System;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Querying;
-using System;
 
 
 namespace Emby.Server.Implementations.Sorting
 namespace Emby.Server.Implementations.Sorting
 {
 {

+ 2 - 2
Emby.Server.Implementations/Sorting/NameComparer.cs

@@ -1,7 +1,7 @@
-using MediaBrowser.Controller.Entities;
+using System;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Querying;
-using System;
 
 
 namespace Emby.Server.Implementations.Sorting
 namespace Emby.Server.Implementations.Sorting
 {
 {

+ 2 - 2
Emby.Server.Implementations/Sorting/OfficialRatingComparer.cs

@@ -1,8 +1,8 @@
-using MediaBrowser.Controller.Entities;
+using System;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Querying;
-using System;
 
 
 namespace Emby.Server.Implementations.Sorting
 namespace Emby.Server.Implementations.Sorting
 {
 {

+ 2 - 2
Emby.Server.Implementations/Sorting/PremiereDateComparer.cs

@@ -1,7 +1,7 @@
-using MediaBrowser.Controller.Entities;
+using System;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Querying;
-using System;
 
 
 namespace Emby.Server.Implementations.Sorting
 namespace Emby.Server.Implementations.Sorting
 {
 {

+ 2 - 2
Emby.Server.Implementations/Sorting/RandomComparer.cs

@@ -1,7 +1,7 @@
-using MediaBrowser.Controller.Entities;
+using System;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Querying;
-using System;
 
 
 namespace Emby.Server.Implementations.Sorting
 namespace Emby.Server.Implementations.Sorting
 {
 {

+ 2 - 2
Emby.Server.Implementations/Sorting/RuntimeComparer.cs

@@ -1,7 +1,7 @@
-using MediaBrowser.Controller.Entities;
+using System;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Querying;
-using System;
 
 
 namespace Emby.Server.Implementations.Sorting
 namespace Emby.Server.Implementations.Sorting
 {
 {

+ 1 - 1
Emby.Server.Implementations/Sorting/SeriesSortNameComparer.cs

@@ -1,7 +1,7 @@
+using System;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Querying;
-using System;
 
 
 namespace Emby.Server.Implementations.Sorting
 namespace Emby.Server.Implementations.Sorting
 {
 {

+ 2 - 2
Emby.Server.Implementations/Sorting/SortNameComparer.cs

@@ -1,7 +1,7 @@
-using MediaBrowser.Controller.Entities;
+using System;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Querying;
-using System;
 
 
 namespace Emby.Server.Implementations.Sorting
 namespace Emby.Server.Implementations.Sorting
 {
 {

+ 2 - 2
Emby.Server.Implementations/Sorting/StartDateComparer.cs

@@ -1,8 +1,8 @@
-using MediaBrowser.Controller.Entities;
+using System;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Querying;
-using System;
 
 
 namespace Emby.Server.Implementations.Sorting
 namespace Emby.Server.Implementations.Sorting
 {
 {

+ 3 - 3
Emby.Server.Implementations/Sorting/StudioComparer.cs

@@ -1,8 +1,8 @@
-using MediaBrowser.Controller.Entities;
+using System;
+using System.Linq;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Querying;
-using System;
-using System.Linq;
 
 
 namespace Emby.Server.Implementations.Sorting
 namespace Emby.Server.Implementations.Sorting
 {
 {