diff options
Diffstat (limited to 'MediaBrowser.Model')
66 files changed, 173 insertions, 1085 deletions
diff --git a/MediaBrowser.Model/Activity/ActivityLogEntry.cs b/MediaBrowser.Model/Activity/ActivityLogEntry.cs index 1f4bff10d..a61ebc268 100644 --- a/MediaBrowser.Model/Activity/ActivityLogEntry.cs +++ b/MediaBrowser.Model/Activity/ActivityLogEntry.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.Logging; +using Microsoft.Extensions.Logging; using System; namespace MediaBrowser.Model.Activity @@ -63,6 +63,6 @@ namespace MediaBrowser.Model.Activity /// Gets or sets the log severity. /// </summary> /// <value>The log severity.</value> - public LogSeverity Severity { get; set; } + public LogLevel Severity { get; set; } } } diff --git a/MediaBrowser.Model/Channels/ChannelFeatures.cs b/MediaBrowser.Model/Channels/ChannelFeatures.cs index 39b40cabc..d4caf499b 100644 --- a/MediaBrowser.Model/Channels/ChannelFeatures.cs +++ b/MediaBrowser.Model/Channels/ChannelFeatures.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System; namespace MediaBrowser.Model.Channels { @@ -76,10 +76,9 @@ namespace MediaBrowser.Model.Channels public ChannelFeatures() { - MediaTypes = new ChannelMediaType[] { }; - ContentTypes = new ChannelMediaContentType[] { }; - - DefaultSortFields = new ChannelItemSortField[] { }; + MediaTypes = Array.Empty<ChannelMediaType>(); + ContentTypes = Array.Empty<ChannelMediaContentType>(); + DefaultSortFields = Array.Empty<ChannelItemSortField>(); } } } diff --git a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs index b5b0101cb..08bf2379f 100644 --- a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs +++ b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs @@ -9,6 +9,7 @@ namespace MediaBrowser.Model.Configuration /// </summary> public class BaseApplicationConfiguration { + // TODO: @bond Remove? /// <summary> /// Gets or sets a value indicating whether [enable debug level logging]. /// </summary> @@ -21,6 +22,7 @@ namespace MediaBrowser.Model.Configuration /// <value><c>true</c> if [enable auto update]; otherwise, <c>false</c>.</value> public bool EnableAutoUpdate { get; set; } + // TODO: @bond Remove? /// <summary> /// The number of days we should retain log files /// </summary> @@ -28,12 +30,6 @@ namespace MediaBrowser.Model.Configuration public int LogFileRetentionDays { get; set; } /// <summary> - /// Gets or sets a value indicating whether [run at startup]. - /// </summary> - /// <value><c>true</c> if [run at startup]; otherwise, <c>false</c>.</value> - public bool RunAtStartup { get; set; } - - /// <summary> /// Gets or sets a value indicating whether this instance is first run. /// </summary> /// <value><c>true</c> if this instance is first run; otherwise, <c>false</c>.</value> diff --git a/MediaBrowser.Model/Configuration/LibraryOptions.cs b/MediaBrowser.Model/Configuration/LibraryOptions.cs index a271d43af..cc70cc888 100644 --- a/MediaBrowser.Model/Configuration/LibraryOptions.cs +++ b/MediaBrowser.Model/Configuration/LibraryOptions.cs @@ -6,7 +6,6 @@ namespace MediaBrowser.Model.Configuration { public class LibraryOptions { - public bool EnableArchiveMediaFiles { get; set; } public bool EnablePhotos { get; set; } public bool EnableRealtimeMonitor { get; set; } public bool EnableChapterImageExtraction { get; set; } @@ -65,10 +64,10 @@ namespace MediaBrowser.Model.Configuration public LibraryOptions() { - TypeOptions = new TypeOptions[] { }; - DisabledSubtitleFetchers = new string[] { }; - SubtitleFetcherOrder = new string[] { }; - DisabledLocalMetadataReaders = new string[] { }; + TypeOptions = Array.Empty<TypeOptions>(); + DisabledSubtitleFetchers = Array.Empty<string>(); + SubtitleFetcherOrder = Array.Empty<string>(); + DisabledLocalMetadataReaders = Array.Empty<string>(); SkipSubtitlesIfAudioTrackMatches = true; RequirePerfectSubtitleMatch = true; @@ -76,7 +75,7 @@ namespace MediaBrowser.Model.Configuration EnablePhotos = true; SaveSubtitlesWithMedia = true; EnableRealtimeMonitor = true; - PathInfos = new MediaPathInfo[] { }; + PathInfos = Array.Empty<MediaPathInfo>(); EnableInternetProviders = true; EnableAutomaticSeriesGrouping = true; SeasonZeroDisplayName = "Specials"; @@ -141,11 +140,11 @@ namespace MediaBrowser.Model.Configuration public TypeOptions() { - MetadataFetchers = new string[] { }; - MetadataFetcherOrder = new string[] { }; - ImageFetchers = new string[] { }; - ImageFetcherOrder = new string[] { }; - ImageOptions = new ImageOption[] { }; + MetadataFetchers = Array.Empty<string>(); + MetadataFetcherOrder = Array.Empty<string>(); + ImageFetchers = Array.Empty<string>(); + ImageFetcherOrder = Array.Empty<string>(); + ImageOptions = Array.Empty<ImageOption>(); } public static Dictionary<string, ImageOption[]> DefaultImageOptions = new Dictionary<string, ImageOption[]> diff --git a/MediaBrowser.Model/Configuration/MetadataOptions.cs b/MediaBrowser.Model/Configuration/MetadataOptions.cs index 26cfee085..dde2bd090 100644 --- a/MediaBrowser.Model/Configuration/MetadataOptions.cs +++ b/MediaBrowser.Model/Configuration/MetadataOptions.cs @@ -1,5 +1,4 @@ -using MediaBrowser.Model.Extensions; -using System; +using System; namespace MediaBrowser.Model.Configuration { @@ -21,18 +20,12 @@ namespace MediaBrowser.Model.Configuration public MetadataOptions() { - DisabledMetadataSavers = new string[] { }; - LocalMetadataReaderOrder = new string[] { }; - - DisabledMetadataFetchers = new string[] { }; - MetadataFetcherOrder = new string[] { }; - DisabledImageFetchers = new string[] { }; - ImageFetcherOrder = new string[] { }; - } - - public bool IsMetadataSaverEnabled(string name) - { - return !ListHelper.ContainsIgnoreCase(DisabledMetadataSavers, name); + DisabledMetadataSavers = Array.Empty<string>(); + LocalMetadataReaderOrder = Array.Empty<string>(); + DisabledMetadataFetchers = Array.Empty<string>(); + MetadataFetcherOrder = Array.Empty<string>(); + DisabledImageFetchers = Array.Empty<string>(); + ImageFetcherOrder = Array.Empty<string>(); } } } diff --git a/MediaBrowser.Model/Configuration/MetadataPluginSummary.cs b/MediaBrowser.Model/Configuration/MetadataPluginSummary.cs index 80142cf43..0bd20f837 100644 --- a/MediaBrowser.Model/Configuration/MetadataPluginSummary.cs +++ b/MediaBrowser.Model/Configuration/MetadataPluginSummary.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System; using MediaBrowser.Model.Entities; namespace MediaBrowser.Model.Configuration @@ -25,8 +25,8 @@ namespace MediaBrowser.Model.Configuration public MetadataPluginSummary() { - SupportedImageTypes = new ImageType[] { }; - Plugins = new MetadataPlugin[] { }; + SupportedImageTypes = Array.Empty<ImageType>(); + Plugins = Array.Empty<MetadataPlugin>(); } } -}
\ No newline at end of file +} diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index cc1275035..565d5f74b 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -173,9 +173,6 @@ namespace MediaBrowser.Model.Configuration public int RemoteClientBitrateLimit { get; set; } - public int SchemaVersion { get; set; } - - public bool EnableAnonymousUsageReporting { get; set; } public bool EnableFolderView { get; set; } public bool EnableGroupingIntoCollections { get; set; } public bool DisplaySpecialsWithinSeasons { get; set; } @@ -202,13 +199,13 @@ namespace MediaBrowser.Model.Configuration /// </summary> public ServerConfiguration() { - UninstalledPlugins = new string[] { }; - RemoteIPFilter = new string[] { }; - LocalNetworkSubnets = new string[] { }; - LocalNetworkAddresses = new string[] { }; - CodecsUsed = new string[] { }; + UninstalledPlugins = Array.Empty<string>(); + RemoteIPFilter = Array.Empty<string>(); + LocalNetworkSubnets = Array.Empty<string>(); + LocalNetworkAddresses = Array.Empty<string>(); + CodecsUsed = Array.Empty<string>(); ImageExtractionTimeoutMs = 0; - PathSubstitutions = new PathSubstitution[] { }; + PathSubstitutions = Array.Empty<PathSubstitution>(); EnableSimpleArtistDetection = true; DisplaySpecialsWithinSeasons = true; @@ -221,7 +218,6 @@ namespace MediaBrowser.Model.Configuration HttpsPortNumber = DefaultHttpsPort; EnableHttps = true; EnableDashboardResponseCaching = true; - EnableAnonymousUsageReporting = true; EnableCaseSensitiveItemIds = true; EnableAutomaticRestart = true; @@ -237,7 +233,7 @@ namespace MediaBrowser.Model.Configuration LibraryMonitorDelay = 60; - ContentTypes = new NameValuePair[] { }; + ContentTypes = Array.Empty<NameValuePair>(); PreferredMetadataLanguage = "en"; MetadataCountryCode = "US"; @@ -250,56 +246,51 @@ namespace MediaBrowser.Model.Configuration MetadataOptions = new[] { - new MetadataOptions {ItemType = "Book"}, - - new MetadataOptions + new MetadataOptions() + { + ItemType = "Book" + }, + new MetadataOptions() { ItemType = "Movie" }, - new MetadataOptions { ItemType = "MusicVideo", - DisabledMetadataFetchers = new []{ "The Open Movie Database" }, - DisabledImageFetchers = new []{ "The Open Movie Database", "FanArt" } + DisabledMetadataFetchers = new [] { "The Open Movie Database" }, + DisabledImageFetchers = new [] { "The Open Movie Database", "FanArt" } }, - new MetadataOptions { ItemType = "Series", - DisabledMetadataFetchers = new []{ "TheMovieDb" }, - DisabledImageFetchers = new []{ "TheMovieDb" } + DisabledMetadataFetchers = new [] { "TheMovieDb" }, + DisabledImageFetchers = new [] { "TheMovieDb" } }, - new MetadataOptions { ItemType = "MusicAlbum", - DisabledMetadataFetchers = new []{ "TheAudioDB" } + DisabledMetadataFetchers = new [] { "TheAudioDB" } }, - new MetadataOptions { ItemType = "MusicArtist", - DisabledMetadataFetchers = new []{ "TheAudioDB" } + DisabledMetadataFetchers = new [] { "TheAudioDB" } }, - new MetadataOptions { ItemType = "BoxSet" }, - new MetadataOptions { ItemType = "Season", - DisabledMetadataFetchers = new []{ "TheMovieDb" }, + DisabledMetadataFetchers = new [] { "TheMovieDb" }, DisabledImageFetchers = new [] { "FanArt" } }, - new MetadataOptions { ItemType = "Episode", - DisabledMetadataFetchers = new []{ "The Open Movie Database", "TheMovieDb" }, - DisabledImageFetchers = new []{ "The Open Movie Database", "TheMovieDb" } + DisabledMetadataFetchers = new [] { "The Open Movie Database", "TheMovieDb" }, + DisabledImageFetchers = new [] { "The Open Movie Database", "TheMovieDb" } } }; } diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs index 34b0be095..39b956138 100644 --- a/MediaBrowser.Model/Configuration/UserConfiguration.cs +++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs @@ -57,10 +57,10 @@ namespace MediaBrowser.Model.Configuration HidePlayedInLatest = true; PlayDefaultAudioTrack = true; - LatestItemsExcludes = new string[] {}; - OrderedViews = new string[] {}; - MyMediaExcludes = new string[] {}; - GroupedFolders = new string[] {}; + LatestItemsExcludes = Array.Empty<string>(); + OrderedViews = Array.Empty<string>(); + MyMediaExcludes = Array.Empty<string>(); + GroupedFolders = Array.Empty<string>(); } } } diff --git a/MediaBrowser.Model/Connect/ConnectAuthenticationExchangeResult.cs b/MediaBrowser.Model/Connect/ConnectAuthenticationExchangeResult.cs deleted file mode 100644 index c60224045..000000000 --- a/MediaBrowser.Model/Connect/ConnectAuthenticationExchangeResult.cs +++ /dev/null @@ -1,17 +0,0 @@ - -namespace MediaBrowser.Model.Connect -{ - public class ConnectAuthenticationExchangeResult - { - /// <summary> - /// Gets or sets the local user identifier. - /// </summary> - /// <value>The local user identifier.</value> - public string LocalUserId { get; set; } - /// <summary> - /// Gets or sets the access token. - /// </summary> - /// <value>The access token.</value> - public string AccessToken { get; set; } - } -} diff --git a/MediaBrowser.Model/Connect/ConnectAuthenticationResult.cs b/MediaBrowser.Model/Connect/ConnectAuthenticationResult.cs deleted file mode 100644 index 0df035e57..000000000 --- a/MediaBrowser.Model/Connect/ConnectAuthenticationResult.cs +++ /dev/null @@ -1,17 +0,0 @@ - -namespace MediaBrowser.Model.Connect -{ - public class ConnectAuthenticationResult - { - /// <summary> - /// Gets or sets the user. - /// </summary> - /// <value>The user.</value> - public ConnectUser User { get; set; } - /// <summary> - /// Gets or sets the access token. - /// </summary> - /// <value>The access token.</value> - public string AccessToken { get; set; } - } -} diff --git a/MediaBrowser.Model/Connect/ConnectAuthorization.cs b/MediaBrowser.Model/Connect/ConnectAuthorization.cs index 84dbf5c36..a949612ab 100644 --- a/MediaBrowser.Model/Connect/ConnectAuthorization.cs +++ b/MediaBrowser.Model/Connect/ConnectAuthorization.cs @@ -14,8 +14,8 @@ namespace MediaBrowser.Model.Connect public ConnectAuthorization() { - EnabledLibraries = new string[] {}; - EnabledChannels = new string[] {}; + EnabledLibraries = Array.Empty<string>(); + EnabledChannels = Array.Empty<string>(); } } } diff --git a/MediaBrowser.Model/Connect/ConnectAuthorizationRequest.cs b/MediaBrowser.Model/Connect/ConnectAuthorizationRequest.cs deleted file mode 100644 index ba4e9f5cf..000000000 --- a/MediaBrowser.Model/Connect/ConnectAuthorizationRequest.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; - -namespace MediaBrowser.Model.Connect -{ - public class ConnectAuthorizationRequest - { - public string SendingUserId { get; set; } - public string ConnectUserName { get; set; } - public string[] EnabledLibraries { get; set; } - public bool EnableLiveTv { get; set; } - public string[] EnabledChannels { get; set; } - - public ConnectAuthorizationRequest() - { - EnabledLibraries = new string[] {}; - EnabledChannels = new string[] {}; - } - } -} diff --git a/MediaBrowser.Model/Devices/DeviceInfo.cs b/MediaBrowser.Model/Devices/DeviceInfo.cs index 590dc5eb3..a588ce029 100644 --- a/MediaBrowser.Model/Devices/DeviceInfo.cs +++ b/MediaBrowser.Model/Devices/DeviceInfo.cs @@ -5,22 +5,6 @@ namespace MediaBrowser.Model.Devices { public class DeviceInfo { - /// <summary> - /// Gets or sets the name of the reported. - /// </summary> - /// <value>The name of the reported.</value> - public string ReportedName { get; set; } - /// <summary> - /// Gets or sets the name of the custom. - /// </summary> - /// <value>The name of the custom.</value> - public string CustomName { get; set; } - /// <summary> - /// Gets or sets the camera upload path. - /// </summary> - /// <value>The camera upload path.</value> - public string CameraUploadPath { get; set; } - public string Name { get; set; } /// <summary> diff --git a/MediaBrowser.Model/Devices/DeviceQuery.cs b/MediaBrowser.Model/Devices/DeviceQuery.cs index 9ceea1ea8..2838239e4 100644 --- a/MediaBrowser.Model/Devices/DeviceQuery.cs +++ b/MediaBrowser.Model/Devices/DeviceQuery.cs @@ -1,14 +1,11 @@ +using System; + namespace MediaBrowser.Model.Devices { public class DeviceQuery { /// <summary> - /// Gets or sets a value indicating whether [supports unique identifier]. - /// </summary> - /// <value><c>null</c> if [supports unique identifier] contains no value, <c>true</c> if [supports unique identifier]; otherwise, <c>false</c>.</value> - public bool? SupportsPersistentIdentifier { get; set; } - /// <summary> /// Gets or sets a value indicating whether [supports synchronize]. /// </summary> /// <value><c>null</c> if [supports synchronize] contains no value, <c>true</c> if [supports synchronize]; otherwise, <c>false</c>.</value> @@ -17,6 +14,6 @@ namespace MediaBrowser.Model.Devices /// Gets or sets the user identifier. /// </summary> /// <value>The user identifier.</value> - public string UserId { get; set; } + public Guid UserId { get; set; } } } diff --git a/MediaBrowser.Model/Devices/DevicesOptions.cs b/MediaBrowser.Model/Devices/DevicesOptions.cs index 5bcdd1a82..8e478d005 100644 --- a/MediaBrowser.Model/Devices/DevicesOptions.cs +++ b/MediaBrowser.Model/Devices/DevicesOptions.cs @@ -10,15 +10,12 @@ namespace MediaBrowser.Model.Devices public DevicesOptions() { - EnabledCameraUploadDevices = new string[] {}; + EnabledCameraUploadDevices = Array.Empty<string>(); } } public class DeviceOptions { - public string[] EnabledCameraUploadDevices { get; set; } - public string CameraUploadPath { get; set; } - public bool EnableCameraUploadSubfolders { get; set; } public string CustomName { get; set; } } } diff --git a/MediaBrowser.Model/Dlna/ContainerProfile.cs b/MediaBrowser.Model/Dlna/ContainerProfile.cs index 3fb0682b0..ccad4cead 100644 --- a/MediaBrowser.Model/Dlna/ContainerProfile.cs +++ b/MediaBrowser.Model/Dlna/ContainerProfile.cs @@ -1,7 +1,5 @@ using System; -using System.Collections.Generic; using System.Xml.Serialization; -using MediaBrowser.Model.Dlna; using MediaBrowser.Model.Extensions; namespace MediaBrowser.Model.Dlna @@ -17,7 +15,7 @@ namespace MediaBrowser.Model.Dlna public ContainerProfile() { - Conditions = new ProfileCondition[] { }; + Conditions = Array.Empty<ProfileCondition>(); } public string[] GetContainers() @@ -25,13 +23,11 @@ namespace MediaBrowser.Model.Dlna return SplitValue(Container); } - private static readonly string[] EmptyStringArray = Array.Empty<string>(); - public static string[] SplitValue(string value) { if (string.IsNullOrEmpty(value)) { - return EmptyStringArray; + return Array.Empty<string>(); } return value.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries); diff --git a/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs b/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs index 966c4a8ce..88d7573e6 100644 --- a/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs +++ b/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs @@ -1,7 +1,6 @@ using MediaBrowser.Model.MediaInfo; using System; using System.Collections.Generic; -using System.Linq; namespace MediaBrowser.Model.Dlna { @@ -28,7 +27,7 @@ namespace MediaBrowser.Model.Dlna DlnaFlags flagValue = DlnaFlags.BackgroundTransferMode | DlnaFlags.InteractiveTransferMode | DlnaFlags.DlnaV15; - + string dlnaflags = string.Format(";DLNA.ORG_FLAGS={0}", DlnaMaps.FlagsToString(flagValue)); diff --git a/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs b/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs index 4fdf4972f..4cde26a03 100644 --- a/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs +++ b/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs @@ -1,13 +1,12 @@ using System; -using System.Collections.Generic; using MediaBrowser.Model.Extensions; namespace MediaBrowser.Model.Dlna { public class ResolutionNormalizer { - private static readonly ResolutionConfiguration[] Configurations = - new [] + private static readonly ResolutionConfiguration[] Configurations = + new[] { new ResolutionConfiguration(426, 320000), new ResolutionConfiguration(640, 400000), @@ -20,24 +19,24 @@ namespace MediaBrowser.Model.Dlna public static ResolutionOptions Normalize(int? inputBitrate, int? unused1, int? unused2, - int outputBitrate, - string inputCodec, + int outputBitrate, + string inputCodec, string outputCodec, int? maxWidth, int? maxHeight) { - // If the bitrate isn't changing, then don't downlscale the resolution - if (inputBitrate.HasValue && outputBitrate >= inputBitrate.Value) - { - if (maxWidth.HasValue || maxHeight.HasValue) - { - return new ResolutionOptions - { - MaxWidth = maxWidth, - MaxHeight = maxHeight - }; - } - } + // If the bitrate isn't changing, then don't downlscale the resolution + if (inputBitrate.HasValue && outputBitrate >= inputBitrate.Value) + { + if (maxWidth.HasValue || maxHeight.HasValue) + { + return new ResolutionOptions + { + MaxWidth = maxWidth, + MaxHeight = maxHeight + }; + } + } var resolutionConfig = GetResolutionConfiguration(outputBitrate); if (resolutionConfig != null) @@ -90,8 +89,8 @@ namespace MediaBrowser.Model.Dlna { var inputScaleFactor = GetVideoBitrateScaleFactor(inputVideoCodec); var outputScaleFactor = GetVideoBitrateScaleFactor(outputVideoCodec); - var scaleFactor = outputScaleFactor/inputScaleFactor; - var newBitrate = scaleFactor*bitrate; + var scaleFactor = outputScaleFactor / inputScaleFactor; + var newBitrate = scaleFactor * bitrate; return Convert.ToInt32(newBitrate); } diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs index 840abf618..41306b4c3 100644 --- a/MediaBrowser.Model/Dlna/StreamBuilder.cs +++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs @@ -1,7 +1,7 @@ using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Extensions; -using MediaBrowser.Model.Logging; +using Microsoft.Extensions.Logging; using MediaBrowser.Model.MediaInfo; using MediaBrowser.Model.Session; using System; @@ -528,7 +528,7 @@ namespace MediaBrowser.Model.Dlna { transcodeReasons.InsertRange(0, GetTranscodeReasonsFromDirectPlayProfile(item, null, audioStream, options.Profile.DirectPlayProfiles)); - _logger.Info("Profile: {0}, No direct play profiles found for Path: {1}", + _logger.LogInformation("Profile: {0}, No direct play profiles found for Path: {1}", options.Profile.Name ?? "Unknown Profile", item.Path ?? "Unknown path"); } @@ -732,7 +732,7 @@ namespace MediaBrowser.Model.Dlna bool isEligibleForDirectPlay = options.EnableDirectPlay && (options.ForceDirectPlay || directPlayEligibilityResult.Item1); bool isEligibleForDirectStream = options.EnableDirectStream && (options.ForceDirectStream || directStreamEligibilityResult.Item1); - _logger.Info("Profile: {0}, Path: {1}, isEligibleForDirectPlay: {2}, isEligibleForDirectStream: {3}", + _logger.LogInformation("Profile: {0}, Path: {1}, isEligibleForDirectPlay: {2}, isEligibleForDirectStream: {3}", options.Profile.Name ?? "Unknown Profile", item.Path ?? "Unknown path", isEligibleForDirectPlay, @@ -1022,7 +1022,7 @@ namespace MediaBrowser.Model.Dlna if (directPlay == null) { - _logger.Info("Profile: {0}, No direct play profiles found for Path: {1}", + _logger.LogInformation("Profile: {0}, No direct play profiles found for Path: {1}", profile.Name ?? "Unknown Profile", mediaSource.Path ?? "Unknown path"); @@ -1188,7 +1188,7 @@ namespace MediaBrowser.Model.Dlna private void LogConditionFailure(DeviceProfile profile, string type, ProfileCondition condition, MediaSourceInfo mediaSource) { - _logger.Info("Profile: {0}, DirectPlay=false. Reason={1}.{2} Condition: {3}. ConditionValue: {4}. IsRequired: {5}. Path: {6}", + _logger.LogInformation("Profile: {0}, DirectPlay=false. Reason={1}.{2} Condition: {3}. ConditionValue: {4}. IsRequired: {5}. Path: {6}", type, profile.Name ?? "Unknown Profile", condition.Property, @@ -1210,7 +1210,7 @@ namespace MediaBrowser.Model.Dlna if (subtitleProfile.Method != SubtitleDeliveryMethod.External && subtitleProfile.Method != SubtitleDeliveryMethod.Embed) { - _logger.Info("Not eligible for {0} due to unsupported subtitles", playMethod); + _logger.LogInformation("Not eligible for {0} due to unsupported subtitles", playMethod); return new ValueTuple<bool, TranscodeReason?>(false, TranscodeReason.SubtitleCodecNotSupported); } } @@ -1397,7 +1397,7 @@ namespace MediaBrowser.Model.Dlna if (itemBitrate > requestedMaxBitrate) { - _logger.Info("Bitrate exceeds " + playMethod + " limit: media bitrate: {0}, max bitrate: {1}", itemBitrate.ToString(CultureInfo.InvariantCulture), requestedMaxBitrate.ToString(CultureInfo.InvariantCulture)); + _logger.LogInformation("Bitrate exceeds " + playMethod + " limit: media bitrate: {0}, max bitrate: {1}", itemBitrate.ToString(CultureInfo.InvariantCulture), requestedMaxBitrate.ToString(CultureInfo.InvariantCulture)); return false; } diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs index c927cd31c..ba0ac0486 100644 --- a/MediaBrowser.Model/Dlna/StreamInfo.cs +++ b/MediaBrowser.Model/Dlna/StreamInfo.cs @@ -18,10 +18,10 @@ namespace MediaBrowser.Model.Dlna { public StreamInfo() { - AudioCodecs = new string[] { }; - VideoCodecs = new string[] { }; - SubtitleCodecs = new string[] { }; - TranscodeReasons = new TranscodeReason[] { }; + AudioCodecs = Array.Empty<string>(); + VideoCodecs = Array.Empty<string>(); + SubtitleCodecs = Array.Empty<string>(); + TranscodeReasons = Array.Empty<TranscodeReason>(); StreamOptions = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase); } diff --git a/MediaBrowser.Model/Dlna/SubtitleProfile.cs b/MediaBrowser.Model/Dlna/SubtitleProfile.cs index a7e61e69a..f85ba4a7a 100644 --- a/MediaBrowser.Model/Dlna/SubtitleProfile.cs +++ b/MediaBrowser.Model/Dlna/SubtitleProfile.cs @@ -1,7 +1,5 @@ using MediaBrowser.Model.Extensions; -using System.Collections.Generic; using System.Xml.Serialization; -using MediaBrowser.Model.Dlna; namespace MediaBrowser.Model.Dlna { @@ -43,4 +41,4 @@ namespace MediaBrowser.Model.Dlna return languages.Length == 0 || ListHelper.ContainsIgnoreCase(languages, subLanguage); } } -}
\ No newline at end of file +} diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs index 3ddbc4150..746d38679 100644 --- a/MediaBrowser.Model/Dto/BaseItemDto.cs +++ b/MediaBrowser.Model/Dto/BaseItemDto.cs @@ -4,10 +4,8 @@ using MediaBrowser.Model.Extensions; using MediaBrowser.Model.Library; using MediaBrowser.Model.LiveTv; using MediaBrowser.Model.Providers; -using MediaBrowser.Model.Sync; using System; using System.Collections.Generic; -using MediaBrowser.Model.Serialization; namespace MediaBrowser.Model.Dto { @@ -67,7 +65,6 @@ namespace MediaBrowser.Model.Dto public int? AirsBeforeSeasonNumber { get; set; } public int? AirsAfterSeasonNumber { get; set; } public int? AirsBeforeEpisodeNumber { get; set; } - public bool? DisplaySpecialsWithSeasons { get; set; } public bool? CanDelete { get; set; } public bool? CanDownload { get; set; } @@ -156,7 +153,6 @@ namespace MediaBrowser.Model.Dto /// <value>The channel identifier.</value> public Guid ChannelId { get; set; } public string ChannelName { get; set; } - public string ServiceName { get; set; } /// <summary> /// Gets or sets the overview. @@ -480,26 +476,6 @@ namespace MediaBrowser.Model.Dto public int? MediaSourceCount { get; set; } /// <summary> - /// Determines whether the specified type is type. - /// </summary> - /// <param name="type">The type.</param> - /// <returns><c>true</c> if the specified type is type; otherwise, <c>false</c>.</returns> - public bool IsType(Type type) - { - return IsType(type.Name); - } - - /// <summary> - /// Determines whether the specified type is type. - /// </summary> - /// <param name="type">The type.</param> - /// <returns><c>true</c> if the specified type is type; otherwise, <c>false</c>.</returns> - public bool IsType(string type) - { - return StringHelper.EqualsIgnoreCase(Type, type); - } - - /// <summary> /// Gets or sets the image tags. /// </summary> /// <value>The image tags.</value> @@ -602,12 +578,6 @@ namespace MediaBrowser.Model.Dto public DateTime? EndDate { get; set; } /// <summary> - /// Gets or sets the home page URL. - /// </summary> - /// <value>The home page URL.</value> - public string HomePageUrl { get; set; } - - /// <summary> /// Gets or sets the locked fields. /// </summary> /// <value>The locked fields.</value> @@ -678,11 +648,6 @@ namespace MediaBrowser.Model.Dto public int? IsoSpeedRating { get; set; } /// <summary> - /// Used by RecordingGroup - /// </summary> - public int? RecordingCount { get; set; } - - /// <summary> /// Gets or sets the series timer identifier. /// </summary> /// <value>The series timer identifier.</value> diff --git a/MediaBrowser.Model/Dto/ChapterInfoDto.cs b/MediaBrowser.Model/Dto/ChapterInfoDto.cs deleted file mode 100644 index b68b55e70..000000000 --- a/MediaBrowser.Model/Dto/ChapterInfoDto.cs +++ /dev/null @@ -1,38 +0,0 @@ -using MediaBrowser.Model.Serialization; - -namespace MediaBrowser.Model.Dto -{ - /// <summary> - /// Class ChapterInfo - /// </summary> - public class ChapterInfoDto - { - /// <summary> - /// Gets or sets the start position ticks. - /// </summary> - /// <value>The start position ticks.</value> - public long StartPositionTicks { get; set; } - - /// <summary> - /// Gets or sets the name. - /// </summary> - /// <value>The name.</value> - public string Name { get; set; } - - /// <summary> - /// Gets or sets the image tag. - /// </summary> - /// <value>The image tag.</value> - public string ImageTag { get; set; } - - /// <summary> - /// Gets a value indicating whether this instance has image. - /// </summary> - /// <value><c>true</c> if this instance has image; otherwise, <c>false</c>.</value> - [IgnoreDataMember] - public bool HasImage - { - get { return ImageTag != null; } - } - } -} diff --git a/MediaBrowser.Model/Dto/GameSystemSummary.cs b/MediaBrowser.Model/Dto/GameSystemSummary.cs index 252868b66..0f21533a0 100644 --- a/MediaBrowser.Model/Dto/GameSystemSummary.cs +++ b/MediaBrowser.Model/Dto/GameSystemSummary.cs @@ -1,5 +1,4 @@ -using System.Collections.Generic; -using System; +using System; namespace MediaBrowser.Model.Dto { @@ -43,7 +42,7 @@ namespace MediaBrowser.Model.Dto /// </summary> public GameSystemSummary() { - GameFileExtensions = new string[] {}; + GameFileExtensions = Array.Empty<string>(); } } } diff --git a/MediaBrowser.Model/Dto/MediaSourceInfo.cs b/MediaBrowser.Model/Dto/MediaSourceInfo.cs index d1d068fb6..be9c2dff3 100644 --- a/MediaBrowser.Model/Dto/MediaSourceInfo.cs +++ b/MediaBrowser.Model/Dto/MediaSourceInfo.cs @@ -1,5 +1,4 @@ using MediaBrowser.Model.Entities; -using MediaBrowser.Model.Extensions; using MediaBrowser.Model.MediaInfo; using System.Collections.Generic; using MediaBrowser.Model.Serialization; @@ -73,7 +72,7 @@ namespace MediaBrowser.Model.Dto public MediaSourceInfo() { - Formats = new string[] { }; + Formats = Array.Empty<string>(); MediaStreams = new List<MediaStream>(); RequiredHttpHeaders = new Dictionary<string, string>(); SupportsTranscoding = true; @@ -115,12 +114,6 @@ namespace MediaBrowser.Model.Dto public int? DefaultAudioStreamIndex { get; set; } public int? DefaultSubtitleStreamIndex { get; set; } - [IgnoreDataMember] - public MediaStream DefaultAudioStream - { - get { return GetDefaultAudioStream(DefaultAudioStreamIndex); } - } - public MediaStream GetDefaultAudioStream(int? defaultIndex) { if (defaultIndex.HasValue) diff --git a/MediaBrowser.Model/Dto/MetadataEditorInfo.cs b/MediaBrowser.Model/Dto/MetadataEditorInfo.cs index aa8b33c81..b7093da71 100644 --- a/MediaBrowser.Model/Dto/MetadataEditorInfo.cs +++ b/MediaBrowser.Model/Dto/MetadataEditorInfo.cs @@ -1,7 +1,7 @@ using MediaBrowser.Model.Entities; using MediaBrowser.Model.Globalization; using MediaBrowser.Model.Providers; -using System.Collections.Generic; +using System; namespace MediaBrowser.Model.Dto { @@ -17,11 +17,11 @@ namespace MediaBrowser.Model.Dto public MetadataEditorInfo() { - ParentalRatingOptions = new ParentalRating[] { }; - Countries = new CountryInfo[] { }; - Cultures = new CultureDto[] { }; - ExternalIdInfos = new ExternalIdInfo[] { }; - ContentTypeOptions = new NameValuePair[] { }; + ParentalRatingOptions = Array.Empty<ParentalRating>(); + Countries = Array.Empty<CountryInfo>(); + Cultures = Array.Empty<CultureDto>(); + ExternalIdInfos = Array.Empty<ExternalIdInfo>(); + ContentTypeOptions = Array.Empty<NameValuePair>(); } } } diff --git a/MediaBrowser.Model/Dto/UserDto.cs b/MediaBrowser.Model/Dto/UserDto.cs index f42c495ad..8d7679fdb 100644 --- a/MediaBrowser.Model/Dto/UserDto.cs +++ b/MediaBrowser.Model/Dto/UserDto.cs @@ -2,7 +2,6 @@ using MediaBrowser.Model.Connect; using MediaBrowser.Model.Users; using System; -using MediaBrowser.Model.Serialization; namespace MediaBrowser.Model.Dto { diff --git a/MediaBrowser.Model/Entities/LibraryUpdateInfo.cs b/MediaBrowser.Model/Entities/LibraryUpdateInfo.cs index dfab9add2..2ae7bead2 100644 --- a/MediaBrowser.Model/Entities/LibraryUpdateInfo.cs +++ b/MediaBrowser.Model/Entities/LibraryUpdateInfo.cs @@ -51,12 +51,12 @@ namespace MediaBrowser.Model.Entities /// </summary> public LibraryUpdateInfo() { - FoldersAddedTo = new string[] { }; - FoldersRemovedFrom = new string[] { }; - ItemsAdded = new string[] { }; - ItemsRemoved = new string[] { }; - ItemsUpdated = new string[] { }; - CollectionFolders = new string[] { }; + FoldersAddedTo = Array.Empty<string>(); + FoldersRemovedFrom = Array.Empty<string>(); + ItemsAdded = Array.Empty<string>(); + ItemsRemoved = Array.Empty<string>(); + ItemsUpdated = Array.Empty<string>(); + CollectionFolders = Array.Empty<string>(); } } } diff --git a/MediaBrowser.Model/Entities/VirtualFolderInfo.cs b/MediaBrowser.Model/Entities/VirtualFolderInfo.cs index 68f713295..c8374f620 100644 --- a/MediaBrowser.Model/Entities/VirtualFolderInfo.cs +++ b/MediaBrowser.Model/Entities/VirtualFolderInfo.cs @@ -34,7 +34,7 @@ namespace MediaBrowser.Model.Entities /// </summary> public VirtualFolderInfo() { - Locations = new string[] {}; + Locations = Array.Empty<string>(); } /// <summary> diff --git a/MediaBrowser.Model/Globalization/CultureDto.cs b/MediaBrowser.Model/Globalization/CultureDto.cs index 6d79aaebb..c0eb8b2ad 100644 --- a/MediaBrowser.Model/Globalization/CultureDto.cs +++ b/MediaBrowser.Model/Globalization/CultureDto.cs @@ -46,7 +46,7 @@ namespace MediaBrowser.Model.Globalization public CultureDto() { - ThreeLetterISOLanguageNames = new string[] {}; + ThreeLetterISOLanguageNames = Array.Empty<string>(); } } } diff --git a/MediaBrowser.Model/Library/UserViewQuery.cs b/MediaBrowser.Model/Library/UserViewQuery.cs index 8b60cfd98..9801b8e8e 100644 --- a/MediaBrowser.Model/Library/UserViewQuery.cs +++ b/MediaBrowser.Model/Library/UserViewQuery.cs @@ -27,7 +27,7 @@ namespace MediaBrowser.Model.Library public UserViewQuery() { IncludeExternalContent = true; - PresetViews = new string[] {}; + PresetViews = Array.Empty<string>(); } } } diff --git a/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs b/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs index e3abd5974..5fe77d41e 100644 --- a/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs +++ b/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs @@ -98,7 +98,7 @@ namespace MediaBrowser.Model.LiveTv public LiveTvChannelQuery() { EnableUserData = true; - SortBy = new string[] {}; + SortBy = Array.Empty<string>(); } } } diff --git a/MediaBrowser.Model/LiveTv/LiveTvInfo.cs b/MediaBrowser.Model/LiveTv/LiveTvInfo.cs index 331b1101b..68281d79b 100644 --- a/MediaBrowser.Model/LiveTv/LiveTvInfo.cs +++ b/MediaBrowser.Model/LiveTv/LiveTvInfo.cs @@ -25,8 +25,8 @@ namespace MediaBrowser.Model.LiveTv public LiveTvInfo() { - Services = new LiveTvServiceInfo[] { }; - EnabledUsers = new string[] {}; + Services = Array.Empty<LiveTvServiceInfo>(); + EnabledUsers = Array.Empty<string>(); } } -}
\ No newline at end of file +} diff --git a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs index eb4f20f9e..6a688c7b4 100644 --- a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs +++ b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs @@ -25,9 +25,9 @@ namespace MediaBrowser.Model.LiveTv public LiveTvOptions() { - TunerHosts = new TunerHostInfo[] { }; - ListingProviders = new ListingsProviderInfo[] { }; - MediaLocationsCreated = new string[] { }; + TunerHosts = Array.Empty<TunerHostInfo>(); + ListingProviders = Array.Empty<ListingsProviderInfo>(); + MediaLocationsCreated = Array.Empty<string>(); RecordingPostProcessorArguments = "\"{path}\""; } } @@ -76,13 +76,13 @@ namespace MediaBrowser.Model.LiveTv public ListingsProviderInfo() { - NewsCategories = new string[] { "news", "journalism", "documentary", "current affairs" }; - SportsCategories = new string[] { "sports", "basketball", "baseball", "football" }; - KidsCategories = new string[] { "kids", "family", "children", "childrens", "disney" }; - MovieCategories = new string[] { "movie" }; - EnabledTuners = new string[] { }; + NewsCategories = new [] { "news", "journalism", "documentary", "current affairs" }; + SportsCategories = new [] { "sports", "basketball", "baseball", "football" }; + KidsCategories = new [] { "kids", "family", "children", "childrens", "disney" }; + MovieCategories = new [] { "movie" }; + EnabledTuners = Array.Empty<string>(); EnableAllTuners = true; - ChannelMappings = new NameValuePair[] {}; + ChannelMappings = Array.Empty<NameValuePair>(); } } } diff --git a/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs b/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs index 23eedfc88..4b7ee971c 100644 --- a/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs +++ b/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs @@ -52,7 +52,7 @@ namespace MediaBrowser.Model.LiveTv public LiveTvServiceInfo() { - Tuners = new string[] { }; + Tuners = Array.Empty<string>(); } } } diff --git a/MediaBrowser.Model/LiveTv/ProgramQuery.cs b/MediaBrowser.Model/LiveTv/ProgramQuery.cs deleted file mode 100644 index 89160948c..000000000 --- a/MediaBrowser.Model/LiveTv/ProgramQuery.cs +++ /dev/null @@ -1,117 +0,0 @@ -using MediaBrowser.Model.Entities; -using System; -using MediaBrowser.Model.Querying; - -namespace MediaBrowser.Model.LiveTv -{ - /// <summary> - /// Class ProgramQuery. - /// </summary> - public class ProgramQuery - { - public ProgramQuery() - { - ChannelIds = new Guid[] { }; - OrderBy = new Tuple<string, SortOrder>[] { }; - Genres = new string[] {}; - GenreIds = new Guid[] { }; - EnableTotalRecordCount = true; - EnableUserData = true; - } - - public bool EnableTotalRecordCount { get; set; } - public bool EnableUserData { get; set; } - - /// <summary> - /// Fields to return within the items, in addition to basic information - /// </summary> - /// <value>The fields.</value> - public ItemFields[] Fields { get; set; } - public bool? EnableImages { get; set; } - public int? ImageTypeLimit { get; set; } - public ImageType[] EnableImageTypes { get; set; } - - /// <summary> - /// Gets or sets the channel ids. - /// </summary> - /// <value>The channel ids.</value> - public Guid[] ChannelIds { get; set; } - - /// <summary> - /// Gets or sets the user identifier. - /// </summary> - /// <value>The user identifier.</value> - public string UserId { get; set; } - public string SeriesTimerId { get; set; } - public string Name { get; set; } - - /// <summary> - /// The earliest date for which a program starts to return - /// </summary> - public DateTime? MinStartDate { get; set; } - - /// <summary> - /// The latest date for which a program starts to return - /// </summary> - public DateTime? MaxStartDate { get; set; } - - /// <summary> - /// The earliest date for which a program ends to return - /// </summary> - public DateTime? MinEndDate { get; set; } - - /// <summary> - /// The latest date for which a program ends to return - /// </summary> - public DateTime? MaxEndDate { get; set; } - - /// <summary> - /// Used to specific whether to return news or not - /// </summary> - /// <remarks>If set to null, all programs will be returned</remarks> - public bool? IsNews { get; set; } - - /// <summary> - /// Used to specific whether to return movies or not - /// </summary> - /// <remarks>If set to null, all programs will be returned</remarks> - public bool? IsMovie { get; set; } - - /// <summary> - /// Gets or sets a value indicating whether this instance is kids. - /// </summary> - /// <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; } - /// <summary> - /// Gets or sets a value indicating whether this instance is sports. - /// </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; } - - /// <summary> - /// Skips over a given number of items within the results. Use for paging. - /// </summary> - public int? StartIndex { get; set; } - public bool? IsSeries { get; set; } - - /// <summary> - /// Gets or sets a value indicating whether this instance has aired. - /// </summary> - /// <value><c>null</c> if [has aired] contains no value, <c>true</c> if [has aired]; otherwise, <c>false</c>.</value> - public bool? HasAired { get; set; } - - /// <summary> - /// The maximum number of items to return - /// </summary> - public int? Limit { get; set; } - - public Tuple<string, SortOrder>[] OrderBy { get; set; } - - /// <summary> - /// Limit results to items containing specific genres - /// </summary> - /// <value>The genres.</value> - public Guid[] GenreIds { get; set; } - public string[] Genres { get; set; } - } -}
\ No newline at end of file diff --git a/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs b/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs deleted file mode 100644 index 9972c4c3f..000000000 --- a/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs +++ /dev/null @@ -1,73 +0,0 @@ -using MediaBrowser.Model.Entities; -using MediaBrowser.Model.Querying; -using System; - -namespace MediaBrowser.Model.LiveTv -{ - public class RecommendedProgramQuery - { - /// <summary> - /// Fields to return within the items, in addition to basic information - /// </summary> - /// <value>The fields.</value> - public ItemFields[] Fields { get; set; } - public bool? EnableImages { get; set; } - public int? ImageTypeLimit { get; set; } - public ImageType[] EnableImageTypes { get; set; } - public Guid[] GenreIds { get; set; } - - public bool EnableTotalRecordCount { get; set; } - - public RecommendedProgramQuery() - { - EnableTotalRecordCount = true; - GenreIds = new Guid[] { }; - } - - /// <summary> - /// Gets or sets the user identifier. - /// </summary> - /// <value>The user identifier.</value> - public string UserId { get; set; } - - /// <summary> - /// Gets or sets a value indicating whether this instance is airing. - /// </summary> - /// <value><c>true</c> if this instance is airing; otherwise, <c>false</c>.</value> - public bool? IsAiring { get; set; } - - /// <summary> - /// Gets or sets a value indicating whether this instance has aired. - /// </summary> - /// <value><c>null</c> if [has aired] contains no value, <c>true</c> if [has aired]; otherwise, <c>false</c>.</value> - public bool? HasAired { get; set; } - - /// <summary> - /// The maximum number of items to return - /// </summary> - /// <value>The limit.</value> - public int? Limit { get; set; } - - /// <summary> - /// Gets or sets a value indicating whether this instance is movie. - /// </summary> - /// <value><c>null</c> if [is movie] contains no value, <c>true</c> if [is movie]; otherwise, <c>false</c>.</value> - public bool? IsNews { get; set; } - /// <summary> - /// Gets or sets a value indicating whether this instance is movie. - /// </summary> - /// <value><c>null</c> if [is movie] contains no value, <c>true</c> if [is movie]; otherwise, <c>false</c>.</value> - public bool? IsMovie { get; set; } - public bool? IsSeries { get; set; } - /// <summary> - /// Gets or sets a value indicating whether this instance is kids. - /// </summary> - /// <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; } - /// <summary> - /// Gets or sets a value indicating whether this instance is sports. - /// </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; } - } -}
\ No newline at end of file diff --git a/MediaBrowser.Model/Logging/IConsoleLogger.cs b/MediaBrowser.Model/Logging/IConsoleLogger.cs deleted file mode 100644 index a8c282d65..000000000 --- a/MediaBrowser.Model/Logging/IConsoleLogger.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace MediaBrowser.Model.Logging -{ - public interface IConsoleLogger - { - void WriteLine(string message); - } -} diff --git a/MediaBrowser.Model/Logging/ILogManager.cs b/MediaBrowser.Model/Logging/ILogManager.cs deleted file mode 100644 index e6a10cf18..000000000 --- a/MediaBrowser.Model/Logging/ILogManager.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System; -using System.Threading; -using System.Threading.Tasks; - -namespace MediaBrowser.Model.Logging -{ - /// <summary> - /// Interface ILogManager - /// </summary> - public interface ILogManager - { - /// <summary> - /// Gets or sets the log level. - /// </summary> - /// <value>The log level.</value> - LogSeverity LogSeverity { get; set; } - - /// <summary> - /// Gets or sets the exception message prefix. - /// </summary> - /// <value>The exception message prefix.</value> - string ExceptionMessagePrefix { get; set; } - - /// <summary> - /// Gets the logger. - /// </summary> - /// <param name="name">The name.</param> - /// <returns>ILogger.</returns> - ILogger GetLogger(string name); - - /// <summary> - /// Reloads the logger. - /// </summary> - Task ReloadLogger(LogSeverity severity, CancellationToken cancellationToken); - - /// <summary> - /// Occurs when [logger loaded]. - /// </summary> - event EventHandler LoggerLoaded; - - /// <summary> - /// Flushes this instance. - /// </summary> - void Flush(); - - /// <summary> - /// Adds the console output. - /// </summary> - void AddConsoleOutput(); - - /// <summary> - /// Removes the console output. - /// </summary> - void RemoveConsoleOutput(); - } -} diff --git a/MediaBrowser.Model/Logging/ILogger.cs b/MediaBrowser.Model/Logging/ILogger.cs deleted file mode 100644 index be9d6fc50..000000000 --- a/MediaBrowser.Model/Logging/ILogger.cs +++ /dev/null @@ -1,78 +0,0 @@ -using System; -using System.Text; - -namespace MediaBrowser.Model.Logging -{ - /// <summary> - /// Interface ILogger - /// </summary> - public interface ILogger - { - /// <summary> - /// Infoes the specified message. - /// </summary> - /// <param name="message">The message.</param> - /// <param name="paramList">The param list.</param> - void Info(string message, params object[] paramList); - - /// <summary> - /// Errors the specified message. - /// </summary> - /// <param name="message">The message.</param> - /// <param name="paramList">The param list.</param> - void Error(string message, params object[] paramList); - - /// <summary> - /// Warns the specified message. - /// </summary> - /// <param name="message">The message.</param> - /// <param name="paramList">The param list.</param> - void Warn(string message, params object[] paramList); - - /// <summary> - /// Debugs the specified message. - /// </summary> - /// <param name="message">The message.</param> - /// <param name="paramList">The param list.</param> - void Debug(string message, params object[] paramList); - - /// <summary> - /// Fatals the specified message. - /// </summary> - /// <param name="message">The message.</param> - /// <param name="paramList">The param list.</param> - void Fatal(string message, params object[] paramList); - - /// <summary> - /// Fatals the exception. - /// </summary> - /// <param name="message">The message.</param> - /// <param name="exception">The exception.</param> - /// <param name="paramList">The param list.</param> - void FatalException(string message, Exception exception, params object[] paramList); - - /// <summary> - /// Logs the exception. - /// </summary> - /// <param name="message">The message.</param> - /// <param name="exception">The exception.</param> - /// <param name="paramList">The param list.</param> - void ErrorException(string message, Exception exception, params object[] paramList); - - /// <summary> - /// Logs the multiline. - /// </summary> - /// <param name="message">The message.</param> - /// <param name="severity">The severity.</param> - /// <param name="additionalContent">Content of the additional.</param> - void LogMultiline(string message, LogSeverity severity, StringBuilder additionalContent); - - /// <summary> - /// Logs the specified severity. - /// </summary> - /// <param name="severity">The severity.</param> - /// <param name="message">The message.</param> - /// <param name="paramList">The parameter list.</param> - void Log(LogSeverity severity, string message, params object[] paramList); - } -} diff --git a/MediaBrowser.Model/Logging/LogHelper.cs b/MediaBrowser.Model/Logging/LogHelper.cs deleted file mode 100644 index cf1c02186..000000000 --- a/MediaBrowser.Model/Logging/LogHelper.cs +++ /dev/null @@ -1,97 +0,0 @@ -using System; -using System.Text; - -namespace MediaBrowser.Model.Logging -{ - /// <summary> - /// Class LogHelper - /// </summary> - public static class LogHelper - { - /// <summary> - /// Gets the log message. - /// </summary> - /// <param name="exception">The exception.</param> - /// <returns>StringBuilder.</returns> - public static StringBuilder GetLogMessage(Exception exception) - { - if (exception == null) - { - throw new ArgumentNullException("exception"); - } - - var messageText = new StringBuilder(); - - messageText.AppendLine(exception.ToString()); - - messageText.AppendLine(exception.GetType().FullName); - - LogExceptionData(messageText, exception); - - messageText.AppendLine(exception.StackTrace ?? "No Stack Trace Available"); - - // Log the InnerExceptions, if any - AppendInnerExceptions(messageText, exception); - - messageText.AppendLine(string.Empty); - - return messageText; - } - - /// <summary> - /// Appends the inner exceptions. - /// </summary> - /// <param name="messageText">The message text.</param> - /// <param name="e">The e.</param> - private static void AppendInnerExceptions(StringBuilder messageText, Exception e) - { - var aggregate = e as AggregateException; - - if (aggregate != null && aggregate.InnerExceptions != null) - { - foreach (var ex in aggregate.InnerExceptions) - { - AppendInnerException(messageText, ex); - AppendInnerExceptions(messageText, ex); - } - } - - else if (e.InnerException != null) - { - AppendInnerException(messageText, e.InnerException); - AppendInnerExceptions(messageText, e.InnerException); - } - } - - /// <summary> - /// Appends the inner exception. - /// </summary> - /// <param name="messageText">The message text.</param> - /// <param name="e">The e.</param> - private static void AppendInnerException(StringBuilder messageText, Exception e) - { - messageText.AppendLine("InnerException: " + e.GetType().FullName); - messageText.AppendLine(e.ToString()); - - LogExceptionData(messageText, e); - - if (e.StackTrace != null) - { - messageText.AppendLine(e.StackTrace); - } - } - - /// <summary> - /// Logs the exception data. - /// </summary> - /// <param name="messageText">The message text.</param> - /// <param name="e">The e.</param> - private static void LogExceptionData(StringBuilder messageText, Exception e) - { - foreach (var key in e.Data.Keys) - { - messageText.AppendLine(key + ": " + e.Data[key]); - } - } - } -} diff --git a/MediaBrowser.Model/Logging/LogSeverity.cs b/MediaBrowser.Model/Logging/LogSeverity.cs deleted file mode 100644 index ae0487289..000000000 --- a/MediaBrowser.Model/Logging/LogSeverity.cs +++ /dev/null @@ -1,30 +0,0 @@ - -namespace MediaBrowser.Model.Logging -{ - /// <summary> - /// Enum LogSeverity - /// </summary> - public enum LogSeverity - { - /// <summary> - /// The info - /// </summary> - Info, - /// <summary> - /// The debug - /// </summary> - Debug, - /// <summary> - /// The warn - /// </summary> - Warn, - /// <summary> - /// The error - /// </summary> - Error, - /// <summary> - /// The fatal - /// </summary> - Fatal - } -} diff --git a/MediaBrowser.Model/Logging/NullLogger.cs b/MediaBrowser.Model/Logging/NullLogger.cs deleted file mode 100644 index d211d2567..000000000 --- a/MediaBrowser.Model/Logging/NullLogger.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System; -using System.Text; - -namespace MediaBrowser.Model.Logging -{ - public class NullLogger : ILogger - { - public void Info(string message, params object[] paramList) - { - } - - public void Error(string message, params object[] paramList) - { - } - - public void Warn(string message, params object[] paramList) - { - } - - public void Debug(string message, params object[] paramList) - { - } - - public void Fatal(string message, params object[] paramList) - { - } - - public void FatalException(string message, Exception exception, params object[] paramList) - { - } - - public void Log(LogSeverity severity, string message, params object[] paramList) - { - } - - public void ErrorException(string message, Exception exception, params object[] paramList) - { - } - - public void LogMultiline(string message, LogSeverity severity, StringBuilder additionalContent) - { - } - } -} diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index 1b1a24b68..fe1068842 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -6,7 +6,11 @@ </PropertyGroup> <ItemGroup> - <Compile Include="..\SharedVersion.cs"/> + <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" /> + </ItemGroup> + + <ItemGroup> + <Compile Include="..\SharedVersion.cs" /> </ItemGroup> </Project> diff --git a/MediaBrowser.Model/MediaInfo/MediaInfo.cs b/MediaBrowser.Model/MediaInfo/MediaInfo.cs index 55545e23a..eb8a4434e 100644 --- a/MediaBrowser.Model/MediaInfo/MediaInfo.cs +++ b/MediaBrowser.Model/MediaInfo/MediaInfo.cs @@ -7,8 +7,6 @@ namespace MediaBrowser.Model.MediaInfo { public class MediaInfo : MediaSourceInfo, IHasProviderIds { - private static readonly string[] EmptyStringArray = new string[] {}; - public ChapterInfo[] Chapters { get; set; } /// <summary> @@ -56,13 +54,13 @@ namespace MediaBrowser.Model.MediaInfo public MediaInfo() { - Chapters = new ChapterInfo[] { }; - Artists = new string[] {}; - AlbumArtists = EmptyStringArray; - Studios = new string[] {}; - Genres = new string[] {}; - People = new BaseItemPerson[] { }; + Chapters = Array.Empty<ChapterInfo>(); + Artists = Array.Empty<string>(); + AlbumArtists = Array.Empty<string>(); + Studios = Array.Empty<string>(); + Genres = Array.Empty<string>(); + People = Array.Empty<BaseItemPerson>(); ProviderIds = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase); } } -}
\ No newline at end of file +} diff --git a/MediaBrowser.Model/MediaInfo/PlaybackInfoRequest.cs b/MediaBrowser.Model/MediaInfo/PlaybackInfoRequest.cs index c68c047f6..91673da9e 100644 --- a/MediaBrowser.Model/MediaInfo/PlaybackInfoRequest.cs +++ b/MediaBrowser.Model/MediaInfo/PlaybackInfoRequest.cs @@ -1,5 +1,4 @@ using MediaBrowser.Model.Dlna; -using System.Collections.Generic; using System; namespace MediaBrowser.Model.MediaInfo diff --git a/MediaBrowser.Model/News/INewsService.cs b/MediaBrowser.Model/News/INewsService.cs deleted file mode 100644 index 4c92664d9..000000000 --- a/MediaBrowser.Model/News/INewsService.cs +++ /dev/null @@ -1,17 +0,0 @@ -using MediaBrowser.Model.Querying; - -namespace MediaBrowser.Model.News -{ - /// <summary> - /// Interface INewsFeed - /// </summary> - public interface INewsService - { - /// <summary> - /// Gets the product news. - /// </summary> - /// <param name="query">The query.</param> - /// <returns>QueryResult{NewsItem}.</returns> - QueryResult<NewsItem> GetProductNews(NewsQuery query); - } -} diff --git a/MediaBrowser.Model/News/NewsItem.cs b/MediaBrowser.Model/News/NewsItem.cs deleted file mode 100644 index 2a05c420a..000000000 --- a/MediaBrowser.Model/News/NewsItem.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; - -namespace MediaBrowser.Model.News -{ - public class NewsItem - { - public string Title { get; set; } - public string Link { get; set; } - public string Description { get; set; } - public string DescriptionHtml { get; set; } - public string Guid { get; set; } - public DateTime Date { get; set; } - } -} diff --git a/MediaBrowser.Model/News/NewsQuery.cs b/MediaBrowser.Model/News/NewsQuery.cs deleted file mode 100644 index 567888921..000000000 --- a/MediaBrowser.Model/News/NewsQuery.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace MediaBrowser.Model.News -{ - public class NewsQuery - { - public int? StartIndex { get; set; } - - public int? Limit { get; set; } - } -}
\ No newline at end of file diff --git a/MediaBrowser.Model/Notifications/NotificationOption.cs b/MediaBrowser.Model/Notifications/NotificationOption.cs index cda9e311d..ce49ae209 100644 --- a/MediaBrowser.Model/Notifications/NotificationOption.cs +++ b/MediaBrowser.Model/Notifications/NotificationOption.cs @@ -21,18 +21,6 @@ namespace MediaBrowser.Model.Notifications /// </summary> /// <value><c>true</c> if enabled; otherwise, <c>false</c>.</value> public bool Enabled { get; set; } - - /// <summary> - /// Gets or sets the title format string. - /// </summary> - /// <value>The title format string.</value> - public string Title { get; set; } - - /// <summary> - /// Gets or sets the description. - /// </summary> - /// <value>The description.</value> - public string Description { get; set; } /// <summary> /// Gets or sets the disabled services. @@ -48,9 +36,9 @@ namespace MediaBrowser.Model.Notifications public NotificationOption() { - DisabledServices = new string[] {}; - DisabledMonitorUsers = new string[] {}; - SendToUsers = new string[] {}; + DisabledServices = Array.Empty<string>(); + DisabledMonitorUsers = Array.Empty<string>(); + SendToUsers = Array.Empty<string>(); } } -}
\ No newline at end of file +} diff --git a/MediaBrowser.Model/Notifications/NotificationRequest.cs b/MediaBrowser.Model/Notifications/NotificationRequest.cs index 9c89e40fb..7fa57ca9a 100644 --- a/MediaBrowser.Model/Notifications/NotificationRequest.cs +++ b/MediaBrowser.Model/Notifications/NotificationRequest.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; namespace MediaBrowser.Model.Notifications { @@ -22,8 +21,6 @@ namespace MediaBrowser.Model.Notifications /// </summary> public string NotificationType { get; set; } - public Dictionary<string, string> Variables { get; set; } - public SendToUserType? SendToUserMode { get; set; } public NotificationRequest() diff --git a/MediaBrowser.Model/Notifications/NotificationServiceInfo.cs b/MediaBrowser.Model/Notifications/NotificationServiceInfo.cs deleted file mode 100644 index 0ffe7d4ae..000000000 --- a/MediaBrowser.Model/Notifications/NotificationServiceInfo.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace MediaBrowser.Model.Notifications -{ - public class NotificationServiceInfo - { - public string Name { get; set; } - public string Id { get; set; } - } -}
\ No newline at end of file diff --git a/MediaBrowser.Model/Notifications/NotificationTypeInfo.cs b/MediaBrowser.Model/Notifications/NotificationTypeInfo.cs index 4c3283d8e..203712fa8 100644 --- a/MediaBrowser.Model/Notifications/NotificationTypeInfo.cs +++ b/MediaBrowser.Model/Notifications/NotificationTypeInfo.cs @@ -1,5 +1,4 @@ -using System.Collections.Generic; -using System; +using System; namespace MediaBrowser.Model.Notifications { @@ -14,16 +13,5 @@ namespace MediaBrowser.Model.Notifications public string Category { get; set; } public bool IsBasedOnUserEvent { get; set; } - - public string DefaultTitle { get; set; } - - public string DefaultDescription { get; set; } - - public string[] Variables { get; set; } - - public NotificationTypeInfo() - { - Variables = new string[] {}; - } } -}
\ No newline at end of file +} diff --git a/MediaBrowser.Model/Playlists/PlaylistCreationRequest.cs b/MediaBrowser.Model/Playlists/PlaylistCreationRequest.cs index 4c5c8bf51..db2724efa 100644 --- a/MediaBrowser.Model/Playlists/PlaylistCreationRequest.cs +++ b/MediaBrowser.Model/Playlists/PlaylistCreationRequest.cs @@ -1,11 +1,10 @@ -using System.Collections.Generic; -using System; +using System; namespace MediaBrowser.Model.Playlists { public class PlaylistCreationRequest { - public string Name { get; set; } + public string Name { get; set; } public Guid[] ItemIdList { get; set; } diff --git a/MediaBrowser.Model/Providers/SubtitleOptions.cs b/MediaBrowser.Model/Providers/SubtitleOptions.cs index f67b8870d..fde816dd3 100644 --- a/MediaBrowser.Model/Providers/SubtitleOptions.cs +++ b/MediaBrowser.Model/Providers/SubtitleOptions.cs @@ -18,10 +18,10 @@ namespace MediaBrowser.Model.Providers public SubtitleOptions() { - DownloadLanguages = new string[] {}; + DownloadLanguages = Array.Empty<string>(); SkipIfAudioTrackMatches = true; RequirePerfectMatch = true; } } -}
\ No newline at end of file +} diff --git a/MediaBrowser.Model/Querying/QueryFilters.cs b/MediaBrowser.Model/Querying/QueryFilters.cs index 992bba303..f46650a03 100644 --- a/MediaBrowser.Model/Querying/QueryFilters.cs +++ b/MediaBrowser.Model/Querying/QueryFilters.cs @@ -12,10 +12,10 @@ namespace MediaBrowser.Model.Querying public QueryFiltersLegacy() { - Genres = new string[] {}; - Tags = new string[] {}; - OfficialRatings = new string[] {}; - Years = new int[] { }; + Genres = Array.Empty<string>(); + Tags = Array.Empty<string>(); + OfficialRatings = Array.Empty<string>(); + Years = Array.Empty<int>(); } } public class QueryFilters @@ -25,8 +25,8 @@ namespace MediaBrowser.Model.Querying public QueryFilters() { - Tags = new string[] {}; - Genres = new NameGuidPair[] { }; + Tags = Array.Empty<string>(); + Genres = Array.Empty<NameGuidPair>(); } } } diff --git a/MediaBrowser.Model/Search/SearchQuery.cs b/MediaBrowser.Model/Search/SearchQuery.cs index 6a1861c8e..9ed2f4ffb 100644 --- a/MediaBrowser.Model/Search/SearchQuery.cs +++ b/MediaBrowser.Model/Search/SearchQuery.cs @@ -57,9 +57,9 @@ namespace MediaBrowser.Model.Search IncludePeople = true; IncludeStudios = true; - MediaTypes = new string[] {}; - IncludeItemTypes = new string[] {}; - ExcludeItemTypes = new string[] {}; + MediaTypes = Array.Empty<string>(); + IncludeItemTypes = Array.Empty<string>(); + ExcludeItemTypes = Array.Empty<string>(); } } } diff --git a/MediaBrowser.Model/Session/ClientCapabilities.cs b/MediaBrowser.Model/Session/ClientCapabilities.cs index 0a780b910..0ba9988bb 100644 --- a/MediaBrowser.Model/Session/ClientCapabilities.cs +++ b/MediaBrowser.Model/Session/ClientCapabilities.cs @@ -12,8 +12,6 @@ namespace MediaBrowser.Model.Session public bool SupportsMediaControl { get; set; } public bool SupportsContentUploading { get; set; } public string MessageCallbackUrl { get; set; } - public string PushToken { get; set; } - public string PushTokenType { get; set; } public bool SupportsPersistentIdentifier { get; set; } public bool SupportsSync { get; set; } @@ -25,9 +23,9 @@ namespace MediaBrowser.Model.Session public ClientCapabilities() { - PlayableMediaTypes = new string[] {}; - SupportedCommands = new string[] {}; + PlayableMediaTypes = Array.Empty<string>(); + SupportedCommands = Array.Empty<string>(); SupportsPersistentIdentifier = true; } } -}
\ No newline at end of file +} diff --git a/MediaBrowser.Model/Session/SessionInfoDto.cs b/MediaBrowser.Model/Session/SessionInfoDto.cs deleted file mode 100644 index ca14107df..000000000 --- a/MediaBrowser.Model/Session/SessionInfoDto.cs +++ /dev/null @@ -1,117 +0,0 @@ -using MediaBrowser.Model.Dto; -using System; -using System.Collections.Generic; - -namespace MediaBrowser.Model.Session -{ - public class SessionInfoDto - { - /// <summary> - /// Gets or sets the supported commands. - /// </summary> - /// <value>The supported commands.</value> - public string[] SupportedCommands { get; set; } - - /// <summary> - /// Gets or sets the playable media types. - /// </summary> - /// <value>The playable media types.</value> - public string[] PlayableMediaTypes { get; set; } - - /// <summary> - /// Gets or sets the id. - /// </summary> - /// <value>The id.</value> - public string Id { get; set; } - - public string ServerId { get; set; } - - /// <summary> - /// Gets or sets the user id. - /// </summary> - /// <value>The user id.</value> - public string UserId { get; set; } - - /// <summary> - /// Gets or sets the user primary image tag. - /// </summary> - /// <value>The user primary image tag.</value> - public string UserPrimaryImageTag { get; set; } - - public string RemoteEndPoint { get; set; } - - /// <summary> - /// Gets or sets the name of the user. - /// </summary> - /// <value>The name of the user.</value> - public string UserName { get; set; } - - /// <summary> - /// Gets or sets the additional users present. - /// </summary> - /// <value>The additional users present.</value> - public SessionUserInfo[] AdditionalUsers { get; set; } - - /// <summary> - /// Gets or sets the application version. - /// </summary> - /// <value>The application version.</value> - public string ApplicationVersion { get; set; } - - /// <summary> - /// Gets or sets the type of the client. - /// </summary> - /// <value>The type of the client.</value> - public string Client { get; set; } - - /// <summary> - /// Gets or sets the last activity date. - /// </summary> - /// <value>The last activity date.</value> - public DateTime LastActivityDate { get; set; } - - /// <summary> - /// Gets or sets the name of the device. - /// </summary> - /// <value>The name of the device.</value> - public string DeviceName { get; set; } - - public string DeviceType { get; set; } - - /// <summary> - /// Gets or sets the now playing item. - /// </summary> - /// <value>The now playing item.</value> - public BaseItemDto NowPlayingItem { get; set; } - - /// <summary> - /// Gets or sets the device id. - /// </summary> - /// <value>The device id.</value> - public string DeviceId { get; set; } - - /// <summary> - /// Gets or sets the application icon URL. - /// </summary> - /// <value>The application icon URL.</value> - public string AppIconUrl { get; set; } - - /// <summary> - /// Gets or sets a value indicating whether [supports remote control]. - /// </summary> - /// <value><c>true</c> if [supports remote control]; otherwise, <c>false</c>.</value> - public bool SupportsRemoteControl { get; set; } - - public PlayerStateInfo PlayState { get; set; } - - public TranscodingInfo TranscodingInfo { get; set; } - - public SessionInfoDto() - { - AdditionalUsers = new SessionUserInfo[] { }; - - PlayableMediaTypes = new string[] {}; - SupportedCommands = new string[] {}; - } - } -} diff --git a/MediaBrowser.Model/Sync/SyncJob.cs b/MediaBrowser.Model/Sync/SyncJob.cs index 0cf9312a1..3b2e30d70 100644 --- a/MediaBrowser.Model/Sync/SyncJob.cs +++ b/MediaBrowser.Model/Sync/SyncJob.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using MediaBrowser.Model.Sync; namespace MediaBrowser.Model.Sync { @@ -108,7 +106,7 @@ namespace MediaBrowser.Model.Sync public SyncJob() { - RequestedItemIds = new Guid[] { }; + RequestedItemIds = Array.Empty<Guid>(); } } } diff --git a/MediaBrowser.Model/System/Architecture.cs b/MediaBrowser.Model/System/Architecture.cs deleted file mode 100644 index 73f78cd58..000000000 --- a/MediaBrowser.Model/System/Architecture.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace MediaBrowser.Model.System -{ - public enum Architecture - { - X86 = 0, - X64 = 1, - Arm = 2, - Arm64 = 3 - } -} diff --git a/MediaBrowser.Model/System/IEnvironmentInfo.cs b/MediaBrowser.Model/System/IEnvironmentInfo.cs index 8cf25a365..6af514dc8 100644 --- a/MediaBrowser.Model/System/IEnvironmentInfo.cs +++ b/MediaBrowser.Model/System/IEnvironmentInfo.cs @@ -1,4 +1,5 @@ - +using System.Runtime.InteropServices; + namespace MediaBrowser.Model.System { public interface IEnvironmentInfo diff --git a/MediaBrowser.Model/System/IPowerManagement.cs b/MediaBrowser.Model/System/IPowerManagement.cs deleted file mode 100644 index 03907568c..000000000 --- a/MediaBrowser.Model/System/IPowerManagement.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; - -namespace MediaBrowser.Model.System -{ - public interface IPowerManagement - { - void PreventSystemStandby(); - void AllowSystemStandby(); - void ScheduleWake(DateTime wakeTimeUtc, string displayName); - } -} diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs index c790731c6..a63ce5e66 100644 --- a/MediaBrowser.Model/System/SystemInfo.cs +++ b/MediaBrowser.Model/System/SystemInfo.cs @@ -1,6 +1,5 @@ using MediaBrowser.Model.Updates; -using System.Collections.Generic; -using System; +using System.Runtime.InteropServices; namespace MediaBrowser.Model.System { @@ -119,12 +118,6 @@ namespace MediaBrowser.Model.System /// <value><c>true</c> if this instance has update available; otherwise, <c>false</c>.</value> public bool HasUpdateAvailable { get; set; } - /// <summary> - /// Gets or sets a value indicating whether [supports automatic run at startup]. - /// </summary> - /// <value><c>true</c> if [supports automatic run at startup]; otherwise, <c>false</c>.</value> - public bool SupportsAutoRunAtStartup { get; set; } - public string EncoderLocationType { get; set; } public Architecture SystemArchitecture { get; set; } diff --git a/MediaBrowser.Model/Tasks/ITaskTrigger.cs b/MediaBrowser.Model/Tasks/ITaskTrigger.cs index 7c804348a..9db0041b4 100644 --- a/MediaBrowser.Model/Tasks/ITaskTrigger.cs +++ b/MediaBrowser.Model/Tasks/ITaskTrigger.cs @@ -1,6 +1,6 @@ using System; using MediaBrowser.Model.Events; -using MediaBrowser.Model.Logging; +using Microsoft.Extensions.Logging; namespace MediaBrowser.Model.Tasks { @@ -29,4 +29,4 @@ namespace MediaBrowser.Model.Tasks /// </summary> void Stop(); } -}
\ No newline at end of file +} diff --git a/MediaBrowser.Model/Users/UserPolicy.cs b/MediaBrowser.Model/Users/UserPolicy.cs index 8bddafb5a..e3f6d8620 100644 --- a/MediaBrowser.Model/Users/UserPolicy.cs +++ b/MediaBrowser.Model/Users/UserPolicy.cs @@ -78,7 +78,7 @@ namespace MediaBrowser.Model.Users public UserPolicy() { EnableContentDeletion = true; - EnableContentDeletionFromFolders = new string[] { }; + EnableContentDeletionFromFolders = Array.Empty<string>(); EnableSyncTranscoding = true; EnableMediaConversion = true; @@ -97,20 +97,20 @@ namespace MediaBrowser.Model.Users EnableSharedDeviceControl = true; - BlockedTags = new string[] { }; - BlockUnratedItems = new UnratedItem[] { }; + BlockedTags = Array.Empty<string>(); + BlockUnratedItems = Array.Empty<UnratedItem>(); EnableUserPreferenceAccess = true; - AccessSchedules = new AccessSchedule[] { }; + AccessSchedules = Array.Empty<AccessSchedule>(); EnableAllChannels = true; - EnabledChannels = new string[] { }; + EnabledChannels = Array.Empty<string>(); EnableAllFolders = true; - EnabledFolders = new string[] { }; + EnabledFolders = Array.Empty<string>(); - EnabledDevices = new string[] { }; + EnabledDevices = Array.Empty<string>(); EnableAllDevices = true; EnableContentDownloading = true; @@ -118,4 +118,4 @@ namespace MediaBrowser.Model.Users EnableRemoteAccess = true; } } -}
\ No newline at end of file +} |