Merge branch 'master' into network-rewrite

1 files changed, 10 insertions, 17 deletions

diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs
index 0f3f1bdcb..5b5ca0fca 100644
--- a/MediaBrowser.Providers/Manager/MetadataService.cs
+++ b/MediaBrowser.Providers/Manager/MetadataService.cs
@@ -146,7 +146,7 @@ namespace MediaBrowser.Providers.Manager
                 {
                     var id = itemOfType.GetLookupInfo();
 
-                    if (refreshOptions.SearchResult != null)
+                    if (refreshOptions.SearchResult is not null)
                     {
                         ApplySearchResult(id, refreshOptions.SearchResult);
                     }
@@ -190,7 +190,7 @@ namespace MediaBrowser.Providers.Manager
                 if (item.IsFileProtocol)
                 {
                     var file = TryGetFile(item.Path, refreshOptions.DirectoryService);
-                    if (file != null)
+                    if (file is not null)
                     {
                         item.DateModified = file.LastWriteTimeUtc;
                     }
@@ -243,7 +243,7 @@ namespace MediaBrowser.Providers.Manager
 
         protected async Task SaveItemAsync(MetadataResult<TItemType> result, ItemUpdateType reason, CancellationToken cancellationToken)
         {
-            if (result.Item.SupportsPeople && result.People != null)
+            if (result.Item.SupportsPeople && result.People is not null)
             {
                 var baseItem = result.Item;
 
@@ -815,7 +815,7 @@ namespace MediaBrowser.Providers.Manager
                 var providerName = provider.GetType().Name;
                 Logger.LogDebug("Running {Provider} for {Item}", providerName, logName);
 
-                if (id != null && !tmpDataMerged)
+                if (id is not null && !tmpDataMerged)
                 {
                     MergeNewData(temp.Item, id);
                     tmpDataMerged = true;
@@ -918,15 +918,8 @@ namespace MediaBrowser.Providers.Manager
             var source = sourceResult.Item;
             var target = targetResult.Item;
 
-            if (source == null)
-            {
-                throw new ArgumentException("Item cannot be null.", nameof(sourceResult));
-            }
-
-            if (target == null)
-            {
-                throw new ArgumentException("Item cannot be null.", nameof(targetResult));
-            }
+            ArgumentNullException.ThrowIfNull(sourceResult);
+            ArgumentNullException.ThrowIfNull(targetResult);
 
             if (!lockedFields.Contains(MetadataField.Name))
             {
@@ -1005,11 +998,11 @@ namespace MediaBrowser.Providers.Manager
 
             if (!lockedFields.Contains(MetadataField.Cast))
             {
-                if (replaceData || targetResult.People == null || targetResult.People.Count == 0)
+                if (replaceData || targetResult.People is null || targetResult.People.Count == 0)
                 {
                     targetResult.People = sourceResult.People;
                 }
-                else if (targetResult.People != null && sourceResult.People != null)
+                else if (targetResult.People is not null && sourceResult.People is not null)
                 {
                     MergePeople(sourceResult.People, targetResult.People);
                 }
@@ -1114,7 +1107,7 @@ namespace MediaBrowser.Providers.Manager
                 var normalizedName = person.Name.RemoveDiacritics();
                 var personInSource = source.FirstOrDefault(i => string.Equals(i.Name.RemoveDiacritics(), normalizedName, StringComparison.OrdinalIgnoreCase));
 
-                if (personInSource != null)
+                if (personInSource is not null)
                 {
                     foreach (var providerId in personInSource.ProviderIds)
                     {
@@ -1178,7 +1171,7 @@ namespace MediaBrowser.Providers.Manager
         {
             if (source is Video sourceCast && target is Video targetCast)
             {
-                if (replaceData || targetCast.Video3DFormat == null)
+                if (replaceData || targetCast.Video3DFormat is null)
                 {
                     targetCast.Video3DFormat = sourceCast.Video3DFormat;
                 }