alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-01-15 23:58:57 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Enable nullable reference types for Emby.Server.Implementations

Browse Source
This commit is contained in:
Bond_009
2021-05-20 21:28:18 +02:00
parent e8790bfa96
commit 7e8428e588
151 changed files with 300 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Server.Implementations/Sorting/AiredEpisodeOrderComparer.cs
View File

@@ -16,7 +16,7 @@ namespace Emby.Server.Implementations.Sorting
/// <param name="x">The x.</param>
/// <param name="y">The y.</param>
/// <returns>System.Int32.</returns>
public int Compare(BaseItem x, BaseItem y)
public int Compare(BaseItem? x, BaseItem? y)
{
if (x == null)
{

4
Emby.Server.Implementations/Sorting/AlbumArtistComparer.cs
View File

@@ -18,7 +18,7 @@ namespace Emby.Server.Implementations.Sorting
/// <param name="x">The x.</param>
/// <param name="y">The y.</param>
/// <returns>System.Int32.</returns>
public int Compare(BaseItem x, BaseItem y)
public int Compare(BaseItem? x, BaseItem? y)
{
return string.Compare(GetValue(x), GetValue(y), StringComparison.CurrentCultureIgnoreCase);
}
@@ -28,7 +28,7 @@ namespace Emby.Server.Implementations.Sorting
/// </summary>
/// <param name="x">The x.</param>
/// <returns>System.String.</returns>
private static string GetValue(BaseItem x)
private static string? GetValue(BaseItem? x)
{
var audio = x as IHasAlbumArtist;

4
Emby.Server.Implementations/Sorting/AlbumComparer.cs
View File

@@ -17,7 +17,7 @@ namespace Emby.Server.Implementations.Sorting
/// <param name="x">The x.</param>
/// <param name="y">The y.</param>
/// <returns>System.Int32.</returns>
public int Compare(BaseItem x, BaseItem y)
public int Compare(BaseItem? x, BaseItem? y)
{
return string.Compare(GetValue(x), GetValue(y), StringComparison.CurrentCultureIgnoreCase);
}
@@ -27,7 +27,7 @@ namespace Emby.Server.Implementations.Sorting
/// </summary>
/// <param name="x">The x.</param>
/// <returns>System.String.</returns>
private static string GetValue(BaseItem x)
private static string? GetValue(BaseItem? x)
{
var audio = x as Audio;

4
Emby.Server.Implementations/Sorting/ArtistComparer.cs
View File

@@ -15,7 +15,7 @@ namespace Emby.Server.Implementations.Sorting
public string Name => ItemSortBy.Artist;
/// <inheritdoc />
public int Compare(BaseItem x, BaseItem y)
public int Compare(BaseItem? x, BaseItem? y)
{
return string.Compare(GetValue(x), GetValue(y), StringComparison.CurrentCultureIgnoreCase);
}
@@ -25,7 +25,7 @@ namespace Emby.Server.Implementations.Sorting
/// </summary>
/// <param name="x">The x.</param>
/// <returns>System.String.</returns>
private static string GetValue(BaseItem x)
private static string? GetValue(BaseItem? x)
{
if (!(x is Audio audio))
{

2
Emby.Server.Implementations/Sorting/CommunityRatingComparer.cs
View File

@@ -21,7 +21,7 @@ namespace Emby.Server.Implementations.Sorting
/// <param name="x">The x.</param>
/// <param name="y">The y.</param>
/// <returns>System.Int32.</returns>
public int Compare(BaseItem x, BaseItem y)
public int Compare(BaseItem? x, BaseItem? y)
{
if (x == null)
{

6
Emby.Server.Implementations/Sorting/CriticRatingComparer.cs
View File

@@ -15,14 +15,14 @@ namespace Emby.Server.Implementations.Sorting
/// <param name="x">The x.</param>
/// <param name="y">The y.</param>
/// <returns>System.Int32.</returns>
public int Compare(BaseItem x, BaseItem y)
public int Compare(BaseItem? x, BaseItem? y)
{
return GetValue(x).CompareTo(GetValue(y));
}
private static float GetValue(BaseItem x)
private static float GetValue(BaseItem? x)
{
return x.CriticRating ?? 0;
return x?.CriticRating ?? 0;
}
/// <summary>

2
Emby.Server.Implementations/Sorting/DateCreatedComparer.cs
View File

@@ -16,7 +16,7 @@ namespace Emby.Server.Implementations.Sorting
/// <param name="x">The x.</param>
/// <param name="y">The y.</param>
/// <returns>System.Int32.</returns>
public int Compare(BaseItem x, BaseItem y)
public int Compare(BaseItem? x, BaseItem? y)
{
if (x == null)
{

1
Emby.Server.Implementations/Sorting/DateLastMediaAddedComparer.cs
View File

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

2
Emby.Server.Implementations/Sorting/DatePlayedComparer.cs
View File

@@ -1,3 +1,5 @@
#nullable disable
using System;
using Jellyfin.Data.Entities;
using MediaBrowser.Controller.Entities;

1
Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs
View File

@@ -1,3 +1,4 @@
#nullable disable
#pragma warning disable CS1591
using Jellyfin.Data.Entities;

6
Emby.Server.Implementations/Sorting/IsFolderComparer.cs
View File

@@ -20,7 +20,7 @@ namespace Emby.Server.Implementations.Sorting
/// <param name="x">The x.</param>
/// <param name="y">The y.</param>
/// <returns>System.Int32.</returns>
public int Compare(BaseItem x, BaseItem y)
public int Compare(BaseItem? x, BaseItem? y)
{
return GetValue(x).CompareTo(GetValue(y));
}
@@ -30,9 +30,9 @@ namespace Emby.Server.Implementations.Sorting
/// </summary>
/// <param name="x">The x.</param>
/// <returns>System.String.</returns>
private static int GetValue(BaseItem x)
private static int GetValue(BaseItem? x)
{
return x.IsFolder ? 0 : 1;
return x?.IsFolder ?? true ? 0 : 1;
}
}
}

2
Emby.Server.Implementations/Sorting/IsPlayedComparer.cs
View File

@@ -1,3 +1,5 @@
#nullable disable
#pragma warning disable CS1591
using Jellyfin.Data.Entities;

2
Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs
View File

@@ -1,3 +1,5 @@
#nullable disable
#pragma warning disable CS1591
using Jellyfin.Data.Entities;

2
Emby.Server.Implementations/Sorting/NameComparer.cs
View File

@@ -16,7 +16,7 @@ namespace Emby.Server.Implementations.Sorting
/// <param name="x">The x.</param>
/// <param name="y">The y.</param>
/// <returns>System.Int32.</returns>
public int Compare(BaseItem x, BaseItem y)
public int Compare(BaseItem? x, BaseItem? y)
{
if (x == null)
{

2
Emby.Server.Implementations/Sorting/OfficialRatingComparer.cs
View File

@@ -29,7 +29,7 @@ namespace Emby.Server.Implementations.Sorting
/// <param name="x">The x.</param>
/// <param name="y">The y.</param>
/// <returns>System.Int32.</returns>
public int Compare(BaseItem x, BaseItem y)
public int Compare(BaseItem? x, BaseItem? y)
{
if (x == null)
{

2
Emby.Server.Implementations/Sorting/PlayCountComparer.cs
View File

@@ -1,3 +1,5 @@
#nullable disable
using Jellyfin.Data.Entities;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;

9
Emby.Server.Implementations/Sorting/PremiereDateComparer.cs
View File

@@ -16,7 +16,7 @@ namespace Emby.Server.Implementations.Sorting
/// <param name="x">The x.</param>
/// <param name="y">The y.</param>
/// <returns>System.Int32.</returns>
public int Compare(BaseItem x, BaseItem y)
public int Compare(BaseItem? x, BaseItem? y)
{
return GetDate(x).CompareTo(GetDate(y));
}
@@ -26,8 +26,13 @@ namespace Emby.Server.Implementations.Sorting
/// </summary>
/// <param name="x">The x.</param>
/// <returns>DateTime.</returns>
private static DateTime GetDate(BaseItem x)
private static DateTime GetDate(BaseItem? x)
{
if (x == null)
{
return DateTime.MinValue;
}
if (x.PremiereDate.HasValue)
{
return x.PremiereDate.Value;

9
Emby.Server.Implementations/Sorting/ProductionYearComparer.cs
View File

@@ -15,7 +15,7 @@ namespace Emby.Server.Implementations.Sorting
/// <param name="x">The x.</param>
/// <param name="y">The y.</param>
/// <returns>System.Int32.</returns>
public int Compare(BaseItem x, BaseItem y)
public int Compare(BaseItem? x, BaseItem? y)
{
return GetValue(x).CompareTo(GetValue(y));
}
@@ -25,8 +25,13 @@ namespace Emby.Server.Implementations.Sorting
/// </summary>
/// <param name="x">The x.</param>
/// <returns>DateTime.</returns>
private static int GetValue(BaseItem x)
private static int GetValue(BaseItem? x)
{
if (x == null)
{
return 0;
}
if (x.ProductionYear.HasValue)
{
return x.ProductionYear.Value;

2
Emby.Server.Implementations/Sorting/RandomComparer.cs
View File

@@ -16,7 +16,7 @@ namespace Emby.Server.Implementations.Sorting
/// <param name="x">The x.</param>
/// <param name="y">The y.</param>
/// <returns>System.Int32.</returns>
public int Compare(BaseItem x, BaseItem y)
public int Compare(BaseItem? x, BaseItem? y)
{
return Guid.NewGuid().CompareTo(Guid.NewGuid());
}

2
Emby.Server.Implementations/Sorting/RuntimeComparer.cs
View File

@@ -1,3 +1,5 @@
#nullable disable
using System;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Sorting;

2
Emby.Server.Implementations/Sorting/SeriesSortNameComparer.cs
View File

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

2
Emby.Server.Implementations/Sorting/SortNameComparer.cs
View File

@@ -1,3 +1,5 @@
#nullable disable
using System;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Sorting;

2
Emby.Server.Implementations/Sorting/StartDateComparer.cs
View File

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

2
Emby.Server.Implementations/Sorting/StudioComparer.cs
View File

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