From 9bdb99fe92edaf06679ef855eae9f8bb69b970df Mon Sep 17 00:00:00 2001
From: Luke Foust <luke@foust.com>
Date: Sun, 22 Mar 2020 12:58:53 -0700
Subject: [PATCH 01/12] Add type to externalids to distinguish them in the UI

---
 .../Providers/IExternalId.cs                  | 19 +++++++++++++
 .../Providers/ExternalIdInfo.cs               |  6 ++++
 .../Manager/ProviderManager.cs                |  1 +
 .../Movies/MovieExternalIds.cs                |  6 ++++
 .../Music/MusicExternalIds.cs                 |  3 ++
 .../Plugins/AudioDb/ExternalIds.cs            | 16 +++++++++--
 .../Plugins/MusicBrainz/ExternalIds.cs        | 28 +++++++++++++++----
 MediaBrowser.Providers/TV/TvExternalIds.cs    | 12 ++++++++
 .../Tmdb/BoxSets/TmdbBoxSetExternalId.cs      |  3 ++
 .../Tmdb/Movies/TmdbMovieExternalId.cs        |  3 ++
 .../Tmdb/People/TmdbPersonExternalId.cs       |  3 ++
 .../Tmdb/TV/TmdbSeriesExternalId.cs           |  3 ++
 12 files changed, 96 insertions(+), 7 deletions(-)

diff --git a/MediaBrowser.Controller/Providers/IExternalId.cs b/MediaBrowser.Controller/Providers/IExternalId.cs
index d7e337bda..157a2076e 100644
--- a/MediaBrowser.Controller/Providers/IExternalId.cs
+++ b/MediaBrowser.Controller/Providers/IExternalId.cs
@@ -8,8 +8,27 @@ namespace MediaBrowser.Controller.Providers
 
         string Key { get; }
 
+        ExternalIdType Type { get; }
+
         string UrlFormatString { get; }
 
         bool Supports(IHasProviderIds item);
     }
+
+    public enum ExternalIdType
+    {
+        None,
+        Album,
+        AlbumArtist,
+        Artist,
+        BoxSet,
+        Episode,
+        Movie,
+        OtherArtist,
+        Person,
+        ReleaseGroup,
+        Season,
+        Series,
+        Track
+    }
 }
diff --git a/MediaBrowser.Model/Providers/ExternalIdInfo.cs b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
index 2b481ad7e..8d6d91143 100644
--- a/MediaBrowser.Model/Providers/ExternalIdInfo.cs
+++ b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
@@ -16,6 +16,12 @@ namespace MediaBrowser.Model.Providers
         /// <value>The key.</value>
         public string Key { get; set; }
 
+        /// <summary>
+        /// Gets or sets the type.
+        /// </summary>
+        /// <value>The type.</value>
+        public string Type { get; set; }
+
         /// <summary>
         /// Gets or sets the URL format string.
         /// </summary>
diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs
index e7b349f67..608a0cd19 100644
--- a/MediaBrowser.Providers/Manager/ProviderManager.cs
+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs
@@ -910,6 +910,7 @@ namespace MediaBrowser.Providers.Manager
                 {
                     Name = i.Name,
                     Key = i.Key,
+                    Type = i.Type == ExternalIdType.None ? null : i.Type.ToString(),
                     UrlFormatString = i.UrlFormatString
 
                 });
diff --git a/MediaBrowser.Providers/Movies/MovieExternalIds.cs b/MediaBrowser.Providers/Movies/MovieExternalIds.cs
index 55810b1ed..1ede0e7a5 100644
--- a/MediaBrowser.Providers/Movies/MovieExternalIds.cs
+++ b/MediaBrowser.Providers/Movies/MovieExternalIds.cs
@@ -15,6 +15,9 @@ namespace MediaBrowser.Providers.Movies
         /// <inheritdoc />
         public string Key => MetadataProviders.Imdb.ToString();
 
+        /// <inheritdoc />
+        public ExternalIdType Type => ExternalIdType.None;
+
         /// <inheritdoc />
         public string UrlFormatString => "https://www.imdb.com/title/{0}";
 
@@ -39,6 +42,9 @@ namespace MediaBrowser.Providers.Movies
         /// <inheritdoc />
         public string Key => MetadataProviders.Imdb.ToString();
 
+        /// <inheritdoc />
+        public ExternalIdType Type => ExternalIdType.Person;
+
         /// <inheritdoc />
         public string UrlFormatString => "https://www.imdb.com/name/{0}";
 
diff --git a/MediaBrowser.Providers/Music/MusicExternalIds.cs b/MediaBrowser.Providers/Music/MusicExternalIds.cs
index 628b9a9a1..54e034713 100644
--- a/MediaBrowser.Providers/Music/MusicExternalIds.cs
+++ b/MediaBrowser.Providers/Music/MusicExternalIds.cs
@@ -12,6 +12,9 @@ namespace MediaBrowser.Providers.Music
         /// <inheritdoc />
         public string Key => "IMVDb";
 
+        /// <inheritdoc />
+        public ExternalIdType Type => ExternalIdType.None;
+
         /// <inheritdoc />
         public string UrlFormatString => null;
 
diff --git a/MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs b/MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs
index 2d8cb431c..785185d61 100644
--- a/MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs
+++ b/MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs
@@ -12,6 +12,9 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
         /// <inheritdoc />
         public string Key => MetadataProviders.AudioDbAlbum.ToString();
 
+        /// <inheritdoc />
+        public ExternalIdType Type => ExternalIdType.None;
+
         /// <inheritdoc />
         public string UrlFormatString => "https://www.theaudiodb.com/album/{0}";
 
@@ -22,11 +25,14 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
     public class AudioDbOtherAlbumExternalId : IExternalId
     {
         /// <inheritdoc />
-        public string Name => "TheAudioDb Album";
+        public string Name => "TheAudioDb";
 
         /// <inheritdoc />
         public string Key => MetadataProviders.AudioDbAlbum.ToString();
 
+        /// <inheritdoc />
+        public ExternalIdType Type => ExternalIdType.Album;
+
         /// <inheritdoc />
         public string UrlFormatString => "https://www.theaudiodb.com/album/{0}";
 
@@ -42,6 +48,9 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
         /// <inheritdoc />
         public string Key => MetadataProviders.AudioDbArtist.ToString();
 
+        /// <inheritdoc />
+        public ExternalIdType Type => ExternalIdType.Artist;
+
         /// <inheritdoc />
         public string UrlFormatString => "https://www.theaudiodb.com/artist/{0}";
 
@@ -52,11 +61,14 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
     public class AudioDbOtherArtistExternalId : IExternalId
     {
         /// <inheritdoc />
-        public string Name => "TheAudioDb Artist";
+        public string Name => "TheAudioDb";
 
         /// <inheritdoc />
         public string Key => MetadataProviders.AudioDbArtist.ToString();
 
+        /// <inheritdoc />
+        public ExternalIdType Type => ExternalIdType.OtherArtist;
+
         /// <inheritdoc />
         public string UrlFormatString => "https://www.theaudiodb.com/artist/{0}";
 
diff --git a/MediaBrowser.Providers/Plugins/MusicBrainz/ExternalIds.cs b/MediaBrowser.Providers/Plugins/MusicBrainz/ExternalIds.cs
index 03565a34c..ed9fa6307 100644
--- a/MediaBrowser.Providers/Plugins/MusicBrainz/ExternalIds.cs
+++ b/MediaBrowser.Providers/Plugins/MusicBrainz/ExternalIds.cs
@@ -8,11 +8,14 @@ namespace MediaBrowser.Providers.Music
     public class MusicBrainzReleaseGroupExternalId : IExternalId
     {
         /// <inheritdoc />
-        public string Name => "MusicBrainz Release Group";
+        public string Name => "MusicBrainz";
 
         /// <inheritdoc />
         public string Key => MetadataProviders.MusicBrainzReleaseGroup.ToString();
 
+        /// <inheritdoc />
+        public ExternalIdType Type => ExternalIdType.ReleaseGroup;
+
         /// <inheritdoc />
         public string UrlFormatString => Plugin.Instance.Configuration.Server + "/release-group/{0}";
 
@@ -23,11 +26,14 @@ namespace MediaBrowser.Providers.Music
     public class MusicBrainzAlbumArtistExternalId : IExternalId
     {
         /// <inheritdoc />
-        public string Name => "MusicBrainz Album Artist";
+        public string Name => "MusicBrainz";
 
         /// <inheritdoc />
         public string Key => MetadataProviders.MusicBrainzAlbumArtist.ToString();
 
+        /// <inheritdoc />
+        public ExternalIdType Type => ExternalIdType.AlbumArtist;
+
         /// <inheritdoc />
         public string UrlFormatString => Plugin.Instance.Configuration.Server + "/artist/{0}";
 
@@ -38,11 +44,14 @@ namespace MediaBrowser.Providers.Music
     public class MusicBrainzAlbumExternalId : IExternalId
     {
         /// <inheritdoc />
-        public string Name => "MusicBrainz Album";
+        public string Name => "MusicBrainz";
 
         /// <inheritdoc />
         public string Key => MetadataProviders.MusicBrainzAlbum.ToString();
 
+        /// <inheritdoc />
+        public ExternalIdType Type => ExternalIdType.Album;
+
         /// <inheritdoc />
         public string UrlFormatString => Plugin.Instance.Configuration.Server + "/release/{0}";
 
@@ -58,6 +67,9 @@ namespace MediaBrowser.Providers.Music
         /// <inheritdoc />
         public string Key => MetadataProviders.MusicBrainzArtist.ToString();
 
+        /// <inheritdoc />
+        public ExternalIdType Type => ExternalIdType.Artist;
+
         /// <inheritdoc />
         public string UrlFormatString => Plugin.Instance.Configuration.Server + "/artist/{0}";
 
@@ -68,12 +80,15 @@ namespace MediaBrowser.Providers.Music
     public class MusicBrainzOtherArtistExternalId : IExternalId
     {
         /// <inheritdoc />
-        public string Name => "MusicBrainz Artist";
+        public string Name => "MusicBrainz";
 
         /// <inheritdoc />
 
         public string Key => MetadataProviders.MusicBrainzArtist.ToString();
 
+        /// <inheritdoc />
+        public ExternalIdType Type => ExternalIdType.OtherArtist;
+
         /// <inheritdoc />
         public string UrlFormatString => Plugin.Instance.Configuration.Server + "/artist/{0}";
 
@@ -84,11 +99,14 @@ namespace MediaBrowser.Providers.Music
     public class MusicBrainzTrackId : IExternalId
     {
         /// <inheritdoc />
-        public string Name => "MusicBrainz Track";
+        public string Name => "MusicBrainz";
 
         /// <inheritdoc />
         public string Key => MetadataProviders.MusicBrainzTrack.ToString();
 
+        /// <inheritdoc />
+        public ExternalIdType Type => ExternalIdType.Track;
+
         /// <inheritdoc />
         public string UrlFormatString => Plugin.Instance.Configuration.Server + "/track/{0}";
 
diff --git a/MediaBrowser.Providers/TV/TvExternalIds.cs b/MediaBrowser.Providers/TV/TvExternalIds.cs
index baf854285..a3c24f7dd 100644
--- a/MediaBrowser.Providers/TV/TvExternalIds.cs
+++ b/MediaBrowser.Providers/TV/TvExternalIds.cs
@@ -13,6 +13,9 @@ namespace MediaBrowser.Providers.TV
         /// <inheritdoc />
         public string Key => MetadataProviders.Zap2It.ToString();
 
+        /// <inheritdoc />
+        public ExternalIdType Type => ExternalIdType.None;
+
         /// <inheritdoc />
         public string UrlFormatString => "http://tvlistings.zap2it.com/overview.html?programSeriesId={0}";
 
@@ -28,6 +31,9 @@ namespace MediaBrowser.Providers.TV
         /// <inheritdoc />
         public string Key => MetadataProviders.Tvdb.ToString();
 
+        /// <inheritdoc />
+        public ExternalIdType Type => ExternalIdType.None;
+
         /// <inheritdoc />
         public string UrlFormatString => TvdbUtils.TvdbBaseUrl + "?tab=series&id={0}";
 
@@ -44,6 +50,9 @@ namespace MediaBrowser.Providers.TV
         /// <inheritdoc />
         public string Key => MetadataProviders.Tvdb.ToString();
 
+        /// <inheritdoc />
+        public ExternalIdType Type => ExternalIdType.Season;
+
         /// <inheritdoc />
         public string UrlFormatString => null;
 
@@ -59,6 +68,9 @@ namespace MediaBrowser.Providers.TV
         /// <inheritdoc />
         public string Key => MetadataProviders.Tvdb.ToString();
 
+        /// <inheritdoc />
+        public ExternalIdType Type => ExternalIdType.Episode;
+
         /// <inheritdoc />
         public string UrlFormatString => TvdbUtils.TvdbBaseUrl + "?tab=episode&id={0}";
 
diff --git a/MediaBrowser.Providers/Tmdb/BoxSets/TmdbBoxSetExternalId.cs b/MediaBrowser.Providers/Tmdb/BoxSets/TmdbBoxSetExternalId.cs
index 187295e1e..a51355254 100644
--- a/MediaBrowser.Providers/Tmdb/BoxSets/TmdbBoxSetExternalId.cs
+++ b/MediaBrowser.Providers/Tmdb/BoxSets/TmdbBoxSetExternalId.cs
@@ -13,6 +13,9 @@ namespace MediaBrowser.Providers.Tmdb.BoxSets
         /// <inheritdoc />
         public string Key => MetadataProviders.TmdbCollection.ToString();
 
+        /// <inheritdoc />
+        public ExternalIdType Type => ExternalIdType.BoxSet;
+
         /// <inheritdoc />
         public string UrlFormatString => TmdbUtils.BaseTmdbUrl + "collection/{0}";
 
diff --git a/MediaBrowser.Providers/Tmdb/Movies/TmdbMovieExternalId.cs b/MediaBrowser.Providers/Tmdb/Movies/TmdbMovieExternalId.cs
index fc7a4583f..af565b079 100644
--- a/MediaBrowser.Providers/Tmdb/Movies/TmdbMovieExternalId.cs
+++ b/MediaBrowser.Providers/Tmdb/Movies/TmdbMovieExternalId.cs
@@ -14,6 +14,9 @@ namespace MediaBrowser.Providers.Tmdb.Movies
         /// <inheritdoc />
         public string Key => MetadataProviders.Tmdb.ToString();
 
+        /// <inheritdoc />
+        public ExternalIdType Type => ExternalIdType.Movie;
+
         /// <inheritdoc />
         public string UrlFormatString => TmdbUtils.BaseTmdbUrl + "movie/{0}";
 
diff --git a/MediaBrowser.Providers/Tmdb/People/TmdbPersonExternalId.cs b/MediaBrowser.Providers/Tmdb/People/TmdbPersonExternalId.cs
index 2c61bc70a..1ec43c269 100644
--- a/MediaBrowser.Providers/Tmdb/People/TmdbPersonExternalId.cs
+++ b/MediaBrowser.Providers/Tmdb/People/TmdbPersonExternalId.cs
@@ -12,6 +12,9 @@ namespace MediaBrowser.Providers.Tmdb.People
         /// <inheritdoc />
         public string Key => MetadataProviders.Tmdb.ToString();
 
+        /// <inheritdoc />
+        public ExternalIdType Type => ExternalIdType.Person;
+
         /// <inheritdoc />
         public string UrlFormatString => TmdbUtils.BaseTmdbUrl + "person/{0}";
 
diff --git a/MediaBrowser.Providers/Tmdb/TV/TmdbSeriesExternalId.cs b/MediaBrowser.Providers/Tmdb/TV/TmdbSeriesExternalId.cs
index 524a3b05e..43ef06bf7 100644
--- a/MediaBrowser.Providers/Tmdb/TV/TmdbSeriesExternalId.cs
+++ b/MediaBrowser.Providers/Tmdb/TV/TmdbSeriesExternalId.cs
@@ -12,6 +12,9 @@ namespace MediaBrowser.Providers.Tmdb.TV
         /// <inheritdoc />
         public string Key => MetadataProviders.Tmdb.ToString();
 
+        /// <inheritdoc />
+        public ExternalIdType Type => ExternalIdType.Series;
+
         /// <inheritdoc />
         public string UrlFormatString => TmdbUtils.BaseTmdbUrl + "tv/{0}";
 

From 0fb78cf54b51843c54e7ff59d191c490a5b196cd Mon Sep 17 00:00:00 2001
From: Luke Foust <luke@foust.com>
Date: Thu, 26 Mar 2020 14:26:12 -0700
Subject: [PATCH 02/12] Add documentation around Name, Id, and Type. Changed
 ExternalIdType to ExternalIdMediaType

---
 .../Providers/ExternalIdMediaType.cs          | 45 +++++++++++++++++++
 .../Providers/IExternalId.cs                  | 27 ++++-------
 .../Providers/ExternalIdInfo.cs               | 17 ++++---
 .../Manager/ProviderManager.cs                |  2 +-
 .../Movies/MovieExternalIds.cs                |  4 +-
 .../Music/MusicExternalIds.cs                 |  2 +-
 .../Plugins/AudioDb/ExternalIds.cs            |  8 ++--
 .../Plugins/MusicBrainz/ExternalIds.cs        | 12 ++---
 MediaBrowser.Providers/TV/TvExternalIds.cs    |  8 ++--
 .../Tmdb/BoxSets/TmdbBoxSetExternalId.cs      |  2 +-
 .../Tmdb/Movies/TmdbMovieExternalId.cs        |  2 +-
 .../Tmdb/People/TmdbPersonExternalId.cs       |  2 +-
 .../Tmdb/TV/TmdbSeriesExternalId.cs           |  2 +-
 13 files changed, 84 insertions(+), 49 deletions(-)
 create mode 100644 MediaBrowser.Controller/Providers/ExternalIdMediaType.cs

diff --git a/MediaBrowser.Controller/Providers/ExternalIdMediaType.cs b/MediaBrowser.Controller/Providers/ExternalIdMediaType.cs
new file mode 100644
index 000000000..470f1e24c
--- /dev/null
+++ b/MediaBrowser.Controller/Providers/ExternalIdMediaType.cs
@@ -0,0 +1,45 @@
+namespace MediaBrowser.Controller.Providers
+{
+    /// <summary>The specific media type of an <see cref="IExternalId"/>.</summary>
+    public enum ExternalIdMediaType
+    {
+        /// <summary>There is no specific media type</summary>
+        None,
+
+        /// <summary>A music album</summary>
+        Album,
+
+        /// <summary>The artist of a music album</summary>
+        AlbumArtist,
+
+        /// <summary>The artist of a media item</summary>
+        Artist,
+
+        /// <summary>A boxed set of media</summary>
+        BoxSet,
+
+        /// <summary>A series episode</summary>
+        Episode,
+
+        /// <summary>A movie</summary>
+        Movie,
+
+        /// <summary>An alternative artist apart from the main artist</summary>
+        OtherArtist,
+
+        /// <summary>A person</summary>
+        Person,
+
+        /// <summary>A release group</summary>
+        ReleaseGroup,
+
+        /// <summary>A single season of a series</summary>
+        Season,
+
+        /// <summary>A series</summary>
+        Series,
+
+        /// <summary>A music track</summary>
+        Track
+    }
+}
diff --git a/MediaBrowser.Controller/Providers/IExternalId.cs b/MediaBrowser.Controller/Providers/IExternalId.cs
index 157a2076e..c877ffe1f 100644
--- a/MediaBrowser.Controller/Providers/IExternalId.cs
+++ b/MediaBrowser.Controller/Providers/IExternalId.cs
@@ -2,33 +2,24 @@ using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Controller.Providers
 {
+    /// <summary>Represents and identifier for an external provider.</summary>
     public interface IExternalId
     {
+        /// <summary>Gets the name used to identify this provider</summary>
         string Name { get; }
 
+        /// <summary>Gets the unique key to distinguish this provider/type pair. This should be unique across providers.</summary>
         string Key { get; }
 
-        ExternalIdType Type { get; }
+        /// <summary>Gets the specific media type for this id.</summary>
+        ExternalIdMediaType Type { get; }
 
+        /// <summary>Gets the url format string for this id.</summary>
         string UrlFormatString { get; }
 
+        /// <summary>Determines whether this id supports a given item type.</summary>
+        /// <param name="item">The item.</param>
+        /// <returns>True if this item is supported, otherwise false.</returns>
         bool Supports(IHasProviderIds item);
     }
-
-    public enum ExternalIdType
-    {
-        None,
-        Album,
-        AlbumArtist,
-        Artist,
-        BoxSet,
-        Episode,
-        Movie,
-        OtherArtist,
-        Person,
-        ReleaseGroup,
-        Season,
-        Series,
-        Track
-    }
 }
diff --git a/MediaBrowser.Model/Providers/ExternalIdInfo.cs b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
index 8d6d91143..befcc309b 100644
--- a/MediaBrowser.Model/Providers/ExternalIdInfo.cs
+++ b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
@@ -1,31 +1,30 @@
-#pragma warning disable CS1591
-
 namespace MediaBrowser.Model.Providers
 {
+    /// <summary>
+    /// Represents the external id information for serialization to the client.
+    /// </summary>
     public class ExternalIdInfo
     {
         /// <summary>
-        /// Gets or sets the name.
+        /// Gets or sets the name of the external id provider (IE: IMDB, MusicBrainz, etc).
         /// </summary>
-        /// <value>The name.</value>
         public string Name { get; set; }
 
         /// <summary>
-        /// Gets or sets the key.
+        /// Gets or sets the unique key for this id. This key should be unique across all providers.
         /// </summary>
-        /// <value>The key.</value>
         public string Key { get; set; }
 
         /// <summary>
-        /// Gets or sets the type.
+        /// Gets or sets the media type (Album, Artist, etc).
+        /// This can be null if there is no specific type.
+        /// This string is also used to localize the media type on the client.
         /// </summary>
-        /// <value>The type.</value>
         public string Type { get; set; }
 
         /// <summary>
         /// Gets or sets the URL format string.
         /// </summary>
-        /// <value>The URL format string.</value>
         public string UrlFormatString { get; set; }
     }
 }
diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs
index 608a0cd19..fee988d50 100644
--- a/MediaBrowser.Providers/Manager/ProviderManager.cs
+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs
@@ -910,7 +910,7 @@ namespace MediaBrowser.Providers.Manager
                 {
                     Name = i.Name,
                     Key = i.Key,
-                    Type = i.Type == ExternalIdType.None ? null : i.Type.ToString(),
+                    Type = i.Type == ExternalIdMediaType.None ? null : i.Type.ToString(),
                     UrlFormatString = i.UrlFormatString
 
                 });
diff --git a/MediaBrowser.Providers/Movies/MovieExternalIds.cs b/MediaBrowser.Providers/Movies/MovieExternalIds.cs
index 1ede0e7a5..a7b359a2d 100644
--- a/MediaBrowser.Providers/Movies/MovieExternalIds.cs
+++ b/MediaBrowser.Providers/Movies/MovieExternalIds.cs
@@ -16,7 +16,7 @@ namespace MediaBrowser.Providers.Movies
         public string Key => MetadataProviders.Imdb.ToString();
 
         /// <inheritdoc />
-        public ExternalIdType Type => ExternalIdType.None;
+        public ExternalIdMediaType Type => ExternalIdMediaType.None;
 
         /// <inheritdoc />
         public string UrlFormatString => "https://www.imdb.com/title/{0}";
@@ -43,7 +43,7 @@ namespace MediaBrowser.Providers.Movies
         public string Key => MetadataProviders.Imdb.ToString();
 
         /// <inheritdoc />
-        public ExternalIdType Type => ExternalIdType.Person;
+        public ExternalIdMediaType Type => ExternalIdMediaType.Person;
 
         /// <inheritdoc />
         public string UrlFormatString => "https://www.imdb.com/name/{0}";
diff --git a/MediaBrowser.Providers/Music/MusicExternalIds.cs b/MediaBrowser.Providers/Music/MusicExternalIds.cs
index 54e034713..19879411e 100644
--- a/MediaBrowser.Providers/Music/MusicExternalIds.cs
+++ b/MediaBrowser.Providers/Music/MusicExternalIds.cs
@@ -13,7 +13,7 @@ namespace MediaBrowser.Providers.Music
         public string Key => "IMVDb";
 
         /// <inheritdoc />
-        public ExternalIdType Type => ExternalIdType.None;
+        public ExternalIdMediaType Type => ExternalIdMediaType.None;
 
         /// <inheritdoc />
         public string UrlFormatString => null;
diff --git a/MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs b/MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs
index 785185d61..cd65acb76 100644
--- a/MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs
+++ b/MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs
@@ -13,7 +13,7 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
         public string Key => MetadataProviders.AudioDbAlbum.ToString();
 
         /// <inheritdoc />
-        public ExternalIdType Type => ExternalIdType.None;
+        public ExternalIdMediaType Type => ExternalIdMediaType.None;
 
         /// <inheritdoc />
         public string UrlFormatString => "https://www.theaudiodb.com/album/{0}";
@@ -31,7 +31,7 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
         public string Key => MetadataProviders.AudioDbAlbum.ToString();
 
         /// <inheritdoc />
-        public ExternalIdType Type => ExternalIdType.Album;
+        public ExternalIdMediaType Type => ExternalIdMediaType.Album;
 
         /// <inheritdoc />
         public string UrlFormatString => "https://www.theaudiodb.com/album/{0}";
@@ -49,7 +49,7 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
         public string Key => MetadataProviders.AudioDbArtist.ToString();
 
         /// <inheritdoc />
-        public ExternalIdType Type => ExternalIdType.Artist;
+        public ExternalIdMediaType Type => ExternalIdMediaType.Artist;
 
         /// <inheritdoc />
         public string UrlFormatString => "https://www.theaudiodb.com/artist/{0}";
@@ -67,7 +67,7 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
         public string Key => MetadataProviders.AudioDbArtist.ToString();
 
         /// <inheritdoc />
-        public ExternalIdType Type => ExternalIdType.OtherArtist;
+        public ExternalIdMediaType Type => ExternalIdMediaType.OtherArtist;
 
         /// <inheritdoc />
         public string UrlFormatString => "https://www.theaudiodb.com/artist/{0}";
diff --git a/MediaBrowser.Providers/Plugins/MusicBrainz/ExternalIds.cs b/MediaBrowser.Providers/Plugins/MusicBrainz/ExternalIds.cs
index ed9fa6307..7d74a8d35 100644
--- a/MediaBrowser.Providers/Plugins/MusicBrainz/ExternalIds.cs
+++ b/MediaBrowser.Providers/Plugins/MusicBrainz/ExternalIds.cs
@@ -14,7 +14,7 @@ namespace MediaBrowser.Providers.Music
         public string Key => MetadataProviders.MusicBrainzReleaseGroup.ToString();
 
         /// <inheritdoc />
-        public ExternalIdType Type => ExternalIdType.ReleaseGroup;
+        public ExternalIdMediaType Type => ExternalIdMediaType.ReleaseGroup;
 
         /// <inheritdoc />
         public string UrlFormatString => Plugin.Instance.Configuration.Server + "/release-group/{0}";
@@ -32,7 +32,7 @@ namespace MediaBrowser.Providers.Music
         public string Key => MetadataProviders.MusicBrainzAlbumArtist.ToString();
 
         /// <inheritdoc />
-        public ExternalIdType Type => ExternalIdType.AlbumArtist;
+        public ExternalIdMediaType Type => ExternalIdMediaType.AlbumArtist;
 
         /// <inheritdoc />
         public string UrlFormatString => Plugin.Instance.Configuration.Server + "/artist/{0}";
@@ -50,7 +50,7 @@ namespace MediaBrowser.Providers.Music
         public string Key => MetadataProviders.MusicBrainzAlbum.ToString();
 
         /// <inheritdoc />
-        public ExternalIdType Type => ExternalIdType.Album;
+        public ExternalIdMediaType Type => ExternalIdMediaType.Album;
 
         /// <inheritdoc />
         public string UrlFormatString => Plugin.Instance.Configuration.Server + "/release/{0}";
@@ -68,7 +68,7 @@ namespace MediaBrowser.Providers.Music
         public string Key => MetadataProviders.MusicBrainzArtist.ToString();
 
         /// <inheritdoc />
-        public ExternalIdType Type => ExternalIdType.Artist;
+        public ExternalIdMediaType Type => ExternalIdMediaType.Artist;
 
         /// <inheritdoc />
         public string UrlFormatString => Plugin.Instance.Configuration.Server + "/artist/{0}";
@@ -87,7 +87,7 @@ namespace MediaBrowser.Providers.Music
         public string Key => MetadataProviders.MusicBrainzArtist.ToString();
 
         /// <inheritdoc />
-        public ExternalIdType Type => ExternalIdType.OtherArtist;
+        public ExternalIdMediaType Type => ExternalIdMediaType.OtherArtist;
 
         /// <inheritdoc />
         public string UrlFormatString => Plugin.Instance.Configuration.Server + "/artist/{0}";
@@ -105,7 +105,7 @@ namespace MediaBrowser.Providers.Music
         public string Key => MetadataProviders.MusicBrainzTrack.ToString();
 
         /// <inheritdoc />
-        public ExternalIdType Type => ExternalIdType.Track;
+        public ExternalIdMediaType Type => ExternalIdMediaType.Track;
 
         /// <inheritdoc />
         public string UrlFormatString => Plugin.Instance.Configuration.Server + "/track/{0}";
diff --git a/MediaBrowser.Providers/TV/TvExternalIds.cs b/MediaBrowser.Providers/TV/TvExternalIds.cs
index a3c24f7dd..75d8b6bf5 100644
--- a/MediaBrowser.Providers/TV/TvExternalIds.cs
+++ b/MediaBrowser.Providers/TV/TvExternalIds.cs
@@ -14,7 +14,7 @@ namespace MediaBrowser.Providers.TV
         public string Key => MetadataProviders.Zap2It.ToString();
 
         /// <inheritdoc />
-        public ExternalIdType Type => ExternalIdType.None;
+        public ExternalIdMediaType Type => ExternalIdMediaType.None;
 
         /// <inheritdoc />
         public string UrlFormatString => "http://tvlistings.zap2it.com/overview.html?programSeriesId={0}";
@@ -32,7 +32,7 @@ namespace MediaBrowser.Providers.TV
         public string Key => MetadataProviders.Tvdb.ToString();
 
         /// <inheritdoc />
-        public ExternalIdType Type => ExternalIdType.None;
+        public ExternalIdMediaType Type => ExternalIdMediaType.None;
 
         /// <inheritdoc />
         public string UrlFormatString => TvdbUtils.TvdbBaseUrl + "?tab=series&id={0}";
@@ -51,7 +51,7 @@ namespace MediaBrowser.Providers.TV
         public string Key => MetadataProviders.Tvdb.ToString();
 
         /// <inheritdoc />
-        public ExternalIdType Type => ExternalIdType.Season;
+        public ExternalIdMediaType Type => ExternalIdMediaType.Season;
 
         /// <inheritdoc />
         public string UrlFormatString => null;
@@ -69,7 +69,7 @@ namespace MediaBrowser.Providers.TV
         public string Key => MetadataProviders.Tvdb.ToString();
 
         /// <inheritdoc />
-        public ExternalIdType Type => ExternalIdType.Episode;
+        public ExternalIdMediaType Type => ExternalIdMediaType.Episode;
 
         /// <inheritdoc />
         public string UrlFormatString => TvdbUtils.TvdbBaseUrl + "?tab=episode&id={0}";
diff --git a/MediaBrowser.Providers/Tmdb/BoxSets/TmdbBoxSetExternalId.cs b/MediaBrowser.Providers/Tmdb/BoxSets/TmdbBoxSetExternalId.cs
index a51355254..a83cde93c 100644
--- a/MediaBrowser.Providers/Tmdb/BoxSets/TmdbBoxSetExternalId.cs
+++ b/MediaBrowser.Providers/Tmdb/BoxSets/TmdbBoxSetExternalId.cs
@@ -14,7 +14,7 @@ namespace MediaBrowser.Providers.Tmdb.BoxSets
         public string Key => MetadataProviders.TmdbCollection.ToString();
 
         /// <inheritdoc />
-        public ExternalIdType Type => ExternalIdType.BoxSet;
+        public ExternalIdMediaType Type => ExternalIdMediaType.BoxSet;
 
         /// <inheritdoc />
         public string UrlFormatString => TmdbUtils.BaseTmdbUrl + "collection/{0}";
diff --git a/MediaBrowser.Providers/Tmdb/Movies/TmdbMovieExternalId.cs b/MediaBrowser.Providers/Tmdb/Movies/TmdbMovieExternalId.cs
index af565b079..f9ea00067 100644
--- a/MediaBrowser.Providers/Tmdb/Movies/TmdbMovieExternalId.cs
+++ b/MediaBrowser.Providers/Tmdb/Movies/TmdbMovieExternalId.cs
@@ -15,7 +15,7 @@ namespace MediaBrowser.Providers.Tmdb.Movies
         public string Key => MetadataProviders.Tmdb.ToString();
 
         /// <inheritdoc />
-        public ExternalIdType Type => ExternalIdType.Movie;
+        public ExternalIdMediaType Type => ExternalIdMediaType.Movie;
 
         /// <inheritdoc />
         public string UrlFormatString => TmdbUtils.BaseTmdbUrl + "movie/{0}";
diff --git a/MediaBrowser.Providers/Tmdb/People/TmdbPersonExternalId.cs b/MediaBrowser.Providers/Tmdb/People/TmdbPersonExternalId.cs
index 1ec43c269..854fd4156 100644
--- a/MediaBrowser.Providers/Tmdb/People/TmdbPersonExternalId.cs
+++ b/MediaBrowser.Providers/Tmdb/People/TmdbPersonExternalId.cs
@@ -13,7 +13,7 @@ namespace MediaBrowser.Providers.Tmdb.People
         public string Key => MetadataProviders.Tmdb.ToString();
 
         /// <inheritdoc />
-        public ExternalIdType Type => ExternalIdType.Person;
+        public ExternalIdMediaType Type => ExternalIdMediaType.Person;
 
         /// <inheritdoc />
         public string UrlFormatString => TmdbUtils.BaseTmdbUrl + "person/{0}";
diff --git a/MediaBrowser.Providers/Tmdb/TV/TmdbSeriesExternalId.cs b/MediaBrowser.Providers/Tmdb/TV/TmdbSeriesExternalId.cs
index 43ef06bf7..770448c7f 100644
--- a/MediaBrowser.Providers/Tmdb/TV/TmdbSeriesExternalId.cs
+++ b/MediaBrowser.Providers/Tmdb/TV/TmdbSeriesExternalId.cs
@@ -13,7 +13,7 @@ namespace MediaBrowser.Providers.Tmdb.TV
         public string Key => MetadataProviders.Tmdb.ToString();
 
         /// <inheritdoc />
-        public ExternalIdType Type => ExternalIdType.Series;
+        public ExternalIdMediaType Type => ExternalIdMediaType.Series;
 
         /// <inheritdoc />
         public string UrlFormatString => TmdbUtils.BaseTmdbUrl + "tv/{0}";

From 526e47c3624aca76234006b031b74e595f295cc8 Mon Sep 17 00:00:00 2001
From: Mark Monteiro <marknr.monteiro@protonmail.com>
Date: Sun, 17 May 2020 14:22:36 -0400
Subject: [PATCH 03/12] Clean up documentation

---
 .../Providers/ExternalIdMediaType.cs          | 60 ++++++++++++++-----
 .../Providers/IExternalId.cs                  | 21 +++++--
 .../Providers/ExternalIdInfo.cs               |  2 +-
 3 files changed, 63 insertions(+), 20 deletions(-)

diff --git a/MediaBrowser.Controller/Providers/ExternalIdMediaType.cs b/MediaBrowser.Controller/Providers/ExternalIdMediaType.cs
index 470f1e24c..dc87aefc8 100644
--- a/MediaBrowser.Controller/Providers/ExternalIdMediaType.cs
+++ b/MediaBrowser.Controller/Providers/ExternalIdMediaType.cs
@@ -1,45 +1,77 @@
 namespace MediaBrowser.Controller.Providers
 {
-    /// <summary>The specific media type of an <see cref="IExternalId"/>.</summary>
+    /// <summary>
+    /// The specific media type of an <see cref="IExternalId"/>.
+    /// </summary>
+    /// <remarks>
+    /// This is used as a translation key for clients.
+    /// </remarks>
     public enum ExternalIdMediaType
     {
-        /// <summary>There is no specific media type</summary>
+        /// <summary>
+        /// There is no specific media type associated with the external id, or the external provider only has one
+        /// id type so there is no need to be specific.
+        /// </summary>
         None,
 
-        /// <summary>A music album</summary>
+        /// <summary>
+        /// A music album.
+        /// </summary>
         Album,
 
-        /// <summary>The artist of a music album</summary>
+        /// <summary>
+        /// The artist of a music album.
+        /// </summary>
         AlbumArtist,
 
-        /// <summary>The artist of a media item</summary>
+        /// <summary>
+        /// The artist of a media item.
+        /// </summary>
         Artist,
 
-        /// <summary>A boxed set of media</summary>
+        /// <summary>
+        /// A boxed set of media.
+        /// </summary>
         BoxSet,
 
-        /// <summary>A series episode</summary>
+        /// <summary>
+        /// A series episode.
+        /// </summary>
         Episode,
 
-        /// <summary>A movie</summary>
+        /// <summary>
+        /// A movie.
+        /// </summary>
         Movie,
 
-        /// <summary>An alternative artist apart from the main artist</summary>
+        /// <summary>
+        /// An alternative artist apart from the main artist.
+        /// </summary>
         OtherArtist,
 
-        /// <summary>A person</summary>
+        /// <summary>
+        /// A person.
+        /// </summary>
         Person,
 
-        /// <summary>A release group</summary>
+        /// <summary>
+        /// A release group.
+        /// </summary>
         ReleaseGroup,
 
-        /// <summary>A single season of a series</summary>
+        /// <summary>
+        /// A single season of a series.
+        /// </summary>
         Season,
 
-        /// <summary>A series</summary>
+        /// <summary>
+        /// A series.
+        /// </summary>
         Series,
 
-        /// <summary>A music track</summary>
+        /// <summary>
+        /// A music track.
+        /// </summary>
         Track
     }
 }
diff --git a/MediaBrowser.Controller/Providers/IExternalId.cs b/MediaBrowser.Controller/Providers/IExternalId.cs
index c877ffe1f..f362c42eb 100644
--- a/MediaBrowser.Controller/Providers/IExternalId.cs
+++ b/MediaBrowser.Controller/Providers/IExternalId.cs
@@ -5,19 +5,30 @@ namespace MediaBrowser.Controller.Providers
     /// <summary>Represents and identifier for an external provider.</summary>
     public interface IExternalId
     {
-        /// <summary>Gets the name used to identify this provider</summary>
+        /// <summary>
+        /// Gets the display name of the provider associated with this ID type.
+        /// </summary>
         string Name { get; }
 
-        /// <summary>Gets the unique key to distinguish this provider/type pair. This should be unique across providers.</summary>
+        /// <summary>
+        /// Gets the unique key to distinguish this provider/type pair. This should be unique across providers.
+        /// </summary>
+        // TODO: This property is not actually unique at the moment. It should be updated to be unique.
         string Key { get; }
 
-        /// <summary>Gets the specific media type for this id.</summary>
+        /// <summary>
+        /// Gets the specific media type for this id.
+        /// </summary>
         ExternalIdMediaType Type { get; }
 
-        /// <summary>Gets the url format string for this id.</summary>
+        /// <summary>
+        /// Gets the URL format string for this id.
+        /// </summary>
         string UrlFormatString { get; }
 
-        /// <summary>Determines whether this id supports a given item type.</summary>
+        /// <summary>
+        /// Determines whether this id supports a given item type.
+        /// </summary>
         /// <param name="item">The item.</param>
         /// <returns>True if this item is supported, otherwise false.</returns>
         bool Supports(IHasProviderIds item);
diff --git a/MediaBrowser.Model/Providers/ExternalIdInfo.cs b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
index befcc309b..ca0c857c4 100644
--- a/MediaBrowser.Model/Providers/ExternalIdInfo.cs
+++ b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
@@ -6,7 +6,7 @@ namespace MediaBrowser.Model.Providers
     public class ExternalIdInfo
     {
         /// <summary>
-        /// Gets or sets the name of the external id provider (IE: IMDB, MusicBrainz, etc).
+        /// Gets or sets the display name of the external id provider (IE: IMDB, MusicBrainz, etc).
         /// </summary>
         public string Name { get; set; }
 

From e5c857ac3639c2aba34e59437e501bfdd6b1ba02 Mon Sep 17 00:00:00 2001
From: Mark Monteiro <marknr.monteiro@protonmail.com>
Date: Sun, 17 May 2020 15:29:53 -0400
Subject: [PATCH 04/12] Rename external id type 'None' to 'General'

---
 MediaBrowser.Controller/Providers/ExternalIdMediaType.cs | 2 +-
 MediaBrowser.Providers/Manager/ProviderManager.cs        | 2 +-
 MediaBrowser.Providers/Movies/MovieExternalIds.cs        | 2 +-
 MediaBrowser.Providers/Music/MusicExternalIds.cs         | 2 +-
 MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs    | 2 +-
 MediaBrowser.Providers/TV/TvExternalIds.cs               | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/MediaBrowser.Controller/Providers/ExternalIdMediaType.cs b/MediaBrowser.Controller/Providers/ExternalIdMediaType.cs
index dc87aefc8..43c2b2f22 100644
--- a/MediaBrowser.Controller/Providers/ExternalIdMediaType.cs
+++ b/MediaBrowser.Controller/Providers/ExternalIdMediaType.cs
@@ -12,7 +12,7 @@ namespace MediaBrowser.Controller.Providers
         /// There is no specific media type associated with the external id, or the external provider only has one
         /// id type so there is no need to be specific.
         /// </summary>
-        None,
+        General,
 
         /// <summary>
         /// A music album.
diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs
index b0380ae31..49083c01b 100644
--- a/MediaBrowser.Providers/Manager/ProviderManager.cs
+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs
@@ -908,7 +908,7 @@ namespace MediaBrowser.Providers.Manager
                 {
                     Name = i.Name,
                     Key = i.Key,
-                    Type = i.Type == ExternalIdMediaType.None ? null : i.Type.ToString(),
+                    Type = i.Type == ExternalIdMediaType.General ? null : i.Type.ToString(),
                     UrlFormatString = i.UrlFormatString
                 });
         }
diff --git a/MediaBrowser.Providers/Movies/MovieExternalIds.cs b/MediaBrowser.Providers/Movies/MovieExternalIds.cs
index a7b359a2d..1098b9882 100644
--- a/MediaBrowser.Providers/Movies/MovieExternalIds.cs
+++ b/MediaBrowser.Providers/Movies/MovieExternalIds.cs
@@ -16,7 +16,7 @@ namespace MediaBrowser.Providers.Movies
         public string Key => MetadataProviders.Imdb.ToString();
 
         /// <inheritdoc />
-        public ExternalIdMediaType Type => ExternalIdMediaType.None;
+        public ExternalIdMediaType Type => ExternalIdMediaType.General;
 
         /// <inheritdoc />
         public string UrlFormatString => "https://www.imdb.com/title/{0}";
diff --git a/MediaBrowser.Providers/Music/MusicExternalIds.cs b/MediaBrowser.Providers/Music/MusicExternalIds.cs
index 19879411e..351cdb92c 100644
--- a/MediaBrowser.Providers/Music/MusicExternalIds.cs
+++ b/MediaBrowser.Providers/Music/MusicExternalIds.cs
@@ -13,7 +13,7 @@ namespace MediaBrowser.Providers.Music
         public string Key => "IMVDb";
 
         /// <inheritdoc />
-        public ExternalIdMediaType Type => ExternalIdMediaType.None;
+        public ExternalIdMediaType Type => ExternalIdMediaType.General;
 
         /// <inheritdoc />
         public string UrlFormatString => null;
diff --git a/MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs b/MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs
index cd65acb76..150149a6b 100644
--- a/MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs
+++ b/MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs
@@ -13,7 +13,7 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
         public string Key => MetadataProviders.AudioDbAlbum.ToString();
 
         /// <inheritdoc />
-        public ExternalIdMediaType Type => ExternalIdMediaType.None;
+        public ExternalIdMediaType Type => ExternalIdMediaType.General;
 
         /// <inheritdoc />
         public string UrlFormatString => "https://www.theaudiodb.com/album/{0}";
diff --git a/MediaBrowser.Providers/TV/TvExternalIds.cs b/MediaBrowser.Providers/TV/TvExternalIds.cs
index 75d8b6bf5..ccdf8bd29 100644
--- a/MediaBrowser.Providers/TV/TvExternalIds.cs
+++ b/MediaBrowser.Providers/TV/TvExternalIds.cs
@@ -14,7 +14,7 @@ namespace MediaBrowser.Providers.TV
         public string Key => MetadataProviders.Zap2It.ToString();
 
         /// <inheritdoc />
-        public ExternalIdMediaType Type => ExternalIdMediaType.None;
+        public ExternalIdMediaType Type => ExternalIdMediaType.General;
 
         /// <inheritdoc />
         public string UrlFormatString => "http://tvlistings.zap2it.com/overview.html?programSeriesId={0}";
@@ -32,7 +32,7 @@ namespace MediaBrowser.Providers.TV
         public string Key => MetadataProviders.Tvdb.ToString();
 
         /// <inheritdoc />
-        public ExternalIdMediaType Type => ExternalIdMediaType.None;
+        public ExternalIdMediaType Type => ExternalIdMediaType.General;
 
         /// <inheritdoc />
         public string UrlFormatString => TvdbUtils.TvdbBaseUrl + "?tab=series&id={0}";

From 422d5b2b68bdce4da385a19382a7a52060cb10b2 Mon Sep 17 00:00:00 2001
From: Mark Monteiro <marknr.monteiro@protonmail.com>
Date: Sun, 17 May 2020 15:57:24 -0400
Subject: [PATCH 05/12] Move ExternalIdMediaType enum to MediaBrowser.Model

---
 MediaBrowser.Controller/Providers/IExternalId.cs                | 1 +
 .../Providers/ExternalIdMediaType.cs                            | 2 +-
 MediaBrowser.Providers/Movies/MovieExternalIds.cs               | 1 +
 MediaBrowser.Providers/Music/MusicExternalIds.cs                | 1 +
 MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs           | 1 +
 MediaBrowser.Providers/Plugins/MusicBrainz/ExternalIds.cs       | 1 +
 MediaBrowser.Providers/TV/TvExternalIds.cs                      | 1 +
 MediaBrowser.Providers/Tmdb/BoxSets/TmdbBoxSetExternalId.cs     | 1 +
 MediaBrowser.Providers/Tmdb/Movies/TmdbMovieExternalId.cs       | 1 +
 MediaBrowser.Providers/Tmdb/People/TmdbPersonExternalId.cs      | 1 +
 MediaBrowser.Providers/Tmdb/TV/TmdbSeriesExternalId.cs          | 1 +
 11 files changed, 11 insertions(+), 1 deletion(-)
 rename {MediaBrowser.Controller => MediaBrowser.Model}/Providers/ExternalIdMediaType.cs (97%)

diff --git a/MediaBrowser.Controller/Providers/IExternalId.cs b/MediaBrowser.Controller/Providers/IExternalId.cs
index f362c42eb..0fcf0c09d 100644
--- a/MediaBrowser.Controller/Providers/IExternalId.cs
+++ b/MediaBrowser.Controller/Providers/IExternalId.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Providers;
 
 namespace MediaBrowser.Controller.Providers
 {
diff --git a/MediaBrowser.Controller/Providers/ExternalIdMediaType.cs b/MediaBrowser.Model/Providers/ExternalIdMediaType.cs
similarity index 97%
rename from MediaBrowser.Controller/Providers/ExternalIdMediaType.cs
rename to MediaBrowser.Model/Providers/ExternalIdMediaType.cs
index 43c2b2f22..8c5356c92 100644
--- a/MediaBrowser.Controller/Providers/ExternalIdMediaType.cs
+++ b/MediaBrowser.Model/Providers/ExternalIdMediaType.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Controller.Providers
+namespace MediaBrowser.Model.Providers
 {
     /// <summary>
     /// The specific media type of an <see cref="IExternalId"/>.
diff --git a/MediaBrowser.Providers/Movies/MovieExternalIds.cs b/MediaBrowser.Providers/Movies/MovieExternalIds.cs
index 1098b9882..a82394a93 100644
--- a/MediaBrowser.Providers/Movies/MovieExternalIds.cs
+++ b/MediaBrowser.Providers/Movies/MovieExternalIds.cs
@@ -4,6 +4,7 @@ using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Providers;
 
 namespace MediaBrowser.Providers.Movies
 {
diff --git a/MediaBrowser.Providers/Music/MusicExternalIds.cs b/MediaBrowser.Providers/Music/MusicExternalIds.cs
index 351cdb92c..12323bcbd 100644
--- a/MediaBrowser.Providers/Music/MusicExternalIds.cs
+++ b/MediaBrowser.Providers/Music/MusicExternalIds.cs
@@ -1,6 +1,7 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Providers;
 
 namespace MediaBrowser.Providers.Music
 {
diff --git a/MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs b/MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs
index 150149a6b..126a79a08 100644
--- a/MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs
+++ b/MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs
@@ -1,6 +1,7 @@
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Providers;
 
 namespace MediaBrowser.Providers.Plugins.AudioDb
 {
diff --git a/MediaBrowser.Providers/Plugins/MusicBrainz/ExternalIds.cs b/MediaBrowser.Providers/Plugins/MusicBrainz/ExternalIds.cs
index 7d74a8d35..5756cb838 100644
--- a/MediaBrowser.Providers/Plugins/MusicBrainz/ExternalIds.cs
+++ b/MediaBrowser.Providers/Plugins/MusicBrainz/ExternalIds.cs
@@ -1,6 +1,7 @@
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Providers;
 using MediaBrowser.Providers.Plugins.MusicBrainz;
 
 namespace MediaBrowser.Providers.Music
diff --git a/MediaBrowser.Providers/TV/TvExternalIds.cs b/MediaBrowser.Providers/TV/TvExternalIds.cs
index ccdf8bd29..4c005666f 100644
--- a/MediaBrowser.Providers/TV/TvExternalIds.cs
+++ b/MediaBrowser.Providers/TV/TvExternalIds.cs
@@ -1,6 +1,7 @@
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Providers;
 using MediaBrowser.Providers.Plugins.TheTvdb;
 
 namespace MediaBrowser.Providers.TV
diff --git a/MediaBrowser.Providers/Tmdb/BoxSets/TmdbBoxSetExternalId.cs b/MediaBrowser.Providers/Tmdb/BoxSets/TmdbBoxSetExternalId.cs
index a83cde93c..6e131029c 100644
--- a/MediaBrowser.Providers/Tmdb/BoxSets/TmdbBoxSetExternalId.cs
+++ b/MediaBrowser.Providers/Tmdb/BoxSets/TmdbBoxSetExternalId.cs
@@ -2,6 +2,7 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Providers;
 
 namespace MediaBrowser.Providers.Tmdb.BoxSets
 {
diff --git a/MediaBrowser.Providers/Tmdb/Movies/TmdbMovieExternalId.cs b/MediaBrowser.Providers/Tmdb/Movies/TmdbMovieExternalId.cs
index f9ea00067..cffd33542 100644
--- a/MediaBrowser.Providers/Tmdb/Movies/TmdbMovieExternalId.cs
+++ b/MediaBrowser.Providers/Tmdb/Movies/TmdbMovieExternalId.cs
@@ -3,6 +3,7 @@ using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Providers;
 
 namespace MediaBrowser.Providers.Tmdb.Movies
 {
diff --git a/MediaBrowser.Providers/Tmdb/People/TmdbPersonExternalId.cs b/MediaBrowser.Providers/Tmdb/People/TmdbPersonExternalId.cs
index 854fd4156..460740254 100644
--- a/MediaBrowser.Providers/Tmdb/People/TmdbPersonExternalId.cs
+++ b/MediaBrowser.Providers/Tmdb/People/TmdbPersonExternalId.cs
@@ -1,6 +1,7 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Providers;
 
 namespace MediaBrowser.Providers.Tmdb.People
 {
diff --git a/MediaBrowser.Providers/Tmdb/TV/TmdbSeriesExternalId.cs b/MediaBrowser.Providers/Tmdb/TV/TmdbSeriesExternalId.cs
index 770448c7f..8adcc4d46 100644
--- a/MediaBrowser.Providers/Tmdb/TV/TmdbSeriesExternalId.cs
+++ b/MediaBrowser.Providers/Tmdb/TV/TmdbSeriesExternalId.cs
@@ -1,6 +1,7 @@
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Providers;
 
 namespace MediaBrowser.Providers.Tmdb.TV
 {

From 67edf1b7f5f423ab5fa53644bacdba6974b430db Mon Sep 17 00:00:00 2001
From: Mark Monteiro <marknr.monteiro@protonmail.com>
Date: Sun, 17 May 2020 15:59:13 -0400
Subject: [PATCH 06/12] Do not convert 'Type' value to string unnecessarily,
 and do not replace 'General' type with null

---
 MediaBrowser.Controller/Providers/IExternalId.cs  | 3 +++
 MediaBrowser.Model/Providers/ExternalIdInfo.cs    | 9 +++++----
 MediaBrowser.Providers/Manager/ProviderManager.cs | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/MediaBrowser.Controller/Providers/IExternalId.cs b/MediaBrowser.Controller/Providers/IExternalId.cs
index 0fcf0c09d..149c58847 100644
--- a/MediaBrowser.Controller/Providers/IExternalId.cs
+++ b/MediaBrowser.Controller/Providers/IExternalId.cs
@@ -20,6 +20,9 @@ namespace MediaBrowser.Controller.Providers
         /// <summary>
         /// Gets the specific media type for this id.
         /// </summary>
+        /// <remarks>
+        /// This can be used along with the <see cref="Name"/> to localize the external id on the client.
+        /// </remarks>
         ExternalIdMediaType Type { get; }
 
         /// <summary>
diff --git a/MediaBrowser.Model/Providers/ExternalIdInfo.cs b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
index ca0c857c4..493c6136e 100644
--- a/MediaBrowser.Model/Providers/ExternalIdInfo.cs
+++ b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
@@ -16,11 +16,12 @@ namespace MediaBrowser.Model.Providers
         public string Key { get; set; }
 
         /// <summary>
-        /// Gets or sets the media type (Album, Artist, etc).
-        /// This can be null if there is no specific type.
-        /// This string is also used to localize the media type on the client.
+        /// Gets or sets the specific media type for this id.
         /// </summary>
-        public string Type { get; set; }
+        /// <remarks>
+        /// This can be used along with the <see cref="Name"/> to localize the external id on the client.
+        /// </remarks>
+        public ExternalIdMediaType Type { get; set; }
 
         /// <summary>
         /// Gets or sets the URL format string.
diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs
index 49083c01b..4ab758123 100644
--- a/MediaBrowser.Providers/Manager/ProviderManager.cs
+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs
@@ -908,7 +908,7 @@ namespace MediaBrowser.Providers.Manager
                 {
                     Name = i.Name,
                     Key = i.Key,
-                    Type = i.Type == ExternalIdMediaType.General ? null : i.Type.ToString(),
+                    Type = i.Type,
                     UrlFormatString = i.UrlFormatString
                 });
         }

From c82f7eeca14839cd21e1904f79007c0d24c85f8f Mon Sep 17 00:00:00 2001
From: Mark Monteiro <marknr.monteiro@protonmail.com>
Date: Sun, 17 May 2020 16:24:28 -0400
Subject: [PATCH 07/12] Clean up some doc comments

---
 MediaBrowser.Controller/Providers/IExternalId.cs    | 9 ++++++---
 MediaBrowser.Model/Providers/ExternalIdInfo.cs      | 4 +++-
 MediaBrowser.Model/Providers/ExternalIdMediaType.cs | 8 ++++----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/MediaBrowser.Controller/Providers/IExternalId.cs b/MediaBrowser.Controller/Providers/IExternalId.cs
index 149c58847..ae87aab9e 100644
--- a/MediaBrowser.Controller/Providers/IExternalId.cs
+++ b/MediaBrowser.Controller/Providers/IExternalId.cs
@@ -3,7 +3,9 @@ using MediaBrowser.Model.Providers;
 
 namespace MediaBrowser.Controller.Providers
 {
-    /// <summary>Represents and identifier for an external provider.</summary>
+    /// <summary>
+    /// Represents an identifier for an external provider.
+    /// </summary>
     public interface IExternalId
     {
         /// <summary>
@@ -14,11 +16,12 @@ namespace MediaBrowser.Controller.Providers
         /// <summary>
         /// Gets the unique key to distinguish this provider/type pair. This should be unique across providers.
         /// </summary>
-        // TODO: This property is not actually unique at the moment. It should be updated to be unique.
+        // TODO: This property is not actually unique across the concrete types at the moment. It should be updated to be unique.
         string Key { get; }
 
         /// <summary>
-        /// Gets the specific media type for this id.
+        /// Gets the specific media type for this id. This is used to distinguish between the different
+        /// external id types for providers with multiple ids.
         /// </summary>
         /// <remarks>
         /// This can be used along with the <see cref="Name"/> to localize the external id on the client.
diff --git a/MediaBrowser.Model/Providers/ExternalIdInfo.cs b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
index 493c6136e..92a639546 100644
--- a/MediaBrowser.Model/Providers/ExternalIdInfo.cs
+++ b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
@@ -13,10 +13,12 @@ namespace MediaBrowser.Model.Providers
         /// <summary>
         /// Gets or sets the unique key for this id. This key should be unique across all providers.
         /// </summary>
+        // TODO: This property is not actually unique across the concrete types at the moment. It should be updated to be unique.
         public string Key { get; set; }
 
         /// <summary>
-        /// Gets or sets the specific media type for this id.
+        /// Gets or sets the specific media type for this id. This is used to distinguish between the different
+        /// external id types for providers with multiple ids.
         /// </summary>
         /// <remarks>
         /// This can be used along with the <see cref="Name"/> to localize the external id on the client.
diff --git a/MediaBrowser.Model/Providers/ExternalIdMediaType.cs b/MediaBrowser.Model/Providers/ExternalIdMediaType.cs
index 8c5356c92..881cd77fc 100644
--- a/MediaBrowser.Model/Providers/ExternalIdMediaType.cs
+++ b/MediaBrowser.Model/Providers/ExternalIdMediaType.cs
@@ -1,16 +1,16 @@
 namespace MediaBrowser.Model.Providers
 {
     /// <summary>
-    /// The specific media type of an <see cref="IExternalId"/>.
+    /// The specific media type of an <see cref="ExternalIdInfo"/>.
     /// </summary>
     /// <remarks>
-    /// This is used as a translation key for clients.
+    /// Client applications may use this as a translation key.
     /// </remarks>
     public enum ExternalIdMediaType
     {
         /// <summary>
-        /// There is no specific media type associated with the external id, or the external provider only has one
-        /// id type so there is no need to be specific.
+        /// There is no specific media type associated with the external id, or this is the default id for the external
+        /// provider so there is no need to specify a type.
         /// </summary>
         General,
 

From d06fee75b65def754ce58e8322a59bf8c942b82f Mon Sep 17 00:00:00 2001
From: Mark Monteiro <marknr.monteiro@protonmail.com>
Date: Sun, 17 May 2020 17:35:43 -0400
Subject: [PATCH 08/12] Rename Name to ProviderName

---
 MediaBrowser.Controller/Providers/IExternalId.cs     |  4 ++--
 MediaBrowser.Model/Providers/ExternalIdInfo.cs       |  1 +
 MediaBrowser.Providers/Manager/ProviderManager.cs    |  6 +++---
 MediaBrowser.Providers/Movies/MovieExternalIds.cs    |  4 ++--
 MediaBrowser.Providers/Music/MusicExternalIds.cs     |  2 +-
 .../Plugins/AudioDb/ExternalIds.cs                   |  8 ++++----
 .../Plugins/MusicBrainz/ExternalIds.cs               | 12 ++++++------
 MediaBrowser.Providers/TV/TvExternalIds.cs           |  8 ++++----
 .../Tmdb/BoxSets/TmdbBoxSetExternalId.cs             |  2 +-
 .../Tmdb/Movies/TmdbMovieExternalId.cs               |  2 +-
 .../Tmdb/People/TmdbPersonExternalId.cs              |  2 +-
 .../Tmdb/TV/TmdbSeriesExternalId.cs                  |  2 +-
 12 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/MediaBrowser.Controller/Providers/IExternalId.cs b/MediaBrowser.Controller/Providers/IExternalId.cs
index ae87aab9e..96d1e4622 100644
--- a/MediaBrowser.Controller/Providers/IExternalId.cs
+++ b/MediaBrowser.Controller/Providers/IExternalId.cs
@@ -11,7 +11,7 @@ namespace MediaBrowser.Controller.Providers
         /// <summary>
         /// Gets the display name of the provider associated with this ID type.
         /// </summary>
-        string Name { get; }
+        string ProviderName { get; }
 
         /// <summary>
         /// Gets the unique key to distinguish this provider/type pair. This should be unique across providers.
@@ -24,7 +24,7 @@ namespace MediaBrowser.Controller.Providers
         /// external id types for providers with multiple ids.
         /// </summary>
         /// <remarks>
-        /// This can be used along with the <see cref="Name"/> to localize the external id on the client.
+        /// This can be used along with the <see cref="ProviderName"/> to localize the external id on the client.
         /// </remarks>
         ExternalIdMediaType Type { get; }
 
diff --git a/MediaBrowser.Model/Providers/ExternalIdInfo.cs b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
index 92a639546..445c86d73 100644
--- a/MediaBrowser.Model/Providers/ExternalIdInfo.cs
+++ b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
@@ -8,6 +8,7 @@ namespace MediaBrowser.Model.Providers
         /// <summary>
         /// Gets or sets the display name of the external id provider (IE: IMDB, MusicBrainz, etc).
         /// </summary>
+        // TODO: This should be renamed to ProviderName
         public string Name { get; set; }
 
         /// <summary>
diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs
index 4ab758123..95133a9a7 100644
--- a/MediaBrowser.Providers/Manager/ProviderManager.cs
+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs
@@ -96,7 +96,7 @@ namespace MediaBrowser.Providers.Manager
 
             _metadataServices = metadataServices.OrderBy(i => i.Order).ToArray();
             _metadataProviders = metadataProviders.ToArray();
-            _externalIds = externalIds.OrderBy(i => i.Name).ToArray();
+            _externalIds = externalIds.OrderBy(i => i.ProviderName).ToArray();
 
             _savers = metadataSavers.Where(i =>
             {
@@ -891,7 +891,7 @@ namespace MediaBrowser.Providers.Manager
 
                 return new ExternalUrl
                 {
-                    Name = i.Name,
+                    Name = i.ProviderName,
                     Url = string.Format(
                         CultureInfo.InvariantCulture,
                         i.UrlFormatString,
@@ -906,7 +906,7 @@ namespace MediaBrowser.Providers.Manager
             return GetExternalIds(item)
                 .Select(i => new ExternalIdInfo
                 {
-                    Name = i.Name,
+                    Name = i.ProviderName,
                     Key = i.Key,
                     Type = i.Type,
                     UrlFormatString = i.UrlFormatString
diff --git a/MediaBrowser.Providers/Movies/MovieExternalIds.cs b/MediaBrowser.Providers/Movies/MovieExternalIds.cs
index a82394a93..2b0c0d1c2 100644
--- a/MediaBrowser.Providers/Movies/MovieExternalIds.cs
+++ b/MediaBrowser.Providers/Movies/MovieExternalIds.cs
@@ -11,7 +11,7 @@ namespace MediaBrowser.Providers.Movies
     public class ImdbExternalId : IExternalId
     {
         /// <inheritdoc />
-        public string Name => "IMDb";
+        public string ProviderName => "IMDb";
 
         /// <inheritdoc />
         public string Key => MetadataProviders.Imdb.ToString();
@@ -38,7 +38,7 @@ namespace MediaBrowser.Providers.Movies
     public class ImdbPersonExternalId : IExternalId
     {
         /// <inheritdoc />
-        public string Name => "IMDb";
+        public string ProviderName => "IMDb";
 
         /// <inheritdoc />
         public string Key => MetadataProviders.Imdb.ToString();
diff --git a/MediaBrowser.Providers/Music/MusicExternalIds.cs b/MediaBrowser.Providers/Music/MusicExternalIds.cs
index 12323bcbd..4490d0f05 100644
--- a/MediaBrowser.Providers/Music/MusicExternalIds.cs
+++ b/MediaBrowser.Providers/Music/MusicExternalIds.cs
@@ -8,7 +8,7 @@ namespace MediaBrowser.Providers.Music
     public class ImvdbId : IExternalId
     {
         /// <inheritdoc />
-        public string Name => "IMVDb";
+        public string ProviderName => "IMVDb";
 
         /// <inheritdoc />
         public string Key => "IMVDb";
diff --git a/MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs b/MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs
index 126a79a08..e299eb3ee 100644
--- a/MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs
+++ b/MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs
@@ -8,7 +8,7 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
     public class AudioDbAlbumExternalId : IExternalId
     {
         /// <inheritdoc />
-        public string Name => "TheAudioDb";
+        public string ProviderName => "TheAudioDb";
 
         /// <inheritdoc />
         public string Key => MetadataProviders.AudioDbAlbum.ToString();
@@ -26,7 +26,7 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
     public class AudioDbOtherAlbumExternalId : IExternalId
     {
         /// <inheritdoc />
-        public string Name => "TheAudioDb";
+        public string ProviderName => "TheAudioDb";
 
         /// <inheritdoc />
         public string Key => MetadataProviders.AudioDbAlbum.ToString();
@@ -44,7 +44,7 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
     public class AudioDbArtistExternalId : IExternalId
     {
         /// <inheritdoc />
-        public string Name => "TheAudioDb";
+        public string ProviderName => "TheAudioDb";
 
         /// <inheritdoc />
         public string Key => MetadataProviders.AudioDbArtist.ToString();
@@ -62,7 +62,7 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
     public class AudioDbOtherArtistExternalId : IExternalId
     {
         /// <inheritdoc />
-        public string Name => "TheAudioDb";
+        public string ProviderName => "TheAudioDb";
 
         /// <inheritdoc />
         public string Key => MetadataProviders.AudioDbArtist.ToString();
diff --git a/MediaBrowser.Providers/Plugins/MusicBrainz/ExternalIds.cs b/MediaBrowser.Providers/Plugins/MusicBrainz/ExternalIds.cs
index 5756cb838..247e87fd5 100644
--- a/MediaBrowser.Providers/Plugins/MusicBrainz/ExternalIds.cs
+++ b/MediaBrowser.Providers/Plugins/MusicBrainz/ExternalIds.cs
@@ -9,7 +9,7 @@ namespace MediaBrowser.Providers.Music
     public class MusicBrainzReleaseGroupExternalId : IExternalId
     {
         /// <inheritdoc />
-        public string Name => "MusicBrainz";
+        public string ProviderName => "MusicBrainz";
 
         /// <inheritdoc />
         public string Key => MetadataProviders.MusicBrainzReleaseGroup.ToString();
@@ -27,7 +27,7 @@ namespace MediaBrowser.Providers.Music
     public class MusicBrainzAlbumArtistExternalId : IExternalId
     {
         /// <inheritdoc />
-        public string Name => "MusicBrainz";
+        public string ProviderName => "MusicBrainz";
 
         /// <inheritdoc />
         public string Key => MetadataProviders.MusicBrainzAlbumArtist.ToString();
@@ -45,7 +45,7 @@ namespace MediaBrowser.Providers.Music
     public class MusicBrainzAlbumExternalId : IExternalId
     {
         /// <inheritdoc />
-        public string Name => "MusicBrainz";
+        public string ProviderName => "MusicBrainz";
 
         /// <inheritdoc />
         public string Key => MetadataProviders.MusicBrainzAlbum.ToString();
@@ -63,7 +63,7 @@ namespace MediaBrowser.Providers.Music
     public class MusicBrainzArtistExternalId : IExternalId
     {
         /// <inheritdoc />
-        public string Name => "MusicBrainz";
+        public string ProviderName => "MusicBrainz";
 
         /// <inheritdoc />
         public string Key => MetadataProviders.MusicBrainzArtist.ToString();
@@ -81,7 +81,7 @@ namespace MediaBrowser.Providers.Music
     public class MusicBrainzOtherArtistExternalId : IExternalId
     {
         /// <inheritdoc />
-        public string Name => "MusicBrainz";
+        public string ProviderName => "MusicBrainz";
 
         /// <inheritdoc />
 
@@ -100,7 +100,7 @@ namespace MediaBrowser.Providers.Music
     public class MusicBrainzTrackId : IExternalId
     {
         /// <inheritdoc />
-        public string Name => "MusicBrainz";
+        public string ProviderName => "MusicBrainz";
 
         /// <inheritdoc />
         public string Key => MetadataProviders.MusicBrainzTrack.ToString();
diff --git a/MediaBrowser.Providers/TV/TvExternalIds.cs b/MediaBrowser.Providers/TV/TvExternalIds.cs
index 4c005666f..12ad3d8a2 100644
--- a/MediaBrowser.Providers/TV/TvExternalIds.cs
+++ b/MediaBrowser.Providers/TV/TvExternalIds.cs
@@ -9,7 +9,7 @@ namespace MediaBrowser.Providers.TV
     public class Zap2ItExternalId : IExternalId
     {
         /// <inheritdoc />
-        public string Name => "Zap2It";
+        public string ProviderName => "Zap2It";
 
         /// <inheritdoc />
         public string Key => MetadataProviders.Zap2It.ToString();
@@ -27,7 +27,7 @@ namespace MediaBrowser.Providers.TV
     public class TvdbExternalId : IExternalId
     {
         /// <inheritdoc />
-        public string Name => "TheTVDB";
+        public string ProviderName => "TheTVDB";
 
         /// <inheritdoc />
         public string Key => MetadataProviders.Tvdb.ToString();
@@ -46,7 +46,7 @@ namespace MediaBrowser.Providers.TV
     public class TvdbSeasonExternalId : IExternalId
     {
         /// <inheritdoc />
-        public string Name => "TheTVDB";
+        public string ProviderName => "TheTVDB";
 
         /// <inheritdoc />
         public string Key => MetadataProviders.Tvdb.ToString();
@@ -64,7 +64,7 @@ namespace MediaBrowser.Providers.TV
     public class TvdbEpisodeExternalId : IExternalId
     {
         /// <inheritdoc />
-        public string Name => "TheTVDB";
+        public string ProviderName => "TheTVDB";
 
         /// <inheritdoc />
         public string Key => MetadataProviders.Tvdb.ToString();
diff --git a/MediaBrowser.Providers/Tmdb/BoxSets/TmdbBoxSetExternalId.cs b/MediaBrowser.Providers/Tmdb/BoxSets/TmdbBoxSetExternalId.cs
index 6e131029c..1d3c80536 100644
--- a/MediaBrowser.Providers/Tmdb/BoxSets/TmdbBoxSetExternalId.cs
+++ b/MediaBrowser.Providers/Tmdb/BoxSets/TmdbBoxSetExternalId.cs
@@ -9,7 +9,7 @@ namespace MediaBrowser.Providers.Tmdb.BoxSets
     public class TmdbBoxSetExternalId : IExternalId
     {
         /// <inheritdoc />
-        public string Name => TmdbUtils.ProviderName;
+        public string ProviderName => TmdbUtils.ProviderName;
 
         /// <inheritdoc />
         public string Key => MetadataProviders.TmdbCollection.ToString();
diff --git a/MediaBrowser.Providers/Tmdb/Movies/TmdbMovieExternalId.cs b/MediaBrowser.Providers/Tmdb/Movies/TmdbMovieExternalId.cs
index cffd33542..75e71dda4 100644
--- a/MediaBrowser.Providers/Tmdb/Movies/TmdbMovieExternalId.cs
+++ b/MediaBrowser.Providers/Tmdb/Movies/TmdbMovieExternalId.cs
@@ -10,7 +10,7 @@ namespace MediaBrowser.Providers.Tmdb.Movies
     public class TmdbMovieExternalId : IExternalId
     {
         /// <inheritdoc />
-        public string Name => TmdbUtils.ProviderName;
+        public string ProviderName => TmdbUtils.ProviderName;
 
         /// <inheritdoc />
         public string Key => MetadataProviders.Tmdb.ToString();
diff --git a/MediaBrowser.Providers/Tmdb/People/TmdbPersonExternalId.cs b/MediaBrowser.Providers/Tmdb/People/TmdbPersonExternalId.cs
index 460740254..a8685d669 100644
--- a/MediaBrowser.Providers/Tmdb/People/TmdbPersonExternalId.cs
+++ b/MediaBrowser.Providers/Tmdb/People/TmdbPersonExternalId.cs
@@ -8,7 +8,7 @@ namespace MediaBrowser.Providers.Tmdb.People
     public class TmdbPersonExternalId : IExternalId
     {
         /// <inheritdoc />
-        public string Name => TmdbUtils.ProviderName;
+        public string ProviderName => TmdbUtils.ProviderName;
 
         /// <inheritdoc />
         public string Key => MetadataProviders.Tmdb.ToString();
diff --git a/MediaBrowser.Providers/Tmdb/TV/TmdbSeriesExternalId.cs b/MediaBrowser.Providers/Tmdb/TV/TmdbSeriesExternalId.cs
index 8adcc4d46..fd6dd9b41 100644
--- a/MediaBrowser.Providers/Tmdb/TV/TmdbSeriesExternalId.cs
+++ b/MediaBrowser.Providers/Tmdb/TV/TmdbSeriesExternalId.cs
@@ -8,7 +8,7 @@ namespace MediaBrowser.Providers.Tmdb.TV
     public class TmdbSeriesExternalId : IExternalId
     {
         /// <inheritdoc />
-        public string Name => TmdbUtils.ProviderName;
+        public string ProviderName => TmdbUtils.ProviderName;
 
         /// <inheritdoc />
         public string Key => MetadataProviders.Tmdb.ToString();

From 07897ec7af468f5e71fd901a8dad05911e19daf5 Mon Sep 17 00:00:00 2001
From: Mark Monteiro <marknr.monteiro@protonmail.com>
Date: Sat, 23 May 2020 15:49:02 -0400
Subject: [PATCH 09/12] Specify enum values for ExternalIdMediaType explicitly

---
 .../Providers/ExternalIdMediaType.cs          | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/MediaBrowser.Model/Providers/ExternalIdMediaType.cs b/MediaBrowser.Model/Providers/ExternalIdMediaType.cs
index 881cd77fc..56f55d15c 100644
--- a/MediaBrowser.Model/Providers/ExternalIdMediaType.cs
+++ b/MediaBrowser.Model/Providers/ExternalIdMediaType.cs
@@ -12,66 +12,66 @@ namespace MediaBrowser.Model.Providers
         /// There is no specific media type associated with the external id, or this is the default id for the external
         /// provider so there is no need to specify a type.
         /// </summary>
-        General,
+        General = 0,
 
         /// <summary>
         /// A music album.
         /// </summary>
-        Album,
+        Album = 1,
 
         /// <summary>
         /// The artist of a music album.
         /// </summary>
-        AlbumArtist,
+        AlbumArtist = 2,
 
         /// <summary>
         /// The artist of a media item.
         /// </summary>
-        Artist,
+        Artist = 3,
 
         /// <summary>
         /// A boxed set of media.
         /// </summary>
-        BoxSet,
+        BoxSet = 4,
 
         /// <summary>
         /// A series episode.
         /// </summary>
-        Episode,
+        Episode = 5,
 
         /// <summary>
         /// A movie.
         /// </summary>
-        Movie,
+        Movie = 6,
 
         /// <summary>
         /// An alternative artist apart from the main artist.
         /// </summary>
-        OtherArtist,
+        OtherArtist = 7,
 
         /// <summary>
         /// A person.
         /// </summary>
-        Person,
+        Person = 8,
 
         /// <summary>
         /// A release group.
         /// </summary>
-        ReleaseGroup,
+        ReleaseGroup = 9,
 
         /// <summary>
         /// A single season of a series.
         /// </summary>
-        Season,
+        Season = 10,
 
         /// <summary>
         /// A series.
         /// </summary>
-        Series,
+        Series = 11,
 
         /// <summary>
         /// A music track.
         /// </summary>
-        Track
+        Track = 12
     }
 }

From 4f6e5591ece8d9344385d13f923384abfc07b709 Mon Sep 17 00:00:00 2001
From: Mark Monteiro <marknr.monteiro@protonmail.com>
Date: Sat, 23 May 2020 16:08:51 -0400
Subject: [PATCH 10/12] Remove 'General' as an ExternalIdMediaType, and instead
 use 'null' to represent a general external id type

---
 MediaBrowser.Controller/Providers/IExternalId.cs     |  4 +++-
 MediaBrowser.Model/Providers/ExternalIdInfo.cs       |  4 +++-
 MediaBrowser.Model/Providers/ExternalIdMediaType.cs  |  6 ------
 MediaBrowser.Providers/Movies/MovieExternalIds.cs    |  4 ++--
 MediaBrowser.Providers/Music/MusicExternalIds.cs     |  2 +-
 .../Plugins/AudioDb/ExternalIds.cs                   |  8 ++++----
 .../Plugins/MusicBrainz/ExternalIds.cs               | 12 ++++++------
 MediaBrowser.Providers/TV/TvExternalIds.cs           |  8 ++++----
 .../Tmdb/BoxSets/TmdbBoxSetExternalId.cs             |  2 +-
 .../Tmdb/Movies/TmdbMovieExternalId.cs               |  2 +-
 .../Tmdb/People/TmdbPersonExternalId.cs              |  2 +-
 .../Tmdb/TV/TmdbSeriesExternalId.cs                  |  2 +-
 12 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/MediaBrowser.Controller/Providers/IExternalId.cs b/MediaBrowser.Controller/Providers/IExternalId.cs
index 96d1e4622..5e38446bc 100644
--- a/MediaBrowser.Controller/Providers/IExternalId.cs
+++ b/MediaBrowser.Controller/Providers/IExternalId.cs
@@ -22,11 +22,13 @@ namespace MediaBrowser.Controller.Providers
         /// <summary>
         /// Gets the specific media type for this id. This is used to distinguish between the different
         /// external id types for providers with multiple ids.
+        /// A null value indicates there is no specific media type associated with the external id, or this is the
+        /// default id for the external provider so there is no need to specify a type.
         /// </summary>
         /// <remarks>
         /// This can be used along with the <see cref="ProviderName"/> to localize the external id on the client.
         /// </remarks>
-        ExternalIdMediaType Type { get; }
+        ExternalIdMediaType? Type { get; }
 
         /// <summary>
         /// Gets the URL format string for this id.
diff --git a/MediaBrowser.Model/Providers/ExternalIdInfo.cs b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
index 445c86d73..7687e676f 100644
--- a/MediaBrowser.Model/Providers/ExternalIdInfo.cs
+++ b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
@@ -20,11 +20,13 @@ namespace MediaBrowser.Model.Providers
         /// <summary>
         /// Gets or sets the specific media type for this id. This is used to distinguish between the different
         /// external id types for providers with multiple ids.
+        /// A null value indicates there is no specific media type associated with the external id, or this is the
+        /// default id for the external provider so there is no need to specify a type.
         /// </summary>
         /// <remarks>
         /// This can be used along with the <see cref="Name"/> to localize the external id on the client.
         /// </remarks>
-        public ExternalIdMediaType Type { get; set; }
+        public ExternalIdMediaType? Type { get; set; }
 
         /// <summary>
         /// Gets or sets the URL format string.
diff --git a/MediaBrowser.Model/Providers/ExternalIdMediaType.cs b/MediaBrowser.Model/Providers/ExternalIdMediaType.cs
index 56f55d15c..5303c8f58 100644
--- a/MediaBrowser.Model/Providers/ExternalIdMediaType.cs
+++ b/MediaBrowser.Model/Providers/ExternalIdMediaType.cs
@@ -8,12 +8,6 @@ namespace MediaBrowser.Model.Providers
     /// </remarks>
     public enum ExternalIdMediaType
     {
-        /// <summary>
-        /// There is no specific media type associated with the external id, or this is the default id for the external
-        /// provider so there is no need to specify a type.
-        /// </summary>
-        General = 0,
-
         /// <summary>
         /// A music album.
         /// </summary>
diff --git a/MediaBrowser.Providers/Movies/MovieExternalIds.cs b/MediaBrowser.Providers/Movies/MovieExternalIds.cs
index 2b0c0d1c2..b43ae63ab 100644
--- a/MediaBrowser.Providers/Movies/MovieExternalIds.cs
+++ b/MediaBrowser.Providers/Movies/MovieExternalIds.cs
@@ -17,7 +17,7 @@ namespace MediaBrowser.Providers.Movies
         public string Key => MetadataProviders.Imdb.ToString();
 
         /// <inheritdoc />
-        public ExternalIdMediaType Type => ExternalIdMediaType.General;
+        public ExternalIdMediaType? Type => null;
 
         /// <inheritdoc />
         public string UrlFormatString => "https://www.imdb.com/title/{0}";
@@ -44,7 +44,7 @@ namespace MediaBrowser.Providers.Movies
         public string Key => MetadataProviders.Imdb.ToString();
 
         /// <inheritdoc />
-        public ExternalIdMediaType Type => ExternalIdMediaType.Person;
+        public ExternalIdMediaType? Type => ExternalIdMediaType.Person;
 
         /// <inheritdoc />
         public string UrlFormatString => "https://www.imdb.com/name/{0}";
diff --git a/MediaBrowser.Providers/Music/MusicExternalIds.cs b/MediaBrowser.Providers/Music/MusicExternalIds.cs
index 4490d0f05..42694fdee 100644
--- a/MediaBrowser.Providers/Music/MusicExternalIds.cs
+++ b/MediaBrowser.Providers/Music/MusicExternalIds.cs
@@ -14,7 +14,7 @@ namespace MediaBrowser.Providers.Music
         public string Key => "IMVDb";
 
         /// <inheritdoc />
-        public ExternalIdMediaType Type => ExternalIdMediaType.General;
+        public ExternalIdMediaType? Type => null;
 
         /// <inheritdoc />
         public string UrlFormatString => null;
diff --git a/MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs b/MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs
index e299eb3ee..1dd5b21a9 100644
--- a/MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs
+++ b/MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs
@@ -14,7 +14,7 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
         public string Key => MetadataProviders.AudioDbAlbum.ToString();
 
         /// <inheritdoc />
-        public ExternalIdMediaType Type => ExternalIdMediaType.General;
+        public ExternalIdMediaType? Type => null;
 
         /// <inheritdoc />
         public string UrlFormatString => "https://www.theaudiodb.com/album/{0}";
@@ -32,7 +32,7 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
         public string Key => MetadataProviders.AudioDbAlbum.ToString();
 
         /// <inheritdoc />
-        public ExternalIdMediaType Type => ExternalIdMediaType.Album;
+        public ExternalIdMediaType? Type => ExternalIdMediaType.Album;
 
         /// <inheritdoc />
         public string UrlFormatString => "https://www.theaudiodb.com/album/{0}";
@@ -50,7 +50,7 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
         public string Key => MetadataProviders.AudioDbArtist.ToString();
 
         /// <inheritdoc />
-        public ExternalIdMediaType Type => ExternalIdMediaType.Artist;
+        public ExternalIdMediaType? Type => ExternalIdMediaType.Artist;
 
         /// <inheritdoc />
         public string UrlFormatString => "https://www.theaudiodb.com/artist/{0}";
@@ -68,7 +68,7 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
         public string Key => MetadataProviders.AudioDbArtist.ToString();
 
         /// <inheritdoc />
-        public ExternalIdMediaType Type => ExternalIdMediaType.OtherArtist;
+        public ExternalIdMediaType? Type => ExternalIdMediaType.OtherArtist;
 
         /// <inheritdoc />
         public string UrlFormatString => "https://www.theaudiodb.com/artist/{0}";
diff --git a/MediaBrowser.Providers/Plugins/MusicBrainz/ExternalIds.cs b/MediaBrowser.Providers/Plugins/MusicBrainz/ExternalIds.cs
index 247e87fd5..969bdd01d 100644
--- a/MediaBrowser.Providers/Plugins/MusicBrainz/ExternalIds.cs
+++ b/MediaBrowser.Providers/Plugins/MusicBrainz/ExternalIds.cs
@@ -15,7 +15,7 @@ namespace MediaBrowser.Providers.Music
         public string Key => MetadataProviders.MusicBrainzReleaseGroup.ToString();
 
         /// <inheritdoc />
-        public ExternalIdMediaType Type => ExternalIdMediaType.ReleaseGroup;
+        public ExternalIdMediaType? Type => ExternalIdMediaType.ReleaseGroup;
 
         /// <inheritdoc />
         public string UrlFormatString => Plugin.Instance.Configuration.Server + "/release-group/{0}";
@@ -33,7 +33,7 @@ namespace MediaBrowser.Providers.Music
         public string Key => MetadataProviders.MusicBrainzAlbumArtist.ToString();
 
         /// <inheritdoc />
-        public ExternalIdMediaType Type => ExternalIdMediaType.AlbumArtist;
+        public ExternalIdMediaType? Type => ExternalIdMediaType.AlbumArtist;
 
         /// <inheritdoc />
         public string UrlFormatString => Plugin.Instance.Configuration.Server + "/artist/{0}";
@@ -51,7 +51,7 @@ namespace MediaBrowser.Providers.Music
         public string Key => MetadataProviders.MusicBrainzAlbum.ToString();
 
         /// <inheritdoc />
-        public ExternalIdMediaType Type => ExternalIdMediaType.Album;
+        public ExternalIdMediaType? Type => ExternalIdMediaType.Album;
 
         /// <inheritdoc />
         public string UrlFormatString => Plugin.Instance.Configuration.Server + "/release/{0}";
@@ -69,7 +69,7 @@ namespace MediaBrowser.Providers.Music
         public string Key => MetadataProviders.MusicBrainzArtist.ToString();
 
         /// <inheritdoc />
-        public ExternalIdMediaType Type => ExternalIdMediaType.Artist;
+        public ExternalIdMediaType? Type => ExternalIdMediaType.Artist;
 
         /// <inheritdoc />
         public string UrlFormatString => Plugin.Instance.Configuration.Server + "/artist/{0}";
@@ -88,7 +88,7 @@ namespace MediaBrowser.Providers.Music
         public string Key => MetadataProviders.MusicBrainzArtist.ToString();
 
         /// <inheritdoc />
-        public ExternalIdMediaType Type => ExternalIdMediaType.OtherArtist;
+        public ExternalIdMediaType? Type => ExternalIdMediaType.OtherArtist;
 
         /// <inheritdoc />
         public string UrlFormatString => Plugin.Instance.Configuration.Server + "/artist/{0}";
@@ -106,7 +106,7 @@ namespace MediaBrowser.Providers.Music
         public string Key => MetadataProviders.MusicBrainzTrack.ToString();
 
         /// <inheritdoc />
-        public ExternalIdMediaType Type => ExternalIdMediaType.Track;
+        public ExternalIdMediaType? Type => ExternalIdMediaType.Track;
 
         /// <inheritdoc />
         public string UrlFormatString => Plugin.Instance.Configuration.Server + "/track/{0}";
diff --git a/MediaBrowser.Providers/TV/TvExternalIds.cs b/MediaBrowser.Providers/TV/TvExternalIds.cs
index 12ad3d8a2..2bf6020dd 100644
--- a/MediaBrowser.Providers/TV/TvExternalIds.cs
+++ b/MediaBrowser.Providers/TV/TvExternalIds.cs
@@ -15,7 +15,7 @@ namespace MediaBrowser.Providers.TV
         public string Key => MetadataProviders.Zap2It.ToString();
 
         /// <inheritdoc />
-        public ExternalIdMediaType Type => ExternalIdMediaType.General;
+        public ExternalIdMediaType? Type => null;
 
         /// <inheritdoc />
         public string UrlFormatString => "http://tvlistings.zap2it.com/overview.html?programSeriesId={0}";
@@ -33,7 +33,7 @@ namespace MediaBrowser.Providers.TV
         public string Key => MetadataProviders.Tvdb.ToString();
 
         /// <inheritdoc />
-        public ExternalIdMediaType Type => ExternalIdMediaType.General;
+        public ExternalIdMediaType? Type => null;
 
         /// <inheritdoc />
         public string UrlFormatString => TvdbUtils.TvdbBaseUrl + "?tab=series&id={0}";
@@ -52,7 +52,7 @@ namespace MediaBrowser.Providers.TV
         public string Key => MetadataProviders.Tvdb.ToString();
 
         /// <inheritdoc />
-        public ExternalIdMediaType Type => ExternalIdMediaType.Season;
+        public ExternalIdMediaType? Type => ExternalIdMediaType.Season;
 
         /// <inheritdoc />
         public string UrlFormatString => null;
@@ -70,7 +70,7 @@ namespace MediaBrowser.Providers.TV
         public string Key => MetadataProviders.Tvdb.ToString();
 
         /// <inheritdoc />
-        public ExternalIdMediaType Type => ExternalIdMediaType.Episode;
+        public ExternalIdMediaType? Type => ExternalIdMediaType.Episode;
 
         /// <inheritdoc />
         public string UrlFormatString => TvdbUtils.TvdbBaseUrl + "?tab=episode&id={0}";
diff --git a/MediaBrowser.Providers/Tmdb/BoxSets/TmdbBoxSetExternalId.cs b/MediaBrowser.Providers/Tmdb/BoxSets/TmdbBoxSetExternalId.cs
index 1d3c80536..bfef1e038 100644
--- a/MediaBrowser.Providers/Tmdb/BoxSets/TmdbBoxSetExternalId.cs
+++ b/MediaBrowser.Providers/Tmdb/BoxSets/TmdbBoxSetExternalId.cs
@@ -15,7 +15,7 @@ namespace MediaBrowser.Providers.Tmdb.BoxSets
         public string Key => MetadataProviders.TmdbCollection.ToString();
 
         /// <inheritdoc />
-        public ExternalIdMediaType Type => ExternalIdMediaType.BoxSet;
+        public ExternalIdMediaType? Type => ExternalIdMediaType.BoxSet;
 
         /// <inheritdoc />
         public string UrlFormatString => TmdbUtils.BaseTmdbUrl + "collection/{0}";
diff --git a/MediaBrowser.Providers/Tmdb/Movies/TmdbMovieExternalId.cs b/MediaBrowser.Providers/Tmdb/Movies/TmdbMovieExternalId.cs
index 75e71dda4..5b0cd7509 100644
--- a/MediaBrowser.Providers/Tmdb/Movies/TmdbMovieExternalId.cs
+++ b/MediaBrowser.Providers/Tmdb/Movies/TmdbMovieExternalId.cs
@@ -16,7 +16,7 @@ namespace MediaBrowser.Providers.Tmdb.Movies
         public string Key => MetadataProviders.Tmdb.ToString();
 
         /// <inheritdoc />
-        public ExternalIdMediaType Type => ExternalIdMediaType.Movie;
+        public ExternalIdMediaType? Type => ExternalIdMediaType.Movie;
 
         /// <inheritdoc />
         public string UrlFormatString => TmdbUtils.BaseTmdbUrl + "movie/{0}";
diff --git a/MediaBrowser.Providers/Tmdb/People/TmdbPersonExternalId.cs b/MediaBrowser.Providers/Tmdb/People/TmdbPersonExternalId.cs
index a8685d669..fa12a4581 100644
--- a/MediaBrowser.Providers/Tmdb/People/TmdbPersonExternalId.cs
+++ b/MediaBrowser.Providers/Tmdb/People/TmdbPersonExternalId.cs
@@ -14,7 +14,7 @@ namespace MediaBrowser.Providers.Tmdb.People
         public string Key => MetadataProviders.Tmdb.ToString();
 
         /// <inheritdoc />
-        public ExternalIdMediaType Type => ExternalIdMediaType.Person;
+        public ExternalIdMediaType? Type => ExternalIdMediaType.Person;
 
         /// <inheritdoc />
         public string UrlFormatString => TmdbUtils.BaseTmdbUrl + "person/{0}";
diff --git a/MediaBrowser.Providers/Tmdb/TV/TmdbSeriesExternalId.cs b/MediaBrowser.Providers/Tmdb/TV/TmdbSeriesExternalId.cs
index fd6dd9b41..8513dadd2 100644
--- a/MediaBrowser.Providers/Tmdb/TV/TmdbSeriesExternalId.cs
+++ b/MediaBrowser.Providers/Tmdb/TV/TmdbSeriesExternalId.cs
@@ -14,7 +14,7 @@ namespace MediaBrowser.Providers.Tmdb.TV
         public string Key => MetadataProviders.Tmdb.ToString();
 
         /// <inheritdoc />
-        public ExternalIdMediaType Type => ExternalIdMediaType.Series;
+        public ExternalIdMediaType? Type => ExternalIdMediaType.Series;
 
         /// <inheritdoc />
         public string UrlFormatString => TmdbUtils.BaseTmdbUrl + "tv/{0}";

From 5f1b1dc3cc01abcd52155144cb3d9a791ee655fa Mon Sep 17 00:00:00 2001
From: Cody Robibero <cody@robibe.ro>
Date: Fri, 26 Jun 2020 08:41:21 -0600
Subject: [PATCH 11/12] fix nullability

---
 MediaBrowser.Model/Providers/ExternalIdInfo.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/MediaBrowser.Model/Providers/ExternalIdInfo.cs b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
index 7687e676f..01784554f 100644
--- a/MediaBrowser.Model/Providers/ExternalIdInfo.cs
+++ b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
@@ -9,13 +9,13 @@ namespace MediaBrowser.Model.Providers
         /// Gets or sets the display name of the external id provider (IE: IMDB, MusicBrainz, etc).
         /// </summary>
         // TODO: This should be renamed to ProviderName
-        public string Name { get; set; }
+        public string? Name { get; set; }
 
         /// <summary>
         /// Gets or sets the unique key for this id. This key should be unique across all providers.
         /// </summary>
         // TODO: This property is not actually unique across the concrete types at the moment. It should be updated to be unique.
-        public string Key { get; set; }
+        public string? Key { get; set; }
 
         /// <summary>
         /// Gets or sets the specific media type for this id. This is used to distinguish between the different
@@ -31,6 +31,6 @@ namespace MediaBrowser.Model.Providers
         /// <summary>
         /// Gets or sets the URL format string.
         /// </summary>
-        public string UrlFormatString { get; set; }
+        public string? UrlFormatString { get; set; }
     }
 }

From ef49e2b21ccfbf8ffcaf524d4f5fa6949fd31b94 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Fri, 26 Jun 2020 13:20:49 -0600
Subject: [PATCH 12/12] Fix nullable string usage.

---
 MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs b/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs
index e11ceb826..4ac249840 100644
--- a/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs
+++ b/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs
@@ -81,7 +81,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
                 var id = info.Key + "Id";
                 if (!_validProviderIds.ContainsKey(id))
                 {
-                    _validProviderIds.Add(id, info.Key);
+                    _validProviderIds.Add(id, info.Key!);
                 }
             }