mirror/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr synced 2025-02-22 06:01:24 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into release-group

Browse source
This commit is contained in:
Mark McDowall 2012-08-06 11:56:33 -07:00
commit 0d40e2d43e
3 changed files with 10 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
NzbDrone.Core/Providers/MetadataProvider.cs
View file

@ -123,14 +123,20 @@ namespace NzbDrone.Core.Providers
public virtual void CreateForEpisodeFiles(List<EpisodeFile> episodeFiles) public virtual void CreateForEpisodeFiles(List<EpisodeFile> episodeFiles)
{ {
if (episodeFiles == null || !episodeFiles.Any()) if (episodeFiles == null || !episodeFiles.Any())
return; {
Logger.Warn("No episode files, no metadata will be created.");
throw new ArgumentException("EpsiodeFiles must not be null or empty", "episodeFiles");
}
Logger.Trace("Creating metadata for {0} files.", episodeFiles.Count);
var tvDbSeries = _tvDbProvider.GetSeries(episodeFiles.First().SeriesId, true, true); var tvDbSeries = _tvDbProvider.GetSeries(episodeFiles.First().SeriesId, true, true);
foreach(var episodeFile in episodeFiles) foreach(var episodeFile in episodeFiles)
{ {
foreach (var provider in _metadataProviders.Where(i => GetSettings(i.GetType()).Enable)) foreach (var provider in _metadataProviders.Where(i => GetSettings(i.GetType()).Enable))
{ {
Logger.Trace("Creating {0} metadata for {1}", provider.Name, episodeFile.EpisodeFileId);
provider.CreateForEpisodeFile(episodeFile, tvDbSeries); provider.CreateForEpisodeFile(episodeFile, tvDbSeries);
} }
} }

28
NzbDrone.Web/Controllers/HistoryController.cs
View file

@ -27,34 +27,6 @@ namespace NzbDrone.Web.Controllers
return View(); return View();
} }
//public JsonResult AjaxBinding()
//{
// var history = _historyProvider.AllItemsWithRelationships().Select(h => new HistoryModel
// {
// HistoryId = h.HistoryId,
// SeriesId = h.SeriesId,
// EpisodeNumbering = string.Format("{0}x{1:00}", h.Episode.SeasonNumber, h.Episode.EpisodeNumber),
// EpisodeTitle = h.Episode.Title,
// EpisodeOverview = h.Episode.Overview,
// SeriesTitle = h.SeriesTitle,
// SeriesTitleSorter = SortHelper.SkipArticles(h.SeriesTitle),
// NzbTitle = h.NzbTitle,
// Quality = h.Quality.ToString(),
// IsProper = h.IsProper,
// Date = h.Date.ToString(),
// DateSorter = h.Date.ToString("MM/dd/yyyy h:mm:ss tt"),
// Indexer = h.Indexer,
// EpisodeId = h.EpisodeId,
// NzbInfoUrl = h.NzbInfoUrl
// }).OrderByDescending(h => h.Date).ToList();
// return Json(new
// {
// aaData = history
// },
// JsonRequestBehavior.AllowGet);
//}
public ActionResult AjaxBinding(DataTablesPageRequest pageRequest) public ActionResult AjaxBinding(DataTablesPageRequest pageRequest)
{ {
var pageResult = _historyProvider.GetPagedItems(pageRequest); var pageResult = _historyProvider.GetPagedItems(pageRequest);

4
NzbDrone.Web/Views/History/Index.cshtml
View file

@ -2,8 +2,8 @@
@{ViewBag.Title = "History";} @{ViewBag.Title = "History";}
@section ActionMenu{ @section ActionMenu{
<ul class="sub-menu"> <ul class="sub-menu">
<li>@Ajax.ActionLink("Trim History", "Trim", "History", null, new AjaxOptions{ OnSuccess = "reloadGrid", Confirm = "Delete history items older than 30 days?"}, new { Title = "Delete history items older than 30 days" })</li> <li>@Ajax.ActionLink("Trim History", "Trim", "History", null, new AjaxOptions{ OnSuccess = "redrawGrid", Confirm = "Delete history items older than 30 days?"}, new { Title = "Delete history items older than 30 days" })</li>
<li>@Ajax.ActionLink("Purge History", "Purge", "History", null, new AjaxOptions{ OnSuccess = "reloadGrid", Confirm = "Purge all history items?" }, new { Title = "Delete all history items" })</li> <li>@Ajax.ActionLink("Purge History", "Purge", "History", null, new AjaxOptions{ OnSuccess = "redrawGrid", Confirm = "Purge all history items?" }, new { Title = "Delete all history items" })</li>
<li>@Html.ActionLink("Search History", "Index", "SearchHistory", null, new { Title = "Review recent searches" })</li> <li>@Html.ActionLink("Search History", "Index", "SearchHistory", null, new { Title = "Review recent searches" })</li>
</ul> </ul>
} }