alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-10 01:38:49 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Post GPL cleanup

Browse Source
This commit is contained in:
Bond_009
2018-12-27 22:43:48 +01:00
parent c6618d0a5f
commit 340a2c6512
99 changed files with 327 additions and 1053 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
MediaBrowser.Model/Channels/ChannelFeatures.cs
View File

@@ -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>();
}
}
}

21
MediaBrowser.Model/Configuration/LibraryOptions.cs
View File

@@ -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[]>

21
MediaBrowser.Model/Configuration/MetadataOptions.cs
View File

@@ -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>();
}
}
}

8
MediaBrowser.Model/Configuration/MetadataPluginSummary.cs
View File

@@ -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>();
}
}
}
}

49
MediaBrowser.Model/Configuration/ServerConfiguration.cs
View File

@@ -173,8 +173,6 @@ namespace MediaBrowser.Model.Configuration
public int RemoteClientBitrateLimit { get; set; }
public int SchemaVersion { get; set; }
public bool EnableFolderView { get; set; }
public bool EnableGroupingIntoCollections { get; set; }
public bool DisplaySpecialsWithinSeasons { get; set; }
@@ -201,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;
@@ -235,7 +233,7 @@ namespace MediaBrowser.Model.Configuration
LibraryMonitorDelay = 60;
ContentTypes = new NameValuePair[] { };
ContentTypes = Array.Empty<NameValuePair>();
PreferredMetadataLanguage = "en";
MetadataCountryCode = "US";
@@ -248,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" }
}
};
}

8
MediaBrowser.Model/Configuration/UserConfiguration.cs
View File

@@ -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>();
}
}
}

17
MediaBrowser.Model/Connect/ConnectAuthenticationExchangeResult.cs
View File

@@ -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; }
}
}

17
MediaBrowser.Model/Connect/ConnectAuthenticationResult.cs
View File

@@ -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; }
}
}

4
MediaBrowser.Model/Connect/ConnectAuthorization.cs
View File

@@ -14,8 +14,8 @@ namespace MediaBrowser.Model.Connect
public ConnectAuthorization()
{
EnabledLibraries = new string[] {};
EnabledChannels = new string[] {};
EnabledLibraries = Array.Empty<string>();
EnabledChannels = Array.Empty<string>();
}
}
}

19
MediaBrowser.Model/Connect/ConnectAuthorizationRequest.cs
View File

@@ -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[] {};
}
}
}

16
MediaBrowser.Model/Devices/DeviceInfo.cs
View File

@@ -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>

5
MediaBrowser.Model/Devices/DeviceQuery.cs
View File

@@ -5,11 +5,6 @@ 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>

5
MediaBrowser.Model/Devices/DevicesOptions.cs
View File

@@ -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; }
}
}

8
MediaBrowser.Model/Dlna/ContainerProfile.cs
View File

@@ -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);

3
MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
View File

@@ -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));

37
MediaBrowser.Model/Dlna/ResolutionNormalizer.cs
View File

@@ -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);
}

8
MediaBrowser.Model/Dlna/StreamInfo.cs
View File

@@ -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);
}

4
MediaBrowser.Model/Dlna/SubtitleProfile.cs
View File

@@ -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);
}
}
}
}

35
MediaBrowser.Model/Dto/BaseItemDto.cs
View File

@@ -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.
@@ -479,26 +475,6 @@ namespace MediaBrowser.Model.Dto
public int? PartCount { get; set; }
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>
@@ -601,12 +577,6 @@ namespace MediaBrowser.Model.Dto
/// <value>The end date.</value>
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>
@@ -677,11 +647,6 @@ namespace MediaBrowser.Model.Dto
public double? Altitude { get; set; }
public int? IsoSpeedRating { get; set; }
/// <summary>
/// Used by RecordingGroup
/// </summary>
public int? RecordingCount { get; set; }
/// <summary>
/// Gets or sets the series timer identifier.
/// </summary>

38
MediaBrowser.Model/Dto/ChapterInfoDto.cs
View File

@@ -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; }
}
}
}

5
MediaBrowser.Model/Dto/GameSystemSummary.cs
View File

@@ -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>();
}
}
}

9
MediaBrowser.Model/Dto/MediaSourceInfo.cs
View File

@@ -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)

12
MediaBrowser.Model/Dto/MetadataEditorInfo.cs
View File

@@ -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>();
}
}
}

1
MediaBrowser.Model/Dto/UserDto.cs
View File

@@ -2,7 +2,6 @@
using MediaBrowser.Model.Connect;
using MediaBrowser.Model.Users;
using System;
using MediaBrowser.Model.Serialization;
namespace MediaBrowser.Model.Dto
{

12
MediaBrowser.Model/Entities/LibraryUpdateInfo.cs
View File

@@ -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>();
}
}
}

2
MediaBrowser.Model/Entities/VirtualFolderInfo.cs
View File

@@ -34,7 +34,7 @@ namespace MediaBrowser.Model.Entities
/// </summary>
public VirtualFolderInfo()
{
Locations = new string[] {};
Locations = Array.Empty<string>();
}
/// <summary>

2
MediaBrowser.Model/Globalization/CultureDto.cs
View File

@@ -46,7 +46,7 @@ namespace MediaBrowser.Model.Globalization
public CultureDto()
{
ThreeLetterISOLanguageNames = new string[] {};
ThreeLetterISOLanguageNames = Array.Empty<string>();
}
}
}

2
MediaBrowser.Model/Library/UserViewQuery.cs
View File

@@ -27,7 +27,7 @@ namespace MediaBrowser.Model.Library
public UserViewQuery()
{
IncludeExternalContent = true;
PresetViews = new string[] {};
PresetViews = Array.Empty<string>();
}
}
}

2
MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs
View File

@@ -98,7 +98,7 @@ namespace MediaBrowser.Model.LiveTv
public LiveTvChannelQuery()
{
EnableUserData = true;
SortBy = new string[] {};
SortBy = Array.Empty<string>();
}
}
}

6
MediaBrowser.Model/LiveTv/LiveTvInfo.cs
View File

@@ -25,8 +25,8 @@ namespace MediaBrowser.Model.LiveTv
public LiveTvInfo()
{
Services = new LiveTvServiceInfo[] { };
EnabledUsers = new string[] {};
Services = Array.Empty<LiveTvServiceInfo>();
EnabledUsers = Array.Empty<string>();
}
}
}
}

18
MediaBrowser.Model/LiveTv/LiveTvOptions.cs
View File

@@ -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>();
}
}
}

2
MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs
View File

@@ -52,7 +52,7 @@ namespace MediaBrowser.Model.LiveTv
public LiveTvServiceInfo()
{
Tuners = new string[] { };
Tuners = Array.Empty<string>();
}
}
}

117
MediaBrowser.Model/LiveTv/ProgramQuery.cs
View File

@@ -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; }
}
}

73
MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs
View File

@@ -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; }
}
}

16
MediaBrowser.Model/MediaInfo/MediaInfo.cs
View File

@@ -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);
}
}
}
}

1
MediaBrowser.Model/MediaInfo/PlaybackInfoRequest.cs
View File

@@ -1,5 +1,4 @@
using MediaBrowser.Model.Dlna;
using System.Collections.Generic;
using System;
namespace MediaBrowser.Model.MediaInfo

20
MediaBrowser.Model/Notifications/NotificationOption.cs
View File

@@ -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>();
}
}
}
}

3
MediaBrowser.Model/Notifications/NotificationRequest.cs
View File

@@ -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()

8
MediaBrowser.Model/Notifications/NotificationServiceInfo.cs
View File

@@ -1,8 +0,0 @@
namespace MediaBrowser.Model.Notifications
{
public class NotificationServiceInfo
{
public string Name { get; set; }
public string Id { get; set; }
}
}

16
MediaBrowser.Model/Notifications/NotificationTypeInfo.cs
View File

@@ -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[] {};
}
}
}
}

5
MediaBrowser.Model/Playlists/PlaylistCreationRequest.cs
View File

@@ -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; }

4
MediaBrowser.Model/Providers/SubtitleOptions.cs
View File

@@ -18,10 +18,10 @@ namespace MediaBrowser.Model.Providers
public SubtitleOptions()
{
DownloadLanguages = new string[] {};
DownloadLanguages = Array.Empty<string>();
SkipIfAudioTrackMatches = true;
RequirePerfectMatch = true;
}
}
}
}

12
MediaBrowser.Model/Querying/QueryFilters.cs
View File

@@ -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>();
}
}
}

6
MediaBrowser.Model/Search/SearchQuery.cs
View File

@@ -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>();
}
}
}

6
MediaBrowser.Model/Session/ClientCapabilities.cs
View File

@@ -25,9 +25,9 @@ namespace MediaBrowser.Model.Session
public ClientCapabilities()
{
PlayableMediaTypes = new string[] {};
SupportedCommands = new string[] {};
PlayableMediaTypes = Array.Empty<string>();
SupportedCommands = Array.Empty<string>();
SupportsPersistentIdentifier = true;
}
}
}
}

117
MediaBrowser.Model/Session/SessionInfoDto.cs
View File

@@ -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[] {};
}
}
}

4
MediaBrowser.Model/Sync/SyncJob.cs
View File

@@ -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>();
}
}
}

16
MediaBrowser.Model/Users/UserPolicy.cs
View File

@@ -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;
}
}
}
}