From e296d944172d385c033751f23d501dd8ed040cf4 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sat, 25 Apr 2015 09:10:43 -0700 Subject: [PATCH] Set default Metadata name --- .../Consumers/MediaBrowser/MediaBrowserMetadata.cs | 8 ++++++++ .../MetaData/Consumers/Roksbox/RoksboxMetadata.cs | 8 ++++++++ src/NzbDrone.Core/MetaData/Consumers/Wdtv/WdtvMetadata.cs | 8 ++++++++ src/NzbDrone.Core/MetaData/Consumers/Xbmc/XbmcMetadata.cs | 8 ++++++++ src/NzbDrone.Core/MetaData/MetadataFactory.cs | 2 +- src/NzbDrone.Core/Metadata/MetadataBase.cs | 8 +------- 6 files changed, 34 insertions(+), 8 deletions(-) diff --git a/src/NzbDrone.Core/MetaData/Consumers/MediaBrowser/MediaBrowserMetadata.cs b/src/NzbDrone.Core/MetaData/Consumers/MediaBrowser/MediaBrowserMetadata.cs index dd1191eb0..b43417407 100644 --- a/src/NzbDrone.Core/MetaData/Consumers/MediaBrowser/MediaBrowserMetadata.cs +++ b/src/NzbDrone.Core/MetaData/Consumers/MediaBrowser/MediaBrowserMetadata.cs @@ -30,6 +30,14 @@ namespace NzbDrone.Core.Metadata.Consumers.MediaBrowser _logger = logger; } + public override string Name + { + get + { + return "Emby (Media Browser)"; + } + } + public override List AfterRename(Series series, List existingMetadataFiles, List episodeFiles) { var updatedMetadataFiles = new List(); diff --git a/src/NzbDrone.Core/MetaData/Consumers/Roksbox/RoksboxMetadata.cs b/src/NzbDrone.Core/MetaData/Consumers/Roksbox/RoksboxMetadata.cs index 1c7329b95..726f518ff 100644 --- a/src/NzbDrone.Core/MetaData/Consumers/Roksbox/RoksboxMetadata.cs +++ b/src/NzbDrone.Core/MetaData/Consumers/Roksbox/RoksboxMetadata.cs @@ -34,6 +34,14 @@ namespace NzbDrone.Core.Metadata.Consumers.Roksbox private static List ValidCertification = new List { "G", "NC-17", "PG", "PG-13", "R", "UR", "UNRATED", "NR", "TV-Y", "TV-Y7", "TV-Y7-FV", "TV-G", "TV-PG", "TV-14", "TV-MA" }; private static readonly Regex SeasonImagesRegex = new Regex(@"^(season (?\d+))|(?specials)", RegexOptions.Compiled | RegexOptions.IgnoreCase); + public override string Name + { + get + { + return "Roksbox"; + } + } + public override List AfterRename(Series series, List existingMetadataFiles, List episodeFiles) { var episodeFilesMetadata = existingMetadataFiles.Where(c => c.EpisodeFileId > 0).ToList(); diff --git a/src/NzbDrone.Core/MetaData/Consumers/Wdtv/WdtvMetadata.cs b/src/NzbDrone.Core/MetaData/Consumers/Wdtv/WdtvMetadata.cs index f29254812..bc4e5edca 100644 --- a/src/NzbDrone.Core/MetaData/Consumers/Wdtv/WdtvMetadata.cs +++ b/src/NzbDrone.Core/MetaData/Consumers/Wdtv/WdtvMetadata.cs @@ -33,6 +33,14 @@ namespace NzbDrone.Core.Metadata.Consumers.Wdtv private static readonly Regex SeasonImagesRegex = new Regex(@"^(season (?\d+))|(?specials)", RegexOptions.Compiled | RegexOptions.IgnoreCase); + public override string Name + { + get + { + return "WDTV"; + } + } + public override List AfterRename(Series series, List existingMetadataFiles, List episodeFiles) { var episodeFilesMetadata = existingMetadataFiles.Where(c => c.EpisodeFileId > 0).ToList(); diff --git a/src/NzbDrone.Core/MetaData/Consumers/Xbmc/XbmcMetadata.cs b/src/NzbDrone.Core/MetaData/Consumers/Xbmc/XbmcMetadata.cs index 159ed22e4..19fc5406f 100644 --- a/src/NzbDrone.Core/MetaData/Consumers/Xbmc/XbmcMetadata.cs +++ b/src/NzbDrone.Core/MetaData/Consumers/Xbmc/XbmcMetadata.cs @@ -35,6 +35,14 @@ namespace NzbDrone.Core.Metadata.Consumers.Xbmc private static readonly Regex SeasonImagesRegex = new Regex(@"^season(?\d{2,}|-all|-specials)-(?poster|banner|fanart)\.(?:png|jpg)", RegexOptions.Compiled | RegexOptions.IgnoreCase); private static readonly Regex EpisodeImageRegex = new Regex(@"-thumb\.(?:png|jpg)", RegexOptions.Compiled | RegexOptions.IgnoreCase); + public override string Name + { + get + { + return "Kodi (XBMC)"; + } + } + public override List AfterRename(Series series, List existingMetadataFiles, List episodeFiles) { var episodeFilesMetadata = existingMetadataFiles.Where(c => c.EpisodeFileId > 0).ToList(); diff --git a/src/NzbDrone.Core/MetaData/MetadataFactory.cs b/src/NzbDrone.Core/MetaData/MetadataFactory.cs index d5d358bf8..ae7056779 100644 --- a/src/NzbDrone.Core/MetaData/MetadataFactory.cs +++ b/src/NzbDrone.Core/MetaData/MetadataFactory.cs @@ -32,7 +32,7 @@ namespace NzbDrone.Core.Metadata definitions.Add(new MetadataDefinition { Enable = false, - Name = provider.GetType().Name.Replace("Metadata", ""), + Name = provider.Name, Implementation = provider.GetType().Name, Settings = (IProviderConfig)Activator.CreateInstance(provider.ConfigContract) }); diff --git a/src/NzbDrone.Core/Metadata/MetadataBase.cs b/src/NzbDrone.Core/Metadata/MetadataBase.cs index b2f47b1c2..dae6abfa8 100644 --- a/src/NzbDrone.Core/Metadata/MetadataBase.cs +++ b/src/NzbDrone.Core/Metadata/MetadataBase.cs @@ -10,13 +10,7 @@ namespace NzbDrone.Core.Metadata { public abstract class MetadataBase : IMetadata where TSettings : IProviderConfig, new() { - public string Name - { - get - { - return GetType().Name; - } - } + public abstract string Name { get; } public Type ConfigContract {