Removed indexertype property

pull/4/head
kay.one 14 years ago
parent 0e191f6a44
commit 67d8bf4147

@ -184,7 +184,7 @@ namespace NzbDrone.Core.Providers.Indexer
IsProper = parseResult.Proper, IsProper = parseResult.Proper,
NzbTitle = feedItem.Title.Text, NzbTitle = feedItem.Title.Text,
Quality = parseResult.Quality, Quality = parseResult.Quality,
Indexer = GetIndexerType() Indexer = Name
}); });
} }
@ -247,15 +247,6 @@ namespace NzbDrone.Core.Providers.Indexer
/// <returns>Download link URL</returns> /// <returns>Download link URL</returns>
protected abstract string NzbDownloadUrl(SyndicationItem item); protected abstract string NzbDownloadUrl(SyndicationItem item);
/// <summary>
/// Gets he IndexerType Enum for this indexer
/// </summary>
/// <returns>IndexerType Enum</returns>
protected virtual IndexerType GetIndexerType()
{
return IndexerType.Unknown;
}
private bool InHistory(IList<Episode> episodes, EpisodeParseResult parseResult, SyndicationItem feedItem) private bool InHistory(IList<Episode> episodes, EpisodeParseResult parseResult, SyndicationItem feedItem)
{ {
foreach (var episode in episodes) foreach (var episode in episodes)

@ -1,12 +1,9 @@
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.Net; using System.Net;
using System.ServiceModel.Syndication; using System.ServiceModel.Syndication;
using System.Web;
using NzbDrone.Core.Model; using NzbDrone.Core.Model;
using NzbDrone.Core.Providers.Core; using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Providers.ExternalNotification; using NzbDrone.Core.Providers.ExternalNotification;
using SubSonic.Repository;
namespace NzbDrone.Core.Providers.Indexer namespace NzbDrone.Core.Providers.Indexer
{ {
@ -50,7 +47,7 @@ namespace NzbDrone.Core.Providers.Indexer
protected override string NzbDownloadUrl(SyndicationItem item) protected override string NzbDownloadUrl(SyndicationItem item)
{ {
return item.Id; return item.Id + "/nzb";
} }
protected override EpisodeParseResult CustomParser(SyndicationItem item, EpisodeParseResult currentResult) protected override EpisodeParseResult CustomParser(SyndicationItem item, EpisodeParseResult currentResult)
@ -64,9 +61,5 @@ namespace NzbDrone.Core.Providers.Indexer
return currentResult; return currentResult;
} }
protected override IndexerType GetIndexerType()
{
return IndexerType.Newzbin;
}
} }
} }

@ -50,9 +50,5 @@ namespace NzbDrone.Core.Providers.Indexer
return item.Links[0].Uri.ToString(); return item.Links[0].Uri.ToString();
} }
protected override IndexerType GetIndexerType()
{
return IndexerType.NzbMatrix;
}
} }
} }

@ -46,9 +46,5 @@ namespace NzbDrone.Core.Providers.Indexer
return item.Id; return item.Id;
} }
protected override IndexerType GetIndexerType() }
{
return IndexerType.NzbsOrg;
}
}
} }

@ -49,9 +49,5 @@ namespace NzbDrone.Core.Providers.Indexer
return item.Links[0].Uri.ToString(); return item.Links[0].Uri.ToString();
} }
protected override IndexerType GetIndexerType()
{
return IndexerType.NzbsRus;
}
} }
} }

@ -15,7 +15,7 @@ namespace NzbDrone.Core.Repository
public QualityTypes Quality { get; set; } public QualityTypes Quality { get; set; }
public DateTime Date { get; set; } public DateTime Date { get; set; }
public bool IsProper { get; set; } public bool IsProper { get; set; }
public IndexerType? Indexer { get; set; } public string Indexer { get; set; }
[SubSonicToOneRelation(ThisClassContainsJoinKey = true)] [SubSonicToOneRelation(ThisClassContainsJoinKey = true)]
public virtual Episode Episode { get; protected set; } public virtual Episode Episode { get; protected set; }

@ -43,7 +43,7 @@ namespace NzbDrone.Web.Controllers
//TODO: possible subsonic bug, IQuarible causes some issues so ToList() is called //TODO: possible subsonic bug, IQuarible causes some issues so ToList() is called
//https://github.com/subsonic/SubSonic-3.0/issues/263 //https://github.com/subsonic/SubSonic-3.0/issues/263
var history = _historyProvider.AllItems().ToList().Select(h => new HistoryModel var history = _historyProvider.AllItems().ToList().Select(h => new HistoryModel
{ {
HistoryId = h.HistoryId, HistoryId = h.HistoryId,
@ -56,7 +56,7 @@ namespace NzbDrone.Web.Controllers
Quality = h.Quality.ToString(), Quality = h.Quality.ToString(),
IsProper = h.IsProper, IsProper = h.IsProper,
Date = h.Date, Date = h.Date,
Indexer = String.IsNullOrEmpty(h.Indexer.ToString()) ? "Unknown" : h.Indexer.ToString() Indexer = h.Indexer
}); });
return View(new GridModel(history)); return View(new GridModel(history));

Loading…
Cancel
Save