fix SA1513/SA1516

2026-06-16 04:30:24 +01:00 · 2020-06-16 09:43:52 +12:00
parent 25f8e596cb
commit 247f9c61e6
283 changed files with 1810 additions and 0 deletions
--- a/MediaBrowser.Model/Configuration/LibraryOptions.cs
+++ b/MediaBrowser.Model/Configuration/LibraryOptions.cs
@@ -10,17 +10,27 @@ namespace MediaBrowser.Model.Configuration
    public class LibraryOptions
    {
        public bool EnablePhotos { get; set; }
+
        public bool EnableRealtimeMonitor { get; set; }
+
        public bool EnableChapterImageExtraction { get; set; }
+
        public bool ExtractChapterImagesDuringLibraryScan { get; set; }
+
        public bool DownloadImagesInAdvance { get; set; }
+
        public MediaPathInfo[] PathInfos { get; set; }

        public bool SaveLocalMetadata { get; set; }
+
        public bool EnableInternetProviders { get; set; }
+
        public bool ImportMissingEpisodes { get; set; }
+
        public bool EnableAutomaticSeriesGrouping { get; set; }
+
        public bool EnableEmbeddedTitles { get; set; }
+
        public bool EnableEmbeddedEpisodeInfos { get; set; }

        public int AutomaticRefreshIntervalDays { get; set; }
@@ -38,17 +48,25 @@ namespace MediaBrowser.Model.Configuration
        public string MetadataCountryCode { get; set; }

        public string SeasonZeroDisplayName { get; set; }
+
        public string[] MetadataSavers { get; set; }
+
        public string[] DisabledLocalMetadataReaders { get; set; }
+
        public string[] LocalMetadataReaderOrder { get; set; }

        public string[] DisabledSubtitleFetchers { get; set; }
+
        public string[] SubtitleFetcherOrder { get; set; }

        public bool SkipSubtitlesIfEmbeddedSubtitlesPresent { get; set; }
+
        public bool SkipSubtitlesIfAudioTrackMatches { get; set; }
+
        public string[] SubtitleDownloadLanguages { get; set; }
+
        public bool RequirePerfectSubtitleMatch { get; set; }
+
        public bool SaveSubtitlesWithMedia { get; set; }

        public TypeOptions[] TypeOptions { get; set; }
@@ -89,17 +107,22 @@ namespace MediaBrowser.Model.Configuration
    public class MediaPathInfo
    {
        public string Path { get; set; }
+
        public string NetworkPath { get; set; }
    }

    public class TypeOptions
    {
        public string Type { get; set; }
+
        public string[] MetadataFetchers { get; set; }
+
        public string[] MetadataFetcherOrder { get; set; }

        public string[] ImageFetchers { get; set; }
+
        public string[] ImageFetcherOrder { get; set; }
+
        public ImageOption[] ImageOptions { get; set; }

        public ImageOption GetImageOptions(ImageType type)
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -34,6 +34,7 @@ namespace MediaBrowser.Model.Configuration
        public string[] GroupedFolders { get; set; }

        public SubtitlePlaybackMode SubtitleMode { get; set; }
+
        public bool DisplayCollectionsView { get; set; }

        public bool EnableLocalPassword { get; set; }
@@ -41,12 +42,15 @@ namespace MediaBrowser.Model.Configuration
        public string[] OrderedViews { get; set; }

        public string[] LatestItemsExcludes { get; set; }
+
        public string[] MyMediaExcludes { get; set; }

        public bool HidePlayedInLatest { get; set; }

        public bool RememberAudioSelections { get; set; }
+
        public bool RememberSubtitleSelections { get; set; }
+
        public bool EnableNextEpisodeAutoPlay { get; set; }

        /// <summary>
--- a/MediaBrowser.Model/Configuration/XbmcMetadataOptions.cs
+++ b/MediaBrowser.Model/Configuration/XbmcMetadataOptions.cs
@@ -10,6 +10,7 @@ namespace MediaBrowser.Model.Configuration
        public string ReleaseDateFormat { get; set; }

        public bool SaveImagePathsInNfo { get; set; }
+
        public bool EnablePathSubstitution { get; set; }

        public bool EnableExtraThumbsDuplication { get; set; }
--- a/MediaBrowser.Model/Dlna/AudioOptions.cs
+++ b/MediaBrowser.Model/Dlna/AudioOptions.cs
@@ -85,6 +85,7 @@ namespace MediaBrowser.Model.Dlna
                {
                    return Profile.MaxStaticMusicBitrate;
                }
+
                return Profile.MaxStaticBitrate;
            }

--- a/MediaBrowser.Model/Dlna/DeviceProfile.cs
+++ b/MediaBrowser.Model/Dlna/DeviceProfile.cs
@@ -27,16 +27,25 @@ namespace MediaBrowser.Model.Dlna
        public DeviceIdentification Identification { get; set; }

        public string FriendlyName { get; set; }
+
        public string Manufacturer { get; set; }
+
        public string ManufacturerUrl { get; set; }
+
        public string ModelName { get; set; }
+
        public string ModelDescription { get; set; }
+
        public string ModelNumber { get; set; }
+
        public string ModelUrl { get; set; }
+
        public string SerialNumber { get; set; }

        public bool EnableAlbumArtInDidl { get; set; }
+
        public bool EnableSingleAlbumArtLimit { get; set; }
+
        public bool EnableSingleSubtitleLimit { get; set; }

        public string SupportedMediaTypes { get; set; }
@@ -46,15 +55,19 @@ namespace MediaBrowser.Model.Dlna
        public string AlbumArtPn { get; set; }

        public int MaxAlbumArtWidth { get; set; }
+
        public int MaxAlbumArtHeight { get; set; }

        public int? MaxIconWidth { get; set; }
+
        public int? MaxIconHeight { get; set; }

        public long? MaxStreamingBitrate { get; set; }
+
        public long? MaxStaticBitrate { get; set; }

        public int? MusicStreamingTranscodingBitrate { get; set; }
+
        public int? MaxStaticMusicBitrate { get; set; }

        /// <summary>
@@ -65,10 +78,13 @@ namespace MediaBrowser.Model.Dlna
        public string ProtocolInfo { get; set; }

        public int TimelineOffsetSeconds { get; set; }
+
        public bool RequiresPlainVideoItems { get; set; }
+
        public bool RequiresPlainFolders { get; set; }

        public bool EnableMSMediaReceiverRegistrar { get; set; }
+
        public bool IgnoreTranscodeByteRangeRequests { get; set; }

        public XmlAttribute[] XmlRootAttributes { get; set; }
@@ -88,6 +104,7 @@ namespace MediaBrowser.Model.Dlna
        public ContainerProfile[] ContainerProfiles { get; set; }

        public CodecProfile[] CodecProfiles { get; set; }
+
        public ResponseProfile[] ResponseProfiles { get; set; }

        public SubtitleProfile[] SubtitleProfiles { get; set; }
@@ -169,6 +186,7 @@ namespace MediaBrowser.Model.Dlna

                return i;
            }
+
            return null;
        }

@@ -209,6 +227,7 @@ namespace MediaBrowser.Model.Dlna

                return i;
            }
+
            return null;
        }

@@ -254,6 +273,7 @@ namespace MediaBrowser.Model.Dlna

                return i;
            }
+
            return null;
        }

@@ -318,6 +338,7 @@ namespace MediaBrowser.Model.Dlna

                return i;
            }
+
            return null;
        }
    }
--- a/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs
+++ b/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs
@@ -107,6 +107,7 @@ namespace MediaBrowser.Model.Dlna

                return list.ToArray();
            }
+
            if (string.Equals(videoCodec, "h264", StringComparison.OrdinalIgnoreCase))
            {
                if (string.Equals(audioCodec, "lpcm", StringComparison.OrdinalIgnoreCase))
@@ -150,8 +151,10 @@ namespace MediaBrowser.Model.Dlna
                    {
                        return new MediaFormatProfile[] { MediaFormatProfile.VC1_TS_AP_L2_AC3_ISO };
                    }
+
                    return new MediaFormatProfile[] { MediaFormatProfile.VC1_TS_AP_L1_AC3_ISO };
                }
+
                if (string.Equals(audioCodec, "dts", StringComparison.OrdinalIgnoreCase))
                {
                    suffix = string.Equals(suffix, "_ISO", StringComparison.OrdinalIgnoreCase) ? suffix : "_T";
@@ -190,10 +193,12 @@ namespace MediaBrowser.Model.Dlna
                {
                    return MediaFormatProfile.AVC_MP4_MP_SD_AC3;
                }
+
                if (string.Equals(audioCodec, "mp3", StringComparison.OrdinalIgnoreCase))
                {
                    return MediaFormatProfile.AVC_MP4_MP_SD_MPEG1_L3;
                }
+
                if (width.HasValue && height.HasValue)
                {
                    if ((width.Value <= 720) && (height.Value <= 576))
@@ -277,6 +282,7 @@ namespace MediaBrowser.Model.Dlna
                        {
                            return MediaFormatProfile.WMVMED_FULL;
                        }
+
                        return MediaFormatProfile.WMVMED_PRO;
                    }
                }
@@ -285,6 +291,7 @@ namespace MediaBrowser.Model.Dlna
                {
                    return MediaFormatProfile.WMVHIGH_FULL;
                }
+
                return MediaFormatProfile.WMVHIGH_PRO;
            }

@@ -342,6 +349,7 @@ namespace MediaBrowser.Model.Dlna
            {
                return MediaFormatProfile.WMA_BASE;
            }
+
            return MediaFormatProfile.WMA_FULL;
        }

@@ -353,14 +361,17 @@ namespace MediaBrowser.Model.Dlna
                {
                    return MediaFormatProfile.LPCM16_44_MONO;
                }
+
                if (frequency.Value == 44100 && channels.Value == 2)
                {
                    return MediaFormatProfile.LPCM16_44_STEREO;
                }
+
                if (frequency.Value == 48000 && channels.Value == 1)
                {
                    return MediaFormatProfile.LPCM16_48_MONO;
                }
+
                if (frequency.Value == 48000 && channels.Value == 2)
                {
                    return MediaFormatProfile.LPCM16_48_STEREO;
@@ -378,6 +389,7 @@ namespace MediaBrowser.Model.Dlna
            {
                return MediaFormatProfile.AAC_ISO_320;
            }
+
            return MediaFormatProfile.AAC_ISO;
        }

@@ -387,6 +399,7 @@ namespace MediaBrowser.Model.Dlna
            {
                return MediaFormatProfile.AAC_ADTS_320;
            }
+
            return MediaFormatProfile.AAC_ADTS;
        }

--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -627,10 +627,12 @@ namespace MediaBrowser.Model.Dlna
            {
                playlistItem.MinSegments = transcodingProfile.MinSegments;
            }
+
            if (transcodingProfile.SegmentLength > 0)
            {
                playlistItem.SegmentLength = transcodingProfile.SegmentLength;
            }
+
            playlistItem.SubProtocol = transcodingProfile.Protocol;

            if (!string.IsNullOrEmpty(transcodingProfile.MaxAudioChannels)
@@ -947,6 +949,7 @@ namespace MediaBrowser.Model.Dlna
            {
                return (PlayMethod.DirectPlay, new List<TranscodeReason>());
            }
+
            if (options.ForceDirectStream)
            {
                return (PlayMethod.DirectStream, new List<TranscodeReason>());
@@ -1261,6 +1264,7 @@ namespace MediaBrowser.Model.Dlna
                    return true;
                }
            }
+
            return false;
        }

@@ -1363,14 +1367,17 @@ namespace MediaBrowser.Model.Dlna
            {
                throw new ArgumentException("ItemId is required");
            }
+
            if (string.IsNullOrEmpty(options.DeviceId))
            {
                throw new ArgumentException("DeviceId is required");
            }
+
            if (options.Profile == null)
            {
                throw new ArgumentException("Profile is required");
            }
+
            if (options.MediaSources == null)
            {
                throw new ArgumentException("MediaSources is required");
@@ -1418,6 +1425,7 @@ namespace MediaBrowser.Model.Dlna
                                    item.AudioBitrate = Math.Max(num, item.AudioBitrate ?? num);
                                }
                            }
+
                            break;
                        }
                    case ProfileConditionValue.AudioChannels:
@@ -1452,6 +1460,7 @@ namespace MediaBrowser.Model.Dlna
                                    item.SetOption(qualifier, "audiochannels", Math.Max(num, item.GetTargetAudioChannels(qualifier) ?? num).ToString(CultureInfo.InvariantCulture));
                                }
                            }
+
                            break;
                        }
                    case ProfileConditionValue.IsAvc:
@@ -1472,6 +1481,7 @@ namespace MediaBrowser.Model.Dlna
                                    item.RequireAvc = true;
                                }
                            }
+
                            break;
                        }
                    case ProfileConditionValue.IsAnamorphic:
@@ -1492,6 +1502,7 @@ namespace MediaBrowser.Model.Dlna
                                    item.RequireNonAnamorphic = true;
                                }
                            }
+
                            break;
                        }
                    case ProfileConditionValue.IsInterlaced:
@@ -1522,6 +1533,7 @@ namespace MediaBrowser.Model.Dlna
                                    item.SetOption(qualifier, "deinterlace", "true");
                                }
                            }
+
                            break;
                        }
                    case ProfileConditionValue.AudioProfile:
@@ -1567,6 +1579,7 @@ namespace MediaBrowser.Model.Dlna
                                    item.SetOption(qualifier, "maxrefframes", Math.Max(num, item.GetTargetRefFrames(qualifier) ?? num).ToString(CultureInfo.InvariantCulture));
                                }
                            }
+
                            break;
                        }
                    case ProfileConditionValue.VideoBitDepth:
@@ -1601,6 +1614,7 @@ namespace MediaBrowser.Model.Dlna
                                    item.SetOption(qualifier, "videobitdepth", Math.Max(num, item.GetTargetVideoBitDepth(qualifier) ?? num).ToString(CultureInfo.InvariantCulture));
                                }
                            }
+
                            break;
                        }
                    case ProfileConditionValue.VideoProfile:
@@ -1623,6 +1637,7 @@ namespace MediaBrowser.Model.Dlna
                                    item.SetOption(qualifier, "profile", string.Join(",", values));
                                }
                            }
+
                            break;
                        }
                    case ProfileConditionValue.Height:
@@ -1647,6 +1662,7 @@ namespace MediaBrowser.Model.Dlna
                                    item.MaxHeight = Math.Max(num, item.MaxHeight ?? num);
                                }
                            }
+
                            break;
                        }
                    case ProfileConditionValue.VideoBitrate:
@@ -1671,6 +1687,7 @@ namespace MediaBrowser.Model.Dlna
                                    item.VideoBitrate = Math.Max(num, item.VideoBitrate ?? num);
                                }
                            }
+
                            break;
                        }
                    case ProfileConditionValue.VideoFramerate:
@@ -1695,6 +1712,7 @@ namespace MediaBrowser.Model.Dlna
                                    item.MaxFramerate = Math.Max(num, item.MaxFramerate ?? num);
                                }
                            }
+
                            break;
                        }
                    case ProfileConditionValue.VideoLevel:
@@ -1719,6 +1737,7 @@ namespace MediaBrowser.Model.Dlna
                                    item.SetOption(qualifier, "level", Math.Max(num, item.GetTargetVideoLevel(qualifier) ?? num).ToString(CultureInfo.InvariantCulture));
                                }
                            }
+
                            break;
                        }
                    case ProfileConditionValue.Width:
@@ -1743,8 +1762,10 @@ namespace MediaBrowser.Model.Dlna
                                    item.MaxWidth = Math.Max(num, item.MaxWidth ?? num);
                                }
                            }
+
                            break;
                        }
+
                    default:
                        break;
                }
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -69,6 +69,7 @@ namespace MediaBrowser.Model.Dlna
        public Guid ItemId { get; set; }

        public PlayMethod PlayMethod { get; set; }
+
        public EncodingContext Context { get; set; }

        public DlnaProfileType MediaType { get; set; }
@@ -80,15 +81,23 @@ namespace MediaBrowser.Model.Dlna
        public long StartPositionTicks { get; set; }

        public int? SegmentLength { get; set; }
+
        public int? MinSegments { get; set; }
+
        public bool BreakOnNonKeyFrames { get; set; }

        public bool RequireAvc { get; set; }
+
        public bool RequireNonAnamorphic { get; set; }
+
        public bool CopyTimestamps { get; set; }
+
        public bool EnableMpegtsM2TsMode { get; set; }
+
        public bool EnableSubtitlesInManifest { get; set; }
+
        public string[] AudioCodecs { get; set; }
+
        public string[] VideoCodecs { get; set; }

        public int? AudioStreamIndex { get; set; }
@@ -96,6 +105,7 @@ namespace MediaBrowser.Model.Dlna
        public int? SubtitleStreamIndex { get; set; }

        public int? TranscodingMaxAudioChannels { get; set; }
+
        public int? GlobalMaxAudioChannels { get; set; }

        public int? AudioBitrate { get; set; }
@@ -103,12 +113,15 @@ namespace MediaBrowser.Model.Dlna
        public int? VideoBitrate { get; set; }

        public int? MaxWidth { get; set; }
+
        public int? MaxHeight { get; set; }

        public float? MaxFramerate { get; set; }

        public DeviceProfile DeviceProfile { get; set; }
+
        public string DeviceProfileId { get; set; }
+
        public string DeviceId { get; set; }

        public long? RunTimeTicks { get; set; }
@@ -120,10 +133,13 @@ namespace MediaBrowser.Model.Dlna
        public MediaSourceInfo MediaSource { get; set; }

        public string[] SubtitleCodecs { get; set; }
+
        public SubtitleDeliveryMethod SubtitleDeliveryMethod { get; set; }
+
        public string SubtitleFormat { get; set; }

        public string PlaySessionId { get; set; }
+
        public TranscodeReason[] TranscodeReasons { get; set; }

        public Dictionary<string, string> StreamOptions { get; private set; }
@@ -160,11 +176,13 @@ namespace MediaBrowser.Model.Dlna
                {
                    continue;
                }
+
                if (string.Equals(pair.Name, "SubtitleStreamIndex", StringComparison.OrdinalIgnoreCase) &&
                    string.Equals(pair.Value, "-1", StringComparison.OrdinalIgnoreCase))
                {
                    continue;
                }
+
                if (string.Equals(pair.Name, "Static", StringComparison.OrdinalIgnoreCase) &&
                    string.Equals(pair.Value, "false", StringComparison.OrdinalIgnoreCase))
                {
@@ -993,6 +1011,7 @@ namespace MediaBrowser.Model.Dlna
                {
                    return GetMediaStreamCount(MediaStreamType.Video, int.MaxValue);
                }
+
                return GetMediaStreamCount(MediaStreamType.Video, 1);
            }
        }
@@ -1005,6 +1024,7 @@ namespace MediaBrowser.Model.Dlna
                {
                    return GetMediaStreamCount(MediaStreamType.Audio, int.MaxValue);
                }
+
                return GetMediaStreamCount(MediaStreamType.Audio, 1);
            }
        }
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -62,17 +62,23 @@ namespace MediaBrowser.Model.Dto
        public DateTime? DateCreated { get; set; }

        public DateTime? DateLastMediaAdded { get; set; }
+
        public string ExtraType { get; set; }

        public int? AirsBeforeSeasonNumber { get; set; }
+
        public int? AirsAfterSeasonNumber { get; set; }
+
        public int? AirsBeforeEpisodeNumber { get; set; }
+
        public bool? CanDelete { get; set; }
+
        public bool? CanDownload { get; set; }

        public bool? HasSubtitles { get; set; }

        public string PreferredMetadataLanguage { get; set; }
+
        public string PreferredMetadataCountryCode { get; set; }

        /// <summary>
@@ -87,6 +93,7 @@ namespace MediaBrowser.Model.Dto
        /// </summary>
        /// <value>The name of the sort.</value>
        public string SortName { get; set; }
+
        public string ForcedSortName { get; set; }

        /// <summary>
@@ -146,6 +153,7 @@ namespace MediaBrowser.Model.Dto
        /// </summary>
        /// <value>The channel identifier.</value>
        public Guid ChannelId { get; set; }
+
        public string ChannelName { get; set; }

        /// <summary>
@@ -213,6 +221,7 @@ namespace MediaBrowser.Model.Dto
        /// </summary>
        /// <value>The number.</value>
        public string Number { get; set; }
+
        public string ChannelNumber { get; set; }

        /// <summary>
@@ -467,6 +476,7 @@ namespace MediaBrowser.Model.Dto
        /// </summary>
        /// <value>The part count.</value>
        public int? PartCount { get; set; }
+
        public int? MediaSourceCount { get; set; }

        /// <summary>
@@ -599,6 +609,7 @@ namespace MediaBrowser.Model.Dto
        /// </summary>
        /// <value>The series count.</value>
        public int? SeriesCount { get; set; }
+
        public int? ProgramCount { get; set; }
        /// <summary>
        /// Gets or sets the episode count.
@@ -615,6 +626,7 @@ namespace MediaBrowser.Model.Dto
        /// </summary>
        /// <value>The album count.</value>
        public int? AlbumCount { get; set; }
+
        public int? ArtistCount { get; set; }
        /// <summary>
        /// Gets or sets the music video count.
@@ -629,18 +641,31 @@ namespace MediaBrowser.Model.Dto
        public bool? LockData { get; set; }

        public int? Width { get; set; }
+
        public int? Height { get; set; }
+
        public string CameraMake { get; set; }
+
        public string CameraModel { get; set; }
+
        public string Software { get; set; }
+
        public double? ExposureTime { get; set; }
+
        public double? FocalLength { get; set; }
+
        public ImageOrientation? ImageOrientation { get; set; }
+
        public double? Aperture { get; set; }
+
        public double? ShutterSpeed { get; set; }
+
        public double? Latitude { get; set; }
+
        public double? Longitude { get; set; }
+
        public double? Altitude { get; set; }
+
        public int? IsoSpeedRating { get; set; }

        /// <summary>
--- a/MediaBrowser.Model/Dto/MediaSourceInfo.cs
+++ b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
@@ -13,16 +13,19 @@ namespace MediaBrowser.Model.Dto
    public class MediaSourceInfo
    {
        public MediaProtocol Protocol { get; set; }
+
        public string Id { get; set; }

        public string Path { get; set; }

        public string EncoderPath { get; set; }
+
        public MediaProtocol? EncoderProtocol { get; set; }

        public MediaSourceType Type { get; set; }

        public string Container { get; set; }
+
        public long? Size { get; set; }

        public string Name { get; set; }
@@ -33,19 +36,33 @@ namespace MediaBrowser.Model.Dto
        public bool IsRemote { get; set; }

        public string ETag { get; set; }
+
        public long? RunTimeTicks { get; set; }
+
        public bool ReadAtNativeFramerate { get; set; }
+
        public bool IgnoreDts { get; set; }
+
        public bool IgnoreIndex { get; set; }
+
        public bool GenPtsInput { get; set; }
+
        public bool SupportsTranscoding { get; set; }
+
        public bool SupportsDirectStream { get; set; }
+
        public bool SupportsDirectPlay { get; set; }
+
        public bool IsInfiniteStream { get; set; }
+
        public bool RequiresOpening { get; set; }
+
        public string OpenToken { get; set; }
+
        public bool RequiresClosing { get; set; }
+
        public string LiveStreamId { get; set; }
+
        public int? BufferMs { get; set; }

        public bool RequiresLooping { get; set; }
@@ -67,10 +84,13 @@ namespace MediaBrowser.Model.Dto
        public int? Bitrate { get; set; }

        public TransportStreamTimestamp? Timestamp { get; set; }
+
        public Dictionary<string, string> RequiredHttpHeaders { get; set; }

        public string TranscodingUrl { get; set; }
+
        public string TranscodingSubProtocol { get; set; }
+
        public string TranscodingContainer { get; set; }

        public int? AnalyzeDurationMs { get; set; }
@@ -118,6 +138,7 @@ namespace MediaBrowser.Model.Dto
        public TranscodeReason[] TranscodeReasons { get; set; }

        public int? DefaultAudioStreamIndex { get; set; }
+
        public int? DefaultSubtitleStreamIndex { get; set; }

        public MediaStream GetDefaultAudioStream(int? defaultIndex)
--- a/MediaBrowser.Model/Dto/MetadataEditorInfo.cs
+++ b/MediaBrowser.Model/Dto/MetadataEditorInfo.cs
@@ -11,11 +11,15 @@ namespace MediaBrowser.Model.Dto
    public class MetadataEditorInfo
    {
        public ParentalRating[] ParentalRatingOptions { get; set; }
+
        public CountryInfo[] Countries { get; set; }
+
        public CultureDto[] Cultures { get; set; }
+
        public ExternalIdInfo[] ExternalIdInfos { get; set; }

        public string ContentType { get; set; }
+
        public NameValuePair[] ContentTypeOptions { get; set; }

        public MetadataEditorInfo()
--- a/MediaBrowser.Model/Dto/NameIdPair.cs
+++ b/MediaBrowser.Model/Dto/NameIdPair.cs
@@ -23,6 +23,7 @@ namespace MediaBrowser.Model.Dto
    public class NameGuidPair
    {
        public string Name { get; set; }
+
        public Guid Id { get; set; }
    }
 }
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -125,6 +125,7 @@ namespace MediaBrowser.Model.Entities
                    {
                        attributes.Add(StringHelper.FirstToUpper(Language));
                    }
+
                    if (!string.IsNullOrEmpty(Codec) && !string.Equals(Codec, "dca", StringComparison.OrdinalIgnoreCase))
                    {
                        attributes.Add(AudioCodec.GetFriendlyName(Codec));
@@ -142,6 +143,7 @@ namespace MediaBrowser.Model.Entities
                    {
                        attributes.Add(Channels.Value.ToString(CultureInfo.InvariantCulture) + " ch");
                    }
+
                    if (IsDefault)
                    {
                        attributes.Add("Default");
@@ -227,30 +229,37 @@ namespace MediaBrowser.Model.Entities
                {
                    return "4K";
                }
+
                if (width >= 2500)
                {
                    if (i.IsInterlaced)
                    {
                        return "1440i";
                    }
+
                    return "1440p";
                }
+
                if (width >= 1900 || height >= 1000)
                {
                    if (i.IsInterlaced)
                    {
                        return "1080i";
                    }
+
                    return "1080p";
                }
+
                if (width >= 1260 || height >= 700)
                {
                    if (i.IsInterlaced)
                    {
                        return "720i";
                    }
+
                    return "720p";
                }
+
                if (width >= 700 || height >= 440)
                {

@@ -258,11 +267,13 @@ namespace MediaBrowser.Model.Entities
                    {
                        return "480i";
                    }
+
                    return "480p";
                }

                return "SD";
            }
+
            return null;
        }

@@ -448,6 +459,7 @@ namespace MediaBrowser.Model.Entities
            {
                return false;
            }
+
            if (string.Equals(fromCodec, "ssa", StringComparison.OrdinalIgnoreCase))
            {
                return false;
@@ -458,6 +470,7 @@ namespace MediaBrowser.Model.Entities
            {
                return false;
            }
+
            if (string.Equals(toCodec, "ssa", StringComparison.OrdinalIgnoreCase))
            {
                return false;
--- a/MediaBrowser.Model/Entities/MediaUrl.cs
+++ b/MediaBrowser.Model/Entities/MediaUrl.cs
@@ -6,6 +6,7 @@ namespace MediaBrowser.Model.Entities
    public class MediaUrl
    {
        public string Url { get; set; }
+
        public string Name { get; set; }
    }
 }
--- a/MediaBrowser.Model/Entities/VirtualFolderInfo.cs
+++ b/MediaBrowser.Model/Entities/VirtualFolderInfo.cs
@@ -52,6 +52,7 @@ namespace MediaBrowser.Model.Entities
        public string PrimaryImageItemId { get; set; }

        public double? RefreshProgress { get; set; }
+
        public string RefreshStatus { get; set; }
    }
 }
--- a/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs
@@ -124,6 +124,7 @@ namespace MediaBrowser.Model.LiveTv
        /// </summary>
        /// <value><c>true</c> if this instance is post padding required; otherwise, <c>false</c>.</value>
        public bool IsPostPaddingRequired { get; set; }
+
        public KeepUntil KeepUntil { get; set; }
    }
 }
--- a/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs
@@ -64,6 +64,7 @@ namespace MediaBrowser.Model.LiveTv
        /// </summary>
        /// <value><c>true</c> if [add current program]; otherwise, <c>false</c>.</value>
        public bool AddCurrentProgram { get; set; }
+
        public bool EnableUserData { get; set; }

        /// <summary>
@@ -88,6 +89,7 @@ namespace MediaBrowser.Model.LiveTv
        /// </summary>
        /// <value><c>null</c> if [is sports] contains no value, <c>true</c> if [is sports]; otherwise, <c>false</c>.</value>
        public bool? IsSports { get; set; }
+
        public bool? IsSeries { get; set; }

        public string[] SortBy { get; set; }
--- a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
@@ -9,21 +9,29 @@ namespace MediaBrowser.Model.LiveTv
    public class LiveTvOptions
    {
        public int? GuideDays { get; set; }
+
        public string RecordingPath { get; set; }
+
        public string MovieRecordingPath { get; set; }
+
        public string SeriesRecordingPath { get; set; }
+
        public bool EnableRecordingSubfolders { get; set; }
+
        public bool EnableOriginalAudioWithEncodedRecordings { get; set; }

        public TunerHostInfo[] TunerHosts { get; set; }
+
        public ListingsProviderInfo[] ListingProviders { get; set; }

        public int PrePaddingSeconds { get; set; }
+
        public int PostPaddingSeconds { get; set; }

        public string[] MediaLocationsCreated { get; set; }

        public string RecordingPostProcessor { get; set; }
+
        public string RecordingPostProcessorArguments { get; set; }

        public LiveTvOptions()
@@ -38,15 +46,25 @@ namespace MediaBrowser.Model.LiveTv
    public class TunerHostInfo
    {
        public string Id { get; set; }
+
        public string Url { get; set; }
+
        public string Type { get; set; }
+
        public string DeviceId { get; set; }
+
        public string FriendlyName { get; set; }
+
        public bool ImportFavoritesOnly { get; set; }
+
        public bool AllowHWTranscoding { get; set; }
+
        public bool EnableStreamLooping { get; set; }
+
        public string Source { get; set; }
+
        public int TunerCount { get; set; }
+
        public string UserAgent { get; set; }

        public TunerHostInfo()
@@ -58,23 +76,39 @@ namespace MediaBrowser.Model.LiveTv
    public class ListingsProviderInfo
    {
        public string Id { get; set; }
+
        public string Type { get; set; }
+
        public string Username { get; set; }
+
        public string Password { get; set; }
+
        public string ListingsId { get; set; }
+
        public string ZipCode { get; set; }
+
        public string Country { get; set; }
+
        public string Path { get; set; }

        public string[] EnabledTuners { get; set; }
+
        public bool EnableAllTuners { get; set; }
+
        public string[] NewsCategories { get; set; }
+
        public string[] SportsCategories { get; set; }
+
        public string[] KidsCategories { get; set; }
+
        public string[] MovieCategories { get; set; }
+
        public NameValuePair[] ChannelMappings { get; set; }
+
        public string MoviePrefix { get; set; }
+
        public string PreferredLanguage { get; set; }
+
        public string UserAgent { get; set; }

        public ListingsProviderInfo()
--- a/MediaBrowser.Model/LiveTv/RecordingQuery.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingQuery.cs
@@ -65,14 +65,23 @@ namespace MediaBrowser.Model.LiveTv
        /// </summary>
        /// <value>The fields.</value>
        public ItemFields[] Fields { get; set; }
+
        public bool? EnableImages { get; set; }
+
        public bool? IsLibraryItem { get; set; }
+
        public bool? IsNews { get; set; }
+
        public bool? IsMovie { get; set; }
+
        public bool? IsSeries { get; set; }
+
        public bool? IsKids { get; set; }
+
        public bool? IsSports { get; set; }
+
        public int? ImageTypeLimit { get; set; }
+
        public ImageType[] EnableImageTypes { get; set; }

        public bool EnableTotalRecordCount { get; set; }
--- a/MediaBrowser.Model/MediaInfo/LiveStreamRequest.cs
+++ b/MediaBrowser.Model/MediaInfo/LiveStreamRequest.cs
@@ -32,18 +32,29 @@ namespace MediaBrowser.Model.MediaInfo
        }

        public string OpenToken { get; set; }
+
        public Guid UserId { get; set; }
+
        public string PlaySessionId { get; set; }
+
        public long? MaxStreamingBitrate { get; set; }
+
        public long? StartTimeTicks { get; set; }
+
        public int? AudioStreamIndex { get; set; }
+
        public int? SubtitleStreamIndex { get; set; }
+
        public int? MaxAudioChannels { get; set; }
+
        public Guid ItemId { get; set; }
+
        public DeviceProfile DeviceProfile { get; set; }

        public bool EnableDirectPlay { get; set; }
+
        public bool EnableDirectStream { get; set; }
+
        public MediaProtocol[] DirectPlayProtocols { get; set; }
    }
 }
--- a/MediaBrowser.Model/MediaInfo/MediaInfo.cs
+++ b/MediaBrowser.Model/MediaInfo/MediaInfo.cs
@@ -35,13 +35,21 @@ namespace MediaBrowser.Model.MediaInfo
        /// </summary>
        /// <value>The studios.</value>
        public string[] Studios { get; set; }
+
        public string[] Genres { get; set; }
+
        public string ShowName { get; set; }
+
        public int? IndexNumber { get; set; }
+
        public int? ParentIndexNumber { get; set; }
+
        public int? ProductionYear { get; set; }
+
        public DateTime? PremiereDate { get; set; }
+
        public BaseItemPerson[] People { get; set; }
+
        public Dictionary<string, string> ProviderIds { get; set; }

        /// <summary>
--- a/MediaBrowser.Model/MediaInfo/PlaybackInfoRequest.cs
+++ b/MediaBrowser.Model/MediaInfo/PlaybackInfoRequest.cs
@@ -29,11 +29,17 @@ namespace MediaBrowser.Model.MediaInfo
        public DeviceProfile DeviceProfile { get; set; }

        public bool EnableDirectPlay { get; set; }
+
        public bool EnableDirectStream { get; set; }
+
        public bool EnableTranscoding { get; set; }
+
        public bool AllowVideoStreamCopy { get; set; }
+
        public bool AllowAudioStreamCopy { get; set; }
+
        public bool IsPlayback { get; set; }
+
        public bool AutoOpenLiveStream { get; set; }

        public MediaProtocol[] DirectPlayProtocols { get; set; }
--- a/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs
+++ b/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs
@@ -8,15 +8,25 @@ namespace MediaBrowser.Model.Providers
    public class RemoteSubtitleInfo
    {
        public string ThreeLetterISOLanguageName { get; set; }
+
        public string Id { get; set; }
+
        public string ProviderName { get; set; }
+
        public string Name { get; set; }
+
        public string Format { get; set; }
+
        public string Author { get; set; }
+
        public string Comment { get; set; }
+
        public DateTime? DateCreated { get; set; }
+
        public float? CommunityRating { get; set; }
+
        public int? DownloadCount { get; set; }
+
        public bool? IsHashMatch { get; set; }
    }
 }
--- a/MediaBrowser.Model/Providers/SubtitleOptions.cs
+++ b/MediaBrowser.Model/Providers/SubtitleOptions.cs
@@ -8,13 +8,19 @@ namespace MediaBrowser.Model.Providers
    public class SubtitleOptions
    {
        public bool SkipIfEmbeddedSubtitlesPresent { get; set; }
+
        public bool SkipIfAudioTrackMatches { get; set; }
+
        public string[] DownloadLanguages { get; set; }
+
        public bool DownloadMovieSubtitles { get; set; }
+
        public bool DownloadEpisodeSubtitles { get; set; }

        public string OpenSubtitlesUsername { get; set; }
+
        public string OpenSubtitlesPasswordHash { get; set; }
+
        public bool IsOpenSubtitleVipAccount { get; set; }

        public bool RequirePerfectMatch { get; set; }
--- a/MediaBrowser.Model/Providers/SubtitleProviderInfo.cs
+++ b/MediaBrowser.Model/Providers/SubtitleProviderInfo.cs
@@ -6,6 +6,7 @@ namespace MediaBrowser.Model.Providers
    public class SubtitleProviderInfo
    {
        public string Name { get; set; }
+
        public string Id { get; set; }
    }
 }
--- a/MediaBrowser.Model/Querying/QueryFilters.cs
+++ b/MediaBrowser.Model/Querying/QueryFilters.cs
@@ -9,8 +9,11 @@ namespace MediaBrowser.Model.Querying
    public class QueryFiltersLegacy
    {
        public string[] Genres { get; set; }
+
        public string[] Tags { get; set; }
+
        public string[] OfficialRatings { get; set; }
+
        public int[] Years { get; set; }

        public QueryFiltersLegacy()
@@ -21,9 +24,11 @@ namespace MediaBrowser.Model.Querying
            Years = Array.Empty<int>();
        }
    }
+
    public class QueryFilters
    {
        public NameGuidPair[] Genres { get; set; }
+
        public string[] Tags { get; set; }

        public QueryFilters()
--- a/MediaBrowser.Model/Search/SearchHint.cs
+++ b/MediaBrowser.Model/Search/SearchHint.cs
@@ -100,6 +100,7 @@ namespace MediaBrowser.Model.Search
        public string MediaType { get; set; }

        public DateTime? StartDate { get; set; }
+
        public DateTime? EndDate { get; set; }

        /// <summary>
--- a/MediaBrowser.Model/Search/SearchQuery.cs
+++ b/MediaBrowser.Model/Search/SearchQuery.cs
@@ -32,14 +32,21 @@ namespace MediaBrowser.Model.Search
        public int? Limit { get; set; }

        public bool IncludePeople { get; set; }
+
        public bool IncludeMedia { get; set; }
+
        public bool IncludeGenres { get; set; }
+
        public bool IncludeStudios { get; set; }
+
        public bool IncludeArtists { get; set; }

        public string[] MediaTypes { get; set; }
+
        public string[] IncludeItemTypes { get; set; }
+
        public string[] ExcludeItemTypes { get; set; }
+
        public string ParentId { get; set; }

        public bool? IsMovie { get; set; }
--- a/MediaBrowser.Model/Services/IRequest.cs
+++ b/MediaBrowser.Model/Services/IRequest.cs
@@ -76,9 +76,13 @@ namespace MediaBrowser.Model.Services
    public interface IHttpFile
    {
        string Name { get; }
+
        string FileName { get; }
+
        long ContentLength { get; }
+
        string ContentType { get; }
+
        Stream InputStream { get; }
    }

--- a/MediaBrowser.Model/Services/IService.cs
+++ b/MediaBrowser.Model/Services/IService.cs
@@ -8,6 +8,8 @@ namespace MediaBrowser.Model.Services
    }

    public interface IReturn { }
+
    public interface IReturn<T> : IReturn { }
+
    public interface IReturnVoid : IReturn { }
 }
--- a/MediaBrowser.Model/Session/ClientCapabilities.cs
+++ b/MediaBrowser.Model/Session/ClientCapabilities.cs
@@ -13,15 +13,19 @@ namespace MediaBrowser.Model.Session
        public string[] SupportedCommands { get; set; }

        public bool SupportsMediaControl { get; set; }
+
        public bool SupportsContentUploading { get; set; }
+
        public string MessageCallbackUrl { get; set; }

        public bool SupportsPersistentIdentifier { get; set; }
+
        public bool SupportsSync { get; set; }

        public DeviceProfile DeviceProfile { get; set; }

        public string AppStoreUrl { get; set; }
+
        public string IconUrl { get; set; }

        public ClientCapabilities()
--- a/MediaBrowser.Model/Session/PlayRequest.cs
+++ b/MediaBrowser.Model/Session/PlayRequest.cs
@@ -39,8 +39,11 @@ namespace MediaBrowser.Model.Session
        public Guid ControllingUserId { get; set; }

        public int? SubtitleStreamIndex { get; set; }
+
        public int? AudioStreamIndex { get; set; }
+
        public string MediaSourceId { get; set; }
+
        public int? StartIndex { get; set; }
    }
 }
--- a/MediaBrowser.Model/Session/PlaybackProgressInfo.cs
+++ b/MediaBrowser.Model/Session/PlaybackProgressInfo.cs
@@ -105,6 +105,7 @@ namespace MediaBrowser.Model.Session
        public RepeatMode RepeatMode { get; set; }

        public QueueItem[] NowPlayingQueue { get; set; }
+
        public string PlaylistItemId { get; set; }
    }

@@ -118,6 +119,7 @@ namespace MediaBrowser.Model.Session
    public class QueueItem
    {
        public Guid Id { get; set; }
+
        public string PlaylistItemId { get; set; }
    }
 }
--- a/MediaBrowser.Model/Session/PlaybackStopInfo.cs
+++ b/MediaBrowser.Model/Session/PlaybackStopInfo.cs
@@ -62,6 +62,7 @@ namespace MediaBrowser.Model.Session
        public string NextMediaType { get; set; }

        public string PlaylistItemId { get; set; }
+
        public QueueItem[] NowPlayingQueue { get; set; }
    }
 }
--- a/MediaBrowser.Model/Session/TranscodingInfo.cs
+++ b/MediaBrowser.Model/Session/TranscodingInfo.cs
@@ -8,17 +8,25 @@ namespace MediaBrowser.Model.Session
    public class TranscodingInfo
    {
        public string AudioCodec { get; set; }
+
        public string VideoCodec { get; set; }
+
        public string Container { get; set; }
+
        public bool IsVideoDirect { get; set; }
+
        public bool IsAudioDirect { get; set; }
+
        public int? Bitrate { get; set; }

        public float? Framerate { get; set; }
+
        public double? CompletionPercentage { get; set; }

        public int? Width { get; set; }
+
        public int? Height { get; set; }
+
        public int? AudioChannels { get; set; }

        public TranscodeReason[] TranscodeReasons { get; set; }
--- a/MediaBrowser.Model/Sync/SyncJob.cs
+++ b/MediaBrowser.Model/Sync/SyncJob.cs
@@ -122,7 +122,9 @@ namespace MediaBrowser.Model.Sync
        public int ItemCount { get; set; }

        public string ParentName { get; set; }
+
        public string PrimaryImageItemId { get; set; }
+
        public string PrimaryImageTag { get; set; }

        public SyncJob()
--- a/MediaBrowser.Model/Users/UserAction.cs
+++ b/MediaBrowser.Model/Users/UserAction.cs
@@ -8,11 +8,17 @@ namespace MediaBrowser.Model.Users
    public class UserAction
    {
        public string Id { get; set; }
+
        public string ServerId { get; set; }
+
        public Guid UserId { get; set; }
+
        public Guid ItemId { get; set; }
+
        public UserActionType Type { get; set; }
+
        public DateTime Date { get; set; }
+
        public long? PositionTicks { get; set; }
    }
 }
--- a/MediaBrowser.Model/Users/UserPolicy.cs
+++ b/MediaBrowser.Model/Users/UserPolicy.cs
@@ -35,24 +35,37 @@ namespace MediaBrowser.Model.Users
        public int? MaxParentalRating { get; set; }

        public string[] BlockedTags { get; set; }
+
        public bool EnableUserPreferenceAccess { get; set; }
+
        public AccessSchedule[] AccessSchedules { get; set; }
+
        public UnratedItem[] BlockUnratedItems { get; set; }
+
        public bool EnableRemoteControlOfOtherUsers { get; set; }
+
        public bool EnableSharedDeviceControl { get; set; }
+
        public bool EnableRemoteAccess { get; set; }

        public bool EnableLiveTvManagement { get; set; }
+
        public bool EnableLiveTvAccess { get; set; }

        public bool EnableMediaPlayback { get; set; }
+
        public bool EnableAudioPlaybackTranscoding { get; set; }
+
        public bool EnableVideoPlaybackTranscoding { get; set; }
+
        public bool EnablePlaybackRemuxing { get; set; }
+
        public bool ForceRemoteSourceTranscoding { get; set; }

        public bool EnableContentDeletion { get; set; }
+
        public string[] EnableContentDeletionFromFolders { get; set; }
+
        public bool EnableContentDownloading { get; set; }

        /// <summary>
@@ -60,29 +73,36 @@ namespace MediaBrowser.Model.Users
        /// </summary>
        /// <value><c>true</c> if [enable synchronize]; otherwise, <c>false</c>.</value>
        public bool EnableSyncTranscoding { get; set; }
+
        public bool EnableMediaConversion { get; set; }

        public string[] EnabledDevices { get; set; }
+
        public bool EnableAllDevices { get; set; }

        public string[] EnabledChannels { get; set; }
+
        public bool EnableAllChannels { get; set; }

        public string[] EnabledFolders { get; set; }
+
        public bool EnableAllFolders { get; set; }

        public int InvalidLoginAttemptCount { get; set; }
+
        public int LoginAttemptsBeforeLockout { get; set; }

        public bool EnablePublicSharing { get; set; }

        public string[] BlockedMediaFolders { get; set; }
+
        public string[] BlockedChannels { get; set; }

        public int RemoteClientBitrateLimit { get; set; }

        [XmlElement(ElementName = "AuthenticationProviderId")]
        public string AuthenticationProviderId { get; set; }
+
        public string PasswordResetProviderId { get; set; }

        /// <summary>