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

Merge pull request #4236 from ConfusedPolarBear/warnings1

Fix some warnings
Bond-009 пре 4 година
родитељ
комит
7775066475
47 измењених фајлова са 74 додато и 33 уклоњено
  1. 0 3
      Emby.Server.Implementations/Data/SqliteItemRepository.cs
  2. 0 1
      Emby.Server.Implementations/Dto/DtoService.cs
  3. 0 1
      Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
  4. 0 8
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
  5. 1 0
      Emby.Server.Implementations/LiveTv/LiveTvManager.cs
  6. 1 0
      Emby.Server.Implementations/Updates/InstallationManager.cs
  7. 2 0
      MediaBrowser.Controller/Channels/InternalChannelFeatures.cs
  8. 0 1
      MediaBrowser.Controller/Entities/Audio/Audio.cs
  9. 2 0
      MediaBrowser.Controller/Entities/BaseItem.cs
  10. 0 1
      MediaBrowser.Controller/Entities/Folder.cs
  11. 0 2
      MediaBrowser.Controller/Entities/IHasMediaSources.cs
  12. 0 1
      MediaBrowser.Controller/Entities/Photo.cs
  13. 0 1
      MediaBrowser.Controller/Entities/TV/Series.cs
  14. 0 1
      MediaBrowser.Controller/Entities/UserViewBuilder.cs
  15. 0 1
      MediaBrowser.Controller/IO/FileData.cs
  16. 2 0
      MediaBrowser.Controller/Library/ILibraryManager.cs
  17. 2 0
      MediaBrowser.Controller/Library/IMediaSourceManager.cs
  18. 1 0
      MediaBrowser.Controller/Library/ItemResolveArgs.cs
  19. 1 0
      MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
  20. 0 1
      MediaBrowser.Controller/LiveTv/ITunerHost.cs
  21. 1 0
      MediaBrowser.Controller/LiveTv/LiveTvServiceStatusInfo.cs
  22. 7 0
      MediaBrowser.Controller/LiveTv/ProgramInfo.cs
  23. 1 0
      MediaBrowser.Controller/LiveTv/RecordingInfo.cs
  24. 1 0
      MediaBrowser.Controller/LiveTv/TimerInfo.cs
  25. 1 3
      MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
  26. 2 0
      MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
  27. 1 0
      MediaBrowser.Controller/Persistence/IItemRepository.cs
  28. 1 0
      MediaBrowser.Controller/Resolvers/IItemResolver.cs
  29. 0 1
      MediaBrowser.Controller/Session/SessionInfo.cs
  30. 13 1
      MediaBrowser.Model/Dlna/StreamBuilder.cs
  31. 0 1
      MediaBrowser.Model/Dlna/StreamInfo.cs
  32. 8 0
      MediaBrowser.Model/Dto/BaseItemDto.cs
  33. 2 0
      MediaBrowser.Model/Entities/MediaStream.cs
  34. 4 0
      MediaBrowser.Model/Entities/MetadataProvider.cs
  35. 1 0
      MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs
  36. 0 1
      MediaBrowser.Model/Providers/RemoteImageInfo.cs
  37. 0 1
      MediaBrowser.Model/Providers/RemoteSearchResult.cs
  38. 1 0
      MediaBrowser.Model/Querying/ItemFields.cs
  39. 3 0
      MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs
  40. 3 0
      MediaBrowser.Model/Session/PlaybackProgressInfo.cs
  41. 2 0
      MediaBrowser.Model/Sync/SyncCategory.cs
  42. 4 1
      MediaBrowser.Model/System/SystemInfo.cs
  43. 1 0
      MediaBrowser.Model/Tasks/IConfigurableScheduledTask.cs
  44. 1 0
      MediaBrowser.Providers/Plugins/MusicBrainz/ArtistProvider.cs
  45. 4 0
      MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzAlbumProvider.cs
  46. 0 1
      MediaBrowser.Providers/Plugins/Tmdb/Movies/GenericTmdbMovieInfo.cs
  47. 0 1
      MediaBrowser.Providers/TV/DummySeasonProvider.cs

+ 0 - 3
Emby.Server.Implementations/Data/SqliteItemRepository.cs

@@ -2263,7 +2263,6 @@ namespace Emby.Server.Implementations.Data
             return query.IncludeItemTypes.Contains("Trailer", StringComparer.OrdinalIgnoreCase);
             return query.IncludeItemTypes.Contains("Trailer", StringComparer.OrdinalIgnoreCase);
         }
         }
 
 
-
         private static readonly HashSet<string> _artistExcludeParentTypes = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
         private static readonly HashSet<string> _artistExcludeParentTypes = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
         {
         {
             "Series",
             "Series",
@@ -3291,7 +3290,6 @@ namespace Emby.Server.Implementations.Data
                 }
                 }
             }
             }
 
 
-
             var isReturningZeroItems = query.Limit.HasValue && query.Limit <= 0;
             var isReturningZeroItems = query.Limit.HasValue && query.Limit <= 0;
 
 
             var statementTexts = new List<string>();
             var statementTexts = new List<string>();
@@ -6006,7 +6004,6 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
             }
             }
         }
         }
 
 
-
         /// <summary>
         /// <summary>
         /// Gets the chapter.
         /// Gets the chapter.
         /// </summary>
         /// </summary>

+ 0 - 1
Emby.Server.Implementations/Dto/DtoService.cs

@@ -468,7 +468,6 @@ namespace Emby.Server.Implementations.Dto
                     IncludeItemTypes = new[] { typeof(MusicAlbum).Name },
                     IncludeItemTypes = new[] { typeof(MusicAlbum).Name },
                     Name = item.Album,
                     Name = item.Album,
                     Limit = 1
                     Limit = 1
-
                 });
                 });
 
 
                 if (parentAlbumIds.Count > 0)
                 if (parentAlbumIds.Count > 0)

+ 0 - 1
Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs

@@ -28,7 +28,6 @@ namespace Emby.Server.Implementations.EntryPoints
         private readonly object _syncLock = new object();
         private readonly object _syncLock = new object();
         private Timer _updateTimer;
         private Timer _updateTimer;
 
 
-
         public UserDataChangeNotifier(IUserDataManager userDataManager, ISessionManager sessionManager, IUserManager userManager)
         public UserDataChangeNotifier(IUserDataManager userDataManager, ISessionManager sessionManager, IUserManager userManager)
         {
         {
             _userDataManager = userDataManager;
             _userDataManager = userDataManager;

+ 0 - 8
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs

@@ -874,7 +874,6 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                 public List<Lineup> lineups { get; set; }
                 public List<Lineup> lineups { get; set; }
             }
             }
 
 
-
             public class Headends
             public class Headends
             {
             {
                 public string headend { get; set; }
                 public string headend { get; set; }
@@ -886,8 +885,6 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                 public List<Lineup> lineups { get; set; }
                 public List<Lineup> lineups { get; set; }
             }
             }
 
 
-
-
             public class Map
             public class Map
             {
             {
                 public string stationID { get; set; }
                 public string stationID { get; set; }
@@ -971,9 +968,6 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                 public List<string> date { get; set; }
                 public List<string> date { get; set; }
             }
             }
 
 
-
-
-
             public class Rating
             public class Rating
             {
             {
                 public string body { get; set; }
                 public string body { get; set; }
@@ -1017,8 +1011,6 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                 public string isPremiereOrFinale { get; set; }
                 public string isPremiereOrFinale { get; set; }
             }
             }
 
 
-
-
             public class MetadataSchedule
             public class MetadataSchedule
             {
             {
                 public string modified { get; set; }
                 public string modified { get; set; }

+ 1 - 0
Emby.Server.Implementations/LiveTv/LiveTvManager.cs

@@ -2135,6 +2135,7 @@ namespace Emby.Server.Implementations.LiveTv
         }
         }
 
 
         private bool _disposed = false;
         private bool _disposed = false;
+
         /// <summary>
         /// <summary>
         /// Releases unmanaged and - optionally - managed resources.
         /// Releases unmanaged and - optionally - managed resources.
         /// </summary>
         /// </summary>

+ 1 - 0
Emby.Server.Implementations/Updates/InstallationManager.cs

@@ -393,6 +393,7 @@ namespace Emby.Server.Implementations.Updates
                     // Ignore any exceptions.
                     // Ignore any exceptions.
                 }
                 }
             }
             }
+
             stream.Position = 0;
             stream.Position = 0;
             _zipClient.ExtractAllFromZip(stream, targetDir, true);
             _zipClient.ExtractAllFromZip(stream, targetDir, true);
 
 

+ 2 - 0
MediaBrowser.Controller/Channels/InternalChannelFeatures.cs

@@ -42,6 +42,7 @@ namespace MediaBrowser.Controller.Channels
         /// Indicates if a sort ascending/descending toggle is supported or not.
         /// Indicates if a sort ascending/descending toggle is supported or not.
         /// </summary>
         /// </summary>
         public bool SupportsSortOrderToggle { get; set; }
         public bool SupportsSortOrderToggle { get; set; }
+
         /// <summary>
         /// <summary>
         /// Gets or sets the automatic refresh levels.
         /// Gets or sets the automatic refresh levels.
         /// </summary>
         /// </summary>
@@ -53,6 +54,7 @@ namespace MediaBrowser.Controller.Channels
         /// </summary>
         /// </summary>
         /// <value>The daily download limit.</value>
         /// <value>The daily download limit.</value>
         public int? DailyDownloadLimit { get; set; }
         public int? DailyDownloadLimit { get; set; }
+
         /// <summary>
         /// <summary>
         /// Gets or sets a value indicating whether [supports downloading].
         /// Gets or sets a value indicating whether [supports downloading].
         /// </summary>
         /// </summary>

+ 0 - 1
MediaBrowser.Controller/Entities/Audio/Audio.cs

@@ -90,7 +90,6 @@ namespace MediaBrowser.Controller.Entities.Audio
 
 
             var songKey = IndexNumber.HasValue ? IndexNumber.Value.ToString("0000") : string.Empty;
             var songKey = IndexNumber.HasValue ? IndexNumber.Value.ToString("0000") : string.Empty;
 
 
-
             if (ParentIndexNumber.HasValue)
             if (ParentIndexNumber.HasValue)
             {
             {
                 songKey = ParentIndexNumber.Value.ToString("0000") + "-" + songKey;
                 songKey = ParentIndexNumber.Value.ToString("0000") + "-" + songKey;

+ 2 - 0
MediaBrowser.Controller/Entities/BaseItem.cs

@@ -197,6 +197,7 @@ namespace MediaBrowser.Controller.Entities
         public virtual bool SupportsRemoteImageDownloading => true;
         public virtual bool SupportsRemoteImageDownloading => true;
 
 
         private string _name;
         private string _name;
+
         /// <summary>
         /// <summary>
         /// Gets or sets the name.
         /// Gets or sets the name.
         /// </summary>
         /// </summary>
@@ -661,6 +662,7 @@ namespace MediaBrowser.Controller.Entities
         }
         }
 
 
         private string _forcedSortName;
         private string _forcedSortName;
+
         /// <summary>
         /// <summary>
         /// Gets or sets the name of the forced sort.
         /// Gets or sets the name of the forced sort.
         /// </summary>
         /// </summary>

+ 0 - 1
MediaBrowser.Controller/Entities/Folder.cs

@@ -1386,7 +1386,6 @@ namespace MediaBrowser.Controller.Entities
             }
             }
         }
         }
 
 
-
         /// <summary>
         /// <summary>
         /// Gets the linked children.
         /// Gets the linked children.
         /// </summary>
         /// </summary>

+ 0 - 2
MediaBrowser.Controller/Entities/IHasMediaSources.cs

@@ -21,7 +21,5 @@ namespace MediaBrowser.Controller.Entities
         List<MediaSourceInfo> GetMediaSources(bool enablePathSubstitution);
         List<MediaSourceInfo> GetMediaSources(bool enablePathSubstitution);
 
 
         List<MediaStream> GetMediaStreams();
         List<MediaStream> GetMediaStreams();
-
-
     }
     }
 }
 }

+ 0 - 1
MediaBrowser.Controller/Entities/Photo.cs

@@ -16,7 +16,6 @@ namespace MediaBrowser.Controller.Entities
         [JsonIgnore]
         [JsonIgnore]
         public override Folder LatestItemsIndexContainer => AlbumEntity;
         public override Folder LatestItemsIndexContainer => AlbumEntity;
 
 
-
         [JsonIgnore]
         [JsonIgnore]
         public PhotoAlbum AlbumEntity
         public PhotoAlbum AlbumEntity
         {
         {

+ 0 - 1
MediaBrowser.Controller/Entities/TV/Series.cs

@@ -450,7 +450,6 @@ namespace MediaBrowser.Controller.Entities.TV
             });
             });
         }
         }
 
 
-
         protected override bool GetBlockUnratedValue(User user)
         protected override bool GetBlockUnratedValue(User user)
         {
         {
             return user.GetPreference(PreferenceKind.BlockUnratedItems).Contains(UnratedItem.Series.ToString());
             return user.GetPreference(PreferenceKind.BlockUnratedItems).Contains(UnratedItem.Series.ToString());

+ 0 - 1
MediaBrowser.Controller/Entities/UserViewBuilder.cs

@@ -258,7 +258,6 @@ namespace MediaBrowser.Controller.Entities
                 IncludeItemTypes = new[] { typeof(Movie).Name },
                 IncludeItemTypes = new[] { typeof(Movie).Name },
                 Recursive = true,
                 Recursive = true,
                 EnableTotalRecordCount = false
                 EnableTotalRecordCount = false
-
             }).Items
             }).Items
                 .SelectMany(i => i.Genres)
                 .SelectMany(i => i.Genres)
                 .DistinctNames()
                 .DistinctNames()

+ 0 - 1
MediaBrowser.Controller/IO/FileData.cs

@@ -111,5 +111,4 @@ namespace MediaBrowser.Controller.IO
             return returnResult;
             return returnResult;
         }
         }
     }
     }
-
 }
 }

+ 2 - 0
MediaBrowser.Controller/Library/ILibraryManager.cs

@@ -77,6 +77,7 @@ namespace MediaBrowser.Controller.Library
         MusicArtist GetArtist(string name);
         MusicArtist GetArtist(string name);
 
 
         MusicArtist GetArtist(string name, DtoOptions options);
         MusicArtist GetArtist(string name, DtoOptions options);
+
         /// <summary>
         /// <summary>
         /// Gets a Studio.
         /// Gets a Studio.
         /// </summary>
         /// </summary>
@@ -234,6 +235,7 @@ namespace MediaBrowser.Controller.Library
         /// Occurs when [item updated].
         /// Occurs when [item updated].
         /// </summary>
         /// </summary>
         event EventHandler<ItemChangeEventArgs> ItemUpdated;
         event EventHandler<ItemChangeEventArgs> ItemUpdated;
+
         /// <summary>
         /// <summary>
         /// Occurs when [item removed].
         /// Occurs when [item removed].
         /// </summary>
         /// </summary>

+ 2 - 0
MediaBrowser.Controller/Library/IMediaSourceManager.cs

@@ -28,12 +28,14 @@ namespace MediaBrowser.Controller.Library
         /// <param name="itemId">The item identifier.</param>
         /// <param name="itemId">The item identifier.</param>
         /// <returns>IEnumerable&lt;MediaStream&gt;.</returns>
         /// <returns>IEnumerable&lt;MediaStream&gt;.</returns>
         List<MediaStream> GetMediaStreams(Guid itemId);
         List<MediaStream> GetMediaStreams(Guid itemId);
+
         /// <summary>
         /// <summary>
         /// Gets the media streams.
         /// Gets the media streams.
         /// </summary>
         /// </summary>
         /// <param name="mediaSourceId">The media source identifier.</param>
         /// <param name="mediaSourceId">The media source identifier.</param>
         /// <returns>IEnumerable&lt;MediaStream&gt;.</returns>
         /// <returns>IEnumerable&lt;MediaStream&gt;.</returns>
         List<MediaStream> GetMediaStreams(string mediaSourceId);
         List<MediaStream> GetMediaStreams(string mediaSourceId);
+
         /// <summary>
         /// <summary>
         /// Gets the media streams.
         /// Gets the media streams.
         /// </summary>
         /// </summary>

+ 1 - 0
MediaBrowser.Controller/Library/ItemResolveArgs.cs

@@ -156,6 +156,7 @@ namespace MediaBrowser.Controller.Library
         }
         }
 
 
         // REVIEW: @bond
         // REVIEW: @bond
+
         /// <summary>
         /// <summary>
         /// Gets the physical locations.
         /// Gets the physical locations.
         /// </summary>
         /// </summary>

+ 1 - 0
MediaBrowser.Controller/LiveTv/ILiveTvManager.cs

@@ -231,6 +231,7 @@ namespace MediaBrowser.Controller.LiveTv
         /// Saves the tuner host.
         /// Saves the tuner host.
         /// </summary>
         /// </summary>
         Task<TunerHostInfo> SaveTunerHost(TunerHostInfo info, bool dataSourceChanged = true);
         Task<TunerHostInfo> SaveTunerHost(TunerHostInfo info, bool dataSourceChanged = true);
+
         /// <summary>
         /// <summary>
         /// Saves the listing provider.
         /// Saves the listing provider.
         /// </summary>
         /// </summary>

+ 0 - 1
MediaBrowser.Controller/LiveTv/ITunerHost.cs

@@ -56,7 +56,6 @@ namespace MediaBrowser.Controller.LiveTv
         Task<List<MediaSourceInfo>> GetChannelStreamMediaSources(string channelId, CancellationToken cancellationToken);
         Task<List<MediaSourceInfo>> GetChannelStreamMediaSources(string channelId, CancellationToken cancellationToken);
 
 
         Task<List<TunerHostInfo>> DiscoverDevices(int discoveryDurationMs, CancellationToken cancellationToken);
         Task<List<TunerHostInfo>> DiscoverDevices(int discoveryDurationMs, CancellationToken cancellationToken);
-
     }
     }
 
 
     public interface IConfigurableTunerHost
     public interface IConfigurableTunerHost

+ 1 - 0
MediaBrowser.Controller/LiveTv/LiveTvServiceStatusInfo.cs

@@ -42,6 +42,7 @@ namespace MediaBrowser.Controller.LiveTv
         /// </summary>
         /// </summary>
         /// <value>The tuners.</value>
         /// <value>The tuners.</value>
         public List<LiveTvTunerInfo> Tuners { get; set; }
         public List<LiveTvTunerInfo> Tuners { get; set; }
+
         /// <summary>
         /// <summary>
         /// Gets or sets a value indicating whether this instance is visible.
         /// Gets or sets a value indicating whether this instance is visible.
         /// </summary>
         /// </summary>

+ 7 - 0
MediaBrowser.Controller/LiveTv/ProgramInfo.cs

@@ -35,6 +35,7 @@ namespace MediaBrowser.Controller.LiveTv
         /// </summary>
         /// </summary>
         /// <value>The overview.</value>
         /// <value>The overview.</value>
         public string Overview { get; set; }
         public string Overview { get; set; }
+
         /// <summary>
         /// <summary>
         /// Gets or sets the short overview.
         /// Gets or sets the short overview.
         /// </summary>
         /// </summary>
@@ -169,31 +170,37 @@ namespace MediaBrowser.Controller.LiveTv
         /// </summary>
         /// </summary>
         /// <value>The production year.</value>
         /// <value>The production year.</value>
         public int? ProductionYear { get; set; }
         public int? ProductionYear { get; set; }
+
         /// <summary>
         /// <summary>
         /// Gets or sets the home page URL.
         /// Gets or sets the home page URL.
         /// </summary>
         /// </summary>
         /// <value>The home page URL.</value>
         /// <value>The home page URL.</value>
         public string HomePageUrl { get; set; }
         public string HomePageUrl { get; set; }
+
         /// <summary>
         /// <summary>
         /// Gets or sets the series identifier.
         /// Gets or sets the series identifier.
         /// </summary>
         /// </summary>
         /// <value>The series identifier.</value>
         /// <value>The series identifier.</value>
         public string SeriesId { get; set; }
         public string SeriesId { get; set; }
+
         /// <summary>
         /// <summary>
         /// Gets or sets the show identifier.
         /// Gets or sets the show identifier.
         /// </summary>
         /// </summary>
         /// <value>The show identifier.</value>
         /// <value>The show identifier.</value>
         public string ShowId { get; set; }
         public string ShowId { get; set; }
+
         /// <summary>
         /// <summary>
         /// Gets or sets the season number.
         /// Gets or sets the season number.
         /// </summary>
         /// </summary>
         /// <value>The season number.</value>
         /// <value>The season number.</value>
         public int? SeasonNumber { get; set; }
         public int? SeasonNumber { get; set; }
+
         /// <summary>
         /// <summary>
         /// Gets or sets the episode number.
         /// Gets or sets the episode number.
         /// </summary>
         /// </summary>
         /// <value>The episode number.</value>
         /// <value>The episode number.</value>
         public int? EpisodeNumber { get; set; }
         public int? EpisodeNumber { get; set; }
+
         /// <summary>
         /// <summary>
         /// Gets or sets the etag.
         /// Gets or sets the etag.
         /// </summary>
         /// </summary>

+ 1 - 0
MediaBrowser.Controller/LiveTv/RecordingInfo.cs

@@ -187,6 +187,7 @@ namespace MediaBrowser.Controller.LiveTv
         /// </summary>
         /// </summary>
         /// <value><c>null</c> if [has image] contains no value, <c>true</c> if [has image]; otherwise, <c>false</c>.</value>
         /// <value><c>null</c> if [has image] contains no value, <c>true</c> if [has image]; otherwise, <c>false</c>.</value>
         public bool? HasImage { get; set; }
         public bool? HasImage { get; set; }
+
         /// <summary>
         /// <summary>
         /// Gets or sets the show identifier.
         /// Gets or sets the show identifier.
         /// </summary>
         /// </summary>

+ 1 - 0
MediaBrowser.Controller/LiveTv/TimerInfo.cs

@@ -113,6 +113,7 @@ namespace MediaBrowser.Controller.LiveTv
 
 
         // Program properties
         // Program properties
         public int? SeasonNumber { get; set; }
         public int? SeasonNumber { get; set; }
+
         /// <summary>
         /// <summary>
         /// Gets or sets the episode number.
         /// Gets or sets the episode number.
         /// </summary>
         /// </summary>

+ 1 - 3
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs

@@ -109,7 +109,6 @@ namespace MediaBrowser.Controller.MediaEncoding
             }
             }
 
 
             return _mediaEncoder.SupportsHwaccel("vaapi");
             return _mediaEncoder.SupportsHwaccel("vaapi");
-
         }
         }
 
 
         /// <summary>
         /// <summary>
@@ -508,6 +507,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                                 arg.Append("-hwaccel qsv ");
                                 arg.Append("-hwaccel qsv ");
                             }
                             }
                         }
                         }
+
                         // While using SW decoder
                         // While using SW decoder
                         else
                         else
                         {
                         {
@@ -1441,7 +1441,6 @@ namespace MediaBrowser.Controller.MediaEncoding
 
 
             var codec = outputAudioCodec ?? string.Empty;
             var codec = outputAudioCodec ?? string.Empty;
 
 
-
             int? transcoderChannelLimit;
             int? transcoderChannelLimit;
             if (codec.IndexOf("wma", StringComparison.OrdinalIgnoreCase) != -1)
             if (codec.IndexOf("wma", StringComparison.OrdinalIgnoreCase) != -1)
             {
             {
@@ -2511,7 +2510,6 @@ namespace MediaBrowser.Controller.MediaEncoding
             return inputModifier;
             return inputModifier;
         }
         }
 
 
-
         public void AttachMediaSourceInfo(
         public void AttachMediaSourceInfo(
             EncodingJobInfo state,
             EncodingJobInfo state,
             MediaSourceInfo mediaSource,
             MediaSourceInfo mediaSource,

+ 2 - 0
MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs

@@ -697,10 +697,12 @@ namespace MediaBrowser.Controller.MediaEncoding
         /// The progressive.
         /// The progressive.
         /// </summary>
         /// </summary>
         Progressive,
         Progressive,
+
         /// <summary>
         /// <summary>
         /// The HLS.
         /// The HLS.
         /// </summary>
         /// </summary>
         Hls,
         Hls,
+
         /// <summary>
         /// <summary>
         /// The dash.
         /// The dash.
         /// </summary>
         /// </summary>

+ 1 - 0
MediaBrowser.Controller/Persistence/IItemRepository.cs

@@ -100,6 +100,7 @@ namespace MediaBrowser.Controller.Persistence
         /// <param name="query">The query.</param>
         /// <param name="query">The query.</param>
         /// <returns>IEnumerable&lt;Guid&gt;.</returns>
         /// <returns>IEnumerable&lt;Guid&gt;.</returns>
         QueryResult<Guid> GetItemIds(InternalItemsQuery query);
         QueryResult<Guid> GetItemIds(InternalItemsQuery query);
+
         /// <summary>
         /// <summary>
         /// Gets the items.
         /// Gets the items.
         /// </summary>
         /// </summary>

+ 1 - 0
MediaBrowser.Controller/Resolvers/IItemResolver.cs

@@ -19,6 +19,7 @@ namespace MediaBrowser.Controller.Resolvers
         /// <param name="args">The args.</param>
         /// <param name="args">The args.</param>
         /// <returns>BaseItem.</returns>
         /// <returns>BaseItem.</returns>
         BaseItem ResolvePath(ItemResolveArgs args);
         BaseItem ResolvePath(ItemResolveArgs args);
+
         /// <summary>
         /// <summary>
         /// Gets the priority.
         /// Gets the priority.
         /// </summary>
         /// </summary>

+ 0 - 1
MediaBrowser.Controller/Session/SessionInfo.cs

@@ -22,7 +22,6 @@ namespace MediaBrowser.Controller.Session
         private readonly ISessionManager _sessionManager;
         private readonly ISessionManager _sessionManager;
         private readonly ILogger _logger;
         private readonly ILogger _logger;
 
 
-
         private readonly object _progressLock = new object();
         private readonly object _progressLock = new object();
         private Timer _progressTimer;
         private Timer _progressTimer;
         private PlaybackProgressInfo _lastProgressInfo;
         private PlaybackProgressInfo _lastProgressInfo;

+ 13 - 1
MediaBrowser.Model/Dlna/StreamBuilder.cs

@@ -498,7 +498,6 @@ namespace MediaBrowser.Model.Dlna
                 }
                 }
             }
             }
 
 
-
             if (playMethods.Count > 0)
             if (playMethods.Count > 0)
             {
             {
                 transcodeReasons.Clear();
                 transcodeReasons.Clear();
@@ -1431,6 +1430,7 @@ namespace MediaBrowser.Model.Dlna
 
 
                             break;
                             break;
                         }
                         }
+
                     case ProfileConditionValue.AudioChannels:
                     case ProfileConditionValue.AudioChannels:
                         {
                         {
                             if (string.IsNullOrEmpty(qualifier))
                             if (string.IsNullOrEmpty(qualifier))
@@ -1466,6 +1466,7 @@ namespace MediaBrowser.Model.Dlna
 
 
                             break;
                             break;
                         }
                         }
+
                     case ProfileConditionValue.IsAvc:
                     case ProfileConditionValue.IsAvc:
                         {
                         {
                             if (!enableNonQualifiedConditions)
                             if (!enableNonQualifiedConditions)
@@ -1487,6 +1488,7 @@ namespace MediaBrowser.Model.Dlna
 
 
                             break;
                             break;
                         }
                         }
+
                     case ProfileConditionValue.IsAnamorphic:
                     case ProfileConditionValue.IsAnamorphic:
                         {
                         {
                             if (!enableNonQualifiedConditions)
                             if (!enableNonQualifiedConditions)
@@ -1508,6 +1510,7 @@ namespace MediaBrowser.Model.Dlna
 
 
                             break;
                             break;
                         }
                         }
+
                     case ProfileConditionValue.IsInterlaced:
                     case ProfileConditionValue.IsInterlaced:
                         {
                         {
                             if (string.IsNullOrEmpty(qualifier))
                             if (string.IsNullOrEmpty(qualifier))
@@ -1539,6 +1542,7 @@ namespace MediaBrowser.Model.Dlna
 
 
                             break;
                             break;
                         }
                         }
+
                     case ProfileConditionValue.AudioProfile:
                     case ProfileConditionValue.AudioProfile:
                     case ProfileConditionValue.Has64BitOffsets:
                     case ProfileConditionValue.Has64BitOffsets:
                     case ProfileConditionValue.PacketLength:
                     case ProfileConditionValue.PacketLength:
@@ -1550,6 +1554,7 @@ namespace MediaBrowser.Model.Dlna
                             // Not supported yet
                             // Not supported yet
                             break;
                             break;
                         }
                         }
+
                     case ProfileConditionValue.RefFrames:
                     case ProfileConditionValue.RefFrames:
                         {
                         {
                             if (string.IsNullOrEmpty(qualifier))
                             if (string.IsNullOrEmpty(qualifier))
@@ -1585,6 +1590,7 @@ namespace MediaBrowser.Model.Dlna
 
 
                             break;
                             break;
                         }
                         }
+
                     case ProfileConditionValue.VideoBitDepth:
                     case ProfileConditionValue.VideoBitDepth:
                         {
                         {
                             if (string.IsNullOrEmpty(qualifier))
                             if (string.IsNullOrEmpty(qualifier))
@@ -1620,6 +1626,7 @@ namespace MediaBrowser.Model.Dlna
 
 
                             break;
                             break;
                         }
                         }
+
                     case ProfileConditionValue.VideoProfile:
                     case ProfileConditionValue.VideoProfile:
                         {
                         {
                             if (string.IsNullOrEmpty(qualifier))
                             if (string.IsNullOrEmpty(qualifier))
@@ -1643,6 +1650,7 @@ namespace MediaBrowser.Model.Dlna
 
 
                             break;
                             break;
                         }
                         }
+
                     case ProfileConditionValue.Height:
                     case ProfileConditionValue.Height:
                         {
                         {
                             if (!enableNonQualifiedConditions)
                             if (!enableNonQualifiedConditions)
@@ -1668,6 +1676,7 @@ namespace MediaBrowser.Model.Dlna
 
 
                             break;
                             break;
                         }
                         }
+
                     case ProfileConditionValue.VideoBitrate:
                     case ProfileConditionValue.VideoBitrate:
                         {
                         {
                             if (!enableNonQualifiedConditions)
                             if (!enableNonQualifiedConditions)
@@ -1693,6 +1702,7 @@ namespace MediaBrowser.Model.Dlna
 
 
                             break;
                             break;
                         }
                         }
+
                     case ProfileConditionValue.VideoFramerate:
                     case ProfileConditionValue.VideoFramerate:
                         {
                         {
                             if (!enableNonQualifiedConditions)
                             if (!enableNonQualifiedConditions)
@@ -1718,6 +1728,7 @@ namespace MediaBrowser.Model.Dlna
 
 
                             break;
                             break;
                         }
                         }
+
                     case ProfileConditionValue.VideoLevel:
                     case ProfileConditionValue.VideoLevel:
                         {
                         {
                             if (string.IsNullOrEmpty(qualifier))
                             if (string.IsNullOrEmpty(qualifier))
@@ -1743,6 +1754,7 @@ namespace MediaBrowser.Model.Dlna
 
 
                             break;
                             break;
                         }
                         }
+
                     case ProfileConditionValue.Width:
                     case ProfileConditionValue.Width:
                         {
                         {
                             if (!enableNonQualifiedConditions)
                             if (!enableNonQualifiedConditions)

+ 0 - 1
MediaBrowser.Model/Dlna/StreamInfo.cs

@@ -276,7 +276,6 @@ namespace MediaBrowser.Model.Dlna
 
 
             list.Add(new NameValuePair("SubtitleMethod", item.SubtitleStreamIndex.HasValue && item.SubtitleDeliveryMethod != SubtitleDeliveryMethod.External ? item.SubtitleDeliveryMethod.ToString() : string.Empty));
             list.Add(new NameValuePair("SubtitleMethod", item.SubtitleStreamIndex.HasValue && item.SubtitleDeliveryMethod != SubtitleDeliveryMethod.External ? item.SubtitleDeliveryMethod.ToString() : string.Empty));
 
 
-
             if (!item.IsDirectStream)
             if (!item.IsDirectStream)
             {
             {
                 if (item.RequireNonAnamorphic)
                 if (item.RequireNonAnamorphic)

+ 8 - 0
MediaBrowser.Model/Dto/BaseItemDto.cs

@@ -429,6 +429,7 @@ namespace MediaBrowser.Model.Dto
         /// </summary>
         /// </summary>
         /// <value>The album id.</value>
         /// <value>The album id.</value>
         public Guid AlbumId { get; set; }
         public Guid AlbumId { get; set; }
+
         /// <summary>
         /// <summary>
         /// Gets or sets the album image tag.
         /// Gets or sets the album image tag.
         /// </summary>
         /// </summary>
@@ -599,11 +600,13 @@ namespace MediaBrowser.Model.Dto
         /// </summary>
         /// </summary>
         /// <value>The trailer count.</value>
         /// <value>The trailer count.</value>
         public int? TrailerCount { get; set; }
         public int? TrailerCount { get; set; }
+
         /// <summary>
         /// <summary>
         /// Gets or sets the movie count.
         /// Gets or sets the movie count.
         /// </summary>
         /// </summary>
         /// <value>The movie count.</value>
         /// <value>The movie count.</value>
         public int? MovieCount { get; set; }
         public int? MovieCount { get; set; }
+
         /// <summary>
         /// <summary>
         /// Gets or sets the series count.
         /// Gets or sets the series count.
         /// </summary>
         /// </summary>
@@ -611,16 +614,19 @@ namespace MediaBrowser.Model.Dto
         public int? SeriesCount { get; set; }
         public int? SeriesCount { get; set; }
 
 
         public int? ProgramCount { get; set; }
         public int? ProgramCount { get; set; }
+
         /// <summary>
         /// <summary>
         /// Gets or sets the episode count.
         /// Gets or sets the episode count.
         /// </summary>
         /// </summary>
         /// <value>The episode count.</value>
         /// <value>The episode count.</value>
         public int? EpisodeCount { get; set; }
         public int? EpisodeCount { get; set; }
+
         /// <summary>
         /// <summary>
         /// Gets or sets the song count.
         /// Gets or sets the song count.
         /// </summary>
         /// </summary>
         /// <value>The song count.</value>
         /// <value>The song count.</value>
         public int? SongCount { get; set; }
         public int? SongCount { get; set; }
+
         /// <summary>
         /// <summary>
         /// Gets or sets the album count.
         /// Gets or sets the album count.
         /// </summary>
         /// </summary>
@@ -628,6 +634,7 @@ namespace MediaBrowser.Model.Dto
         public int? AlbumCount { get; set; }
         public int? AlbumCount { get; set; }
 
 
         public int? ArtistCount { get; set; }
         public int? ArtistCount { get; set; }
+
         /// <summary>
         /// <summary>
         /// Gets or sets the music video count.
         /// Gets or sets the music video count.
         /// </summary>
         /// </summary>
@@ -768,6 +775,7 @@ namespace MediaBrowser.Model.Dto
         /// </summary>
         /// </summary>
         /// <value>The timer identifier.</value>
         /// <value>The timer identifier.</value>
         public string TimerId { get; set; }
         public string TimerId { get; set; }
+
         /// <summary>
         /// <summary>
         /// Gets or sets the current program.
         /// Gets or sets the current program.
         /// </summary>
         /// </summary>

+ 2 - 0
MediaBrowser.Model/Entities/MediaStream.cs

@@ -451,11 +451,13 @@ namespace MediaBrowser.Model.Entities
         /// </summary>
         /// </summary>
         /// <value>The method.</value>
         /// <value>The method.</value>
         public SubtitleDeliveryMethod? DeliveryMethod { get; set; }
         public SubtitleDeliveryMethod? DeliveryMethod { get; set; }
+
         /// <summary>
         /// <summary>
         /// Gets or sets the delivery URL.
         /// Gets or sets the delivery URL.
         /// </summary>
         /// </summary>
         /// <value>The delivery URL.</value>
         /// <value>The delivery URL.</value>
         public string DeliveryUrl { get; set; }
         public string DeliveryUrl { get; set; }
+
         /// <summary>
         /// <summary>
         /// Gets or sets a value indicating whether this instance is external URL.
         /// Gets or sets a value indicating whether this instance is external URL.
         /// </summary>
         /// </summary>

+ 4 - 0
MediaBrowser.Model/Entities/MetadataProvider.cs

@@ -11,18 +11,22 @@ namespace MediaBrowser.Model.Entities
         /// The imdb.
         /// The imdb.
         /// </summary>
         /// </summary>
         Imdb = 2,
         Imdb = 2,
+
         /// <summary>
         /// <summary>
         /// The TMDB.
         /// The TMDB.
         /// </summary>
         /// </summary>
         Tmdb = 3,
         Tmdb = 3,
+
         /// <summary>
         /// <summary>
         /// The TVDB.
         /// The TVDB.
         /// </summary>
         /// </summary>
         Tvdb = 4,
         Tvdb = 4,
+
         /// <summary>
         /// <summary>
         /// The tvcom.
         /// The tvcom.
         /// </summary>
         /// </summary>
         Tvcom = 5,
         Tvcom = 5,
+
         /// <summary>
         /// <summary>
         /// Tmdb Collection Id.
         /// Tmdb Collection Id.
         /// </summary>
         /// </summary>

+ 1 - 0
MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs

@@ -84,6 +84,7 @@ namespace MediaBrowser.Model.LiveTv
         /// </summary>
         /// </summary>
         /// <value><c>null</c> if [is kids] contains no value, <c>true</c> if [is kids]; otherwise, <c>false</c>.</value>
         /// <value><c>null</c> if [is kids] contains no value, <c>true</c> if [is kids]; otherwise, <c>false</c>.</value>
         public bool? IsKids { get; set; }
         public bool? IsKids { get; set; }
+
         /// <summary>
         /// <summary>
         /// Gets or sets a value indicating whether this instance is sports.
         /// Gets or sets a value indicating whether this instance is sports.
         /// </summary>
         /// </summary>

+ 0 - 1
MediaBrowser.Model/Providers/RemoteImageInfo.cs

@@ -68,5 +68,4 @@ namespace MediaBrowser.Model.Providers
         /// <value>The type of the rating.</value>
         /// <value>The type of the rating.</value>
         public RatingType RatingType { get; set; }
         public RatingType RatingType { get; set; }
     }
     }
-
 }
 }

+ 0 - 1
MediaBrowser.Model/Providers/RemoteSearchResult.cs

@@ -50,6 +50,5 @@ namespace MediaBrowser.Model.Providers
         public RemoteSearchResult AlbumArtist { get; set; }
         public RemoteSearchResult AlbumArtist { get; set; }
 
 
         public RemoteSearchResult[] Artists { get; set; }
         public RemoteSearchResult[] Artists { get; set; }
-
     }
     }
 }
 }

+ 1 - 0
MediaBrowser.Model/Querying/ItemFields.cs

@@ -168,6 +168,7 @@ namespace MediaBrowser.Model.Querying
         Studios,
         Studios,
 
 
         BasicSyncInfo,
         BasicSyncInfo,
+
         /// <summary>
         /// <summary>
         /// The synchronize information.
         /// The synchronize information.
         /// </summary>
         /// </summary>

+ 3 - 0
MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs

@@ -37,16 +37,19 @@ namespace MediaBrowser.Model.Querying
         /// </summary>
         /// </summary>
         /// <value>The fields.</value>
         /// <value>The fields.</value>
         public ItemFields[] Fields { get; set; }
         public ItemFields[] Fields { get; set; }
+
         /// <summary>
         /// <summary>
         /// Gets or sets a value indicating whether [enable images].
         /// Gets or sets a value indicating whether [enable images].
         /// </summary>
         /// </summary>
         /// <value><c>null</c> if [enable images] contains no value, <c>true</c> if [enable images]; otherwise, <c>false</c>.</value>
         /// <value><c>null</c> if [enable images] contains no value, <c>true</c> if [enable images]; otherwise, <c>false</c>.</value>
         public bool? EnableImages { get; set; }
         public bool? EnableImages { get; set; }
+
         /// <summary>
         /// <summary>
         /// Gets or sets the image type limit.
         /// Gets or sets the image type limit.
         /// </summary>
         /// </summary>
         /// <value>The image type limit.</value>
         /// <value>The image type limit.</value>
         public int? ImageTypeLimit { get; set; }
         public int? ImageTypeLimit { get; set; }
+
         /// <summary>
         /// <summary>
         /// Gets or sets the enable image types.
         /// Gets or sets the enable image types.
         /// </summary>
         /// </summary>

+ 3 - 0
MediaBrowser.Model/Session/PlaybackProgressInfo.cs

@@ -88,16 +88,19 @@ namespace MediaBrowser.Model.Session
         /// </summary>
         /// </summary>
         /// <value>The play method.</value>
         /// <value>The play method.</value>
         public PlayMethod PlayMethod { get; set; }
         public PlayMethod PlayMethod { get; set; }
+
         /// <summary>
         /// <summary>
         /// Gets or sets the live stream identifier.
         /// Gets or sets the live stream identifier.
         /// </summary>
         /// </summary>
         /// <value>The live stream identifier.</value>
         /// <value>The live stream identifier.</value>
         public string LiveStreamId { get; set; }
         public string LiveStreamId { get; set; }
+
         /// <summary>
         /// <summary>
         /// Gets or sets the play session identifier.
         /// Gets or sets the play session identifier.
         /// </summary>
         /// </summary>
         /// <value>The play session identifier.</value>
         /// <value>The play session identifier.</value>
         public string PlaySessionId { get; set; }
         public string PlaySessionId { get; set; }
+
         /// <summary>
         /// <summary>
         /// Gets or sets the repeat mode.
         /// Gets or sets the repeat mode.
         /// </summary>
         /// </summary>

+ 2 - 0
MediaBrowser.Model/Sync/SyncCategory.cs

@@ -8,10 +8,12 @@ namespace MediaBrowser.Model.Sync
         /// The latest.
         /// The latest.
         /// </summary>
         /// </summary>
         Latest = 0,
         Latest = 0,
+
         /// <summary>
         /// <summary>
         /// The next up.
         /// The next up.
         /// </summary>
         /// </summary>
         NextUp = 1,
         NextUp = 1,
+
         /// <summary>
         /// <summary>
         /// The resume.
         /// The resume.
         /// </summary>
         /// </summary>

+ 4 - 1
MediaBrowser.Model/System/SystemInfo.cs

@@ -14,13 +14,16 @@ namespace MediaBrowser.Model.System
     {
     {
         /// <summary>No path to FFmpeg found.</summary>
         /// <summary>No path to FFmpeg found.</summary>
         NotFound,
         NotFound,
+
         /// <summary>Path supplied via command line using switch --ffmpeg.</summary>
         /// <summary>Path supplied via command line using switch --ffmpeg.</summary>
         SetByArgument,
         SetByArgument,
+
         /// <summary>User has supplied path via Transcoding UI page.</summary>
         /// <summary>User has supplied path via Transcoding UI page.</summary>
         Custom,
         Custom,
+
         /// <summary>FFmpeg tool found on system $PATH.</summary>
         /// <summary>FFmpeg tool found on system $PATH.</summary>
         System
         System
-    };
+    }
 
 
     /// <summary>
     /// <summary>
     /// Class SystemInfo.
     /// Class SystemInfo.

+ 1 - 0
MediaBrowser.Model/Tasks/IConfigurableScheduledTask.cs

@@ -9,6 +9,7 @@ namespace MediaBrowser.Model.Tasks
         /// </summary>
         /// </summary>
         /// <value><c>true</c> if this instance is hidden; otherwise, <c>false</c>.</value>
         /// <value><c>true</c> if this instance is hidden; otherwise, <c>false</c>.</value>
         bool IsHidden { get; }
         bool IsHidden { get; }
+
         /// <summary>
         /// <summary>
         /// Gets a value indicating whether this instance is enabled.
         /// Gets a value indicating whether this instance is enabled.
         /// </summary>
         /// </summary>

+ 1 - 0
MediaBrowser.Providers/Plugins/MusicBrainz/ArtistProvider.cs

@@ -198,6 +198,7 @@ namespace MediaBrowser.Providers.Music
                                 result.Name = reader.ReadElementContentAsString();
                                 result.Name = reader.ReadElementContentAsString();
                                 break;
                                 break;
                             }
                             }
+
                         case "annotation":
                         case "annotation":
                             {
                             {
                                 result.Overview = reader.ReadElementContentAsString();
                                 result.Overview = reader.ReadElementContentAsString();

+ 4 - 0
MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzAlbumProvider.cs

@@ -444,6 +444,7 @@ namespace MediaBrowser.Providers.Music
                                     result.Title = reader.ReadElementContentAsString();
                                     result.Title = reader.ReadElementContentAsString();
                                     break;
                                     break;
                                 }
                                 }
+
                             case "date":
                             case "date":
                                 {
                                 {
                                     var val = reader.ReadElementContentAsString();
                                     var val = reader.ReadElementContentAsString();
@@ -454,17 +455,20 @@ namespace MediaBrowser.Providers.Music
 
 
                                     break;
                                     break;
                                 }
                                 }
+
                             case "annotation":
                             case "annotation":
                                 {
                                 {
                                     result.Overview = reader.ReadElementContentAsString();
                                     result.Overview = reader.ReadElementContentAsString();
                                     break;
                                     break;
                                 }
                                 }
+
                             case "release-group":
                             case "release-group":
                                 {
                                 {
                                     result.ReleaseGroupId = reader.GetAttribute("id");
                                     result.ReleaseGroupId = reader.GetAttribute("id");
                                     reader.Skip();
                                     reader.Skip();
                                     break;
                                     break;
                                 }
                                 }
+
                             case "artist-credit":
                             case "artist-credit":
                                 {
                                 {
                                     using (var subReader = reader.ReadSubtree())
                                     using (var subReader = reader.ReadSubtree())

+ 0 - 1
MediaBrowser.Providers/Plugins/Tmdb/Movies/GenericTmdbMovieInfo.cs

@@ -302,7 +302,6 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
                 {
                 {
                     Url = string.Format(CultureInfo.InvariantCulture, "https://www.youtube.com/watch?v={0}", i.Source),
                     Url = string.Format(CultureInfo.InvariantCulture, "https://www.youtube.com/watch?v={0}", i.Source),
                     Name = i.Name
                     Name = i.Name
-
                 }).ToArray();
                 }).ToArray();
             }
             }
         }
         }

+ 0 - 1
MediaBrowser.Providers/TV/DummySeasonProvider.cs

@@ -217,7 +217,6 @@ namespace MediaBrowser.Providers.TV
                     new DeleteOptions
                     new DeleteOptions
                     {
                     {
                         DeleteFileLocation = true
                         DeleteFileLocation = true
-
                     },
                     },
                     false);
                     false);