Procházet zdrojové kódy

Visual Studio Reformat: MediaBrowser.Api

Erwin de Haan před 6 roky
rodič
revize
b67c1b933e
72 změnil soubory, kde provedl 372 přidání a 458 odebrání
  1. 13 13
      MediaBrowser.Api/ApiEntryPoint.cs
  2. 5 7
      MediaBrowser.Api/BaseApiService.cs
  3. 8 8
      MediaBrowser.Api/ChannelService.cs
  4. 5 5
      MediaBrowser.Api/ConfigurationService.cs
  5. 4 5
      MediaBrowser.Api/Devices/DeviceService.cs
  6. 2 3
      MediaBrowser.Api/DisplayPreferencesService.cs
  7. 5 5
      MediaBrowser.Api/EnvironmentService.cs
  8. 4 6
      MediaBrowser.Api/FilterService.cs
  9. 4 9
      MediaBrowser.Api/GamesService.cs
  10. 2 3
      MediaBrowser.Api/IHasItemFields.cs
  11. 6 6
      MediaBrowser.Api/Images/ImageByNameService.cs
  12. 8 12
      MediaBrowser.Api/Images/ImageService.cs
  13. 8 10
      MediaBrowser.Api/Images/RemoteImageService.cs
  14. 9 9
      MediaBrowser.Api/ItemLookupService.cs
  15. 2 6
      MediaBrowser.Api/ItemRefreshService.cs
  16. 6 7
      MediaBrowser.Api/ItemUpdateService.cs
  17. 15 19
      MediaBrowser.Api/Library/LibraryService.cs
  18. 6 8
      MediaBrowser.Api/Library/LibraryStructureService.cs
  19. 15 16
      MediaBrowser.Api/LiveTv/LiveTvService.cs
  20. 1 3
      MediaBrowser.Api/LiveTv/ProgressiveFileCopier.cs
  21. 0 1
      MediaBrowser.Api/LocalizationService.cs
  22. 3 3
      MediaBrowser.Api/Movies/CollectionService.cs
  23. 8 10
      MediaBrowser.Api/Movies/MoviesService.cs
  24. 2 2
      MediaBrowser.Api/Movies/TrailersService.cs
  25. 4 4
      MediaBrowser.Api/Music/AlbumsService.cs
  26. 4 7
      MediaBrowser.Api/Music/InstantMixService.cs
  27. 6 6
      MediaBrowser.Api/PackageService.cs
  28. 12 13
      MediaBrowser.Api/Playback/BaseStreamingService.cs
  29. 10 10
      MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
  30. 11 11
      MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
  31. 4 5
      MediaBrowser.Api/Playback/Hls/HlsSegmentService.cs
  32. 3 3
      MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
  33. 9 9
      MediaBrowser.Api/Playback/MediaInfoService.cs
  34. 2 5
      MediaBrowser.Api/Playback/Progressive/AudioService.cs
  35. 6 9
      MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
  36. 2 4
      MediaBrowser.Api/Playback/Progressive/ProgressiveStreamWriter.cs
  37. 3 3
      MediaBrowser.Api/Playback/Progressive/VideoService.cs
  38. 2 2
      MediaBrowser.Api/Playback/StaticRemoteStreamWriter.cs
  39. 0 1
      MediaBrowser.Api/Playback/StreamRequest.cs
  40. 4 13
      MediaBrowser.Api/Playback/StreamState.cs
  41. 2 2
      MediaBrowser.Api/Playback/TranscodingThrottler.cs
  42. 1 1
      MediaBrowser.Api/Playback/UniversalAudioService.cs
  43. 3 4
      MediaBrowser.Api/PlaylistService.cs
  44. 7 7
      MediaBrowser.Api/PluginService.cs
  45. 4 4
      MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs
  46. 5 6
      MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs
  47. 3 4
      MediaBrowser.Api/SearchService.cs
  48. 4 7
      MediaBrowser.Api/Session/SessionInfoWebSocketListener.cs
  49. 8 9
      MediaBrowser.Api/Session/SessionsService.cs
  50. 6 7
      MediaBrowser.Api/SimilarItemsHelper.cs
  51. 5 7
      MediaBrowser.Api/StartupWizardService.cs
  52. 11 11
      MediaBrowser.Api/Subtitles/SubtitleService.cs
  53. 5 7
      MediaBrowser.Api/SuggestionsService.cs
  54. 3 3
      MediaBrowser.Api/System/ActivityLogService.cs
  55. 5 5
      MediaBrowser.Api/System/ActivityLogWebSocketListener.cs
  56. 8 8
      MediaBrowser.Api/System/SystemService.cs
  57. 5 6
      MediaBrowser.Api/TvShowsService.cs
  58. 2 2
      MediaBrowser.Api/UserLibrary/ArtistsService.cs
  59. 6 8
      MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
  60. 3 4
      MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs
  61. 3 3
      MediaBrowser.Api/UserLibrary/GameGenresService.cs
  62. 3 3
      MediaBrowser.Api/UserLibrary/GenresService.cs
  63. 8 10
      MediaBrowser.Api/UserLibrary/ItemsService.cs
  64. 1 1
      MediaBrowser.Api/UserLibrary/MusicGenresService.cs
  65. 5 5
      MediaBrowser.Api/UserLibrary/PersonsService.cs
  66. 5 5
      MediaBrowser.Api/UserLibrary/PlaystateService.cs
  67. 1 2
      MediaBrowser.Api/UserLibrary/StudiosService.cs
  68. 8 10
      MediaBrowser.Api/UserLibrary/UserLibraryService.cs
  69. 4 8
      MediaBrowser.Api/UserLibrary/UserViewsService.cs
  70. 4 4
      MediaBrowser.Api/UserLibrary/YearsService.cs
  71. 5 5
      MediaBrowser.Api/UserService.cs
  72. 6 9
      MediaBrowser.Api/VideosService.cs

+ 13 - 13
MediaBrowser.Api/ApiEntryPoint.cs

@@ -1,24 +1,24 @@
 using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Api.Playback;
+using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Diagnostics;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.IO;
-using Microsoft.Extensions.Logging;
-using MediaBrowser.Model.Threading;
-using System.Collections.Generic;
-using System.Threading;
-using MediaBrowser.Controller.MediaEncoding;
-using MediaBrowser.Api.Playback;
-using System.IO;
 using MediaBrowser.Model.Session;
-using System.Linq;
-using System.Threading.Tasks;
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Configuration;
-using MediaBrowser.Common.Configuration;
+using MediaBrowser.Model.Threading;
+using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Api
 {
@@ -681,7 +681,7 @@ namespace MediaBrowser.Api
         }
     }
 
-        /// <summary>
+    /// <summary>
     /// Class TranscodingJob
     /// </summary>
     public class TranscodingJob

+ 5 - 7
MediaBrowser.Api/BaseApiService.cs

@@ -1,17 +1,15 @@
-using MediaBrowser.Controller.Dto;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Entities;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using MediaBrowser.Model.Services;
-using MediaBrowser.Model.Extensions;
+using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Api
 {

+ 8 - 8
MediaBrowser.Api/ChannelService.cs

@@ -1,18 +1,18 @@
-using MediaBrowser.Controller.Channels;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.Channels;
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Querying;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Api.UserLibrary;
-using MediaBrowser.Model.Services;
+using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Model.Channels;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Querying;
+using MediaBrowser.Model.Services;
 
 namespace MediaBrowser.Api
 {

+ 5 - 5
MediaBrowser.Api/ConfigurationService.cs

@@ -1,14 +1,14 @@
-using MediaBrowser.Controller.Configuration;
+using System.IO;
+using System.Threading.Tasks;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Configuration;
-using MediaBrowser.Model.Serialization;
-using System.IO;
 using MediaBrowser.Model.IO;
-using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Services;
-using System.Threading.Tasks;
 
 namespace MediaBrowser.Api
 {

+ 4 - 5
MediaBrowser.Api/Devices/DeviceService.cs

@@ -1,14 +1,13 @@
 using System;
+using System.IO;
+using System.Threading.Tasks;
 using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Net;
+using MediaBrowser.Controller.Security;
+using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Devices;
 using MediaBrowser.Model.Querying;
-using MediaBrowser.Model.Session;
-using System.IO;
-using System.Threading.Tasks;
 using MediaBrowser.Model.Services;
-using MediaBrowser.Controller.Security;
-using MediaBrowser.Controller.Session;
 
 namespace MediaBrowser.Api.Devices
 {

+ 2 - 3
MediaBrowser.Api/DisplayPreferencesService.cs

@@ -1,9 +1,8 @@
-using MediaBrowser.Controller.Net;
+using System.Threading;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Serialization;
-using System.Threading;
-using System.Threading.Tasks;
 using MediaBrowser.Model.Services;
 
 namespace MediaBrowser.Api

+ 5 - 5
MediaBrowser.Api/EnvironmentService.cs

@@ -1,11 +1,11 @@
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Net;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Services;
 
 namespace MediaBrowser.Api

+ 4 - 6
MediaBrowser.Api/FilterService.cs

@@ -1,12 +1,10 @@
-using MediaBrowser.Controller.Entities;
+using System;
+using System.Linq;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Dto;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Services;
 
 namespace MediaBrowser.Api

+ 4 - 9
MediaBrowser.Api/GamesService.cs

@@ -1,18 +1,13 @@
-using MediaBrowser.Controller.Dto;
+using System;
+using System.IO;
+using System.Linq;
+using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Dto;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Services;
-using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Api
 {

+ 2 - 3
MediaBrowser.Api/IHasItemFields.cs

@@ -1,7 +1,6 @@
-using MediaBrowser.Model.Querying;
-using System;
-using System.Collections.Generic;
+using System;
 using System.Linq;
+using MediaBrowser.Model.Querying;
 
 namespace MediaBrowser.Api
 {

+ 6 - 6
MediaBrowser.Api/Images/ImageByNameService.cs

@@ -1,13 +1,13 @@
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.Dto;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Services;
 

+ 8 - 12
MediaBrowser.Api/Images/ImageService.cs

@@ -1,5 +1,12 @@
-using MediaBrowser.Common.Extensions;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Drawing;
+using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
@@ -8,19 +15,8 @@ using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-using MediaBrowser.Controller.Dto;
-using MediaBrowser.Controller.IO;
-using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Services;
-
 using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Api.Images

+ 8 - 10
MediaBrowser.Api/Images/RemoteImageService.cs

@@ -1,4 +1,10 @@
-using MediaBrowser.Common.Extensions;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Dto;
@@ -7,16 +13,8 @@ using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Providers;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-using MediaBrowser.Controller.IO;
 using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Providers;
 using MediaBrowser.Model.Services;
 
 namespace MediaBrowser.Api.Images

+ 9 - 9
MediaBrowser.Api/ItemLookupService.cs

@@ -1,4 +1,10 @@
-using MediaBrowser.Common.Extensions;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
@@ -7,14 +13,8 @@ using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Providers;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Providers;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Services;
 using Microsoft.Extensions.Logging;
@@ -240,7 +240,7 @@ namespace MediaBrowser.Api
             //item.ProductionYear = request.ProductionYear;
             //item.Name = request.Name;
 
-            return _providerManager.RefreshFullItem(item, new MetadataRefreshOptions(new DirectoryService(Logger,  _fileSystem))
+            return _providerManager.RefreshFullItem(item, new MetadataRefreshOptions(new DirectoryService(Logger, _fileSystem))
             {
                 MetadataRefreshMode = MetadataRefreshMode.FullRefresh,
                 ImageRefreshMode = MetadataRefreshMode.FullRefresh,

+ 2 - 6
MediaBrowser.Api/ItemRefreshService.cs

@@ -1,13 +1,9 @@
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Providers;
-using System.Threading;
-
-using MediaBrowser.Controller.IO;
 using MediaBrowser.Model.IO;
-using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Services;
+using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Api
 {

+ 6 - 7
MediaBrowser.Api/ItemUpdateService.cs

@@ -1,4 +1,8 @@
-using MediaBrowser.Controller.Configuration;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.TV;
@@ -8,14 +12,9 @@ using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using MediaBrowser.Model.Globalization;
-using MediaBrowser.Model.Services;
 using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Services;
 
 namespace MediaBrowser.Api
 {

+ 15 - 19
MediaBrowser.Api/Library/LibraryService.cs

@@ -1,5 +1,13 @@
-using MediaBrowser.Api.Movies;
-using MediaBrowser.Api.Music;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Api.Movies;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Progress;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
@@ -9,29 +17,17 @@ using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
+using MediaBrowser.Controller.Providers;
 using MediaBrowser.Controller.TV;
 using MediaBrowser.Model.Activity;
+using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Querying;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-using MediaBrowser.Model.IO;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.IO;
+using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.Globalization;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Services;
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Common.Progress;
-using MediaBrowser.Model.Extensions;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Configuration;
 using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Api.Library

+ 6 - 8
MediaBrowser.Api/Library/LibraryStructureService.cs

@@ -1,19 +1,17 @@
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.Entities;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Progress;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller;
 using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.IO;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Services;
 
 namespace MediaBrowser.Api.Library

+ 15 - 16
MediaBrowser.Api/LiveTv/LiveTvService.cs

@@ -1,30 +1,29 @@
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Dto;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.LiveTv;
-using MediaBrowser.Model.Querying;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Api.UserLibrary;
-using MediaBrowser.Model.IO;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Dto;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.TV;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.LiveTv;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Model.Cryptography;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.LiveTv;
+using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Services;
 using MediaBrowser.Model.System;
-using MediaBrowser.Model.Extensions;
-using MediaBrowser.Model.Cryptography;
-using System.Text;
-using MediaBrowser.Controller.Entities;
 
 namespace MediaBrowser.Api.LiveTv
 {

+ 1 - 3
MediaBrowser.Api/LiveTv/ProgressiveFileCopier.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -7,7 +6,6 @@ using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Services;
 using MediaBrowser.Model.System;
-using MediaBrowser.Controller.IO;
 using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Api.LiveTv

+ 0 - 1
MediaBrowser.Api/LocalizationService.cs

@@ -1,7 +1,6 @@
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Globalization;
-using System.Collections.Generic;
 using MediaBrowser.Model.Services;
 
 namespace MediaBrowser.Api

+ 3 - 3
MediaBrowser.Api/Movies/CollectionService.cs

@@ -1,8 +1,8 @@
-using MediaBrowser.Controller.Collections;
+using System;
+using MediaBrowser.Controller.Collections;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Collections;
-using System;
 using MediaBrowser.Model.Services;
 
 namespace MediaBrowser.Api.Movies
@@ -69,7 +69,7 @@ namespace MediaBrowser.Api.Movies
                 Name = request.Name,
                 ParentId = parentId,
                 ItemIdList = SplitValue(request.Ids, ','),
-                UserIds = new [] { userId }
+                UserIds = new[] { userId }
 
             });
 

+ 8 - 10
MediaBrowser.Api/Movies/MoviesService.cs

@@ -1,20 +1,18 @@
-using MediaBrowser.Common.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Net;
-using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Querying;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Model.Extensions;
+using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Services;
 
 namespace MediaBrowser.Api.Movies
@@ -370,7 +368,7 @@ namespace MediaBrowser.Api.Movies
         {
             var people = _libraryManager.GetPeople(new InternalPeopleQuery
             {
-                ExcludePersonTypes = new []
+                ExcludePersonTypes = new[]
                 {
                     PersonType.Director
                 },

+ 2 - 2
MediaBrowser.Api/Movies/TrailersService.cs

@@ -1,11 +1,11 @@
 using MediaBrowser.Api.UserLibrary;
+using MediaBrowser.Controller.Collections;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.Querying;
-using MediaBrowser.Controller.Collections;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Globalization;
+using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Services;
 

+ 4 - 4
MediaBrowser.Api/Music/AlbumsService.cs

@@ -1,12 +1,12 @@
-using MediaBrowser.Controller.Dto;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using MediaBrowser.Model.Services;
 
 namespace MediaBrowser.Api.Music

+ 4 - 7
MediaBrowser.Api/Music/InstantMixService.cs

@@ -1,16 +1,13 @@
-using MediaBrowser.Controller.Dto;
+using System.Collections.Generic;
+using System.Linq;
+using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Playlists;
-using MediaBrowser.Model.Querying;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Services;
-using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Api.Music
 {

+ 6 - 6
MediaBrowser.Api/PackageService.cs

@@ -1,15 +1,15 @@
-using MediaBrowser.Common;
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Common.Updates;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.Updates;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Common;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Progress;
+using MediaBrowser.Common.Updates;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Services;
+using MediaBrowser.Model.Updates;
 
 namespace MediaBrowser.Api
 {

+ 12 - 13
MediaBrowser.Api/Playback/BaseStreamingService.cs

@@ -1,16 +1,3 @@
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Devices;
-using MediaBrowser.Controller.Dlna;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaEncoding;
-using MediaBrowser.Model.Dlna;
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Extensions;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.MediaInfo;
-using MediaBrowser.Model.Serialization;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -19,11 +6,23 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Devices;
+using MediaBrowser.Controller.Dlna;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Diagnostics;
+using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.MediaInfo;
+using MediaBrowser.Model.Serialization;
 using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Api.Playback

+ 10 - 10
MediaBrowser.Api/Playback/Hls/BaseHlsService.cs

@@ -1,20 +1,20 @@
-using MediaBrowser.Controller.Configuration;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Serialization;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.Configuration;
 using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Api.Playback.Hls
@@ -201,7 +201,7 @@ namespace MediaBrowser.Api.Playback.Hls
 
                             while (!reader.EndOfStream)
                             {
-                                var line =  reader.ReadLine();
+                                var line = reader.ReadLine();
 
                                 if (line.IndexOf("#EXTINF:", StringComparison.OrdinalIgnoreCase) != -1)
                                 {

+ 11 - 11
MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs

@@ -1,27 +1,27 @@
-using MediaBrowser.Common.Net;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Net;
+using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Serialization;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Services;
-using MimeTypes = MediaBrowser.Model.Net.MimeTypes;
 using Microsoft.Extensions.Logging;
+using MimeTypes = MediaBrowser.Model.Net.MimeTypes;
 
 namespace MediaBrowser.Api.Playback.Hls
 {

+ 4 - 5
MediaBrowser.Api/Playback/Hls/HlsSegmentService.cs

@@ -1,12 +1,11 @@
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Net;
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Services;
 

+ 3 - 3
MediaBrowser.Api/Playback/Hls/VideoHlsService.cs

@@ -1,14 +1,14 @@
+using System;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Serialization;
-using System;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Services;
 
 namespace MediaBrowser.Api.Playback.Hls

+ 9 - 9
MediaBrowser.Api/Playback/MediaInfoService.cs

@@ -1,23 +1,23 @@
-using MediaBrowser.Common.Net;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.MediaInfo;
-using MediaBrowser.Model.Session;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Controller.Entities.Audio;
-using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Services;
+using MediaBrowser.Model.Session;
 using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Api.Playback

+ 2 - 5
MediaBrowser.Api/Playback/Progressive/AudioService.cs

@@ -1,17 +1,14 @@
-using MediaBrowser.Common.Net;
+using System.Threading.Tasks;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Serialization;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Services;
 using MediaBrowser.Model.System;
 

+ 6 - 9
MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs

@@ -1,4 +1,9 @@
-using MediaBrowser.Common.Net;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Dlna;
@@ -9,16 +14,8 @@ using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.MediaInfo;
 using MediaBrowser.Model.Serialization;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
 using MediaBrowser.Model.Services;
 using MediaBrowser.Model.System;
-using Microsoft.Extensions.Logging;
-using MediaBrowser.Api.LiveTv;
 
 namespace MediaBrowser.Api.Playback.Progressive
 {

+ 2 - 4
MediaBrowser.Api/Playback/Progressive/ProgressiveStreamWriter.cs

@@ -1,12 +1,10 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Controller.Net;
-using System.Collections.Generic;
-using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Services;
 using MediaBrowser.Model.System;
 using Microsoft.Extensions.Logging;

+ 3 - 3
MediaBrowser.Api/Playback/Progressive/VideoService.cs

@@ -1,14 +1,14 @@
+using System.Threading.Tasks;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Serialization;
-using System.Threading.Tasks;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Services;
 using MediaBrowser.Model.System;
 

+ 2 - 2
MediaBrowser.Api/Playback/StaticRemoteStreamWriter.cs

@@ -1,8 +1,8 @@
-using MediaBrowser.Common.Net;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Model.Services;
 
 namespace MediaBrowser.Api.Playback

+ 0 - 1
MediaBrowser.Api/Playback/StreamRequest.cs

@@ -1,6 +1,5 @@
 using System;
 using MediaBrowser.Controller.MediaEncoding;
-using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Services;
 
 namespace MediaBrowser.Api.Playback

+ 4 - 13
MediaBrowser.Api/Playback/StreamState.cs

@@ -1,18 +1,9 @@
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Dlna;
-using MediaBrowser.Model.Drawing;
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.MediaInfo;
-using MediaBrowser.Model.Net;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
+using System;
 using System.IO;
-using System.Linq;
-using System.Threading;
+using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Net;
 using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Api.Playback

+ 2 - 2
MediaBrowser.Api/Playback/TranscodingThrottler.cs

@@ -1,6 +1,6 @@
-using MediaBrowser.Common.Configuration;
+using System;
+using MediaBrowser.Common.Configuration;
 using MediaBrowser.Model.Configuration;
-using System;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Threading;
 using Microsoft.Extensions.Logging;

+ 1 - 1
MediaBrowser.Api/Playback/UniversalAudioService.cs

@@ -128,7 +128,7 @@ namespace MediaBrowser.Api.Playback
 
             var directPlayProfiles = new List<DirectPlayProfile>();
 
-            var containers = (request.Container ?? string.Empty).Split(new [] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+            var containers = (request.Container ?? string.Empty).Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
 
             foreach (var container in containers)
             {

+ 3 - 4
MediaBrowser.Api/PlaylistService.cs

@@ -1,4 +1,6 @@
-using System.Linq;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
@@ -6,10 +8,7 @@ using MediaBrowser.Controller.Playlists;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Playlists;
 using MediaBrowser.Model.Querying;
-using System.Threading.Tasks;
 using MediaBrowser.Model.Services;
-using MediaBrowser.Model.Extensions;
-using System;
 
 namespace MediaBrowser.Api
 {

+ 7 - 7
MediaBrowser.Api/PluginService.cs

@@ -1,5 +1,11 @@
-using MediaBrowser.Common;
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Common;
 using MediaBrowser.Common.Net;
+using MediaBrowser.Common.Plugins;
 using MediaBrowser.Common.Security;
 using MediaBrowser.Common.Updates;
 using MediaBrowser.Controller.Devices;
@@ -7,13 +13,7 @@ using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Plugins;
 using MediaBrowser.Model.Serialization;
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using MediaBrowser.Model.Services;
-using MediaBrowser.Common.Plugins;
 using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Api

+ 4 - 4
MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs

@@ -1,11 +1,11 @@
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.Tasks;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Services;
+using MediaBrowser.Model.Tasks;
 
 namespace MediaBrowser.Api.ScheduledTasks
 {

+ 5 - 6
MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs

@@ -1,12 +1,11 @@
-using MediaBrowser.Model.Events;
-using Microsoft.Extensions.Logging;
-using MediaBrowser.Model.Tasks;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Model.Events;
+using MediaBrowser.Model.Tasks;
+using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Api.ScheduledTasks
 {

+ 3 - 4
MediaBrowser.Api/SearchService.cs

@@ -1,17 +1,16 @@
-using System.Linq;
+using System;
+using System.Linq;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Search;
-using System.Threading.Tasks;
-using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Model.Services;
-using System;
 
 namespace MediaBrowser.Api
 {

+ 4 - 7
MediaBrowser.Api/Session/SessionInfoWebSocketListener.cs

@@ -1,13 +1,10 @@
-using MediaBrowser.Controller.Library;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Session;
 using Microsoft.Extensions.Logging;
-using MediaBrowser.Model.Session;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using MediaBrowser.Model.Threading;
-using System.Threading.Tasks;
 
 namespace MediaBrowser.Api.Session
 {

+ 8 - 9
MediaBrowser.Api/Session/SessionsService.cs

@@ -1,17 +1,16 @@
-using MediaBrowser.Controller.Devices;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Controller.Security;
-using MediaBrowser.Controller.Session;
-using MediaBrowser.Model.Session;
-using System;
-using System.Collections.Generic;
+using System;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Model.Services;
 using MediaBrowser.Controller;
+using MediaBrowser.Controller.Devices;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Controller.Security;
+using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Services;
+using MediaBrowser.Model.Session;
 
 namespace MediaBrowser.Api.Session
 {

+ 6 - 7
MediaBrowser.Api/SimilarItemsHelper.cs

@@ -1,16 +1,15 @@
-using MediaBrowser.Controller.Dto;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Persistence;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
-using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Querying;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Services;
+using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Api
 {

+ 5 - 7
MediaBrowser.Api/StartupWizardService.cs

@@ -1,15 +1,13 @@
-using MediaBrowser.Controller;
+using System.Linq;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Connect;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Net;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
 using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Services;
-using MediaBrowser.Common.Net;
-using System.Threading;
 
 namespace MediaBrowser.Api
 {

+ 11 - 11
MediaBrowser.Api/Subtitles/SubtitleService.cs

@@ -1,12 +1,4 @@
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaEncoding;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Controller.Subtitles;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Providers;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
@@ -14,10 +6,18 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Controller.Providers;
+using MediaBrowser.Controller.Subtitles;
+using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Providers;
 using MediaBrowser.Model.Services;
-using MimeTypes = MediaBrowser.Model.Net.MimeTypes;
 using Microsoft.Extensions.Logging;
+using MimeTypes = MediaBrowser.Model.Net.MimeTypes;
 
 namespace MediaBrowser.Api.Subtitles
 {
@@ -247,7 +247,7 @@ namespace MediaBrowser.Api.Subtitles
         {
             var video = (Video)_libraryManager.GetItemById(request.Id);
 
-           return await _subtitleManager.SearchSubtitles(video, request.Language, request.IsPerfectMatch, CancellationToken.None).ConfigureAwait(false);
+            return await _subtitleManager.SearchSubtitles(video, request.Language, request.IsPerfectMatch, CancellationToken.None).ConfigureAwait(false);
         }
 
         public Task Delete(DeleteSubtitle request)

+ 5 - 7
MediaBrowser.Api/SuggestionsService.cs

@@ -1,15 +1,13 @@
-using MediaBrowser.Controller.Dto;
+using System;
+using System.Linq;
+using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Services;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Api
 {

+ 3 - 3
MediaBrowser.Api/System/ActivityLogService.cs

@@ -1,8 +1,8 @@
-using MediaBrowser.Controller.Net;
+using System;
+using System.Globalization;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Activity;
 using MediaBrowser.Model.Querying;
-using System;
-using System.Globalization;
 using MediaBrowser.Model.Services;
 
 namespace MediaBrowser.Api.System

+ 5 - 5
MediaBrowser.Api/System/ActivityLogWebSocketListener.cs

@@ -1,10 +1,10 @@
-using MediaBrowser.Model.Activity;
-using MediaBrowser.Model.Events;
-using Microsoft.Extensions.Logging;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Controller.Net;
-using System.Threading;
+using MediaBrowser.Model.Activity;
+using MediaBrowser.Model.Events;
+using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Api.System
 {

+ 8 - 8
MediaBrowser.Api/System/SystemService.cs

@@ -1,18 +1,18 @@
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Common.Security;
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.System;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Common.Security;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Services;
-using System.Threading;
+using MediaBrowser.Model.System;
 using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Api.System

+ 5 - 6
MediaBrowser.Api/TvShowsService.cs

@@ -1,4 +1,7 @@
-using MediaBrowser.Common.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.TV;
@@ -6,13 +9,9 @@ using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.TV;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Querying;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Services;
 
 namespace MediaBrowser.Api

+ 2 - 2
MediaBrowser.Api/UserLibrary/ArtistsService.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
@@ -6,7 +7,6 @@ using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Dto;
-using System.Collections.Generic;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Services;
 
@@ -92,7 +92,7 @@ namespace MediaBrowser.Api.UserLibrary
                 //request.IncludeItemTypes = "Audio,MusicVideo";
             }
 
-           return GetResultSlim(request);
+            return GetResultSlim(request);
         }
 
         /// <summary>

+ 6 - 8
MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs

@@ -1,16 +1,14 @@
-using MediaBrowser.Controller.Dto;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Persistence;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Querying;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using MediaBrowser.Controller.Dto;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
+using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Services;
-using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Api.UserLibrary
 {

+ 3 - 4
MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs

@@ -1,8 +1,7 @@
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Querying;
-using System;
-using System.Collections.Generic;
+using System;
 using System.Linq;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Services;
 
 namespace MediaBrowser.Api.UserLibrary

+ 3 - 3
MediaBrowser.Api/UserLibrary/GameGenresService.cs

@@ -1,11 +1,11 @@
-using MediaBrowser.Controller.Dto;
+using System;
+using System.Collections.Generic;
+using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Dto;
-using System;
-using System.Collections.Generic;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Services;
 

+ 3 - 3
MediaBrowser.Api/UserLibrary/GenresService.cs

@@ -1,12 +1,12 @@
-using MediaBrowser.Controller.Dto;
+using System;
+using System.Collections.Generic;
+using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
-using System;
-using System.Collections.Generic;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Services;
 

+ 8 - 10
MediaBrowser.Api/UserLibrary/ItemsService.cs

@@ -1,19 +1,17 @@
-using MediaBrowser.Controller.Dto;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Querying;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Threading.Tasks;
+using MediaBrowser.Controller.Dto;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Globalization;
+using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Services;
-using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Api.UserLibrary
 {
@@ -481,7 +479,7 @@ namespace MediaBrowser.Api.UserLibrary
                 // Albums by artist
                 if (query.ArtistIds.Length > 0 && query.IncludeItemTypes.Length == 1 && string.Equals(query.IncludeItemTypes[0], "MusicAlbum", StringComparison.OrdinalIgnoreCase))
                 {
-                    query.OrderBy = new []
+                    query.OrderBy = new[]
                     {
                         new ValueTuple<string, SortOrder>(ItemSortBy.ProductionYear, SortOrder.Descending),
                         new ValueTuple<string, SortOrder>(ItemSortBy.SortName, SortOrder.Ascending)

+ 1 - 1
MediaBrowser.Api/UserLibrary/MusicGenresService.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
@@ -6,7 +7,6 @@ using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Dto;
-using System.Collections.Generic;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Services;
 

+ 5 - 5
MediaBrowser.Api/UserLibrary/PersonsService.cs

@@ -1,14 +1,14 @@
-using MediaBrowser.Controller.Dto;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Dto;
-using System.Collections.Generic;
-using System.Linq;
-using MediaBrowser.Model.Services;
-using System;
 using MediaBrowser.Model.Querying;
+using MediaBrowser.Model.Services;
 
 namespace MediaBrowser.Api.UserLibrary
 {

+ 5 - 5
MediaBrowser.Api/UserLibrary/PlaystateService.cs

@@ -1,13 +1,13 @@
-using MediaBrowser.Controller.Entities;
+using System;
+using System.Globalization;
+using System.Threading.Tasks;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Session;
-using System;
-using System.Globalization;
-using System.Threading.Tasks;
 using MediaBrowser.Model.Services;
+using MediaBrowser.Model.Session;
 using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Api.UserLibrary

+ 1 - 2
MediaBrowser.Api/UserLibrary/StudiosService.cs

@@ -1,12 +1,11 @@
 using System;
+using System.Collections.Generic;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Dto;
-using System.Collections.Generic;
-using System.Linq;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Services;
 

+ 8 - 10
MediaBrowser.Api/UserLibrary/UserLibraryService.cs

@@ -1,19 +1,17 @@
-using MediaBrowser.Controller.Dto;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.TV;
+using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
+using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Querying;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Model.IO;
-using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Services;
 
 namespace MediaBrowser.Api.UserLibrary

+ 4 - 8
MediaBrowser.Api/UserLibrary/UserViewsService.cs

@@ -1,18 +1,14 @@
-using MediaBrowser.Controller.Dto;
+using System;
+using System.Linq;
+using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Library;
 using MediaBrowser.Model.Querying;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Services;
-using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Api.UserLibrary
 {

+ 4 - 4
MediaBrowser.Api/UserLibrary/YearsService.cs

@@ -1,13 +1,13 @@
-using MediaBrowser.Controller.Dto;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Dto;
-using System.Collections.Generic;
-using System.Linq;
 using MediaBrowser.Model.Services;
-using System;
 
 namespace MediaBrowser.Api.UserLibrary
 {

+ 5 - 5
MediaBrowser.Api/UserService.cs

@@ -1,6 +1,9 @@
-using MediaBrowser.Controller.Authentication;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Authentication;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Library;
@@ -9,11 +12,8 @@ using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Connect;
 using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Users;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
 using MediaBrowser.Model.Services;
+using MediaBrowser.Model.Users;
 
 namespace MediaBrowser.Api
 {

+ 6 - 9
MediaBrowser.Api/VideosService.cs

@@ -1,18 +1,15 @@
-using MediaBrowser.Controller.Configuration;
+using System;
+using System.Linq;
+using System.Threading;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
-using MediaBrowser.Model.Querying;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-using MediaBrowser.Controller.IO;
-using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Services;
 
 namespace MediaBrowser.Api