From 67d8bf414733cc0c0dda59289b8f92391400e2d2 Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Wed, 18 May 2011 20:58:42 -0700 Subject: [PATCH] Removed indexertype property --- .../Providers/Indexer/IndexerProviderBase.cs | 11 +---------- NzbDrone.Core/Providers/Indexer/NewzbinProvider.cs | 11 ++--------- NzbDrone.Core/Providers/Indexer/NzbMatrixProvider.cs | 4 ---- NzbDrone.Core/Providers/Indexer/NzbsOrgProvider.cs | 6 +----- NzbDrone.Core/Providers/Indexer/NzbsRUsProvider.cs | 4 ---- NzbDrone.Core/Repository/History.cs | 2 +- NzbDrone.Web/Controllers/HistoryController.cs | 4 ++-- 7 files changed, 7 insertions(+), 35 deletions(-) diff --git a/NzbDrone.Core/Providers/Indexer/IndexerProviderBase.cs b/NzbDrone.Core/Providers/Indexer/IndexerProviderBase.cs index 9b34f7216..dc84f4c8b 100644 --- a/NzbDrone.Core/Providers/Indexer/IndexerProviderBase.cs +++ b/NzbDrone.Core/Providers/Indexer/IndexerProviderBase.cs @@ -184,7 +184,7 @@ namespace NzbDrone.Core.Providers.Indexer IsProper = parseResult.Proper, NzbTitle = feedItem.Title.Text, Quality = parseResult.Quality, - Indexer = GetIndexerType() + Indexer = Name }); } @@ -247,15 +247,6 @@ namespace NzbDrone.Core.Providers.Indexer /// Download link URL protected abstract string NzbDownloadUrl(SyndicationItem item); - /// - /// Gets he IndexerType Enum for this indexer - /// - /// IndexerType Enum - protected virtual IndexerType GetIndexerType() - { - return IndexerType.Unknown; - } - private bool InHistory(IList episodes, EpisodeParseResult parseResult, SyndicationItem feedItem) { foreach (var episode in episodes) diff --git a/NzbDrone.Core/Providers/Indexer/NewzbinProvider.cs b/NzbDrone.Core/Providers/Indexer/NewzbinProvider.cs index effe1bc89..3e385710b 100644 --- a/NzbDrone.Core/Providers/Indexer/NewzbinProvider.cs +++ b/NzbDrone.Core/Providers/Indexer/NewzbinProvider.cs @@ -1,12 +1,9 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Net; using System.ServiceModel.Syndication; -using System.Web; using NzbDrone.Core.Model; using NzbDrone.Core.Providers.Core; using NzbDrone.Core.Providers.ExternalNotification; -using SubSonic.Repository; namespace NzbDrone.Core.Providers.Indexer { @@ -50,7 +47,7 @@ namespace NzbDrone.Core.Providers.Indexer protected override string NzbDownloadUrl(SyndicationItem item) { - return item.Id; + return item.Id + "/nzb"; } protected override EpisodeParseResult CustomParser(SyndicationItem item, EpisodeParseResult currentResult) @@ -64,9 +61,5 @@ namespace NzbDrone.Core.Providers.Indexer return currentResult; } - protected override IndexerType GetIndexerType() - { - return IndexerType.Newzbin; - } } } \ No newline at end of file diff --git a/NzbDrone.Core/Providers/Indexer/NzbMatrixProvider.cs b/NzbDrone.Core/Providers/Indexer/NzbMatrixProvider.cs index 364a92797..1efdf070f 100644 --- a/NzbDrone.Core/Providers/Indexer/NzbMatrixProvider.cs +++ b/NzbDrone.Core/Providers/Indexer/NzbMatrixProvider.cs @@ -50,9 +50,5 @@ namespace NzbDrone.Core.Providers.Indexer return item.Links[0].Uri.ToString(); } - protected override IndexerType GetIndexerType() - { - return IndexerType.NzbMatrix; - } } } \ No newline at end of file diff --git a/NzbDrone.Core/Providers/Indexer/NzbsOrgProvider.cs b/NzbDrone.Core/Providers/Indexer/NzbsOrgProvider.cs index a69b14952..b1951ac24 100644 --- a/NzbDrone.Core/Providers/Indexer/NzbsOrgProvider.cs +++ b/NzbDrone.Core/Providers/Indexer/NzbsOrgProvider.cs @@ -46,9 +46,5 @@ namespace NzbDrone.Core.Providers.Indexer return item.Id; } - protected override IndexerType GetIndexerType() - { - return IndexerType.NzbsOrg; - } - } + } } \ No newline at end of file diff --git a/NzbDrone.Core/Providers/Indexer/NzbsRUsProvider.cs b/NzbDrone.Core/Providers/Indexer/NzbsRUsProvider.cs index 070678c10..cde0cd431 100644 --- a/NzbDrone.Core/Providers/Indexer/NzbsRUsProvider.cs +++ b/NzbDrone.Core/Providers/Indexer/NzbsRUsProvider.cs @@ -49,9 +49,5 @@ namespace NzbDrone.Core.Providers.Indexer return item.Links[0].Uri.ToString(); } - protected override IndexerType GetIndexerType() - { - return IndexerType.NzbsRus; - } } } \ No newline at end of file diff --git a/NzbDrone.Core/Repository/History.cs b/NzbDrone.Core/Repository/History.cs index af6f3edb4..56651c224 100644 --- a/NzbDrone.Core/Repository/History.cs +++ b/NzbDrone.Core/Repository/History.cs @@ -15,7 +15,7 @@ namespace NzbDrone.Core.Repository public QualityTypes Quality { get; set; } public DateTime Date { get; set; } public bool IsProper { get; set; } - public IndexerType? Indexer { get; set; } + public string Indexer { get; set; } [SubSonicToOneRelation(ThisClassContainsJoinKey = true)] public virtual Episode Episode { get; protected set; } diff --git a/NzbDrone.Web/Controllers/HistoryController.cs b/NzbDrone.Web/Controllers/HistoryController.cs index e74e8a75d..e824f7245 100644 --- a/NzbDrone.Web/Controllers/HistoryController.cs +++ b/NzbDrone.Web/Controllers/HistoryController.cs @@ -43,7 +43,7 @@ namespace NzbDrone.Web.Controllers //TODO: possible subsonic bug, IQuarible causes some issues so ToList() is called //https://github.com/subsonic/SubSonic-3.0/issues/263 - + var history = _historyProvider.AllItems().ToList().Select(h => new HistoryModel { HistoryId = h.HistoryId, @@ -56,7 +56,7 @@ namespace NzbDrone.Web.Controllers Quality = h.Quality.ToString(), IsProper = h.IsProper, Date = h.Date, - Indexer = String.IsNullOrEmpty(h.Indexer.ToString()) ? "Unknown" : h.Indexer.ToString() + Indexer = h.Indexer }); return View(new GridModel(history));