open-source-mirrors
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleaned up RssItemProcessingProvider, will actually process Season NZBs now.

Browse Source 
Added Newzbin ID parsing.
pull/3113/head
Mark McDowall 13 years ago
parent 1076b3ab58
commit caa99540a6
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File

1
NzbDrone.Core/Model/NzbSiteModel.cs
Unescape View File

@ -10,6 +10,7 @@ namespace NzbDrone.Core.Model
{ {
private static readonly IList<NzbSiteModel> Sites = new List<NzbSiteModel> private static readonly IList<NzbSiteModel> Sites = new List<NzbSiteModel>
{ {
new NzbSiteModel {Name = "newzbin", Url = "newzbin.com", Pattern = @"\d{7,10}"},
new NzbSiteModel {Name = "nzbmatrix", Url = "nzbmatrix.com", Pattern = @"\d{6,10}"}, new NzbSiteModel {Name = "nzbmatrix", Url = "nzbmatrix.com", Pattern = @"\d{6,10}"},
new NzbSiteModel {Name = "nzbsDotOrg", Url = "nzbs.org", Pattern = @"\d{5,10}"}, new NzbSiteModel {Name = "nzbsDotOrg", Url = "nzbs.org", Pattern = @"\d{5,10}"},
new NzbSiteModel {Name = "nzbsrus", Url = "nzbsrus.com", Pattern = @"\d{6,10}"}, new NzbSiteModel {Name = "nzbsrus", Url = "nzbsrus.com", Pattern = @"\d{6,10}"},

47
NzbDrone.Core/Providers/RssItemProcessingProvider.cs
Unescape View File

@ -60,11 +60,11 @@ namespace NzbDrone.Core.Providers
} }
//Handles Full Season NZBs //Handles Full Season NZBs
var seasonParsedResult = Parser.ParseSeasonInfo(nzb.Title); var seasonParseResult = Parser.ParseSeasonInfo(nzb.Title);
if (seasonParsedResult != null) if (seasonParseResult != null)
{ {
//ProcessFullSeasonItem ProcessFullSeasonItem(nzb, indexer, seasonParseResult);
return; return;
} }
@ -180,13 +180,14 @@ namespace NzbDrone.Core.Providers
if (indexer.IndexerName != "Newzbin") if (indexer.IndexerName != "Newzbin")
{ {
if (AddByUrl(nzb)) if (_sabProvider.AddByUrl(nzb.Link.ToString(), nzb.TitleFix))
AddToHistory(episodeParseResults, series, nzb, indexer); AddToHistory(episodeParseResults, series, nzb, indexer);
} }
else else
{ {
//Send to SAB using Newzbin ID if (_sabProvider.AddById(nzb.Id, nzb.TitleFix))
AddToHistory(episodeParseResults, series, nzb, indexer);
} }
} }
} }
@ -264,6 +265,7 @@ namespace NzbDrone.Core.Providers
episodesNeeded--; //Decrement the number of downloads we need, used if we want to replace all existing episodes if this will upgrade over X% of files episodesNeeded--; //Decrement the number of downloads we need, used if we want to replace all existing episodes if this will upgrade over X% of files
break; //We only want to download this NZB if ALL episodes can be upgraded by this Season NZB break; //We only want to download this NZB if ALL episodes can be upgraded by this Season NZB
} }
downloadWholeSeason = true;
} }
} }
@ -275,12 +277,7 @@ namespace NzbDrone.Core.Providers
{ {
if (DownloadNzb(nzb)) if (DownloadNzb(nzb))
{ {
var episodeParseResults = new List<EpisodeParseResult>(); var episodeParseResults = GetEpisodeParseList(season.Episodes);
episodeParseResults.AddRange(
season.Episodes.Select(
e =>
new EpisodeParseResult {EpisodeNumber = e.EpisodeNumber, SeasonNumber = e.SeasonNumber}));
AddToHistory(episodeParseResults, series, nzb, indexer); AddToHistory(episodeParseResults, series, nzb, indexer);
} }
} }
@ -293,14 +290,9 @@ namespace NzbDrone.Core.Providers
if (indexer.IndexerName != "Newzbin") if (indexer.IndexerName != "Newzbin")
{ {
if (AddByUrl(nzb)) if (_sabProvider.AddByUrl(nzb.Link.ToString(), nzb.TitleFix))
{ {
var episodeParseResults = new List<EpisodeParseResult>(); var episodeParseResults = GetEpisodeParseList(season.Episodes);
episodeParseResults.AddRange(
season.Episodes.Select(
e =>
new EpisodeParseResult { EpisodeNumber = e.EpisodeNumber, SeasonNumber = e.SeasonNumber }));
AddToHistory(episodeParseResults, series, nzb, indexer); AddToHistory(episodeParseResults, series, nzb, indexer);
} }
@ -308,18 +300,27 @@ namespace NzbDrone.Core.Providers
else else
{ {
//Send to SAB using Newzbin ID if (_sabProvider.AddById(nzb.Id, nzb.TitleFix))
{
var episodeParseResults = GetEpisodeParseList(season.Episodes);
AddToHistory(episodeParseResults, series, nzb, indexer);
}
} }
} }
} }
//Possibly grab the whole season if a certain % of the season is missing, rather than for 1 or 2 episodes //Possibly grab the whole season if a certain % of the season is missing, rather than for 1 or 2 episodes
throw new NotImplementedException("NzbDrone is currently not able to handle downloadinga whole season when less than a whole season it missing");
} }
private bool AddByUrl(NzbInfoModel nzb) private List<EpisodeParseResult> GetEpisodeParseList(List<Episode> episodes)
{ {
return _sabProvider.AddByUrl(nzb.Link.ToString(), nzb.TitleFix); var episodeParseResults = new List<EpisodeParseResult>();
episodeParseResults.AddRange(
episodes.Select(
e =>
new EpisodeParseResult { EpisodeNumber = e.EpisodeNumber, SeasonNumber = e.SeasonNumber }));
return episodeParseResults;
} }
private void AddToHistory(List<EpisodeParseResult> episodeParseResults, Series series, NzbInfoModel nzb, Indexer indexer) private void AddToHistory(List<EpisodeParseResult> episodeParseResults, Series series, NzbInfoModel nzb, Indexer indexer)

Write Preview
Loading…
Cancel
Save