Mirrors/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2024-11-04 10:02:40 +01:00
Code Issues Releases Wiki Activity

Notification settings added to the UI

Browse Source
This commit is contained in:
Mark McDowall 2013-05-19 21:19:54 -07:00
parent a153599d50
commit c5376319fe
21 changed files with 168 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NzbDrone.Api/ClientSchema/Field.cs
View File

@ -7,5 +7,6 @@ public class Field
public string Label { get; set; }
public string HelpText { get; set; }
public string Value { get; set; }
public string Type { get; set; }
}
}

2
NzbDrone.Api/ClientSchema/SchemaBuilder.cs
View File

@ -25,7 +25,7 @@ public static List<Field> GenerateSchema(object model)
Label = fieldAttribute.Label,
HelpText = fieldAttribute.HelpText,
Order = fieldAttribute.Order,
Type = fieldAttribute.Type.ToString().ToLowerInvariant()
};
var value = propertyInfo.GetValue(model, null);

4
NzbDrone.Api/Commands/CommandModule.cs
View File

@ -4,8 +4,6 @@
using NzbDrone.Api.Extensions;
using NzbDrone.Common.Composition;
using NzbDrone.Common.Messaging;
using NzbDrone.Core.Download;
using NzbDrone.Core.Parser.Model;
namespace NzbDrone.Api.Commands
{
@ -24,8 +22,6 @@ public CommandModule(IMessageAggregator messageAggregator, IContainer container)
private CommandResource RunCommand(CommandResource resource)
{
_messageAggregator.PublishEvent(new EpisodeGrabbedEvent(new RemoteEpisode()));
var commandType =
_container.GetImplementations(typeof(ICommand))
.Single(c => c.Name.Replace("Command", "")

3
NzbDrone.Api/Notifications/NotificationResource.cs
View File

@ -7,8 +7,9 @@ namespace NzbDrone.Api.Notifications
{
public class NotificationResource : RestResource
{
public Boolean Enable { get; set; }
public String Name { get; set; }
public Boolean OnGrab { get; set; }
public Boolean OnDownload { get; set; }
public List<Field> Fields { get; set; }
}
}

8
NzbDrone.Core/Annotations/FieldDefinitionAttribute.cs
View File

@ -13,5 +13,13 @@ public FieldDefinitionAttribute(int order)
public int Order { get; private set; }
public string Label { get; set; }
public string HelpText { get; set; }
public FieldType Type { get; set; }
}
public enum FieldType
{
Textbox,
Password,
Checkbox
}
}

1
NzbDrone.Core/Notifications/NotificationService.cs
View File

@ -39,7 +39,6 @@ public NotificationService(INotificationRepository notificationRepository,
public List<Notification> All()
{
var test = _notificationRepository.All();//.Select(ToNotification).ToList();
return _notificationRepository.All().Select(ToNotification).ToList();
}

11
NzbDrone.Core/Notifications/Xbmc/Xbmc.cs
View File

@ -21,14 +21,21 @@ public override void OnGrab(string message)
{
const string header = "NzbDrone [TV] - Grabbed";
_xbmcProvider.Notify(Settings, header, message);
if (Settings.Notify)
{
_xbmcProvider.Notify(Settings, header, message);
}
}
public override void OnDownload(string message, Series series)
{
const string header = "NzbDrone [TV] - Downloaded";
_xbmcProvider.Notify(Settings, header, message);
if (Settings.Notify)
{
_xbmcProvider.Notify(Settings, header, message);
}
UpdateAndClean(series);
}

17
NzbDrone.Core/Notifications/Xbmc/XbmcSettings.cs
View File

@ -8,25 +8,28 @@ namespace NzbDrone.Core.Notifications.Xbmc
{
public class XbmcSettings : INotifcationSettings
{
[FieldDefinition(0, Label = "Host", HelpText = "XBMC Hostnname or IP")]
[FieldDefinition(0, Label = "Host")]
public String Host { get; set; }
[FieldDefinition(1, Label = "Port", HelpText = "Webserver port")]
[FieldDefinition(1, Label = "Port")]
public Int32 Port { get; set; }
[FieldDefinition(2, Label = "Username", HelpText = "Webserver Username")]
[FieldDefinition(2, Label = "Username")]
public String Username { get; set; }
[FieldDefinition(3, Label = "Password", HelpText = "Webserver Password ")]
[FieldDefinition(3, Label = "Password", Type = FieldType.Password)]
public String Password { get; set; }
[FieldDefinition(4, Label = "Update Library", HelpText = "Update Library on Download & Rename?")]
[FieldDefinition(4, Label = "GUI Notification", HelpText = "Show GUI notifications?", Type = FieldType.Checkbox)]
public Boolean Notify { get; set; }
[FieldDefinition(5, Label = "Update Library", HelpText = "Update Library on Download & Rename?", Type = FieldType.Checkbox)]
public Boolean UpdateLibrary { get; set; }
[FieldDefinition(5, Label = "Update Library", HelpText = "Clean Library after update?")]
[FieldDefinition(6, Label = "Clean Library", HelpText = "Clean Library after update?", Type = FieldType.Checkbox)]
public Boolean CleanLibrary { get; set; }
[FieldDefinition(6, Label = "Always Update", HelpText = "Update Library even when a video is playing?")]
[FieldDefinition(7, Label = "Always Update", HelpText = "Update Library even when a video is playing?", Type = FieldType.Checkbox)]
public Boolean AlwaysUpdate { get; set; }
public bool IsValid

2
UI/Form/CheckboxTemplate.html
View File

@ -12,8 +12,10 @@
<div class="btn btn-primary slide-button"></div>
</label>
{{#if helpText}}
<span class="help-inline-checkbox">
<i class="icon-question-sign" title="{{helpText}}"></i>
</span>
{{/if}}
</div>
</div>

12
UI/Form/PasswordTemplate.html Normal file
View File

@ -0,0 +1,12 @@
<div class="control-group">
<label class="control-label">{{label}}</label>
<div class="controls">
<input type="password" name="fields.{{order}}.value"/>
{{#if helpText}}
<span class="help-inline">
<i class="icon-question-sign" title="{{helpText}}"></i>
</span>
{{/if}}
</div>
</div>

8
UI/Form/TextboxTemplate.html
View File

@ -3,8 +3,10 @@
<div class="controls">
<input type="text" name="fields.{{order}}.value"/>
<span class="help-inline">
<i class="icon-question-sign" title="{{helpText}}"></i>
</span>
{{#if helpText}}
<span class="help-inline">
<i class="icon-question-sign" title="{{helpText}}"></i>
</span>
{{/if}}
</div>
</div>

8
UI/Mixins/handlebars.mixin.js
View File

@ -12,6 +12,14 @@ Handlebars.registerHelper('formField', function () {
return Handlebars.helpers.partial.apply(this, ['Form/TextboxTemplate']);
}
if (this.type === 'password') {
return Handlebars.helpers.partial.apply(this, ['Form/PasswordTemplate']);
}
if (this.type === 'checkbox') {
return Handlebars.helpers.partial.apply(this, ['Form/CheckboxTemplate']);
}
return Handlebars.helpers.partial.apply(this, ['Form/TextboxTemplate']);
});

7
UI/Settings/Notifications/Collection.js Normal file
View File

@ -0,0 +1,7 @@
"use strict";
define(['app', 'Settings/Notifications/Model'], function () {
NzbDrone.Settings.Notifications.Collection = Backbone.Collection.extend({
url : NzbDrone.Constants.ApiRoot + '/notification',
model: NzbDrone.Settings.Notifications.Model
});
});

5
UI/Settings/Notifications/CollectionTemplate.html Normal file
View File

@ -0,0 +1,5 @@
<div class="row">
<div class="span12">
<div id="x-notifications" class="form-horizontal"></div>
</div>
</div>

8
UI/Settings/Notifications/CollectionView.js Normal file
View File

@ -0,0 +1,8 @@
'use strict';
define(['app', 'Settings/Notifications/ItemView'], function () {
NzbDrone.Settings.Notifications.CollectionView = Backbone.Marionette.CompositeView.extend({
itemView : NzbDrone.Settings.Notifications.ItemView,
itemViewContainer : '#x-notifications',
template : 'Settings/Notifications/CollectionTemplate'
});
});

47
UI/Settings/Notifications/ItemTemplate.html Normal file
View File

@ -0,0 +1,47 @@
<fieldset>
<legend>{{name}}</legend>
<div class="control-group">
<label class="control-label">On Grab</label>
<div class="controls">
<label class="checkbox toggle well">
<input type="checkbox" name="onGrab"/>
<p>
<span>On</span>
<span>Off</span>
</p>
<div class="btn btn-primary slide-button"></div>
</label>
<span class="help-inline-checkbox">
<i class="icon-question-sign" title="Do you want to get notifications when episodes are grabbed?"></i>
</span>
</div>
</div>
<div class="control-group">
<label class="control-label">On Download</label>
<div class="controls">
<label class="checkbox toggle well">
<input type="checkbox" name="onDownload"/>
<p>
<span>On</span>
<span>Off</span>
</p>
<div class="btn btn-primary slide-button"></div>
</label>
<span class="help-inline-checkbox">
<i class="icon-question-sign" title="Do you want to get notifications when episodes are downloaded?"></i>
</span>
</div>
</div>
{{#each fields}}
{{formField}}
{{/each}}
</fieldset>

33
UI/Settings/Notifications/ItemView.js Normal file
View File

@ -0,0 +1,33 @@
"use strict";
define([
'app',
'Settings/Notifications/Collection'
], function () {
NzbDrone.Settings.Notifications.ItemView = Backbone.Marionette.ItemView.extend({
template : 'Settings/Notifications/ItemTemplate',
initialize: function () {
NzbDrone.vent.on(NzbDrone.Commands.SaveSettings, this.saveSettings, this);
},
saveSettings: function () {
//this.model.save(undefined, this.syncNotification("Naming Settings Saved", "Couldn't Save Naming Settings"));
},
syncNotification: function (success, error) {
return {
success: function () {
window.alert(success);
},
error: function () {
window.alert(error);
}
};
}
});
});

5
UI/Settings/Notifications/Model.js Normal file
View File

@ -0,0 +1,5 @@
"use strict";
define(['app'], function () {
NzbDrone.Settings.Notifications.Model = Backbone.DeepModel.extend({
});
});

3
UI/Settings/Notifications/NotificationsTemplate.html
View File

@ -1,3 +0,0 @@
<div>
Notification settings will go here
</div>

11
UI/Settings/Notifications/NotificationsView.js
View File

@ -1,11 +0,0 @@
'use strict';
define([
'app', 'Settings/SettingsModel'
], function () {
NzbDrone.Settings.Notifications.NotificationsView = Backbone.Marionette.ItemView.extend({
template: 'Settings/Notifications/NotificationsTemplate'
});
});

7
UI/Settings/SettingsLayout.js
View File

@ -5,7 +5,7 @@ define([
'Settings/Quality/QualityLayout',
'Settings/Indexers/CollectionView',
'Settings/DownloadClient/DownloadClientView',
'Settings/Notifications/NotificationsView',
'Settings/Notifications/CollectionView',
'Settings/System/SystemView',
'Settings/Misc/MiscView'
],
@ -117,6 +117,9 @@ define([
this.indexerSettings = new NzbDrone.Settings.Indexers.Collection();
this.indexerSettings.fetch();
this.notificationSettings = new NzbDrone.Settings.Notifications.Collection();
this.notificationSettings.fetch();
if (options.action) {
this.action = options.action.toLowerCase();
}
@ -127,7 +130,7 @@ define([
this.quality.show(new NzbDrone.Settings.Quality.QualityLayout({settings: this.settings}));
this.indexers.show(new NzbDrone.Settings.Indexers.CollectionView({collection: this.indexerSettings}));
this.downloadClient.show(new NzbDrone.Settings.DownloadClient.DownloadClientView({model: this.settings}));
this.notifications.show(new NzbDrone.Settings.Notifications.NotificationsView({model: this.settings}));
this.notifications.show(new NzbDrone.Settings.Notifications.CollectionView({collection: this.notificationSettings}));
this.system.show(new NzbDrone.Settings.System.SystemView({model: this.settings}));
this.misc.show(new NzbDrone.Settings.Misc.MiscView({model: this.settings}));
},