Add TrySetProviderId extension

3 files changed, 10 insertions, 43 deletions

diff --git a/Emby.Server.Implementations/Library/Resolvers/Movies/BoxSetResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Movies/BoxSetResolver.cs
index 955055313..4b1507385 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Movies/BoxSetResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Movies/BoxSetResolver.cs
@@ -68,11 +68,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
             var justName = Path.GetFileName(item.Path.AsSpan());
 
             var id = justName.GetAttributeValue("tmdbid");
-
-            if (!string.IsNullOrEmpty(id))
-            {
-                item.SetProviderId(MetadataProvider.Tmdb, id);
-            }
+            item.TrySetProviderId(MetadataProvider.Tmdb, id);
         }
     }
 }
diff --git a/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
index 1a210e3cc..4debe722b 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
@@ -373,22 +373,14 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
                 {
                     // Check for TMDb id
                     var tmdbid = justName.GetAttributeValue("tmdbid");
-
-                    if (!string.IsNullOrWhiteSpace(tmdbid))
-                    {
-                        item.SetProviderId(MetadataProvider.Tmdb, tmdbid);
-                    }
+                    item.TrySetProviderId(MetadataProvider.Tmdb, tmdbid);
                 }
 
                 if (!string.IsNullOrEmpty(item.Path))
                 {
                     // Check for IMDb id - we use full media path, as we can assume that this will match in any use case (whether  id in parent dir or in file name)
                     var imdbid = item.Path.AsSpan().GetAttributeValue("imdbid");
-
-                    if (!string.IsNullOrWhiteSpace(imdbid))
-                    {
-                        item.SetProviderId(MetadataProvider.Imdb, imdbid);
-                    }
+                    item.TrySetProviderId(MetadataProvider.Imdb, imdbid);
                 }
             }
         }
diff --git a/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs b/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
index 1484c34bc..fb48d7bf1 100644
--- a/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
@@ -186,46 +186,25 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
             var justName = Path.GetFileName(path.AsSpan());
 
             var imdbId = justName.GetAttributeValue("imdbid");
-            if (!string.IsNullOrEmpty(imdbId))
-            {
-                item.SetProviderId(MetadataProvider.Imdb, imdbId);
-            }
+            item.TrySetProviderId(MetadataProvider.Imdb, imdbId);
 
             var tvdbId = justName.GetAttributeValue("tvdbid");
-            if (!string.IsNullOrEmpty(tvdbId))
-            {
-                item.SetProviderId(MetadataProvider.Tvdb, tvdbId);
-            }
+            item.TrySetProviderId(MetadataProvider.Tvdb, tvdbId);
 
             var tvmazeId = justName.GetAttributeValue("tvmazeid");
-            if (!string.IsNullOrEmpty(tvmazeId))
-            {
-                item.SetProviderId(MetadataProvider.TvMaze, tvmazeId);
-            }
+            item.TrySetProviderId(MetadataProvider.TvMaze, tvmazeId);
 
             var tmdbId = justName.GetAttributeValue("tmdbid");
-            if (!string.IsNullOrEmpty(tmdbId))
-            {
-                item.SetProviderId(MetadataProvider.Tmdb, tmdbId);
-            }
+            item.TrySetProviderId(MetadataProvider.Tmdb, tmdbId);
 
             var anidbId = justName.GetAttributeValue("anidbid");
-            if (!string.IsNullOrEmpty(anidbId))
-            {
-                item.SetProviderId("AniDB", anidbId);
-            }
+            item.TrySetProviderId("AniDB", anidbId);
 
             var aniListId = justName.GetAttributeValue("anilistid");
-            if (!string.IsNullOrEmpty(aniListId))
-            {
-                item.SetProviderId("AniList", aniListId);
-            }
+            item.TrySetProviderId("AniList", aniListId);
 
             var aniSearchId = justName.GetAttributeValue("anisearchid");
-            if (!string.IsNullOrEmpty(aniSearchId))
-            {
-                item.SetProviderId("AniSearch", aniSearchId);
-            }
+            item.TrySetProviderId("AniSearch", aniSearchId);
         }
     }
 }