mirror/Lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/Lidarr synced 2024-12-24 16:51:58 +00:00
Code Issues Releases Wiki Activity

SeriesId is now passed back to the controller when adding a new/existing series.

Browse source
This commit is contained in:
Mark McDowall 2011-09-08 20:52:25 -07:00
parent d330c65165
commit 7786f6a914
7 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
NzbDrone.Web/Controllers/AddSeriesController.cs
View file

@ -69,7 +69,6 @@ public ActionResult Index()
return View();
}
public ActionResult ExistingSeries()
{
var result = new ExistingSeriesModel();
@ -81,7 +80,7 @@ public ActionResult ExistingSeries()
unmappedList.AddRange(_rootFolderProvider.GetUnmappedFolders(folder.Path));
}
result.ExistingSeries = new List<Tuple<string, string>>();
result.ExistingSeries = new List<Tuple<string, string, int>>();
foreach (var folder in unmappedList)
{
@ -89,12 +88,14 @@ public ActionResult ExistingSeries()
var tvdbResult = _tvDbProvider.SearchSeries(foldername).FirstOrDefault();
var title = String.Empty;
var seriesId = 0;
if (tvdbResult != null)
{
title = tvdbResult.SeriesName;
seriesId = tvdbResult.Id;
}
result.ExistingSeries.Add(new Tuple<string, string>(folder, title));
result.ExistingSeries.Add(new Tuple<string, string, int>(folder, title, seriesId));
}
var defaultQuality = Convert.ToInt32(_configProvider.DefaultQualityProfile);
@ -104,23 +105,21 @@ public ActionResult ExistingSeries()
}
[HttpPost]
public JsonResult AddNewSeries(string path, string seriesName, int qualityProfileId)
public JsonResult AddNewSeries(string path, string seriesName, int seriesId, int qualityProfileId)
{
path = Path.Combine(path, MediaFileProvider.CleanFilename(seriesName));
return AddExistingSeries(path, seriesName, qualityProfileId);
return AddExistingSeries(path, seriesName, seriesId, qualityProfileId);
}
[HttpPost]
public JsonResult AddExistingSeries(string path, string seriesName, int qualityProfileId)
public JsonResult AddExistingSeries(string path, string seriesName, int seriesId, int qualityProfileId)
{
try
{
//Create the folder for the new series and then Add it
_diskProvider.CreateDirectory(path);
var series = _tvDbProvider.SearchSeries(seriesName).Where(s => s.SeriesName == seriesName).Single();
_seriesProvider.AddSeries(path, series.Id, qualityProfileId);
_seriesProvider.AddSeries(path, seriesId, qualityProfileId);
ScanNewSeries();
return Json(new NotificationResult() { Title = seriesName, Text = "Was added successfully" });
}

2
NzbDrone.Web/Models/ExistingSeriesModel.cs
View file

@ -8,6 +8,6 @@ public class ExistingSeriesModel
{
public SelectList Quality { get; set; }
public List<Tuple<string, string>> ExistingSeries { get; set; }
public List<Tuple<string, string, int>> ExistingSeries { get; set; }
}
}

2
NzbDrone.Web/NzbDrone.Web.csproj
View file

@ -683,9 +683,7 @@
<Content Include="Scripts\Plugins\MicrosoftAjax.js" />
<Content Include="Scripts\Plugins\MicrosoftMvcAjax.debug.js" />
<Content Include="Scripts\Plugins\MicrosoftMvcAjax.js" />
<Content Include="Scripts\Plugins\yui-min.js" />
<Content Include="Scripts\seriesDetails.js" />
<Content Include="Scripts\Plugins\jquery.livequery.js" />
<Content Include="Scripts\settingsForm.js" />
<Content Include="Scripts\Plugins\doTimeout.js" />
<Content Include="Scripts\episodeSearch.js" />

1
NzbDrone.Web/Scripts/AutoComplete.js
View file

@ -40,6 +40,7 @@ function bindSeriesAutoComplete(selector) {
delay: 500,
select: function (event, ui) {
$(this).val(ui.item.Title);
$(this).siblings('.seriesId').val(ui.item.Id);
return false;
}
})

6
NzbDrone.Web/Scripts/addSeries.js
View file

@ -23,6 +23,7 @@ $(".addExistingButton").live('click', function () {
var root = $(this).parents(".existingSeries");
var title = $(this).siblings(".seriesLookup").val();
var seriesId = $(this).siblings(".seriesId").val();
var qualityId = $(this).siblings(".qualitySelector").val();
var path = root.find(".seriesPathValue Label").text();
@ -30,7 +31,7 @@ $(".addExistingButton").live('click', function () {
$.ajax({
type: "POST",
url: addSeriesUrl,
data: jQuery.param({ path: path, seriesName: title, qualityProfileId: qualityId }),
data: jQuery.param({ path: path, seriesName: title, seriesId: seriesId, qualityProfileId: qualityId }),
error: function (req, status, error) {
alert("Sorry! We could not add " + path + " at this time. " + error);
},
@ -79,13 +80,14 @@ function refreshRoot() {
//AddNew
$('#saveNewSeries').live('click', function () {
var seriesTitle = $("#newSeriesLookup").val();
var seriesId = $("#newSeriesId").val();
var qualityId = $("#qualityList").val();
var path = $('#newSeriesPath').val();
$.ajax({
type: "POST",
url: addNewSeriesUrl,
data: jQuery.param({ path: path, seriesName: seriesTitle, qualityProfileId: qualityId }),
data: jQuery.param({ path: path, seriesName: seriesTitle, seriesId: seriesId, qualityProfileId: qualityId }),
error: function (req, status, error) {
alert("Sorry! We could not add " + path + " at this time. " + error);
},

2
NzbDrone.Web/Views/AddSeries/AddNew.cshtml
View file

@ -4,8 +4,8 @@
<div>
<div>
<input id="newSeriesLookup" class="seriesLookup" type="text" style="width: 400px" />
@Html.Hidden("newSeriesId", 0, new { @class = "seriesId" })
</div>
@*<input id="newSeriesPath" class="folderLookup" type="text" style="width: 400px" />*@
@Html.DropDownList("newSeriesPath", new SelectList((IList)ViewData["RootDirs"]), new { style = "width: 406px; margin-left: 0px;" })
@Html.DropDownList("qualityList", new SelectList((IList)ViewData["QualityList"], "QualityProfileId", "Name"), new { @class = "qualitySelector" })
<button id="saveNewSeries">

3
NzbDrone.Web/Views/AddSeries/ExistingSeries.cshtml
View file

@ -42,7 +42,7 @@ else
</div>
}
@foreach (var series in Model.ExistingSeries)
@foreach (var series in Model.ExistingSeries)
{
<span class="existingSeries">
<div>
@ -52,6 +52,7 @@ else
</div>
<div>
<input class="seriesLookup" type="text" style="width: 400px" value="@series.Item2" />
@Html.Hidden("seriesId", series.Item3, new { @class = "seriesId" })
@Html.DropDownList(Guid.NewGuid().ToString(), Model.Quality, new { @class = "qualitySelector" })
<button class="addExistingButton">
Add</button>