diff --git a/src/NzbDrone.Api/Config/NetImportConfigModule.cs b/src/NzbDrone.Api/Config/NetImportConfigModule.cs new file mode 100644 index 000000000..3cd194116 --- /dev/null +++ b/src/NzbDrone.Api/Config/NetImportConfigModule.cs @@ -0,0 +1,20 @@ +using FluentValidation; +using NzbDrone.Api.Validation; +using NzbDrone.Core.Configuration; + +namespace NzbDrone.Api.Config +{ + public class NetImportConfigModule : NzbDroneConfigModule + { + + public NetImportConfigModule(IConfigService configService) + : base(configService) + { + } + + protected override NetImportConfigResource ToResource(IConfigService model) + { + return NetImportConfigResourceMapper.ToResource(model); + } + } +} \ No newline at end of file diff --git a/src/NzbDrone.Api/Config/NetImportConfigResource.cs b/src/NzbDrone.Api/Config/NetImportConfigResource.cs new file mode 100644 index 000000000..7b32aefe3 --- /dev/null +++ b/src/NzbDrone.Api/Config/NetImportConfigResource.cs @@ -0,0 +1,19 @@ +using NzbDrone.Api.REST; +using NzbDrone.Core.Configuration; + +namespace NzbDrone.Api.Config +{ + public class NetImportConfigResource : RestResource + { + } + + public static class NetImportConfigResourceMapper + { + public static NetImportConfigResource ToResource(IConfigService model) + { + return new NetImportConfigResource + { + }; + } + } +} diff --git a/src/NzbDrone.Api/NetImport/NetImportModule.cs b/src/NzbDrone.Api/NetImport/NetImportModule.cs index b128b061d..6130191d7 100644 --- a/src/NzbDrone.Api/NetImport/NetImportModule.cs +++ b/src/NzbDrone.Api/NetImport/NetImportModule.cs @@ -5,7 +5,7 @@ namespace NzbDrone.Api.NetImport public class NetImportModule : ProviderModuleBase { public NetImportModule(NetImportFactory indexerFactory) - : base(indexerFactory, "indexer") + : base(indexerFactory, "netimport") { } diff --git a/src/NzbDrone.Api/NzbDrone.Api.csproj b/src/NzbDrone.Api/NzbDrone.Api.csproj index 6a61d84fc..47a433a54 100644 --- a/src/NzbDrone.Api/NzbDrone.Api.csproj +++ b/src/NzbDrone.Api/NzbDrone.Api.csproj @@ -109,6 +109,8 @@ + + @@ -121,6 +123,8 @@ + + diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index a2607ca25..c8dd24853 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -125,6 +125,7 @@ + diff --git a/src/UI/Settings/NetImport/Add/IndexerAddCollectionView.js b/src/UI/Settings/NetImport/Add/IndexerAddCollectionView.js new file mode 100644 index 000000000..5a4102cf2 --- /dev/null +++ b/src/UI/Settings/NetImport/Add/IndexerAddCollectionView.js @@ -0,0 +1,9 @@ +var ThingyAddCollectionView = require('../../ThingyAddCollectionView'); +var ThingyHeaderGroupView = require('../../ThingyHeaderGroupView'); +var AddItemView = require('./IndexerAddItemView'); + +module.exports = ThingyAddCollectionView.extend({ + itemView : ThingyHeaderGroupView.extend({ itemView : AddItemView }), + itemViewContainer : '.add-indexer .items', + template : 'Settings/Indexers/Add/IndexerAddCollectionViewTemplate' +}); \ No newline at end of file diff --git a/src/UI/Settings/NetImport/Add/IndexerAddCollectionViewTemplate.hbs b/src/UI/Settings/NetImport/Add/IndexerAddCollectionViewTemplate.hbs new file mode 100644 index 000000000..3d581b5e4 --- /dev/null +++ b/src/UI/Settings/NetImport/Add/IndexerAddCollectionViewTemplate.hbs @@ -0,0 +1,18 @@ +
+
+ +

Add Indexer

+
+
+
+ Radarr supports any indexer that uses the Newznab standard, as well as other indexers listed below.
+ For more information on the individual indexers, click on the info buttons. +
+
+
    +
    +
    +
    + +
    +
    diff --git a/src/UI/Settings/NetImport/Add/IndexerAddItemView.js b/src/UI/Settings/NetImport/Add/IndexerAddItemView.js new file mode 100644 index 000000000..3a8b0493a --- /dev/null +++ b/src/UI/Settings/NetImport/Add/IndexerAddItemView.js @@ -0,0 +1,52 @@ +var _ = require('underscore'); +var $ = require('jquery'); +var AppLayout = require('../../../AppLayout'); +var Marionette = require('marionette'); +var EditView = require('../Edit/IndexerEditView'); + +module.exports = Marionette.ItemView.extend({ + template : 'Settings/Indexers/Add/IndexerAddItemViewTemplate', + tagName : 'li', + className : 'add-thingy-item', + + events : { + 'click .x-preset' : '_addPreset', + 'click' : '_add' + }, + + initialize : function(options) { + this.targetCollection = options.targetCollection; + }, + + _addPreset : function(e) { + var presetName = $(e.target).closest('.x-preset').attr('data-id'); + var presetData = _.where(this.model.get('presets'), { name : presetName })[0]; + + this.model.set(presetData); + + this._openEdit(); + }, + + _add : function(e) { + if ($(e.target).closest('.btn,.btn-group').length !== 0 && $(e.target).closest('.x-custom').length === 0) { + return; + } + + this._openEdit(); + }, + + _openEdit : function() { + this.model.set({ + id : undefined, + enableRss : this.model.get('supportsRss'), + enableSearch : this.model.get('supportsSearch') + }); + + var editView = new EditView({ + model : this.model, + targetCollection : this.targetCollection + }); + + AppLayout.modalRegion.show(editView); + } +}); \ No newline at end of file diff --git a/src/UI/Settings/NetImport/Add/IndexerAddItemViewTemplate.hbs b/src/UI/Settings/NetImport/Add/IndexerAddItemViewTemplate.hbs new file mode 100644 index 000000000..40bcb4391 --- /dev/null +++ b/src/UI/Settings/NetImport/Add/IndexerAddItemViewTemplate.hbs @@ -0,0 +1,30 @@ +
    +
    + {{implementationName}} +
    +
    + {{#if_gt presets.length compare=0}} + +
    + +
      + {{#each presets}} +
    • + {{name}} +
      • + {{/each}} +
    +
    + {{/if_gt}} + {{#if infoLink}} + + + + {{/if}} +
    +
    \ No newline at end of file diff --git a/src/UI/Settings/NetImport/Add/IndexerSchemaModal.js b/src/UI/Settings/NetImport/Add/IndexerSchemaModal.js new file mode 100644 index 000000000..52b430e89 --- /dev/null +++ b/src/UI/Settings/NetImport/Add/IndexerSchemaModal.js @@ -0,0 +1,39 @@ +var _ = require('underscore'); +var AppLayout = require('../../../AppLayout'); +var Backbone = require('backbone'); +var SchemaCollection = require('../IndexerCollection'); +var AddCollectionView = require('./IndexerAddCollectionView'); + +module.exports = { + open : function(collection) { + var schemaCollection = new SchemaCollection(); + var originalUrl = schemaCollection.url; + schemaCollection.url = schemaCollection.url + '/schema'; + schemaCollection.fetch(); + schemaCollection.url = originalUrl; + + var groupedSchemaCollection = new Backbone.Collection(); + + schemaCollection.on('sync', function() { + + var groups = schemaCollection.groupBy(function(model, iterator) { + return model.get('protocol'); + }); + var modelCollection = _.map(groups, function(values, key, list) { + return { + "header" : key, + collection : values + }; + }); + + groupedSchemaCollection.reset(modelCollection); + }); + + var view = new AddCollectionView({ + collection : groupedSchemaCollection, + targetCollection : collection + }); + + AppLayout.modalRegion.show(view); + } +}; \ No newline at end of file diff --git a/src/UI/Settings/NetImport/Delete/IndexerDeleteView.js b/src/UI/Settings/NetImport/Delete/IndexerDeleteView.js new file mode 100644 index 000000000..58e7e3eb5 --- /dev/null +++ b/src/UI/Settings/NetImport/Delete/IndexerDeleteView.js @@ -0,0 +1,19 @@ +var vent = require('vent'); +var Marionette = require('marionette'); + +module.exports = Marionette.ItemView.extend({ + template : 'Settings/Indexers/Delete/IndexerDeleteViewTemplate', + + events : { + 'click .x-confirm-delete' : '_delete' + }, + + _delete : function() { + this.model.destroy({ + wait : true, + success : function() { + vent.trigger(vent.Commands.CloseModalCommand); + } + }); + } +}); \ No newline at end of file diff --git a/src/UI/Settings/NetImport/Delete/IndexerDeleteViewTemplate.hbs b/src/UI/Settings/NetImport/Delete/IndexerDeleteViewTemplate.hbs new file mode 100644 index 000000000..c5c7ad7db --- /dev/null +++ b/src/UI/Settings/NetImport/Delete/IndexerDeleteViewTemplate.hbs @@ -0,0 +1,13 @@ +
    +
    + +

    Delete Indexer

    +
    +
    +

    Are you sure you want to delete '{{name}}'?

    +
    +
    + + +
    +
    \ No newline at end of file diff --git a/src/UI/Settings/NetImport/Edit/IndexerEditView.js b/src/UI/Settings/NetImport/Edit/IndexerEditView.js new file mode 100644 index 000000000..616c863a7 --- /dev/null +++ b/src/UI/Settings/NetImport/Edit/IndexerEditView.js @@ -0,0 +1,122 @@ +var _ = require('underscore'); +var $ = require('jquery'); +var vent = require('vent'); +var Marionette = require('marionette'); +var DeleteView = require('../Delete/IndexerDeleteView'); +var AsModelBoundView = require('../../../Mixins/AsModelBoundView'); +var AsValidatedView = require('../../../Mixins/AsValidatedView'); +var AsEditModalView = require('../../../Mixins/AsEditModalView'); +require('../../../Form/FormBuilder'); +require('../../../Mixins/AutoComplete'); +require('bootstrap'); + +var view = Marionette.ItemView.extend({ + template : 'Settings/Indexers/Edit/IndexerEditViewTemplate', + + events : { + 'click .x-back' : '_back', + 'click .x-captcha-refresh' : '_onRefreshCaptcha' + }, + + _deleteView : DeleteView, + + initialize : function(options) { + this.targetCollection = options.targetCollection; + }, + + _onAfterSave : function() { + this.targetCollection.add(this.model, { merge : true }); + vent.trigger(vent.Commands.CloseModalCommand); + }, + + _onAfterSaveAndAdd : function() { + this.targetCollection.add(this.model, { merge : true }); + + require('../Add/IndexerSchemaModal').open(this.targetCollection); + }, + + _back : function() { + if (this.model.isNew()) { + this.model.destroy(); + } + + require('../Add/IndexerSchemaModal').open(this.targetCollection); + }, + + _onRefreshCaptcha : function(event) { + var self = this; + + var target = $(event.target).parents('.input-group'); + + this.ui.indicator.show(); + + this.model.requestAction("checkCaptcha") + .then(function(result) { + if (!result.captchaRequest) { + self.model.setFieldValue('CaptchaToken', ''); + + return result; + } + + return self._showCaptcha(target, result.captchaRequest); + }) + .always(function() { + self.ui.indicator.hide(); + }); + }, + + _showCaptcha : function(target, captchaRequest) { + var self = this; + + var widget = $('
    ').insertAfter(target); + + return this._loadRecaptchaWidget(widget[0], captchaRequest.siteKey, captchaRequest.secretToken) + .then(function(captchaResponse) { + target.parents('.form-group').removeAllErrors(); + widget.remove(); + + var queryParams = { + responseUrl : captchaRequest.responseUrl, + ray : captchaRequest.ray, + captchaResponse: captchaResponse + }; + + return self.model.requestAction("getCaptchaCookie", queryParams); + }) + .then(function(response) { + self.model.setFieldValue('CaptchaToken', response.captchaToken); + }); + }, + + _loadRecaptchaWidget : function(widget, sitekey, stoken) { + var promise = $.Deferred(); + + var renderWidget = function() { + window.grecaptcha.render(widget, { + 'sitekey' : sitekey, + 'stoken' : stoken, + 'callback' : promise.resolve + }); + }; + + if (window.grecaptcha) { + renderWidget(); + } else { + window.grecaptchaLoadCallback = function() { + delete window.grecaptchaLoadCallback; + renderWidget(); + }; + + $.getScript('https://www.google.com/recaptcha/api.js?onload=grecaptchaLoadCallback&render=explicit') + .fail(function() { promise.reject(); }); + } + + return promise; + } +}); + +AsModelBoundView.call(view); +AsValidatedView.call(view); +AsEditModalView.call(view); + +module.exports = view; \ No newline at end of file diff --git a/src/UI/Settings/NetImport/Edit/IndexerEditViewTemplate.hbs b/src/UI/Settings/NetImport/Edit/IndexerEditViewTemplate.hbs new file mode 100644 index 000000000..acfb62cbb --- /dev/null +++ b/src/UI/Settings/NetImport/Edit/IndexerEditViewTemplate.hbs @@ -0,0 +1,92 @@ +
    +
    + + {{#if id}} +

    Edit - {{implementationName}}

    + {{else}} +

    Add - {{implementationName}}

    + {{/if}} +
    +
    +
    +
    + + +
    + +
    +
    + +
    + + +
    +
    +
    +
    + +
    + + +
    +
    +
    +
    + + {{formBuilder}} +
    +
    +
    + {{#if id}} + + {{else}} + + {{/if}} + + + + +
    + + +
      +
    • + save and add +
      • +
    +
    +
    +
    diff --git a/src/UI/Settings/NetImport/IndexerCollectionView.js b/src/UI/Settings/NetImport/IndexerCollectionView.js new file mode 100644 index 000000000..df6ae9596 --- /dev/null +++ b/src/UI/Settings/NetImport/IndexerCollectionView.js @@ -0,0 +1,25 @@ +var Marionette = require('marionette'); +var ItemView = require('./IndexerItemView'); +var SchemaModal = require('./Add/IndexerSchemaModal'); + +module.exports = Marionette.CompositeView.extend({ + itemView : ItemView, + itemViewContainer : '.indexer-list', + template : 'Settings/Indexers/IndexerCollectionViewTemplate', + + ui : { + 'addCard' : '.x-add-card' + }, + + events : { + 'click .x-add-card' : '_openSchemaModal' + }, + + appendHtml : function(collectionView, itemView, index) { + collectionView.ui.addCard.parent('li').before(itemView.el); + }, + + _openSchemaModal : function() { + SchemaModal.open(this.collection); + } +}); \ No newline at end of file diff --git a/src/UI/Settings/NetImport/IndexerCollectionViewTemplate.hbs b/src/UI/Settings/NetImport/IndexerCollectionViewTemplate.hbs new file mode 100644 index 000000000..0f4ece3d8 --- /dev/null +++ b/src/UI/Settings/NetImport/IndexerCollectionViewTemplate.hbs @@ -0,0 +1,16 @@ +
    + Indexers +
    +
    +
      +
    • +
      + + + +
      +
      • +
    +
    +
    +
    \ No newline at end of file diff --git a/src/UI/Settings/NetImport/IndexerItemView.js b/src/UI/Settings/NetImport/IndexerItemView.js new file mode 100644 index 000000000..29cf3d7c5 --- /dev/null +++ b/src/UI/Settings/NetImport/IndexerItemView.js @@ -0,0 +1,24 @@ +var AppLayout = require('../../AppLayout'); +var Marionette = require('marionette'); +var EditView = require('./Edit/IndexerEditView'); + +module.exports = Marionette.ItemView.extend({ + template : 'Settings/Indexers/IndexerItemViewTemplate', + tagName : 'li', + + events : { + 'click' : '_edit' + }, + + initialize : function() { + this.listenTo(this.model, 'sync', this.render); + }, + + _edit : function() { + var view = new EditView({ + model : this.model, + targetCollection : this.model.collection + }); + AppLayout.modalRegion.show(view); + } +}); \ No newline at end of file diff --git a/src/UI/Settings/NetImport/IndexerItemViewTemplate.hbs b/src/UI/Settings/NetImport/IndexerItemViewTemplate.hbs new file mode 100644 index 000000000..abef39886 --- /dev/null +++ b/src/UI/Settings/NetImport/IndexerItemViewTemplate.hbs @@ -0,0 +1,27 @@ +
    +
    +

    {{name}}

    +
    + +
    + {{#if supportsRss}} + {{#if enableRss}} + RSS + {{else}} + RSS + {{/if}} + {{else}} + RSS + {{/if}} + + {{#if supportsSearch}} + {{#if enableSearch}} + Search + {{else}} + Search + {{/if}} + {{else}} + Search + {{/if}} +
    +
    diff --git a/src/UI/Settings/NetImport/IndexerLayout.js b/src/UI/Settings/NetImport/IndexerLayout.js new file mode 100644 index 000000000..f6cbd1ab6 --- /dev/null +++ b/src/UI/Settings/NetImport/IndexerLayout.js @@ -0,0 +1,30 @@ +var Marionette = require('marionette'); +var IndexerCollection = require('./IndexerCollection'); +var CollectionView = require('./IndexerCollectionView'); +var OptionsView = require('./Options/IndexerOptionsView'); +var RestrictionCollection = require('./Restriction/RestrictionCollection'); +var RestrictionCollectionView = require('./Restriction/RestrictionCollectionView'); + +module.exports = Marionette.Layout.extend({ + template : 'Settings/Indexers/IndexerLayoutTemplate', + + regions : { + indexers : '#x-indexers-region', + indexerOptions : '#x-indexer-options-region', + restriction : '#x-restriction-region' + }, + + initialize : function() { + this.indexersCollection = new IndexerCollection(); + this.indexersCollection.fetch(); + + this.restrictionCollection = new RestrictionCollection(); + this.restrictionCollection.fetch(); + }, + + onShow : function() { + this.indexers.show(new CollectionView({ collection : this.indexersCollection })); + this.indexerOptions.show(new OptionsView({ model : this.model })); + this.restriction.show(new RestrictionCollectionView({ collection : this.restrictionCollection })); + } +}); \ No newline at end of file diff --git a/src/UI/Settings/NetImport/IndexerLayoutTemplate.hbs b/src/UI/Settings/NetImport/IndexerLayoutTemplate.hbs new file mode 100644 index 000000000..b82535642 --- /dev/null +++ b/src/UI/Settings/NetImport/IndexerLayoutTemplate.hbs @@ -0,0 +1,5 @@ +
    +
    +
    +
    +
    diff --git a/src/UI/Settings/NetImport/NetImportCollection.js b/src/UI/Settings/NetImport/NetImportCollection.js new file mode 100644 index 000000000..05dcd7a25 --- /dev/null +++ b/src/UI/Settings/NetImport/NetImportCollection.js @@ -0,0 +1,13 @@ +var Backbone = require('backbone'); +var NetImportModel = require('./NetImportModel'); + +module.exports = Backbone.Collection.extend({ + model : NetImportModel, + url : window.NzbDrone.ApiRoot + '/netimport', + + comparator : function(left, right, collection) { + var result = 0; + + return result; + } +}); diff --git a/src/UI/Settings/NetImport/NetImportModel.js b/src/UI/Settings/NetImport/NetImportModel.js new file mode 100644 index 000000000..f072da427 --- /dev/null +++ b/src/UI/Settings/NetImport/NetImportModel.js @@ -0,0 +1,3 @@ +var ProviderSettingsModelBase = require('../ProviderSettingsModelBase'); + +module.exports = ProviderSettingsModelBase.extend({}); diff --git a/src/UI/Settings/NetImport/NetImportSettingsModel.js b/src/UI/Settings/NetImport/NetImportSettingsModel.js new file mode 100644 index 000000000..dbc882fbb --- /dev/null +++ b/src/UI/Settings/NetImport/NetImportSettingsModel.js @@ -0,0 +1,7 @@ +var SettingsModelBase = require('../SettingsModelBase'); + +module.exports = SettingsModelBase.extend({ + url : window.NzbDrone.ApiRoot + '/config/netimport', + successMessage : 'Net Import settings saved', + errorMessage : 'Failed to save net import settings' +}); diff --git a/src/UI/Settings/NetImport/Options/IndexerOptionsView.js b/src/UI/Settings/NetImport/Options/IndexerOptionsView.js new file mode 100644 index 000000000..5d4386faa --- /dev/null +++ b/src/UI/Settings/NetImport/Options/IndexerOptionsView.js @@ -0,0 +1,12 @@ +var Marionette = require('marionette'); +var AsModelBoundView = require('../../../Mixins/AsModelBoundView'); +var AsValidatedView = require('../../../Mixins/AsValidatedView'); + +var view = Marionette.ItemView.extend({ + template : 'Settings/Indexers/Options/IndexerOptionsViewTemplate' +}); + +AsModelBoundView.call(view); +AsValidatedView.call(view); + +module.exports = view; \ No newline at end of file diff --git a/src/UI/Settings/NetImport/Options/IndexerOptionsViewTemplate.hbs b/src/UI/Settings/NetImport/Options/IndexerOptionsViewTemplate.hbs new file mode 100644 index 000000000..056d12648 --- /dev/null +++ b/src/UI/Settings/NetImport/Options/IndexerOptionsViewTemplate.hbs @@ -0,0 +1,40 @@ +
    + Options + +
    + + +
    + +
    + +
    + +
    +
    + +
    + + +
    + +
    + +
    + +
    +
    + +
    + + +
    + + +
    + +
    + +
    +
    +
    diff --git a/src/UI/Settings/NetImport/Restriction/RestrictionCollection.js b/src/UI/Settings/NetImport/Restriction/RestrictionCollection.js new file mode 100644 index 000000000..369250343 --- /dev/null +++ b/src/UI/Settings/NetImport/Restriction/RestrictionCollection.js @@ -0,0 +1,7 @@ +var Backbone = require('backbone'); +var RestrictionModel = require('./RestrictionModel'); + +module.exports = Backbone.Collection.extend({ + model : RestrictionModel, + url : window.NzbDrone.ApiRoot + '/Restriction' +}); \ No newline at end of file diff --git a/src/UI/Settings/NetImport/Restriction/RestrictionCollectionView.js b/src/UI/Settings/NetImport/Restriction/RestrictionCollectionView.js new file mode 100644 index 000000000..58b3a6bfa --- /dev/null +++ b/src/UI/Settings/NetImport/Restriction/RestrictionCollectionView.js @@ -0,0 +1,26 @@ +var AppLayout = require('../../../AppLayout'); +var Marionette = require('marionette'); +var RestrictionItemView = require('./RestrictionItemView'); +var EditView = require('./RestrictionEditView'); +require('../../../Tags/TagHelpers'); +require('bootstrap'); + +module.exports = Marionette.CompositeView.extend({ + template : 'Settings/Indexers/Restriction/RestrictionCollectionViewTemplate', + itemViewContainer : '.x-rows', + itemView : RestrictionItemView, + + events : { + 'click .x-add' : '_addMapping' + }, + + _addMapping : function() { + var model = this.collection.create({ tags : [] }); + var view = new EditView({ + model : model, + targetCollection : this.collection + }); + + AppLayout.modalRegion.show(view); + } +}); \ No newline at end of file diff --git a/src/UI/Settings/NetImport/Restriction/RestrictionCollectionViewTemplate.hbs b/src/UI/Settings/NetImport/Restriction/RestrictionCollectionViewTemplate.hbs new file mode 100644 index 000000000..6dc978854 --- /dev/null +++ b/src/UI/Settings/NetImport/Restriction/RestrictionCollectionViewTemplate.hbs @@ -0,0 +1,24 @@ +
    + Restrictions + +
    +
    + +
    +
    +
    +
    + + + +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/src/UI/Settings/NetImport/Restriction/RestrictionDeleteView.js b/src/UI/Settings/NetImport/Restriction/RestrictionDeleteView.js new file mode 100644 index 000000000..d2166c5ed --- /dev/null +++ b/src/UI/Settings/NetImport/Restriction/RestrictionDeleteView.js @@ -0,0 +1,19 @@ +var vent = require('vent'); +var Marionette = require('marionette'); + +module.exports = Marionette.ItemView.extend({ + template : 'Settings/Indexers/Restriction/RestrictionDeleteViewTemplate', + + events : { + 'click .x-confirm-delete' : '_delete' + }, + + _delete : function() { + this.model.destroy({ + wait : true, + success : function() { + vent.trigger(vent.Commands.CloseModalCommand); + } + }); + } +}); \ No newline at end of file diff --git a/src/UI/Settings/NetImport/Restriction/RestrictionDeleteViewTemplate.hbs b/src/UI/Settings/NetImport/Restriction/RestrictionDeleteViewTemplate.hbs new file mode 100644 index 000000000..215631e5b --- /dev/null +++ b/src/UI/Settings/NetImport/Restriction/RestrictionDeleteViewTemplate.hbs @@ -0,0 +1,13 @@ +
    +
    + +

    Delete Restriction

    +
    +
    +

    Are you sure you want to delete this restriction?

    +
    +
    + + +
    +
    diff --git a/src/UI/Settings/NetImport/Restriction/RestrictionEditView.js b/src/UI/Settings/NetImport/Restriction/RestrictionEditView.js new file mode 100644 index 000000000..e8540d1a5 --- /dev/null +++ b/src/UI/Settings/NetImport/Restriction/RestrictionEditView.js @@ -0,0 +1,55 @@ +var _ = require('underscore'); +var vent = require('vent'); +var AppLayout = require('../../../AppLayout'); +var Marionette = require('marionette'); +var DeleteView = require('./RestrictionDeleteView'); +var CommandController = require('../../../Commands/CommandController'); +var AsModelBoundView = require('../../../Mixins/AsModelBoundView'); +var AsValidatedView = require('../../../Mixins/AsValidatedView'); +var AsEditModalView = require('../../../Mixins/AsEditModalView'); +require('../../../Mixins/TagInput'); +require('bootstrap'); +require('bootstrap.tagsinput'); + +var view = Marionette.ItemView.extend({ + template : 'Settings/Indexers/Restriction/RestrictionEditViewTemplate', + + ui : { + required : '.x-required', + ignored : '.x-ignored', + tags : '.x-tags' + }, + + _deleteView : DeleteView, + + initialize : function(options) { + this.targetCollection = options.targetCollection; + }, + + onRender : function() { + this.ui.required.tagsinput({ + trimValue : true, + tagClass : 'label label-success' + }); + + this.ui.ignored.tagsinput({ + trimValue : true, + tagClass : 'label label-danger' + }); + + this.ui.tags.tagInput({ + model : this.model, + property : 'tags' + }); + }, + + _onAfterSave : function() { + this.targetCollection.add(this.model, { merge : true }); + vent.trigger(vent.Commands.CloseModalCommand); + } +}); + +AsModelBoundView.call(view); +AsValidatedView.call(view); +AsEditModalView.call(view); +module.exports = view; \ No newline at end of file diff --git a/src/UI/Settings/NetImport/Restriction/RestrictionEditViewTemplate.hbs b/src/UI/Settings/NetImport/Restriction/RestrictionEditViewTemplate.hbs new file mode 100644 index 000000000..e02175c20 --- /dev/null +++ b/src/UI/Settings/NetImport/Restriction/RestrictionEditViewTemplate.hbs @@ -0,0 +1,60 @@ +
    +
    + + {{#if id}} +

    Edit Restriction

    + {{else}} +

    Add Restriction

    + {{/if}} +
    +
    +
    +
    + + +
    + +
    + +
    + +
    +
    + +
    + + +
    + +
    + +
    + +
    +
    + +
    + + +
    + +
    + +
    + +
    +
    +
    +
    +
    + {{#if id}} + + {{/if}} + + + +
    + +
    +
    +
    diff --git a/src/UI/Settings/NetImport/Restriction/RestrictionItemView.js b/src/UI/Settings/NetImport/Restriction/RestrictionItemView.js new file mode 100644 index 000000000..729d8ef7d --- /dev/null +++ b/src/UI/Settings/NetImport/Restriction/RestrictionItemView.js @@ -0,0 +1,28 @@ +var AppLayout = require('../../../AppLayout'); +var Marionette = require('marionette'); +var EditView = require('./RestrictionEditView'); + +module.exports = Marionette.ItemView.extend({ + template : 'Settings/Indexers/Restriction/RestrictionItemViewTemplate', + className : 'row', + + ui : { + tags : '.x-tags' + }, + + events : { + 'click .x-edit' : '_edit' + }, + + initialize : function() { + this.listenTo(this.model, 'sync', this.render); + }, + + _edit : function() { + var view = new EditView({ + model : this.model, + targetCollection : this.model.collection + }); + AppLayout.modalRegion.show(view); + } +}); \ No newline at end of file diff --git a/src/UI/Settings/NetImport/Restriction/RestrictionItemViewTemplate.hbs b/src/UI/Settings/NetImport/Restriction/RestrictionItemViewTemplate.hbs new file mode 100644 index 000000000..d7648cb73 --- /dev/null +++ b/src/UI/Settings/NetImport/Restriction/RestrictionItemViewTemplate.hbs @@ -0,0 +1,12 @@ +
    + {{genericTagDisplay required 'label label-success'}} +
    +
    + {{genericTagDisplay ignored 'label label-danger'}} +
    +
    + {{tagDisplay tags}} +
    +
    +
    +
    \ No newline at end of file diff --git a/src/UI/Settings/NetImport/Restriction/RestrictionModel.js b/src/UI/Settings/NetImport/Restriction/RestrictionModel.js new file mode 100644 index 000000000..e8ea08465 --- /dev/null +++ b/src/UI/Settings/NetImport/Restriction/RestrictionModel.js @@ -0,0 +1,4 @@ +var $ = require('jquery'); +var DeepModel = require('backbone.deepmodel'); + +module.exports = DeepModel.extend({}); \ No newline at end of file diff --git a/src/UI/Settings/NetImport/indexers.less b/src/UI/Settings/NetImport/indexers.less new file mode 100644 index 000000000..3fed3ef5f --- /dev/null +++ b/src/UI/Settings/NetImport/indexers.less @@ -0,0 +1,33 @@ +@import "../../Shared/Styles/clickable.less"; + +.indexer-list { + li { + display: inline-block; + vertical-align: top; + } +} + +.indexer-item { + + .clickable; + + width: 290px; + height: 90px; + padding: 10px 15px; + + &.add-card { + .center { + margin-top: -3px; + } + } +} + +.modal-overflow { + overflow-y: visible; +} + +.add-indexer { + li.add-thingy-item { + width: 33%; + } +} \ No newline at end of file diff --git a/src/UI/Settings/SettingsLayout.js b/src/UI/Settings/SettingsLayout.js index 429d702cd..fab5fc000 100644 --- a/src/UI/Settings/SettingsLayout.js +++ b/src/UI/Settings/SettingsLayout.js @@ -12,6 +12,7 @@ var QualityLayout = require('./Quality/QualityLayout'); var IndexerLayout = require('./Indexers/IndexerLayout'); var IndexerCollection = require('./Indexers/IndexerCollection'); var IndexerSettingsModel = require('./Indexers/IndexerSettingsModel'); +var NetImportSettingsModel = require("./NetImport/NetImportSettingsModel"); var DownloadClientLayout = require('./DownloadClient/DownloadClientLayout'); var DownloadClientSettingsModel = require('./DownloadClient/DownloadClientSettingsModel'); var NotificationCollectionView = require('./Notifications/NotificationCollectionView'); @@ -24,229 +25,245 @@ var LoadingView = require('../Shared/LoadingView'); var Config = require('../Config'); module.exports = Marionette.Layout.extend({ - template : 'Settings/SettingsLayoutTemplate', + template : 'Settings/SettingsLayoutTemplate', - regions : { - mediaManagement : '#media-management', - profiles : '#profiles', - quality : '#quality', - indexers : '#indexers', - downloadClient : '#download-client', - notifications : '#notifications', - metadata : '#metadata', - general : '#general', - uiRegion : '#ui', - loading : '#loading-region' - }, + regions : { + mediaManagement : '#media-management', + profiles : '#profiles', + quality : '#quality', + indexers : '#indexers', + downloadClient : '#download-client', + netImport : "#net-import", + notifications : '#notifications', + metadata : '#metadata', + general : '#general', + uiRegion : '#ui', + loading : '#loading-region' + }, - ui : { - mediaManagementTab : '.x-media-management-tab', - profilesTab : '.x-profiles-tab', - qualityTab : '.x-quality-tab', - indexersTab : '.x-indexers-tab', - downloadClientTab : '.x-download-client-tab', - notificationsTab : '.x-notifications-tab', - metadataTab : '.x-metadata-tab', - generalTab : '.x-general-tab', - uiTab : '.x-ui-tab', - advancedSettings : '.x-advanced-settings' - }, + ui : { + mediaManagementTab : '.x-media-management-tab', + profilesTab : '.x-profiles-tab', + qualityTab : '.x-quality-tab', + indexersTab : '.x-indexers-tab', + downloadClientTab : '.x-download-client-tab', + netImportTab : ".x-net-import-tab", + notificationsTab : '.x-notifications-tab', + metadataTab : '.x-metadata-tab', + generalTab : '.x-general-tab', + uiTab : '.x-ui-tab', + advancedSettings : '.x-advanced-settings' + }, - events : { - 'click .x-media-management-tab' : '_showMediaManagement', - 'click .x-profiles-tab' : '_showProfiles', - 'click .x-quality-tab' : '_showQuality', - 'click .x-indexers-tab' : '_showIndexers', - 'click .x-download-client-tab' : '_showDownloadClient', - 'click .x-notifications-tab' : '_showNotifications', - 'click .x-metadata-tab' : '_showMetadata', - 'click .x-general-tab' : '_showGeneral', - 'click .x-ui-tab' : '_showUi', - 'click .x-save-settings' : '_save', - 'change .x-advanced-settings' : '_toggleAdvancedSettings' - }, + events : { + 'click .x-media-management-tab' : '_showMediaManagement', + 'click .x-profiles-tab' : '_showProfiles', + 'click .x-quality-tab' : '_showQuality', + 'click .x-indexers-tab' : '_showIndexers', + 'click .x-download-client-tab' : '_showDownloadClient', + "click .x-net-import-tab" : "_showNetImport", + 'click .x-notifications-tab' : '_showNotifications', + 'click .x-metadata-tab' : '_showMetadata', + 'click .x-general-tab' : '_showGeneral', + 'click .x-ui-tab' : '_showUi', + 'click .x-save-settings' : '_save', + 'change .x-advanced-settings' : '_toggleAdvancedSettings' + }, - initialize : function(options) { - if (options.action) { - this.action = options.action.toLowerCase(); - } + initialize : function(options) { + if (options.action) { + this.action = options.action.toLowerCase(); + } - this.listenTo(vent, vent.Hotkeys.SaveSettings, this._save); - }, + this.listenTo(vent, vent.Hotkeys.SaveSettings, this._save); + }, - onRender : function() { - this.loading.show(new LoadingView()); - var self = this; + onRender : function() { + this.loading.show(new LoadingView()); + var self = this; - this.mediaManagementSettings = new MediaManagementSettingsModel(); - this.namingSettings = new NamingModel(); - this.indexerSettings = new IndexerSettingsModel(); - this.downloadClientSettings = new DownloadClientSettingsModel(); - this.notificationCollection = new NotificationCollection(); - this.generalSettings = new GeneralSettingsModel(); - this.uiSettings = new UiSettingsModel(); - Backbone.$.when(this.mediaManagementSettings.fetch(), this.namingSettings.fetch(), this.indexerSettings.fetch(), this.downloadClientSettings.fetch(), - this.notificationCollection.fetch(), this.generalSettings.fetch(), this.uiSettings.fetch()).done(function() { - if (!self.isClosed) { - self.loading.$el.hide(); - self.mediaManagement.show(new MediaManagementLayout({ - settings : self.mediaManagementSettings, - namingSettings : self.namingSettings - })); - self.profiles.show(new ProfileLayout()); - self.quality.show(new QualityLayout()); - self.indexers.show(new IndexerLayout({ model : self.indexerSettings })); - self.downloadClient.show(new DownloadClientLayout({ model : self.downloadClientSettings })); - self.notifications.show(new NotificationCollectionView({ collection : self.notificationCollection })); - self.metadata.show(new MetadataLayout()); - self.general.show(new GeneralView({ model : self.generalSettings })); - self.uiRegion.show(new UiView({ model : self.uiSettings })); - } - }); + this.mediaManagementSettings = new MediaManagementSettingsModel(); + this.namingSettings = new NamingModel(); + this.indexerSettings = new IndexerSettingsModel(); + this.netImportSettings = new NetImportSettingsModel(); + this.downloadClientSettings = new DownloadClientSettingsModel(); + this.notificationCollection = new NotificationCollection(); + this.generalSettings = new GeneralSettingsModel(); + this.uiSettings = new UiSettingsModel(); + Backbone.$.when(this.mediaManagementSettings.fetch(), this.namingSettings.fetch(), this.indexerSettings.fetch(), this.downloadClientSettings.fetch(), + this.notificationCollection.fetch(), this.generalSettings.fetch(), this.uiSettings.fetch(), this.netImportSettings.fetch()).done(function() { + if (!self.isClosed) { + self.loading.$el.hide(); + self.mediaManagement.show(new MediaManagementLayout({ + settings : self.mediaManagementSettings, + namingSettings : self.namingSettings + })); + self.profiles.show(new ProfileLayout()); + self.quality.show(new QualityLayout()); + self.indexers.show(new IndexerLayout({ model : self.indexerSettings })); + self.downloadClient.show(new DownloadClientLayout({ model : self.downloadClientSettings })); + self.notifications.show(new NotificationCollectionView({ collection : self.notificationCollection })); + self.metadata.show(new MetadataLayout()); + self.general.show(new GeneralView({ model : self.generalSettings })); + self.uiRegion.show(new UiView({ model : self.uiSettings })); + } + }); - this._setAdvancedSettingsState(); - }, + this._setAdvancedSettingsState(); + }, - onShow : function() { - switch (this.action) { - case 'profiles': - this._showProfiles(); - break; - case 'quality': - this._showQuality(); - break; - case 'indexers': - this._showIndexers(); - break; - case 'downloadclient': - this._showDownloadClient(); - break; - case 'connect': - this._showNotifications(); - break; - case 'notifications': - this._showNotifications(); - break; - case 'metadata': - this._showMetadata(); - break; - case 'general': - this._showGeneral(); - break; - case 'ui': - this._showUi(); - break; - default: - this._showMediaManagement(); - } - }, + onShow : function() { + switch (this.action) { + case 'profiles': + this._showProfiles(); + break; + case 'quality': + this._showQuality(); + break; + case 'indexers': + this._showIndexers(); + break; + case 'downloadclient': + this._showDownloadClient(); + break; + case "netimport": + this._showNetImport(); + break; + case 'connect': + this._showNotifications(); + break; + case 'notifications': + this._showNotifications(); + break; + case 'metadata': + this._showMetadata(); + break; + case 'general': + this._showGeneral(); + break; + case 'ui': + this._showUi(); + break; + default: + this._showMediaManagement(); + } + }, - _showMediaManagement : function(e) { - if (e) { - e.preventDefault(); - } + _showMediaManagement : function(e) { + if (e) { + e.preventDefault(); + } - this.ui.mediaManagementTab.tab('show'); - this._navigate('settings/mediamanagement'); - }, + this.ui.mediaManagementTab.tab('show'); + this._navigate('settings/mediamanagement'); + }, - _showProfiles : function(e) { - if (e) { - e.preventDefault(); - } + _showProfiles : function(e) { + if (e) { + e.preventDefault(); + } - this.ui.profilesTab.tab('show'); - this._navigate('settings/profiles'); - }, + this.ui.profilesTab.tab('show'); + this._navigate('settings/profiles'); + }, - _showQuality : function(e) { - if (e) { - e.preventDefault(); - } + _showQuality : function(e) { + if (e) { + e.preventDefault(); + } - this.ui.qualityTab.tab('show'); - this._navigate('settings/quality'); - }, + this.ui.qualityTab.tab('show'); + this._navigate('settings/quality'); + }, - _showIndexers : function(e) { - if (e) { - e.preventDefault(); - } + _showIndexers : function(e) { + if (e) { + e.preventDefault(); + } - this.ui.indexersTab.tab('show'); - this._navigate('settings/indexers'); - }, + this.ui.indexersTab.tab('show'); + this._navigate('settings/indexers'); + }, - _showDownloadClient : function(e) { - if (e) { - e.preventDefault(); - } + _showNetImport : function(e) { + if (e) { + e.preventDefault(); + } - this.ui.downloadClientTab.tab('show'); - this._navigate('settings/downloadclient'); - }, + this.ui.downloadClientTab.tab('show'); + this._navigate('settings/netimport'); + }, - _showNotifications : function(e) { - if (e) { - e.preventDefault(); - } + _showDownloadClient : function(e) { + if (e) { + e.preventDefault(); + } - this.ui.notificationsTab.tab('show'); - this._navigate('settings/connect'); - }, + this.ui.downloadClientTab.tab('show'); + this._navigate('settings/downloadclient'); + }, - _showMetadata : function(e) { - if (e) { - e.preventDefault(); - } - this.ui.metadataTab.tab('show'); - this._navigate('settings/metadata'); - }, + _showNotifications : function(e) { + if (e) { + e.preventDefault(); + } - _showGeneral : function(e) { - if (e) { - e.preventDefault(); - } - this.ui.generalTab.tab('show'); - this._navigate('settings/general'); - }, + this.ui.notificationsTab.tab('show'); + this._navigate('settings/connect'); + }, - _showUi : function(e) { - if (e) { - e.preventDefault(); - } - this.ui.uiTab.tab('show'); - this._navigate('settings/ui'); - }, + _showMetadata : function(e) { + if (e) { + e.preventDefault(); + } + this.ui.metadataTab.tab('show'); + this._navigate('settings/metadata'); + }, - _navigate : function(route) { - Backbone.history.navigate(route, { - trigger : false, - replace : true - }); - }, + _showGeneral : function(e) { + if (e) { + e.preventDefault(); + } + this.ui.generalTab.tab('show'); + this._navigate('settings/general'); + }, - _save : function() { - vent.trigger(vent.Commands.SaveSettings); - }, + _showUi : function(e) { + if (e) { + e.preventDefault(); + } + this.ui.uiTab.tab('show'); + this._navigate('settings/ui'); + }, - _setAdvancedSettingsState : function() { - var checked = Config.getValueBoolean(Config.Keys.AdvancedSettings); - this.ui.advancedSettings.prop('checked', checked); + _navigate : function(route) { + Backbone.history.navigate(route, { + trigger : false, + replace : true + }); + }, - if (checked) { - $('body').addClass('show-advanced-settings'); - } - }, + _save : function() { + vent.trigger(vent.Commands.SaveSettings); + }, - _toggleAdvancedSettings : function() { - var checked = this.ui.advancedSettings.prop('checked'); - Config.setValue(Config.Keys.AdvancedSettings, checked); + _setAdvancedSettingsState : function() { + var checked = Config.getValueBoolean(Config.Keys.AdvancedSettings); + this.ui.advancedSettings.prop('checked', checked); - if (checked) { - $('body').addClass('show-advanced-settings'); - } else { - $('body').removeClass('show-advanced-settings'); - } - } -}); \ No newline at end of file + if (checked) { + $('body').addClass('show-advanced-settings'); + } + }, + + _toggleAdvancedSettings : function() { + var checked = this.ui.advancedSettings.prop('checked'); + Config.setValue(Config.Keys.AdvancedSettings, checked); + + if (checked) { + $('body').addClass('show-advanced-settings'); + } else { + $('body').removeClass('show-advanced-settings'); + } + } +}); diff --git a/src/UI/Settings/SettingsLayoutTemplate.hbs b/src/UI/Settings/SettingsLayoutTemplate.hbs index c69ba9f16..38e5942b6 100644 --- a/src/UI/Settings/SettingsLayoutTemplate.hbs +++ b/src/UI/Settings/SettingsLayoutTemplate.hbs @@ -1,49 +1,51 @@
    -
    -
    - -
    -
    - -
    +
    +
    + +
    +
    + +
    -
    -
    -
    -
    -
    -
    -
    -
    -
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    -
    \ No newline at end of file +