Merge branch 'markus' into kay.one
This commit is contained in:
commit
a9c88bb6ab
|
@ -72,6 +72,16 @@ namespace NzbDrone.Core.Providers.Indexer
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (searchModel.SearchType == SearchType.DailySearch)
|
||||||
|
{
|
||||||
|
return new List<string>
|
||||||
|
{
|
||||||
|
String.Format(
|
||||||
|
@"http://www.newzbin.com/search/query/?q={0}+{1:yyyy-MM-dd}&fpn=p&searchaction=Go&category=8&{2}",
|
||||||
|
searchModel.SeriesTitle, searchModel.AirDate, UrlParams)
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
return new List<string>();
|
return new List<string>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -49,9 +49,14 @@ namespace NzbDrone.Core.Providers.Indexer
|
||||||
|
|
||||||
if (searchModel.SearchType == SearchType.SeasonSearch)
|
if (searchModel.SearchType == SearchType.SeasonSearch)
|
||||||
{
|
{
|
||||||
//Todo: Allow full season searching to process individual episodes
|
searchUrls.Add(String.Format("{0}&limit=100&q={1}&season={2}", url, searchModel.SeriesTitle, searchModel.SeasonNumber));
|
||||||
//searchUrls.Add(String.Format("{0}&limit=100&q={1}&season{2}", url, searchModel.SeriesTitle, searchModel.SeasonNumber));
|
//searchUrls.Add(String.Format("{0}&limit=100&q={1}+Season", url, searchModel.SeriesTitle));
|
||||||
searchUrls.Add(String.Format("{0}&limit=100&q={1}+Season", url, searchModel.SeriesTitle));
|
}
|
||||||
|
|
||||||
|
if (searchModel.SearchType == SearchType.DailySearch)
|
||||||
|
{
|
||||||
|
searchUrls.Add(String.Format("{0}&limit=100&q={1}+{2:yyyy MM dd}", url, searchModel.SeriesTitle,
|
||||||
|
searchModel.AirDate));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -64,6 +64,12 @@ namespace NzbDrone.Core.Providers.Indexer
|
||||||
searchUrls.Add(String.Format("{0}&term={1}+Season", url, searchModel.SeriesTitle));
|
searchUrls.Add(String.Format("{0}&term={1}+Season", url, searchModel.SeriesTitle));
|
||||||
searchUrls.Add(String.Format("{0}&term={1}+S{2:00}", url, searchModel.SeriesTitle, searchModel.SeasonNumber));
|
searchUrls.Add(String.Format("{0}&term={1}+S{2:00}", url, searchModel.SeriesTitle, searchModel.SeasonNumber));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (searchModel.SearchType == SearchType.DailySearch)
|
||||||
|
{
|
||||||
|
searchUrls.Add(String.Format("{0}&term={1}+{2:yyyy MM dd}", url, searchModel.SeriesTitle,
|
||||||
|
searchModel.AirDate));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return searchUrls;
|
return searchUrls;
|
||||||
|
|
|
@ -62,6 +62,12 @@ namespace NzbDrone.Core.Providers.Indexer
|
||||||
searchUrls.Add(String.Format("{0}&action=search&q={1}+Season", url, searchModel.SeriesTitle));
|
searchUrls.Add(String.Format("{0}&action=search&q={1}+Season", url, searchModel.SeriesTitle));
|
||||||
searchUrls.Add(String.Format("{0}&action=search&q={1}+S{2:00}", url, searchModel.SeriesTitle, searchModel.SeasonNumber));
|
searchUrls.Add(String.Format("{0}&action=search&q={1}+S{2:00}", url, searchModel.SeriesTitle, searchModel.SeasonNumber));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (searchModel.SearchType == SearchType.DailySearch)
|
||||||
|
{
|
||||||
|
searchUrls.Add(String.Format("{0}&action=search&q={1}+{2:yyyy.MM.dd}", url, searchModel.SeriesTitle,
|
||||||
|
searchModel.AirDate));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return searchUrls;
|
return searchUrls;
|
||||||
|
|
Loading…
Reference in New Issue