From 63ba324281eeaafbc0be061f782e5a6ca1438b46 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 19 Jul 2015 13:38:41 -0600 Subject: [PATCH] Fixed indexer register by name --- src/Jackett/Indexers/BaseIndexer.cs | 6 +++++- src/Jackett/JackettModule.cs | 10 +++++----- src/Jackett/Services/IndexerManagerService.cs | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/Jackett/Indexers/BaseIndexer.cs b/src/Jackett/Indexers/BaseIndexer.cs index 0e7e4170a..25a5874fe 100644 --- a/src/Jackett/Indexers/BaseIndexer.cs +++ b/src/Jackett/Indexers/BaseIndexer.cs @@ -15,7 +15,7 @@ namespace Jackett.Indexers { public string DisplayDescription { get; private set; } public string DisplayName { get; private set; } - public string ID { get { return StringUtil.StripNonAlphaNumeric(GetType().Name.ToLowerInvariant()); } } + public string ID { get { return GetIndexerID(GetType()); } } public bool IsConfigured { get; protected set; } public Uri SiteLink { get; private set; } public bool RequiresRageIDLookupDisabled { get; private set; } @@ -26,6 +26,10 @@ namespace Jackett.Indexers protected static List cache = new List(); protected static readonly TimeSpan cacheTime = new TimeSpan(0, 9, 0); + public static string GetIndexerID(Type type) + { + return StringUtil.StripNonAlphaNumeric(type.Name.ToLowerInvariant()); + } public BaseIndexer(string name, string description, bool rageid, Uri link, IIndexerManagerService manager, Logger logger) { diff --git a/src/Jackett/JackettModule.cs b/src/Jackett/JackettModule.cs index 2b68ce122..e4b1c2daf 100644 --- a/src/Jackett/JackettModule.cs +++ b/src/Jackett/JackettModule.cs @@ -9,7 +9,7 @@ using Jackett.Indexers; namespace Jackett { - public class JackettModule: Module + public class JackettModule : Module { protected override void Load(ContainerBuilder builder) { @@ -19,11 +19,11 @@ namespace Jackett builder.RegisterApiControllers(thisAssembly).InstancePerRequest(); // Register indexers - foreach(var indexer in thisAssembly.GetTypes() - .Where(p => typeof(IIndexer).IsAssignableFrom(p) && !p.IsInterface) - .ToArray()) + foreach (var indexer in thisAssembly.GetTypes() + .Where(p => typeof(IIndexer).IsAssignableFrom(p) && !p.IsInterface) + .ToArray()) { - builder.RegisterType(indexer).Named(indexer.Name); + builder.RegisterType(indexer).Named(BaseIndexer.GetIndexerID(indexer)); } } } diff --git a/src/Jackett/Services/IndexerManagerService.cs b/src/Jackett/Services/IndexerManagerService.cs index 8f2f8ff74..b6491fa78 100644 --- a/src/Jackett/Services/IndexerManagerService.cs +++ b/src/Jackett/Services/IndexerManagerService.cs @@ -85,7 +85,7 @@ namespace Jackett.Services var indexer = GetIndexer(name); var configPath = GetIndexerConfigFilePath(indexer); File.Delete(configPath); - indexers[name] = container.ResolveNamed(name); + indexers[name] = container.ResolveNamed(indexer.ID); } private string GetIndexerConfigFilePath(IIndexer indexer)