The Free Software Media System - Server Backend & API
Prefer null checks over HasValue everywhere
Shadowghost6382563440b6
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.csindex 3691f4e19d..35c47ecb5c 100644--- a/Emby.Server.Implementations/Library/LibraryManager.cs+++ b/Emby.Server.Implementations/Library/LibraryManager.cs@@ -3195,11 +3195,11 @@ namespace Emby.Server.Implementations.Library}}- if (!episode.ProductionYear.HasValue)+ if (episode.ProductionYear is null){episode.ProductionYear = episodeInfo.Year;- if (episode.ProductionYear.HasValue)+ if (episode.ProductionYear is not null){changed = true;}diff --git a/Emby.Server.Implementations/Sorting/PremiereDateComparer.cs b/Emby.Server.Implementations/Sorting/PremiereDateComparer.csindex 8c8b8824f3..30b268bb60 100644--- a/Emby.Server.Implementations/Sorting/PremiereDateComparer.cs+++ b/Emby.Server.Implementations/Sorting/PremiereDateComparer.cs@@ -45,7 +45,7 @@ namespace Emby.Server.Implementations.Sortingreturn x.PremiereDate.Value;}- if (x.ProductionYear.HasValue)+ if (x.ProductionYear is not null){try{diff --git a/Emby.Server.Implementations/Sorting/ProductionYearComparer.cs b/Emby.Server.Implementations/Sorting/ProductionYearComparer.csindex 9aec87f183..8774bd8d4f 100644--- a/Emby.Server.Implementations/Sorting/ProductionYearComparer.cs+++ b/Emby.Server.Implementations/Sorting/ProductionYearComparer.cs@@ -39,7 +39,7 @@ namespace Emby.Server.Implementations.Sortingreturn 0;}- if (x.ProductionYear.HasValue)+ if (x.ProductionYear is not null){return x.ProductionYear.Value;}diff --git a/MediaBrowser.Controller/Entities/Movies/Movie.cs b/MediaBrowser.Controller/Entities/Movies/Movie.csindex e8817a29cf..8c3ce2ff58 100644--- a/MediaBrowser.Controller/Entities/Movies/Movie.cs+++ b/MediaBrowser.Controller/Entities/Movies/Movie.cs@@ -90,7 +90,7 @@ namespace MediaBrowser.Controller.Entities.Movies{var hasChanges = base.BeforeMetadataRefresh(replaceAllMetadata);- if (!ProductionYear.HasValue)+ if (ProductionYear is null){var info = LibraryManager.ParseName(Name);diff --git a/MediaBrowser.Controller/Entities/MusicVideo.cs b/MediaBrowser.Controller/Entities/MusicVideo.csindex 237ad5198c..effbf98820 100644--- a/MediaBrowser.Controller/Entities/MusicVideo.cs+++ b/MediaBrowser.Controller/Entities/MusicVideo.cs@@ -40,7 +40,7 @@ namespace MediaBrowser.Controller.Entities{var hasChanges = base.BeforeMetadataRefresh(replaceAllMetadata);- if (!ProductionYear.HasValue)+ if (ProductionYear is null){var info = LibraryManager.ParseName(Name);diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.csindex 952187c6e1..d9f300ad20 100644--- a/MediaBrowser.Controller/Entities/TV/Series.cs+++ b/MediaBrowser.Controller/Entities/TV/Series.cs@@ -507,7 +507,7 @@ namespace MediaBrowser.Controller.Entities.TV{var hasChanges = base.BeforeMetadataRefresh(replaceAllMetadata);- if (!ProductionYear.HasValue)+ if (ProductionYear is null){var info = LibraryManager.ParseName(Name);diff --git a/MediaBrowser.Controller/Entities/Trailer.cs b/MediaBrowser.Controller/Entities/Trailer.csindex 939709215c..a2465eedf0 100644--- a/MediaBrowser.Controller/Entities/Trailer.cs+++ b/MediaBrowser.Controller/Entities/Trailer.cs@@ -49,7 +49,7 @@ namespace MediaBrowser.Controller.Entities{var hasChanges = base.BeforeMetadataRefresh(replaceAllMetadata);- if (!ProductionYear.HasValue)+ if (ProductionYear is null){var info = LibraryManager.ParseName(Name);diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.csindex c57ed2faf8..9ba103cc8b 100644--- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs+++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs@@ -730,7 +730,7 @@ namespace MediaBrowser.Controller.Entities// Apply year filterif (query.Years.Length > 0){- if (!(item.ProductionYear.HasValue && query.Years.Contains(item.ProductionYear.Value)))+ if (item.ProductionYear is null || !query.Years.Contains(item.ProductionYear.Value)){return false;}diff --git a/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs b/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.csindex b0f51aec71..bc184d82fb 100644--- a/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs+++ b/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs@@ -277,7 +277,7 @@ namespace MediaBrowser.LocalMetadata.Saversawait writer.WriteElementStringAsync(null, "Rating", null, item.CommunityRating.Value.ToString(CultureInfo.InvariantCulture)).ConfigureAwait(false);}- if (item.ProductionYear.HasValue && item is not Person)+ if (item.ProductionYear is not null && item is not Person){await writer.WriteElementStringAsync(null, "ProductionYear", null, item.ProductionYear.Value.ToString(CultureInfo.InvariantCulture)).ConfigureAwait(false);}diff --git a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.csindex 989701350c..4d2f683a0e 100644--- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs+++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs@@ -189,7 +189,7 @@ namespace MediaBrowser.MediaEncoding.Probing}// Guess ProductionYear from PremiereDate if missing- if (!info.ProductionYear.HasValue && info.PremiereDate.HasValue)+ if (info.ProductionYear is null && info.PremiereDate is not null){info.ProductionYear = info.PremiereDate.Value.Year;}diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.csindex a438a94c40..f09c4c876c 100644--- a/MediaBrowser.Providers/Manager/MetadataService.cs+++ b/MediaBrowser.Providers/Manager/MetadataService.cs@@ -1114,7 +1114,7 @@ namespace MediaBrowser.Providers.Managertarget.PremiereDate = source.PremiereDate;}- if (replaceData || !target.ProductionYear.HasValue)+ if (replaceData || target.ProductionYear is null){target.ProductionYear = source.ProductionYear;}diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.csindex f9d8883dff..ff14f87923 100644--- a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs+++ b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs@@ -432,9 +432,9 @@ namespace MediaBrowser.Providers.MediaInfo}}- if (data.ProductionYear.HasValue)+ if (data.ProductionYear is not null){- if (!video.ProductionYear.HasValue || replaceData)+ if (video.ProductionYear is null || replaceData){video.ProductionYear = data.ProductionYear;}@@ -482,7 +482,7 @@ namespace MediaBrowser.Providers.MediaInfo}// If we don't have a ProductionYear try and get it from PremiereDate- if (video.PremiereDate.HasValue && !video.ProductionYear.HasValue)+ if (video.PremiereDate is not null && video.ProductionYear is null){video.ProductionYear = video.PremiereDate.Value.ToLocalTime().Year;}diff --git a/MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.csindex b5ba2d24f2..af2557df78 100644--- a/MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs+++ b/MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs@@ -82,7 +82,7 @@ namespace MediaBrowser.XbmcMetadata.Saverswriter.WriteElementString("title", album.Name);}- if (album.ProductionYear.HasValue)+ if (album.ProductionYear is not null){writer.WriteElementString("year", album.ProductionYear.Value.ToString(CultureInfo.InvariantCulture));}diff --git a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.csindex 78907a5e68..5a9bbbef4f 100644--- a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs+++ b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs@@ -544,7 +544,7 @@ namespace MediaBrowser.XbmcMetadata.Saverswriter.WriteElementString("rating", item.CommunityRating.Value.ToString(CultureInfo.InvariantCulture));}- if (item.ProductionYear.HasValue)+ if (item.ProductionYear is not null){writer.WriteElementString("year", item.ProductionYear.Value.ToString(CultureInfo.InvariantCulture));}diff --git a/src/Jellyfin.LiveTv/Recordings/RecordingsManager.cs b/src/Jellyfin.LiveTv/Recordings/RecordingsManager.csindex 846f9baf71..62a06370da 100644--- a/src/Jellyfin.LiveTv/Recordings/RecordingsManager.cs+++ b/src/Jellyfin.LiveTv/Recordings/RecordingsManager.cs@@ -497,7 +497,7 @@ public sealed class RecordingsManager : IRecordingsManager, IDisposable// trim trailing period from the folder namevar folderName = _fileSystem.GetValidFilename(timer.Name).Trim().TrimEnd('.').Trim();- if (metadata is not null && metadata.ProductionYear.HasValue)+ if (metadata is not null && metadata.ProductionYear is not null){folderName += " (" + metadata.ProductionYear.Value.ToString(CultureInfo.InvariantCulture) + ")";}@@ -532,7 +532,7 @@ public sealed class RecordingsManager : IRecordingsManager, IDisposable}var folderName = _fileSystem.GetValidFilename(timer.Name).Trim();- if (timer.ProductionYear.HasValue)+ if (timer.ProductionYear is not null){folderName += " (" + timer.ProductionYear.Value.ToString(CultureInfo.InvariantCulture) + ")";}@@ -550,7 +550,7 @@ public sealed class RecordingsManager : IRecordingsManager, IDisposable}var folderName = _fileSystem.GetValidFilename(timer.Name).Trim();- if (timer.ProductionYear.HasValue)+ if (timer.ProductionYear is not null){folderName += " (" + timer.ProductionYear.Value.ToString(CultureInfo.InvariantCulture) + ")";}diff --git a/src/Jellyfin.LiveTv/Recordings/RecordingsMetadataManager.cs b/src/Jellyfin.LiveTv/Recordings/RecordingsMetadataManager.csindex 7e68dbb547..e0e5a00fb9 100644--- a/src/Jellyfin.LiveTv/Recordings/RecordingsMetadataManager.cs+++ b/src/Jellyfin.LiveTv/Recordings/RecordingsMetadataManager.cs@@ -290,7 +290,7 @@ public class RecordingsMetadataManagernull,DateTime.UtcNow.ToString(DateAddedFormat, CultureInfo.InvariantCulture)).ConfigureAwait(false);- if (item.ProductionYear.HasValue)+ if (item.ProductionYear is not null){await writer.WriteElementStringAsync(null, "year", null, item.ProductionYear.Value.ToString(CultureInfo.InvariantCulture)).ConfigureAwait(false);}