Use TryGetProviderId where possible

12 files changed, 22 insertions, 44 deletions

diff --git a/MediaBrowser.Providers/Movies/ImdbExternalUrlProvider.cs b/MediaBrowser.Providers/Movies/ImdbExternalUrlProvider.cs
index eadcc976a..ff8ad1d61 100644
--- a/MediaBrowser.Providers/Movies/ImdbExternalUrlProvider.cs
+++ b/MediaBrowser.Providers/Movies/ImdbExternalUrlProvider.cs
@@ -17,9 +17,7 @@ public class ImdbExternalUrlProvider : IExternalUrlProvider
     public IEnumerable<string> GetExternalUrls(BaseItem item)
     {
         var baseUrl = "https://www.imdb.com/";
-        var externalId = item.GetProviderId(MetadataProvider.Imdb);
-
-        if (!string.IsNullOrEmpty(externalId))
+        if (item.TryGetProviderId(MetadataProvider.Imdb, out var externalId))
         {
             yield return baseUrl + $"title/{externalId}";
         }
diff --git a/MediaBrowser.Providers/Plugins/AudioDb/AudioDbAlbumExternalUrlProvider.cs b/MediaBrowser.Providers/Plugins/AudioDb/AudioDbAlbumExternalUrlProvider.cs
index 1615f1ce5..01d284105 100644
--- a/MediaBrowser.Providers/Plugins/AudioDb/AudioDbAlbumExternalUrlProvider.cs
+++ b/MediaBrowser.Providers/Plugins/AudioDb/AudioDbAlbumExternalUrlProvider.cs
@@ -17,8 +17,7 @@ public class AudioDbAlbumExternalUrlProvider : IExternalUrlProvider
     /// <inheritdoc/>
     public IEnumerable<string> GetExternalUrls(BaseItem item)
     {
-        var externalId = item.GetProviderId(MetadataProvider.AudioDbAlbum);
-        if (!string.IsNullOrEmpty(externalId))
+        if (item.TryGetProviderId(MetadataProvider.AudioDbAlbum, out var externalId))
         {
             var baseUrl = "https://www.theaudiodb.com/";
             switch (item)
diff --git a/MediaBrowser.Providers/Plugins/AudioDb/AudioDbAlbumImageProvider.cs b/MediaBrowser.Providers/Plugins/AudioDb/AudioDbAlbumImageProvider.cs
index 8a516e1ce..d2eeb7f07 100644
--- a/MediaBrowser.Providers/Plugins/AudioDb/AudioDbAlbumImageProvider.cs
+++ b/MediaBrowser.Providers/Plugins/AudioDb/AudioDbAlbumImageProvider.cs
@@ -4,7 +4,6 @@
 
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net.Http;
 using System.Text.Json;
 using System.Threading;
@@ -50,9 +49,7 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
         /// <inheritdoc />
         public async Task<IEnumerable<RemoteImageInfo>> GetImages(BaseItem item, CancellationToken cancellationToken)
         {
-            var id = item.GetProviderId(MetadataProvider.MusicBrainzReleaseGroup);
-
-            if (!string.IsNullOrWhiteSpace(id))
+            if (item.TryGetProviderId(MetadataProvider.MusicBrainzReleaseGroup, out var id))
             {
                 await AudioDbAlbumProvider.Current.EnsureInfo(id, cancellationToken).ConfigureAwait(false);
 
@@ -70,7 +67,7 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
                 }
             }
 
-            return Enumerable.Empty<RemoteImageInfo>();
+            return [];
         }
 
         private List<RemoteImageInfo> GetImages(AudioDbAlbumProvider.Album item)
diff --git a/MediaBrowser.Providers/Plugins/AudioDb/AudioDbArtistExternalUrlProvider.cs b/MediaBrowser.Providers/Plugins/AudioDb/AudioDbArtistExternalUrlProvider.cs
index 5c5057fa1..56b0d9bcb 100644
--- a/MediaBrowser.Providers/Plugins/AudioDb/AudioDbArtistExternalUrlProvider.cs
+++ b/MediaBrowser.Providers/Plugins/AudioDb/AudioDbArtistExternalUrlProvider.cs
@@ -17,8 +17,7 @@ public class AudioDbArtistExternalUrlProvider : IExternalUrlProvider
     /// <inheritdoc/>
     public IEnumerable<string> GetExternalUrls(BaseItem item)
     {
-        var externalId = item.GetProviderId(MetadataProvider.AudioDbArtist);
-        if (!string.IsNullOrEmpty(externalId))
+        if (item.TryGetProviderId(MetadataProvider.AudioDbArtist, out var externalId))
         {
             var baseUrl = "https://www.theaudiodb.com/";
             switch (item)
diff --git a/MediaBrowser.Providers/Plugins/AudioDb/AudioDbArtistImageProvider.cs b/MediaBrowser.Providers/Plugins/AudioDb/AudioDbArtistImageProvider.cs
index 4e7757cd2..88730f34d 100644
--- a/MediaBrowser.Providers/Plugins/AudioDb/AudioDbArtistImageProvider.cs
+++ b/MediaBrowser.Providers/Plugins/AudioDb/AudioDbArtistImageProvider.cs
@@ -4,7 +4,6 @@
 
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net.Http;
 using System.Text.Json;
 using System.Threading;
@@ -43,21 +42,19 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
         /// <inheritdoc />
         public IEnumerable<ImageType> GetSupportedImages(BaseItem item)
         {
-            return new ImageType[]
-            {
+            return
+            [
                 ImageType.Primary,
                 ImageType.Logo,
                 ImageType.Banner,
                 ImageType.Backdrop
-            };
+            ];
         }
 
         /// <inheritdoc />
         public async Task<IEnumerable<RemoteImageInfo>> GetImages(BaseItem item, CancellationToken cancellationToken)
         {
-            var id = item.GetProviderId(MetadataProvider.MusicBrainzArtist);
-
-            if (!string.IsNullOrWhiteSpace(id))
+            if (item.TryGetProviderId(MetadataProvider.MusicBrainzArtist, out var id))
             {
                 await AudioDbArtistProvider.Current.EnsureArtistInfo(id, cancellationToken).ConfigureAwait(false);
 
@@ -75,7 +72,7 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
                 }
             }
 
-            return Enumerable.Empty<RemoteImageInfo>();
+            return [];
         }
 
         private List<RemoteImageInfo> GetImages(AudioDbArtistProvider.Artist item)
diff --git a/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzAlbumArtistExternalUrlProvider.cs b/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzAlbumArtistExternalUrlProvider.cs
index 3de18f4cc..29dbbc58c 100644
--- a/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzAlbumArtistExternalUrlProvider.cs
+++ b/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzAlbumArtistExternalUrlProvider.cs
@@ -19,8 +19,7 @@ public class MusicBrainzAlbumArtistExternalUrlProvider : IExternalUrlProvider
     {
         if (item is MusicAlbum)
         {
-            var externalId = item.GetProviderId(MetadataProvider.MusicBrainzAlbumArtist);
-            if (!string.IsNullOrEmpty(externalId))
+        if (item.TryGetProviderId(MetadataProvider.MusicBrainzAlbumArtist, out var externalId))
             {
                 yield return Plugin.Instance!.Configuration.Server + $"/artist/{externalId}";
             }
diff --git a/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzAlbumExternalUrlProvider.cs b/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzAlbumExternalUrlProvider.cs
index 6d0afdd50..f838dcf4c 100644
--- a/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzAlbumExternalUrlProvider.cs
+++ b/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzAlbumExternalUrlProvider.cs
@@ -19,8 +19,7 @@ public class MusicBrainzAlbumExternalUrlProvider : IExternalUrlProvider
     {
         if (item is MusicAlbum)
         {
-            var externalId = item.GetProviderId(MetadataProvider.MusicBrainzArtist);
-            if (!string.IsNullOrEmpty(externalId))
+        if (item.TryGetProviderId(MetadataProvider.MusicBrainzAlbum, out var externalId))
             {
                 yield return Plugin.Instance!.Configuration.Server + $"/release/{externalId}";
             }
diff --git a/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzArtistExternalUrlProvider.cs b/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzArtistExternalUrlProvider.cs
index cd71191bf..ee5a597c6 100644
--- a/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzArtistExternalUrlProvider.cs
+++ b/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzArtistExternalUrlProvider.cs
@@ -17,8 +17,7 @@ public class MusicBrainzArtistExternalUrlProvider : IExternalUrlProvider
     /// <inheritdoc/>
     public IEnumerable<string> GetExternalUrls(BaseItem item)
     {
-        var externalId = item.GetProviderId(MetadataProvider.MusicBrainzArtist);
-        if (!string.IsNullOrEmpty(externalId))
+        if (item.TryGetProviderId(MetadataProvider.MusicBrainzArtist, out var externalId))
         {
             switch (item)
             {
diff --git a/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzReleaseGroupExternalUrlProvider.cs b/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzReleaseGroupExternalUrlProvider.cs
index 9bc010379..dd0a939f7 100644
--- a/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzReleaseGroupExternalUrlProvider.cs
+++ b/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzReleaseGroupExternalUrlProvider.cs
@@ -19,8 +19,7 @@ public class MusicBrainzReleaseGroupExternalUrlProvider : IExternalUrlProvider
     {
         if (item is MusicAlbum)
         {
-            var externalId = item.GetProviderId(MetadataProvider.MusicBrainzReleaseGroup);
-            if (!string.IsNullOrEmpty(externalId))
+        if (item.TryGetProviderId(MetadataProvider.MusicBrainzReleaseGroup, out var externalId))
             {
                 yield return Plugin.Instance!.Configuration.Server + $"/release-group/{externalId}";
             }
diff --git a/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzTrackExternalUrlProvider.cs b/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzTrackExternalUrlProvider.cs
index fc26dc54d..59e6f42b1 100644
--- a/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzTrackExternalUrlProvider.cs
+++ b/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzTrackExternalUrlProvider.cs
@@ -19,8 +19,7 @@ public class MusicBrainzTrackExternalUrlProvider : IExternalUrlProvider
     {
         if (item is Audio)
         {
-            var externalId = item.GetProviderId(MetadataProvider.MusicBrainzArtist);
-            if (!string.IsNullOrEmpty(externalId))
+        if (item.TryGetProviderId(MetadataProvider.MusicBrainzTrack, out var externalId))
             {
                 yield return Plugin.Instance!.Configuration.Server + $"/track/{externalId}";
             }
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TmdbExternalUrlProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TmdbExternalUrlProvider.cs
index b8fd18f28..bec800c03 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TmdbExternalUrlProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TmdbExternalUrlProvider.cs
@@ -23,16 +23,14 @@ public class TmdbExternalUrlProvider : IExternalUrlProvider
         switch (item)
         {
             case Series:
-                var externalId = item.GetProviderId(MetadataProvider.Tmdb);
-                if (!string.IsNullOrEmpty(externalId))
+                if (item.TryGetProviderId(MetadataProvider.Tmdb, out var externalId))
                 {
                     yield return TmdbUtils.BaseTmdbUrl + $"tv/{externalId}";
                 }
 
                 break;
             case Season season:
-                var seriesExternalId = season.Series.GetProviderId(MetadataProvider.Tmdb);
-                if (!string.IsNullOrEmpty(seriesExternalId))
+                if (season.Series.TryGetProviderId(MetadataProvider.Tmdb, out var seriesExternalId))
                 {
                     var orderString = season.Series.DisplayOrder;
                     if (string.IsNullOrEmpty(orderString))
@@ -52,8 +50,7 @@ public class TmdbExternalUrlProvider : IExternalUrlProvider
 
                 break;
             case Episode episode:
-                seriesExternalId = episode.Series.GetProviderId(MetadataProvider.Tmdb);
-                if (!string.IsNullOrEmpty(seriesExternalId))
+                if (episode.Series.TryGetProviderId(MetadataProvider.Imdb, out seriesExternalId))
                 {
                     var orderString = episode.Series.DisplayOrder;
                     if (string.IsNullOrEmpty(orderString))
@@ -73,24 +70,21 @@ public class TmdbExternalUrlProvider : IExternalUrlProvider
 
                 break;
             case Movie:
-                externalId = item.GetProviderId(MetadataProvider.Tmdb);
-                if (!string.IsNullOrEmpty(externalId))
+                if (item.TryGetProviderId(MetadataProvider.Tmdb, out externalId))
                 {
                     yield return TmdbUtils.BaseTmdbUrl + $"movie/{externalId}";
                 }
 
                 break;
             case Person:
-                externalId = item.GetProviderId(MetadataProvider.Tmdb);
-                if (!string.IsNullOrEmpty(externalId))
+                if (item.TryGetProviderId(MetadataProvider.Tmdb, out externalId))
                 {
                     yield return TmdbUtils.BaseTmdbUrl + $"person/{externalId}";
                 }
 
                 break;
             case BoxSet:
-                externalId = item.GetProviderId(MetadataProvider.Tmdb);
-                if (!string.IsNullOrEmpty(externalId))
+                if (item.TryGetProviderId(MetadataProvider.Tmdb, out externalId))
                 {
                     yield return TmdbUtils.BaseTmdbUrl + $"collection/{externalId}";
                 }
diff --git a/MediaBrowser.Providers/TV/Zap2ItExternalUrlProvider.cs b/MediaBrowser.Providers/TV/Zap2ItExternalUrlProvider.cs
index f6516fdde..52b0583e5 100644
--- a/MediaBrowser.Providers/TV/Zap2ItExternalUrlProvider.cs
+++ b/MediaBrowser.Providers/TV/Zap2ItExternalUrlProvider.cs
@@ -16,8 +16,7 @@ public class Zap2ItExternalUrlProvider : IExternalUrlProvider
     /// <inheritdoc/>
     public IEnumerable<string> GetExternalUrls(BaseItem item)
     {
-        var externalId = item.GetProviderId(MetadataProvider.Zap2It);
-        if (!string.IsNullOrEmpty(externalId))
+        if (item.TryGetProviderId(MetadataProvider.Zap2It, out var externalId))
         {
             yield return $"http://tvlistings.zap2it.com/overview.html?programSeriesId={externalId}";
          }