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

Finishing up Prowl integration.

This commit is contained in:
Mark McDowall 2011-11-02 21:01:44 -07:00
parent eb6b5a6b0e
commit 24a2c2be59
5 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IISExpress/AppServer/applicationhost.config
View File

@ -125,8 +125,8 @@
<virtualDirectory path="/" physicalPath="%NZBDRONE_PATH%\NZBDrone.Web" /> <virtualDirectory path="/" physicalPath="%NZBDRONE_PATH%\NZBDrone.Web" />
</application> </application>
<bindings> <bindings>
<binding protocol="http" bindingInformation="*:12345:localhost" /> <binding protocol="http" bindingInformation="*:8989:localhost" />
<binding protocol="http" bindingInformation="*:12345:" /> <binding protocol="http" bindingInformation="*:8989:" />
</bindings> </bindings>
</site> </site>
<applicationDefaults applicationPool="IISExpressAppPool" /> <applicationDefaults applicationPool="IISExpressAppPool" />

1
NzbDrone.Core/CentralDispatch.cs
View File

@ -107,6 +107,7 @@ namespace NzbDrone.Core
_kernel.Bind<ExternalNotificationBase>().To<Smtp>(); _kernel.Bind<ExternalNotificationBase>().To<Smtp>();
_kernel.Bind<ExternalNotificationBase>().To<Twitter>(); _kernel.Bind<ExternalNotificationBase>().To<Twitter>();
_kernel.Bind<ExternalNotificationBase>().To<Providers.ExternalNotification.Growl>(); _kernel.Bind<ExternalNotificationBase>().To<Providers.ExternalNotification.Growl>();
_kernel.Bind<ExternalNotificationBase>().To<Prowl>();
var notifiers = _kernel.GetAll<ExternalNotificationBase>(); var notifiers = _kernel.GetAll<ExternalNotificationBase>();
_kernel.Get<ExternalNotificationProvider>().InitializeNotifiers(notifiers.ToList()); _kernel.Get<ExternalNotificationProvider>().InitializeNotifiers(notifiers.ToList());

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

@ -490,6 +490,16 @@ namespace NzbDrone.Web.Controllers
_configProvider.GrowlHost = data.GrowlHost; _configProvider.GrowlHost = data.GrowlHost;
_configProvider.GrowlPassword = data.GrowlPassword; _configProvider.GrowlPassword = data.GrowlPassword;
//Prowl
var prowlSettings = _externalNotificationProvider.GetSettings(typeof(Prowl));
prowlSettings.Enable = data.ProwlEnabled;
_externalNotificationProvider.SaveSettings(prowlSettings);
_configProvider.ProwlNotifyOnGrab = data.ProwlNotifyOnGrab;
_configProvider.ProwlNotifyOnDownload = data.ProwlNotifyOnDownload;
_configProvider.ProwlApiKeys = data.ProwlApiKeys;
_configProvider.ProwlPriority = data.ProwlPriority;
return GetSuccessResult(); return GetSuccessResult();
} }

8
NzbDrone.Web/Models/NotificationSettingsModel.cs
View File

@ -125,12 +125,16 @@ namespace NzbDrone.Web.Models
[Description("Send notification when episode is downloaded?")] [Description("Send notification when episode is downloaded?")]
public bool GrowlNotifyOnDownload { get; set; } public bool GrowlNotifyOnDownload { get; set; }
[DataType(DataType.Text)]
[DisplayName("Host running Growl")] [DisplayName("Host running Growl")]
[Description("Host or IP Address:Port")] [Description("Host or IP Address:Port")]
[DisplayFormat(ConvertEmptyStringToNull = false)]
public string GrowlHost { get; set; } public string GrowlHost { get; set; }
[DataType(DataType.Text)]
[DisplayName("Growl host Password")] [DisplayName("Growl host Password")]
[Description("Password is required if Growl is running on another system")] [Description("Password is required if Growl is running on another system")]
[DisplayFormat(ConvertEmptyStringToNull = false)]
public string GrowlPassword { get; set; } public string GrowlPassword { get; set; }
@ -147,12 +151,16 @@ namespace NzbDrone.Web.Models
[Description("Send notification when episode is downloaded?")] [Description("Send notification when episode is downloaded?")]
public bool ProwlNotifyOnDownload { get; set; } public bool ProwlNotifyOnDownload { get; set; }
[DataType(DataType.Text)]
[DisplayName("API Keys")] [DisplayName("API Keys")]
[Description("Comma-Separated list of API Keys")] [Description("Comma-Separated list of API Keys")]
[DisplayFormat(ConvertEmptyStringToNull = false)]
public string ProwlApiKeys { get; set; } public string ProwlApiKeys { get; set; }
[DataType(DataType.Text)]
[DisplayName("Priority")] [DisplayName("Priority")]
[Description("Priority to send alerts to Prowl with")] [Description("Priority to send alerts to Prowl with")]
[DisplayFormat(ConvertEmptyStringToNull = false)]
public int ProwlPriority { get; set; } public int ProwlPriority { get; set; }
public SelectList ProwlPrioritySelectList { get; set; } public SelectList ProwlPrioritySelectList { get; set; }

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

@ -58,7 +58,7 @@
<li><a href="#tabs-smtp">SMTP</a></li> <li><a href="#tabs-smtp">SMTP</a></li>
<li><a href="#tabs-twitter">Twitter</a></li> <li><a href="#tabs-twitter">Twitter</a></li>
<li><a href="#tabs-growl">Growl</a></li> <li><a href="#tabs-growl">Growl</a></li>
<li><a href="#tabs-growl">Prowl</a></li> <li><a href="#tabs-prowl">Prowl</a></li>
</ul> </ul>
<div id="tabs-xbmc"> <div id="tabs-xbmc">
@{Html.RenderPartial("Xbmc", Model);} @{Html.RenderPartial("Xbmc", Model);}