cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-15 09:59:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove 'General' as an ExternalIdMediaType, and instead use 'null' to represent a general external id type

Browse Source
This commit is contained in:
Mark Monteiro 2020-05-23 16:08:51 -04:00
parent 07897ec7af
commit 4f6e5591ec
12 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Controller/Providers/IExternalId.cs
View File

@ -22,11 +22,13 @@ namespace MediaBrowser.Controller.Providers
/// <summary> /// <summary>
/// Gets the specific media type for this id. This is used to distinguish between the different /// Gets the specific media type for this id. This is used to distinguish between the different
/// external id types for providers with multiple ids. /// 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> /// </summary>
/// <remarks> /// <remarks>
/// This can be used along with the <see cref="ProviderName"/> 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> /// </remarks>
ExternalIdMediaType Type { get; } ExternalIdMediaType? Type { get; }
/// <summary> /// <summary>
/// Gets the URL format string for this id. /// Gets the URL format string for this id.

4
MediaBrowser.Model/Providers/ExternalIdInfo.cs
View File

@ -20,11 +20,13 @@ namespace MediaBrowser.Model.Providers
/// <summary> /// <summary>
/// Gets or sets the specific media type for this id. This is used to distinguish between the different /// 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. /// 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> /// </summary>
/// <remarks> /// <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="Name"/> to localize the external id on the client.
/// </remarks> /// </remarks>
public ExternalIdMediaType Type { get; set; } public ExternalIdMediaType? Type { get; set; }
/// <summary> /// <summary>
/// Gets or sets the URL format string. /// Gets or sets the URL format string.

6
MediaBrowser.Model/Providers/ExternalIdMediaType.cs
View File

@ -8,12 +8,6 @@ namespace MediaBrowser.Model.Providers
/// </remarks> /// </remarks>
public enum ExternalIdMediaType 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> /// <summary>
/// A music album. /// A music album.
/// </summary> /// </summary>

4
MediaBrowser.Providers/Movies/MovieExternalIds.cs
View File

@ -17,7 +17,7 @@ namespace MediaBrowser.Providers.Movies
public string Key => MetadataProviders.Imdb.ToString(); public string Key => MetadataProviders.Imdb.ToString();
/// <inheritdoc /> /// <inheritdoc />
public ExternalIdMediaType Type => ExternalIdMediaType.General; public ExternalIdMediaType? Type => null;
/// <inheritdoc /> /// <inheritdoc />
public string UrlFormatString => "https://www.imdb.com/title/{0}"; public string UrlFormatString => "https://www.imdb.com/title/{0}";
@ -44,7 +44,7 @@ namespace MediaBrowser.Providers.Movies
public string Key => MetadataProviders.Imdb.ToString(); public string Key => MetadataProviders.Imdb.ToString();
/// <inheritdoc /> /// <inheritdoc />
public ExternalIdMediaType Type => ExternalIdMediaType.Person; public ExternalIdMediaType? Type => ExternalIdMediaType.Person;
/// <inheritdoc /> /// <inheritdoc />
public string UrlFormatString => "https://www.imdb.com/name/{0}"; public string UrlFormatString => "https://www.imdb.com/name/{0}";

2
MediaBrowser.Providers/Music/MusicExternalIds.cs
View File

@ -14,7 +14,7 @@ namespace MediaBrowser.Providers.Music
public string Key => "IMVDb"; public string Key => "IMVDb";
/// <inheritdoc /> /// <inheritdoc />
public ExternalIdMediaType Type => ExternalIdMediaType.General; public ExternalIdMediaType? Type => null;
/// <inheritdoc /> /// <inheritdoc />
public string UrlFormatString => null; public string UrlFormatString => null;

8
MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs
View File

@ -14,7 +14,7 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
public string Key => MetadataProviders.AudioDbAlbum.ToString(); public string Key => MetadataProviders.AudioDbAlbum.ToString();
/// <inheritdoc /> /// <inheritdoc />
public ExternalIdMediaType Type => ExternalIdMediaType.General; public ExternalIdMediaType? Type => null;
/// <inheritdoc /> /// <inheritdoc />
public string UrlFormatString => "https://www.theaudiodb.com/album/{0}"; public string UrlFormatString => "https://www.theaudiodb.com/album/{0}";
@ -32,7 +32,7 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
public string Key => MetadataProviders.AudioDbAlbum.ToString(); public string Key => MetadataProviders.AudioDbAlbum.ToString();
/// <inheritdoc /> /// <inheritdoc />
public ExternalIdMediaType Type => ExternalIdMediaType.Album; public ExternalIdMediaType? Type => ExternalIdMediaType.Album;
/// <inheritdoc /> /// <inheritdoc />
public string UrlFormatString => "https://www.theaudiodb.com/album/{0}"; public string UrlFormatString => "https://www.theaudiodb.com/album/{0}";
@ -50,7 +50,7 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
public string Key => MetadataProviders.AudioDbArtist.ToString(); public string Key => MetadataProviders.AudioDbArtist.ToString();
/// <inheritdoc /> /// <inheritdoc />
public ExternalIdMediaType Type => ExternalIdMediaType.Artist; public ExternalIdMediaType? Type => ExternalIdMediaType.Artist;
/// <inheritdoc /> /// <inheritdoc />
public string UrlFormatString => "https://www.theaudiodb.com/artist/{0}"; public string UrlFormatString => "https://www.theaudiodb.com/artist/{0}";
@ -68,7 +68,7 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
public string Key => MetadataProviders.AudioDbArtist.ToString(); public string Key => MetadataProviders.AudioDbArtist.ToString();
/// <inheritdoc /> /// <inheritdoc />
public ExternalIdMediaType Type => ExternalIdMediaType.OtherArtist; public ExternalIdMediaType? Type => ExternalIdMediaType.OtherArtist;
/// <inheritdoc /> /// <inheritdoc />
public string UrlFormatString => "https://www.theaudiodb.com/artist/{0}"; public string UrlFormatString => "https://www.theaudiodb.com/artist/{0}";

12
MediaBrowser.Providers/Plugins/MusicBrainz/ExternalIds.cs
View File

@ -15,7 +15,7 @@ namespace MediaBrowser.Providers.Music
public string Key => MetadataProviders.MusicBrainzReleaseGroup.ToString(); public string Key => MetadataProviders.MusicBrainzReleaseGroup.ToString();
/// <inheritdoc /> /// <inheritdoc />
public ExternalIdMediaType Type => ExternalIdMediaType.ReleaseGroup; public ExternalIdMediaType? Type => ExternalIdMediaType.ReleaseGroup;
/// <inheritdoc /> /// <inheritdoc />
public string UrlFormatString => Plugin.Instance.Configuration.Server + "/release-group/{0}"; public string UrlFormatString => Plugin.Instance.Configuration.Server + "/release-group/{0}";
@ -33,7 +33,7 @@ namespace MediaBrowser.Providers.Music
public string Key => MetadataProviders.MusicBrainzAlbumArtist.ToString(); public string Key => MetadataProviders.MusicBrainzAlbumArtist.ToString();
/// <inheritdoc /> /// <inheritdoc />
public ExternalIdMediaType Type => ExternalIdMediaType.AlbumArtist; public ExternalIdMediaType? Type => ExternalIdMediaType.AlbumArtist;
/// <inheritdoc /> /// <inheritdoc />
public string UrlFormatString => Plugin.Instance.Configuration.Server + "/artist/{0}"; public string UrlFormatString => Plugin.Instance.Configuration.Server + "/artist/{0}";
@ -51,7 +51,7 @@ namespace MediaBrowser.Providers.Music
public string Key => MetadataProviders.MusicBrainzAlbum.ToString(); public string Key => MetadataProviders.MusicBrainzAlbum.ToString();
/// <inheritdoc /> /// <inheritdoc />
public ExternalIdMediaType Type => ExternalIdMediaType.Album; public ExternalIdMediaType? Type => ExternalIdMediaType.Album;
/// <inheritdoc /> /// <inheritdoc />
public string UrlFormatString => Plugin.Instance.Configuration.Server + "/release/{0}"; public string UrlFormatString => Plugin.Instance.Configuration.Server + "/release/{0}";
@ -69,7 +69,7 @@ namespace MediaBrowser.Providers.Music
public string Key => MetadataProviders.MusicBrainzArtist.ToString(); public string Key => MetadataProviders.MusicBrainzArtist.ToString();
/// <inheritdoc /> /// <inheritdoc />
public ExternalIdMediaType Type => ExternalIdMediaType.Artist; public ExternalIdMediaType? Type => ExternalIdMediaType.Artist;
/// <inheritdoc /> /// <inheritdoc />
public string UrlFormatString => Plugin.Instance.Configuration.Server + "/artist/{0}"; public string UrlFormatString => Plugin.Instance.Configuration.Server + "/artist/{0}";
@ -88,7 +88,7 @@ namespace MediaBrowser.Providers.Music
public string Key => MetadataProviders.MusicBrainzArtist.ToString(); public string Key => MetadataProviders.MusicBrainzArtist.ToString();
/// <inheritdoc /> /// <inheritdoc />
public ExternalIdMediaType Type => ExternalIdMediaType.OtherArtist; public ExternalIdMediaType? Type => ExternalIdMediaType.OtherArtist;
/// <inheritdoc /> /// <inheritdoc />
public string UrlFormatString => Plugin.Instance.Configuration.Server + "/artist/{0}"; public string UrlFormatString => Plugin.Instance.Configuration.Server + "/artist/{0}";
@ -106,7 +106,7 @@ namespace MediaBrowser.Providers.Music
public string Key => MetadataProviders.MusicBrainzTrack.ToString(); public string Key => MetadataProviders.MusicBrainzTrack.ToString();
/// <inheritdoc /> /// <inheritdoc />
public ExternalIdMediaType Type => ExternalIdMediaType.Track; public ExternalIdMediaType? Type => ExternalIdMediaType.Track;
/// <inheritdoc /> /// <inheritdoc />
public string UrlFormatString => Plugin.Instance.Configuration.Server + "/track/{0}"; public string UrlFormatString => Plugin.Instance.Configuration.Server + "/track/{0}";

8
MediaBrowser.Providers/TV/TvExternalIds.cs
View File

@ -15,7 +15,7 @@ namespace MediaBrowser.Providers.TV
public string Key => MetadataProviders.Zap2It.ToString(); public string Key => MetadataProviders.Zap2It.ToString();
/// <inheritdoc /> /// <inheritdoc />
public ExternalIdMediaType Type => ExternalIdMediaType.General; public ExternalIdMediaType? Type => null;
/// <inheritdoc /> /// <inheritdoc />
public string UrlFormatString => "http://tvlistings.zap2it.com/overview.html?programSeriesId={0}"; 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(); public string Key => MetadataProviders.Tvdb.ToString();
/// <inheritdoc /> /// <inheritdoc />
public ExternalIdMediaType Type => ExternalIdMediaType.General; public ExternalIdMediaType? Type => null;
/// <inheritdoc /> /// <inheritdoc />
public string UrlFormatString => TvdbUtils.TvdbBaseUrl + "?tab=series&id={0}"; public string UrlFormatString => TvdbUtils.TvdbBaseUrl + "?tab=series&id={0}";
@ -52,7 +52,7 @@ namespace MediaBrowser.Providers.TV
public string Key => MetadataProviders.Tvdb.ToString(); public string Key => MetadataProviders.Tvdb.ToString();
/// <inheritdoc /> /// <inheritdoc />
public ExternalIdMediaType Type => ExternalIdMediaType.Season; public ExternalIdMediaType? Type => ExternalIdMediaType.Season;
/// <inheritdoc /> /// <inheritdoc />
public string UrlFormatString => null; public string UrlFormatString => null;
@ -70,7 +70,7 @@ namespace MediaBrowser.Providers.TV
public string Key => MetadataProviders.Tvdb.ToString(); public string Key => MetadataProviders.Tvdb.ToString();
/// <inheritdoc /> /// <inheritdoc />
public ExternalIdMediaType Type => ExternalIdMediaType.Episode; public ExternalIdMediaType? Type => ExternalIdMediaType.Episode;
/// <inheritdoc /> /// <inheritdoc />
public string UrlFormatString => TvdbUtils.TvdbBaseUrl + "?tab=episode&id={0}"; public string UrlFormatString => TvdbUtils.TvdbBaseUrl + "?tab=episode&id={0}";

2
MediaBrowser.Providers/Tmdb/BoxSets/TmdbBoxSetExternalId.cs
View File

@ -15,7 +15,7 @@ namespace MediaBrowser.Providers.Tmdb.BoxSets
public string Key => MetadataProviders.TmdbCollection.ToString(); public string Key => MetadataProviders.TmdbCollection.ToString();
/// <inheritdoc /> /// <inheritdoc />
public ExternalIdMediaType Type => ExternalIdMediaType.BoxSet; public ExternalIdMediaType? Type => ExternalIdMediaType.BoxSet;
/// <inheritdoc /> /// <inheritdoc />
public string UrlFormatString => TmdbUtils.BaseTmdbUrl + "collection/{0}"; public string UrlFormatString => TmdbUtils.BaseTmdbUrl + "collection/{0}";

2
MediaBrowser.Providers/Tmdb/Movies/TmdbMovieExternalId.cs
View File

@ -16,7 +16,7 @@ namespace MediaBrowser.Providers.Tmdb.Movies
public string Key => MetadataProviders.Tmdb.ToString(); public string Key => MetadataProviders.Tmdb.ToString();
/// <inheritdoc /> /// <inheritdoc />
public ExternalIdMediaType Type => ExternalIdMediaType.Movie; public ExternalIdMediaType? Type => ExternalIdMediaType.Movie;
/// <inheritdoc /> /// <inheritdoc />
public string UrlFormatString => TmdbUtils.BaseTmdbUrl + "movie/{0}"; public string UrlFormatString => TmdbUtils.BaseTmdbUrl + "movie/{0}";

2
MediaBrowser.Providers/Tmdb/People/TmdbPersonExternalId.cs
View File

@ -14,7 +14,7 @@ namespace MediaBrowser.Providers.Tmdb.People
public string Key => MetadataProviders.Tmdb.ToString(); public string Key => MetadataProviders.Tmdb.ToString();
/// <inheritdoc /> /// <inheritdoc />
public ExternalIdMediaType Type => ExternalIdMediaType.Person; public ExternalIdMediaType? Type => ExternalIdMediaType.Person;
/// <inheritdoc /> /// <inheritdoc />
public string UrlFormatString => TmdbUtils.BaseTmdbUrl + "person/{0}"; public string UrlFormatString => TmdbUtils.BaseTmdbUrl + "person/{0}";

2
MediaBrowser.Providers/Tmdb/TV/TmdbSeriesExternalId.cs
View File

@ -14,7 +14,7 @@ namespace MediaBrowser.Providers.Tmdb.TV
public string Key => MetadataProviders.Tmdb.ToString(); public string Key => MetadataProviders.Tmdb.ToString();
/// <inheritdoc /> /// <inheritdoc />
public ExternalIdMediaType Type => ExternalIdMediaType.Series; public ExternalIdMediaType? Type => ExternalIdMediaType.Series;
/// <inheritdoc /> /// <inheritdoc />
public string UrlFormatString => TmdbUtils.BaseTmdbUrl + "tv/{0}"; public string UrlFormatString => TmdbUtils.BaseTmdbUrl + "tv/{0}";