github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-14 02:37:08 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/dynamic-jobs'

Browse source
This commit is contained in:
Mark McDowall 2012-10-19 08:39:07 -07:00
commit db585b3bd7
52 changed files with 292 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

4
NzbDrone.Web/Controllers/EpisodeController.cs
View file

@ -26,7 +26,7 @@ namespace NzbDrone.Web.Controllers
public JsonResult SearchSeason(int seriesId, int seasonNumber)
{
_jobProvider.QueueJob(typeof(SeasonSearchJob), seriesId, seasonNumber);
_jobProvider.QueueJob(typeof(SeasonSearchJob), new { SeriesId = seriesId, SeasonNumber = seasonNumber });
return JsonNotificationResult.Queued("Season search");
}
@ -40,7 +40,7 @@ namespace NzbDrone.Web.Controllers
public JsonResult RenameSeason(int seriesId, int seasonNumber)
{
_jobProvider.QueueJob(typeof(RenameSeasonJob), seriesId, seasonNumber);
_jobProvider.QueueJob(typeof(RenameSeasonJob), new { SeriesId = seriesId, SeasonNumber = seasonNumber });
return JsonNotificationResult.Queued("Season rename");
}

4
NzbDrone.Web/Controllers/SeriesController.cs
View file

@ -91,9 +91,9 @@ namespace NzbDrone.Web.Controllers
}
[HttpPost]
public EmptyResult DeleteSeries(int seriesId, bool deleteFiles)
public EmptyResult Delete(int seriesId, bool deleteFiles)
{
_jobProvider.QueueJob(typeof(DeleteSeriesJob), seriesId, Convert.ToInt32(deleteFiles));
_jobProvider.QueueJob(typeof(DeleteSeriesJob), new { SeriesId = seriesId, DeleteFiles = deleteFiles });
return new EmptyResult();
}

3
NzbDrone.Web/Controllers/SystemController.cs
View file

@ -41,8 +41,7 @@ namespace NzbDrone.Web.Controllers
var queue = _jobProvider.Queue.Select(c => new JobQueueItemModel
{
Name = c.JobType.Name,
TargetId = c.TargetId,
SecondaryTargetId = c.SecondaryTargetId
Options = c.Options
});
var serializedQueue = new JavaScriptSerializer().Serialize(queue);