Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DownloadClient added to the UI, it still will only download via Sabnzbd.

This commit is contained in:
Mark McDowall 2012-01-28 13:43:44 -08:00
parent 68e1a0bc4d
commit af0532d959
10 changed files with 234 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NzbDrone.Core/Model/DownloadClientType.cs Normal file
View File

@ -0,0 +1,8 @@
namespace NzbDrone.Core.Model
{
public enum DownloadClientType
{
Sabnzbd = 0,
Blackhole = 1
}
}

1
NzbDrone.Core/NzbDrone.Core.csproj
View File

@ -227,6 +227,7 @@
<Compile Include="Helpers\FileSizeFormatHelper.cs" />
<Compile Include="Helpers\SortHelper.cs" />
<Compile Include="Jobs\CheckpointJob.cs" />
<Compile Include="Model\DownloadClientType.cs" />
<Compile Include="Providers\AnalyticsProvider.cs" />
<Compile Include="Instrumentation\LogDbContext.cs" />
<Compile Include="Instrumentation\LogProvider.cs" />

7
NzbDrone.Core/Providers/Core/ConfigProvider.cs
View File

@ -409,6 +409,13 @@ namespace NzbDrone.Core.Providers.Core
set { SetValue("AutoIgnorePreviouslyDownloadedEpisodes", value); }
}
public virtual DownloadClientType DownloadClient
{
get { return (DownloadClientType)GetValueInt("DownloadClient"); }
set { SetValue("DownloadClient", (int)value); }
}
public string UGuid
{
get { return GetValue("UGuid", Guid.NewGuid().ToString(), persist: true); }

23
NzbDrone.Web/Controllers/SettingsController.cs
View File

@ -6,6 +6,7 @@ using NLog;
using NzbDrone.Common;
using NzbDrone.Common.Model;
using NzbDrone.Core.Helpers;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Providers.ExternalNotification;
@ -90,12 +91,17 @@ namespace NzbDrone.Web.Controllers
});
}
public ActionResult Sabnzbd()
public ActionResult DownloadClient()
{
var tvCategory = _configProvider.SabTvCategory;
var tvCategorySelectList = new SelectList(new[] { tvCategory });
var model = new SabnzbdSettingsModel
var downloadClientTypes = new List<KeyValuePair<int, string>>();
foreach (DownloadClientType downloadClientType in Enum.GetValues(typeof(DownloadClientType)))
downloadClientTypes.Add(new KeyValuePair<int, string>((int)downloadClientType, downloadClientType.ToString()));
var model = new DownloadClientSettingsModel
{
SabHost = _configProvider.SabHost,
SabPort = _configProvider.SabPort,
@ -104,8 +110,10 @@ namespace NzbDrone.Web.Controllers
SabPassword = _configProvider.SabPassword,
SabTvCategory = tvCategory,
SabTvPriority = _configProvider.SabTvPriority,
SabDropDirectory = _configProvider.SabDropDirectory,
SabTvCategorySelectList = tvCategorySelectList
DownloadClientDropDirectory = _configProvider.SabDropDirectory,
SabTvCategorySelectList = tvCategorySelectList,
DownloadClient = (int)_configProvider.DownloadClient,
DownloadClientSelectList = new SelectList(downloadClientTypes, "Key", "Value")
};
return View(model);
@ -373,11 +381,10 @@ namespace NzbDrone.Web.Controllers
}
[HttpPost]
public JsonResult SaveSabnzbd(SabnzbdSettingsModel data)
public JsonResult SaveDownloadClient(DownloadClientSettingsModel data)
{
if (ModelState.IsValid)
{
_configProvider.SabHost = data.SabHost;
_configProvider.SabPort = data.SabPort;
_configProvider.SabApiKey = data.SabApiKey;
@ -385,8 +392,8 @@ namespace NzbDrone.Web.Controllers
_configProvider.SabTvCategory = data.SabTvCategory;
_configProvider.SabUsername = data.SabUsername;
_configProvider.SabTvPriority = data.SabTvPriority;
_configProvider.SabDropDirectory = data.SabDropDirectory;
_configProvider.SabDropDirectory = data.DownloadClientDropDirectory;
_configProvider.DownloadClient = (DownloadClientType)data.DownloadClient;
return GetSuccessResult();
}

18
NzbDrone.Web/Models/SabnzbdSettingsModel.cs → NzbDrone.Web/Models/DownloadClientSettingsModel.cs
View File

@ -7,7 +7,7 @@ using NzbDrone.Core.Model.Sabnzbd;
namespace NzbDrone.Web.Models
{
public class SabnzbdSettingsModel
public class DownloadClientSettingsModel
{
public SelectList PrioritySelectList =
new SelectList(new[] {"Default", "Paused", "Low", "Normal", "High", "Top"});
@ -53,11 +53,21 @@ namespace NzbDrone.Web.Models
[Description("Priority to use when sending NZBs to SABnzbd")]
public SabPriorityType SabTvPriority { get; set; }
[DisplayName("SABnzbd TV Directory")]
[Description("The directory where SABnzbd downloads TV shows to (NzbDrone will sort them for you)")]
[DisplayName("Download Client TV Directory")]
[Description("The directory where your download client downloads TV shows to (NzbDrone will sort them for you)")]
[DisplayFormat(ConvertEmptyStringToNull = false)]
public string SabDropDirectory { get; set; }
public string DownloadClientDropDirectory { get; set; }
[DisplayName("Blackhole Directory")]
[Description("The directory where your download client will pickup NZB files")]
[DisplayFormat(ConvertEmptyStringToNull = false)]
public string BlackholeDirectory { get; set; }
[DisplayName("Download Client")]
[Description("What method do you download NZBs with?")]
public int DownloadClient { get; set; }
public SelectList SabTvCategorySelectList { get; set; }
public SelectList DownloadClientSelectList { get; set; }
}
}

8
NzbDrone.Web/NzbDrone.Web.csproj
View File

@ -235,7 +235,7 @@
<Compile Include="Models\JsonNotificationResult.cs" />
<Compile Include="Models\PendingProcessingModel.cs" />
<Compile Include="Models\ProwlPrioritySelectListModel.cs" />
<Compile Include="Models\SabnzbdSettingsModel.cs" />
<Compile Include="Models\DownloadClientSettingsModel.cs" />
<Compile Include="Models\EpisodeNamingModel.cs" />
<Compile Include="Models\HistoryModel.cs" />
<Compile Include="Models\IndexerSettingsModel.cs" />
@ -530,6 +530,12 @@
<ItemGroup>
<Content Include="Views\Series\SeriesItem.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Settings\DownloadClient.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Settings\Blackhole.cshtml" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

13
NzbDrone.Web/Views/Settings/Blackhole.cshtml Normal file
View File

@ -0,0 +1,13 @@
@using NzbDrone.Web.Helpers;
@model NzbDrone.Web.Models.DownloadClientSettingsModel
@{
Layout = null;
}
<div class="downloadClient">
<label class="labelClass">@Html.LabelFor(m => m.BlackholeDirectory)
<span class="small">@Html.DescriptionFor(m => m.BlackholeDirectory)</span>
</label>
@Html.TextBoxFor(m => m.BlackholeDirectory, new { @class = "inputClass folderLookup" })
</div>

127
NzbDrone.Web/Views/Settings/DownloadClient.cshtml Normal file
View File

@ -0,0 +1,127 @@
@using NzbDrone.Web.Helpers;
@model NzbDrone.Web.Models.DownloadClientSettingsModel
@{ Layout = "~/Views/Shared/_ReferenceLayout.cshtml"; }
@section HeaderContent{
@Html.IncludeCss("Settings.css")
<style>
.downloadClient
{
overflow: auto;
}
.downloadClient h4
{
font-weight: bold;
margin-bottom: 0px;
padding-left: 5px;
padding-top: 3px;
}
#save_button
{
margin-top: 10px;
}
#downloadClient-top
{
overflow: auto;
}
</style>
}
<div id="stylized">
@using (Html.BeginForm("SaveDownloadClient", "Settings", FormMethod.Post, new { id = "DownloadClientForm", name = "DownloadClientForm", @class = "settingsForm" }))
{
<div id="downloadClient-top" class="settingsForm">
<label class="labelClass">@Html.LabelFor(m => m.DownloadClient)
<span class="small">@Html.DescriptionFor(m => m.DownloadClient)</span>
</label>
@Html.DropDownListFor(m => m.DownloadClient, Model.DownloadClientSelectList, new { @class = "inputClass selectClass" })
<label class="labelClass">@Html.LabelFor(m => m.DownloadClientDropDirectory)
<span class="small">@Html.DescriptionFor(m => m.DownloadClientDropDirectory)</span>
</label>
@Html.TextBoxFor(m => m.DownloadClientDropDirectory, new { @class = "inputClass folderLookup" })
</div>
<div class="jquery-accordion" id="downloadClientAccordion">
<h3>
<a href="#">Sabnzbd</a></h3>
@{Html.RenderPartial("Sabnzbd", Model);}
<h3>
<a href="#">Blackhole</a></h3>
@{Html.RenderPartial("Blackhole", Model);}
</div>
<button type="submit" class="save_button" disabled="disabled">
Save</button>
}
</div>
<div id="result" class="hiddenResult">
</div>
@section Scripts{
<script type="text/javascript">
$(document).ready(function () {
$('#downloadClientAccordion').accordion("activate", false);
});
</script>
<script type="text/javascript">
var autoConfigureSabUrl = '@Url.Action("AutoConfigureSab", "Settings")';
function autoConfigureSab() {
$.ajax({
type: "GET",
url: autoConfigureSabUrl,
error: function (req, status, error) {
alert("Sorry! We could not autoconfigure SABnzbd for you");
},
success: autoConfigureSuccess
});
function autoConfigureSuccess(data) {
$('#SabHost').val(data.Host);
$('#SabPort').val(data.Port);
$('#SabApiKey').val(data.ApiKey);
}
}
var sabCategoryUrl = '../Command/GetSabnzbdCategories';
$('#SabTvCategory').focus(function () {
var host = $('#SabHost').val();
var port = $('#SabPort').val();
var apiKey = $('#SabApiKey').val();
var username = $('#SabUsername').val();
var password = $('#SabPassword').val();
$.ajax({
type: "POST",
url: sabCategoryUrl,
data: jQuery.param({ host: host, port: port, apiKey: apiKey, username: username, password: password }),
error: function (req, status, error) {
$.each($('#SabTvCategory option'), function () {
$(this).remove();
});
$('#SabTvCategory').append($('<option />').val('tv').text('Please check your SABnzbd Settings'));
},
success: function (data, textStatus, jqXHR) {
//Get the current value
var currentlySelected = $('#SabTvCategory').val();
//Remove all existing options
$.each($('#SabTvCategory option'), function () {
$(this).remove();
});
//Add the new ones
$.each(data.categories, function () {
$('#SabTvCategory').append($('<option />').val(this.toString()).text(this.toString()));
});
//Attempt to reset to the preiously selected value (change to lower-case)
$("#SabTvCategory").val(currentlySelected.toLowerCase());
}
});
});
</script>
}

2
NzbDrone.Web/Views/Settings/Index.cshtml
View File

@ -6,7 +6,7 @@
<li>@Html.ActionLink("Naming", "Naming", "Settings")</li>
<li>@Html.ActionLink("Indexers", "Indexers", "Settings")</li>
<li>@Html.ActionLink("Quality", "Quality", "Settings")</li>
<li>@Html.ActionLink("SABnzbd", "Sabnzbd", "Settings")</li>
<li>@Html.ActionLink("Download Client", "DownloadClient", "Settings")</li>
<li>@Html.ActionLink("Notifications", "Notifications", "Settings")</li>
<li>@Html.ActionLink("System", "System", "Settings")</li>
<li>@Html.ActionLink("Misc", "Misc", "Settings")</li>

84
NzbDrone.Web/Views/Settings/Sabnzbd.cshtml
View File

@ -1,12 +1,11 @@
@using NzbDrone.Web.Helpers;
@model NzbDrone.Web.Models.SabnzbdSettingsModel
@{ Layout = "~/Views/Shared/_ReferenceLayout.cshtml"; }
@section HeaderContent{
@Html.IncludeCss("Settings.css")
@model NzbDrone.Web.Models.DownloadClientSettingsModel
@{
Layout = null;
}
<div id="stylized">
@using (Html.BeginForm("SaveSabnzbd", "Settings", FormMethod.Post, new { id = "SabForm", name = "SabForm", @class = "settingsForm" }))
{
<div class="downloadClient">
<label class="labelClass">
Auto-Configure <span class="small">If access to SABnzbd doesn't require a username +
password and is on the same system as NzbDrone, you can auto-configure it</span>
@ -49,76 +48,5 @@
</label>
@Html.DropDownListFor(m => m.SabTvPriority, Model.PrioritySelectList, new { @class = "inputClass selectClass" })
<label class="labelClass">@Html.LabelFor(m => m.SabDropDirectory)
<span class="small">@Html.DescriptionFor(m => m.SabDropDirectory)</span>
</label>
@Html.TextBoxFor(m => m.SabDropDirectory, new { @class = "inputClass folderLookup" })
<button type="submit" class="save_button" disabled="disabled">
Save</button>
}
</div>
<div id="result" class="hiddenResult">
</div>
@section Scripts{
<script type="text/javascript">
var autoConfigureSabUrl = '@Url.Action("AutoConfigureSab", "Settings")';
function autoConfigureSab() {
$.ajax({
type: "GET",
url: autoConfigureSabUrl,
error: function (req, status, error) {
alert("Sorry! We could not autoconfigure SABnzbd for you");
},
success: autoConfigureSuccess
});
function autoConfigureSuccess(data) {
$('#SabHost').val(data.Host);
$('#SabPort').val(data.Port);
$('#SabApiKey').val(data.ApiKey);
}
}
var sabCategoryUrl = '../Command/GetSabnzbdCategories';
$('#SabTvCategory').focus(function () {
var host = $('#SabHost').val();
var port = $('#SabPort').val();
var apiKey = $('#SabApiKey').val();
var username = $('#SabUsername').val();
var password = $('#SabPassword').val();
$.ajax({
type: "POST",
url: sabCategoryUrl,
data: jQuery.param({ host: host, port: port, apiKey: apiKey, username: username, password: password }),
error: function (req, status, error) {
$.each($('#SabTvCategory option'), function () {
$(this).remove();
});
$('#SabTvCategory').append($('<option />').val('tv').text('Please check your SABnzbd Settings'));
},
success: function (data, textStatus, jqXHR) {
//Get the current value
var currentlySelected = $('#SabTvCategory').val();
//Remove all existing options
$.each($('#SabTvCategory option'), function () {
$(this).remove();
});
//Add the new ones
$.each(data.categories, function () {
$('#SabTvCategory').append($('<option />').val(this.toString()).text(this.toString()));
});
//Attempt to reset to the preiously selected value (change to lower-case)
$("#SabTvCategory").val(currentlySelected.toLowerCase());
}
});
});
</script>
}