diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 57855008d5..4d9999b37d 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -290,8 +290,6 @@
-
-
@@ -329,8 +327,6 @@
-
-
diff --git a/MediaBrowser.Controller/Providers/IItemIdentityConverter.cs b/MediaBrowser.Controller/Providers/IItemIdentityConverter.cs
deleted file mode 100644
index bfdd1dbf3a..0000000000
--- a/MediaBrowser.Controller/Providers/IItemIdentityConverter.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace MediaBrowser.Controller.Providers
-{
- public interface IItemIdentityConverter { }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Providers/IItemIdentityProvider.cs b/MediaBrowser.Controller/Providers/IItemIdentityProvider.cs
deleted file mode 100644
index 6b403bb55f..0000000000
--- a/MediaBrowser.Controller/Providers/IItemIdentityProvider.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace MediaBrowser.Controller.Providers
-{
- public interface IItemIdentityProvider { }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Providers/IProviderManager.cs b/MediaBrowser.Controller/Providers/IProviderManager.cs
index 57e4ff3200..a976a7f715 100644
--- a/MediaBrowser.Controller/Providers/IProviderManager.cs
+++ b/MediaBrowser.Controller/Providers/IProviderManager.cs
@@ -97,13 +97,11 @@ namespace MediaBrowser.Controller.Providers
///
/// The image providers.
/// The metadata services.
- /// The identity providers.
- /// The identity converters.
/// The metadata providers.
/// The savers.
/// The image savers.
/// The external ids.
- void AddParts(IEnumerable imageProviders, IEnumerable metadataServices, IEnumerable identityProviders, IEnumerable identityConverters, IEnumerable metadataProviders,
+ void AddParts(IEnumerable imageProviders, IEnumerable metadataServices, IEnumerable metadataProviders,
IEnumerable savers,
IEnumerable imageSavers,
IEnumerable externalIds);
@@ -190,21 +188,5 @@ namespace MediaBrowser.Controller.Providers
/// The cancellation token.
/// Task{HttpResponseInfo}.
Task GetSearchImage(string providerName, string url, CancellationToken cancellationToken);
-
- ///
- /// Gets the item identity providers.
- ///
- /// The type of the t lookup information.
- /// IEnumerable<IItemIdentityProvider<TLookupInfo, TIdentity>>.
- IEnumerable> GetItemIdentityProviders()
- where TLookupInfo : ItemLookupInfo;
-
- ///
- /// Gets the item identity converters.
- ///
- /// The type of the t lookup information.
- /// IEnumerable<IItemIdentityConverter<TIdentity>>.
- IEnumerable> GetItemIdentityConverters()
- where TLookupInfo : ItemLookupInfo;
}
}
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Providers/ItemIdentifier.cs b/MediaBrowser.Controller/Providers/ItemIdentifier.cs
deleted file mode 100644
index bbc6dd76cd..0000000000
--- a/MediaBrowser.Controller/Providers/ItemIdentifier.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Controller.Providers
-{
- public static class ItemIdentifier
- where TLookupInfo : ItemLookupInfo
- {
- public static async Task FindIdentities(TLookupInfo item, IProviderManager providerManager, CancellationToken cancellationToken)
- {
- var providers = providerManager.GetItemIdentityProviders();
- var converters = providerManager.GetItemIdentityConverters().ToList();
-
- foreach (var provider in providers)
- {
- await provider.Identify(item);
- }
-
- bool changesMade = true;
-
- while (changesMade)
- {
- changesMade = false;
-
- foreach (var converter in converters)
- {
- if (await converter.Convert(item))
- {
- changesMade = true;
- }
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Providers/ItemIdentities.cs b/MediaBrowser.Controller/Providers/ItemIdentities.cs
deleted file mode 100644
index 48316d0f44..0000000000
--- a/MediaBrowser.Controller/Providers/ItemIdentities.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Controller.Providers
-{
- public interface IItemIdentityProvider : IItemIdentityProvider
- where TLookupInfo : ItemLookupInfo
- {
- Task Identify(TLookupInfo info);
- }
-
- public interface IItemIdentityConverter : IItemIdentityConverter
- where TLookupInfo : ItemLookupInfo
- {
- Task Convert(TLookupInfo info);
- }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs
index b84d1b0ff0..678d495cbc 100644
--- a/MediaBrowser.Providers/Manager/MetadataService.cs
+++ b/MediaBrowser.Providers/Manager/MetadataService.cs
@@ -179,18 +179,6 @@ namespace MediaBrowser.Providers.Manager
lookupInfo.Year = result.ProductionYear;
}
- private async Task FindIdentities(TIdType id, CancellationToken cancellationToken)
- {
- try
- {
- await ItemIdentifier.FindIdentities(id, ProviderManager, cancellationToken).ConfigureAwait(false);
- }
- catch (Exception ex)
- {
- Logger.ErrorException("Error in FindIdentities", ex);
- }
- }
-
private DateTime GetLastRefreshDate(IHasMetadata item)
{
return item.DateLastRefreshed;
diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs
index c95d58a421..29897e0736 100644
--- a/MediaBrowser.Providers/Manager/ProviderManager.cs
+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs
@@ -55,8 +55,6 @@ namespace MediaBrowser.Providers.Manager
private readonly IFileSystem _fileSystem;
private IMetadataService[] _metadataServices = { };
- private IItemIdentityProvider[] _identityProviders = { };
- private IItemIdentityConverter[] _identityConverters = { };
private IMetadataProvider[] _metadataProviders = { };
private IEnumerable _savers;
private IImageSaver[] _imageSavers;
@@ -92,22 +90,17 @@ namespace MediaBrowser.Providers.Manager
///
/// The image providers.
/// The metadata services.
- /// The identity providers.
- /// The identity converters.
/// The metadata providers.
/// The metadata savers.
/// The image savers.
/// The external ids.
public void AddParts(IEnumerable imageProviders, IEnumerable metadataServices,
- IEnumerable identityProviders, IEnumerable identityConverters,
IEnumerable metadataProviders, IEnumerable metadataSavers,
IEnumerable imageSavers, IEnumerable externalIds)
{
ImageProviders = imageProviders.ToArray();
_metadataServices = metadataServices.OrderBy(i => i.Order).ToArray();
- _identityProviders = identityProviders.ToArray();
- _identityConverters = identityConverters.ToArray();
_metadataProviders = metadataProviders.ToArray();
_imageSavers = imageSavers.ToArray();
_externalIds = externalIds.OrderBy(i => i.Name).ToArray();
@@ -301,18 +294,6 @@ namespace MediaBrowser.Providers.Manager
.ThenBy(GetDefaultOrder);
}
- public IEnumerable> GetItemIdentityProviders()
- where TLookupInfo : ItemLookupInfo
- {
- return _identityProviders.OfType>();
- }
-
- public IEnumerable> GetItemIdentityConverters()
- where TLookupInfo : ItemLookupInfo
- {
- return _identityConverters.OfType>();
- }
-
private IEnumerable GetRemoteImageProviders(IHasImages item, bool includeDisabled)
{
var options = GetMetadataOptions(item);
diff --git a/MediaBrowser.Providers/MediaBrowser.Providers.csproj b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
index bbfa20738f..240b2e2cca 100644
--- a/MediaBrowser.Providers/MediaBrowser.Providers.csproj
+++ b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
@@ -177,7 +177,6 @@
-
diff --git a/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeProvider.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeProvider.cs
index 7005ba8f58..a41a95c126 100644
--- a/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeProvider.cs
+++ b/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeProvider.cs
@@ -24,7 +24,7 @@ namespace MediaBrowser.Providers.TV
///
/// Class RemoteEpisodeProvider
///
- class TvdbEpisodeProvider : IRemoteMetadataProvider, IItemIdentityProvider
+ class TvdbEpisodeProvider : IRemoteMetadataProvider
{
private static readonly string FullIdKey = MetadataProviders.Tvdb + "-Full";
@@ -871,86 +871,6 @@ namespace MediaBrowser.Providers.TV
});
}
- public Task Identify(EpisodeInfo info)
- {
- if (info.ProviderIds.ContainsKey(FullIdKey))
- {
- return Task.FromResult