Enable nullable for more files

pull/6735/head
Bond_009 3 years ago
parent dc72d90703
commit 1b6eb2ff2d

@ -586,7 +586,7 @@ namespace Emby.Server.Implementations.Channels
{ {
var supportsLatest = provider is ISupportsLatestMedia; var supportsLatest = provider is ISupportsLatestMedia;
return new ChannelFeatures return new ChannelFeatures(channel.Name, channel.Id)
{ {
CanFilter = !features.MaxPageSize.HasValue, CanFilter = !features.MaxPageSize.HasValue,
CanSearch = provider is ISearchableChannel, CanSearch = provider is ISearchableChannel,
@ -596,8 +596,6 @@ namespace Emby.Server.Implementations.Channels
MediaTypes = features.MediaTypes.ToArray(), MediaTypes = features.MediaTypes.ToArray(),
SupportsSortOrderToggle = features.SupportsSortOrderToggle, SupportsSortOrderToggle = features.SupportsSortOrderToggle,
SupportsLatestMedia = supportsLatest, SupportsLatestMedia = supportsLatest,
Name = channel.Name,
Id = channel.Id.ToString("N", CultureInfo.InvariantCulture),
SupportsContentDownloading = features.SupportsContentDownloading, SupportsContentDownloading = features.SupportsContentDownloading,
AutoRefreshLevels = features.AutoRefreshLevels AutoRefreshLevels = features.AutoRefreshLevels
}; };

@ -530,11 +530,7 @@ namespace Jellyfin.Server.Implementations.Users
} }
} }
return new PinRedeemResult return new PinRedeemResult();
{
Success = false,
UsersReset = Array.Empty<string>()
};
} }
/// <inheritdoc /> /// <inheritdoc />

@ -1,4 +1,3 @@
#nullable disable
#pragma warning disable CS1591 #pragma warning disable CS1591
using System; using System;
@ -7,11 +6,14 @@ namespace MediaBrowser.Model.Channels
{ {
public class ChannelFeatures public class ChannelFeatures
{ {
public ChannelFeatures() public ChannelFeatures(string name, Guid id)
{ {
MediaTypes = Array.Empty<ChannelMediaType>(); MediaTypes = Array.Empty<ChannelMediaType>();
ContentTypes = Array.Empty<ChannelMediaContentType>(); ContentTypes = Array.Empty<ChannelMediaContentType>();
DefaultSortFields = Array.Empty<ChannelItemSortField>(); DefaultSortFields = Array.Empty<ChannelItemSortField>();
Name = name;
Id = id;
} }
/// <summary> /// <summary>
@ -24,7 +26,7 @@ namespace MediaBrowser.Model.Channels
/// Gets or sets the identifier. /// Gets or sets the identifier.
/// </summary> /// </summary>
/// <value>The identifier.</value> /// <value>The identifier.</value>
public string Id { get; set; } public Guid Id { get; set; }
/// <summary> /// <summary>
/// Gets or sets a value indicating whether this instance can search. /// Gets or sets a value indicating whether this instance can search.

@ -1,4 +1,3 @@
#nullable disable
#pragma warning disable CS1591 #pragma warning disable CS1591
using System; using System;
@ -13,13 +12,13 @@ namespace MediaBrowser.Model.Channels
/// Gets or sets the fields to return within the items, in addition to basic information. /// Gets or sets the fields to return within the items, in addition to basic information.
/// </summary> /// </summary>
/// <value>The fields.</value> /// <value>The fields.</value>
public ItemFields[] Fields { get; set; } public ItemFields[]? Fields { get; set; }
public bool? EnableImages { get; set; } public bool? EnableImages { get; set; }
public int? ImageTypeLimit { get; set; } public int? ImageTypeLimit { get; set; }
public ImageType[] EnableImageTypes { get; set; } public ImageType[]? EnableImageTypes { get; set; }
/// <summary> /// <summary>
/// Gets or sets the user identifier. /// Gets or sets the user identifier.

@ -1,4 +1,3 @@
#nullable disable
using System; using System;
using System.Xml.Serialization; using System.Xml.Serialization;
@ -35,21 +34,21 @@ namespace MediaBrowser.Model.Configuration
/// Gets or sets the cache path. /// Gets or sets the cache path.
/// </summary> /// </summary>
/// <value>The cache path.</value> /// <value>The cache path.</value>
public string CachePath { get; set; } public string? CachePath { get; set; }
/// <summary> /// <summary>
/// Gets or sets the last known version that was ran using the configuration. /// Gets or sets the last known version that was ran using the configuration.
/// </summary> /// </summary>
/// <value>The version from previous run.</value> /// <value>The version from previous run.</value>
[XmlIgnore] [XmlIgnore]
public Version PreviousVersion { get; set; } public Version? PreviousVersion { get; set; }
/// <summary> /// <summary>
/// Gets or sets the stringified PreviousVersion to be stored/loaded, /// Gets or sets the stringified PreviousVersion to be stored/loaded,
/// because System.Version itself isn't xml-serializable. /// because System.Version itself isn't xml-serializable.
/// </summary> /// </summary>
/// <value>String value of PreviousVersion.</value> /// <value>String value of PreviousVersion.</value>
public string PreviousVersionStr public string? PreviousVersionStr
{ {
get => PreviousVersion?.ToString(); get => PreviousVersion?.ToString();
set set

@ -1,4 +1,3 @@
#nullable disable
#pragma warning disable CS1591 #pragma warning disable CS1591
using System; using System;
@ -52,21 +51,21 @@ namespace MediaBrowser.Model.Configuration
/// Gets or sets the preferred metadata language. /// Gets or sets the preferred metadata language.
/// </summary> /// </summary>
/// <value>The preferred metadata language.</value> /// <value>The preferred metadata language.</value>
public string PreferredMetadataLanguage { get; set; } public string? PreferredMetadataLanguage { get; set; }
/// <summary> /// <summary>
/// Gets or sets the metadata country code. /// Gets or sets the metadata country code.
/// </summary> /// </summary>
/// <value>The metadata country code.</value> /// <value>The metadata country code.</value>
public string MetadataCountryCode { get; set; } public string? MetadataCountryCode { get; set; }
public string SeasonZeroDisplayName { get; set; } public string SeasonZeroDisplayName { get; set; }
public string[] MetadataSavers { get; set; } public string[]? MetadataSavers { get; set; }
public string[] DisabledLocalMetadataReaders { get; set; } public string[] DisabledLocalMetadataReaders { get; set; }
public string[] LocalMetadataReaderOrder { get; set; } public string[]? LocalMetadataReaderOrder { get; set; }
public string[] DisabledSubtitleFetchers { get; set; } public string[] DisabledSubtitleFetchers { get; set; }
@ -76,7 +75,7 @@ namespace MediaBrowser.Model.Configuration
public bool SkipSubtitlesIfAudioTrackMatches { get; set; } public bool SkipSubtitlesIfAudioTrackMatches { get; set; }
public string[] SubtitleDownloadLanguages { get; set; } public string[]? SubtitleDownloadLanguages { get; set; }
public bool RequirePerfectSubtitleMatch { get; set; } public bool RequirePerfectSubtitleMatch { get; set; }
@ -84,7 +83,7 @@ namespace MediaBrowser.Model.Configuration
public TypeOptions[] TypeOptions { get; set; } public TypeOptions[] TypeOptions { get; set; }
public TypeOptions GetTypeOptions(string type) public TypeOptions? GetTypeOptions(string type)
{ {
foreach (var options in TypeOptions) foreach (var options in TypeOptions)
{ {

@ -1,4 +1,3 @@
#nullable disable
#pragma warning disable CS1591 #pragma warning disable CS1591
using System; using System;
@ -33,7 +32,7 @@ namespace MediaBrowser.Model.Configuration
/// Gets or sets the audio language preference. /// Gets or sets the audio language preference.
/// </summary> /// </summary>
/// <value>The audio language preference.</value> /// <value>The audio language preference.</value>
public string AudioLanguagePreference { get; set; } public string? AudioLanguagePreference { get; set; }
/// <summary> /// <summary>
/// Gets or sets a value indicating whether [play default audio track]. /// Gets or sets a value indicating whether [play default audio track].
@ -45,7 +44,7 @@ namespace MediaBrowser.Model.Configuration
/// Gets or sets the subtitle language preference. /// Gets or sets the subtitle language preference.
/// </summary> /// </summary>
/// <value>The subtitle language preference.</value> /// <value>The subtitle language preference.</value>
public string SubtitleLanguagePreference { get; set; } public string? SubtitleLanguagePreference { get; set; }
public bool DisplayMissingEpisodes { get; set; } public bool DisplayMissingEpisodes { get; set; }

@ -1,4 +1,3 @@
#nullable disable
#pragma warning disable CS1591 #pragma warning disable CS1591
namespace MediaBrowser.Model.Configuration namespace MediaBrowser.Model.Configuration
@ -13,7 +12,7 @@ namespace MediaBrowser.Model.Configuration
EnablePathSubstitution = true; EnablePathSubstitution = true;
} }
public string UserId { get; set; } public string? UserId { get; set; }
public string ReleaseDateFormat { get; set; } public string ReleaseDateFormat { get; set; }

@ -1,4 +1,3 @@
#nullable disable
#pragma warning disable CS1591 #pragma warning disable CS1591
using System; using System;

@ -1,4 +1,3 @@
#nullable disable
#pragma warning disable CS1591 #pragma warning disable CS1591
namespace MediaBrowser.Model.Dlna namespace MediaBrowser.Model.Dlna

@ -1,6 +1,7 @@
#nullable disable
#pragma warning disable CS1591 #pragma warning disable CS1591
using System;
namespace MediaBrowser.Model.Users namespace MediaBrowser.Model.Users
{ {
public class PinRedeemResult public class PinRedeemResult
@ -15,6 +16,6 @@ namespace MediaBrowser.Model.Users
/// Gets or sets the users reset. /// Gets or sets the users reset.
/// </summary> /// </summary>
/// <value>The users reset.</value> /// <value>The users reset.</value>
public string[] UsersReset { get; set; } public string[] UsersReset { get; set; } = Array.Empty<string>();
} }
} }

Loading…
Cancel
Save