mirror of
https://github.com/Sonarr/Sonarr.git
synced 2024-12-16 11:37:58 +02:00
commit
647ea5456b
@ -152,6 +152,7 @@
|
|||||||
<Compile Include="REST\RestResource.cs" />
|
<Compile Include="REST\RestResource.cs" />
|
||||||
<Compile Include="RootFolders\RootFolderModule.cs" />
|
<Compile Include="RootFolders\RootFolderModule.cs" />
|
||||||
<Compile Include="RootFolders\RootFolderResource.cs" />
|
<Compile Include="RootFolders\RootFolderResource.cs" />
|
||||||
|
<Compile Include="Series\SeriesEditorModule.cs" />
|
||||||
<Compile Include="Series\SeriesResource.cs" />
|
<Compile Include="Series\SeriesResource.cs" />
|
||||||
<Compile Include="Series\SeriesModule.cs" />
|
<Compile Include="Series\SeriesModule.cs" />
|
||||||
<Compile Include="Series\SeriesLookupModule.cs" />
|
<Compile Include="Series\SeriesLookupModule.cs" />
|
||||||
|
32
src/NzbDrone.Api/Series/SeriesEditorModule.cs
Normal file
32
src/NzbDrone.Api/Series/SeriesEditorModule.cs
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Diagnostics;
|
||||||
|
using System.Runtime.Remoting.Messaging;
|
||||||
|
using Nancy;
|
||||||
|
using NzbDrone.Api.Extensions;
|
||||||
|
using NzbDrone.Api.Mapping;
|
||||||
|
using NzbDrone.Core.Tv;
|
||||||
|
|
||||||
|
namespace NzbDrone.Api.Series
|
||||||
|
{
|
||||||
|
public class SeriesEditorModule : NzbDroneApiModule
|
||||||
|
{
|
||||||
|
private readonly ISeriesService _seriesService;
|
||||||
|
|
||||||
|
public SeriesEditorModule(ISeriesService seriesService)
|
||||||
|
: base("/series/editor")
|
||||||
|
{
|
||||||
|
_seriesService = seriesService;
|
||||||
|
Put["/"] = series => SaveAll();
|
||||||
|
}
|
||||||
|
|
||||||
|
private Response SaveAll()
|
||||||
|
{
|
||||||
|
//Read from request
|
||||||
|
var series = Request.Body.FromJson<List<SeriesResource>>().InjectTo<List<Core.Tv.Series>>();
|
||||||
|
|
||||||
|
return _seriesService.UpdateSeries(series)
|
||||||
|
.InjectTo<List<SeriesResource>>()
|
||||||
|
.AsResponse(HttpStatusCode.Accepted);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -212,6 +212,7 @@
|
|||||||
<Compile Include="MediaFiles\DownloadedEpisodesImportServiceFixture.cs" />
|
<Compile Include="MediaFiles\DownloadedEpisodesImportServiceFixture.cs" />
|
||||||
<Compile Include="SeriesStatsTests\SeriesStatisticsFixture.cs" />
|
<Compile Include="SeriesStatsTests\SeriesStatisticsFixture.cs" />
|
||||||
<Compile Include="TvTests\SeriesRepositoryTests\QualityProfileRepositoryFixture.cs" />
|
<Compile Include="TvTests\SeriesRepositoryTests\QualityProfileRepositoryFixture.cs" />
|
||||||
|
<Compile Include="TvTests\SeriesServiceTests\UpdateMultipleSeriesFixture.cs" />
|
||||||
<Compile Include="TvTests\SeriesServiceTests\UpdateSeriesFixture.cs" />
|
<Compile Include="TvTests\SeriesServiceTests\UpdateSeriesFixture.cs" />
|
||||||
<Compile Include="UpdateTests\UpdateServiceFixture.cs" />
|
<Compile Include="UpdateTests\UpdateServiceFixture.cs" />
|
||||||
<Compile Include="DecisionEngineTests\AcceptableSizeSpecificationFixture.cs" />
|
<Compile Include="DecisionEngineTests\AcceptableSizeSpecificationFixture.cs" />
|
||||||
|
Binary file not shown.
@ -24,6 +24,7 @@ public interface ISeriesService
|
|||||||
void DeleteSeries(int seriesId, bool deleteFiles);
|
void DeleteSeries(int seriesId, bool deleteFiles);
|
||||||
List<Series> GetAllSeries();
|
List<Series> GetAllSeries();
|
||||||
Series UpdateSeries(Series series);
|
Series UpdateSeries(Series series);
|
||||||
|
List<Series> UpdateSeries(List<Series> series);
|
||||||
bool SeriesPathExists(string folder);
|
bool SeriesPathExists(string folder);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -138,6 +139,22 @@ public Series UpdateSeries(Series series)
|
|||||||
return _seriesRepository.Update(series);
|
return _seriesRepository.Update(series);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<Series> UpdateSeries(List<Series> series)
|
||||||
|
{
|
||||||
|
foreach (var s in series)
|
||||||
|
{
|
||||||
|
if (!String.IsNullOrWhiteSpace(s.RootFolderPath))
|
||||||
|
{
|
||||||
|
var folderName = new DirectoryInfo(s.Path).Name;
|
||||||
|
s.Path = Path.Combine(s.RootFolderPath, folderName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
_seriesRepository.UpdateMany(series);
|
||||||
|
|
||||||
|
return series;
|
||||||
|
}
|
||||||
|
|
||||||
public bool SeriesPathExists(string folder)
|
public bool SeriesPathExists(string folder)
|
||||||
{
|
{
|
||||||
return _seriesRepository.SeriesPathExists(folder);
|
return _seriesRepository.SeriesPathExists(folder);
|
||||||
|
@ -19,6 +19,13 @@ public List<SeriesResource> Lookup(string term)
|
|||||||
return Get<List<SeriesResource>>(request);
|
return Get<List<SeriesResource>>(request);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<SeriesResource> Editor(List<SeriesResource> series)
|
||||||
|
{
|
||||||
|
var request = BuildRequest("editor");
|
||||||
|
request.AddBody(series);
|
||||||
|
return Put<List<SeriesResource>>(request);
|
||||||
|
}
|
||||||
|
|
||||||
public SeriesResource Get(string slug, HttpStatusCode statusCode = HttpStatusCode.OK)
|
public SeriesResource Get(string slug, HttpStatusCode statusCode = HttpStatusCode.OK)
|
||||||
{
|
{
|
||||||
var request = BuildRequest(slug);
|
var request = BuildRequest(slug);
|
||||||
|
@ -102,6 +102,7 @@
|
|||||||
<Compile Include="Client\ReleaseClient.cs" />
|
<Compile Include="Client\ReleaseClient.cs" />
|
||||||
<Compile Include="Client\SeriesClient.cs" />
|
<Compile Include="Client\SeriesClient.cs" />
|
||||||
<Compile Include="CommandIntegerationTests.cs" />
|
<Compile Include="CommandIntegerationTests.cs" />
|
||||||
|
<Compile Include="SeriesEditorIntegrationTest.cs" />
|
||||||
<Compile Include="HistoryIntegrationTest.cs" />
|
<Compile Include="HistoryIntegrationTest.cs" />
|
||||||
<Compile Include="NamingConfigTests.cs" />
|
<Compile Include="NamingConfigTests.cs" />
|
||||||
<Compile Include="EpisodeIntegrationTests.cs" />
|
<Compile Include="EpisodeIntegrationTests.cs" />
|
||||||
|
45
src/NzbDrone.Integration.Test/SeriesEditorIntegrationTest.cs
Normal file
45
src/NzbDrone.Integration.Test/SeriesEditorIntegrationTest.cs
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
using System;
|
||||||
|
using System.Net;
|
||||||
|
using FluentAssertions;
|
||||||
|
using NUnit.Framework;
|
||||||
|
using NzbDrone.Api.Series;
|
||||||
|
using System.Linq;
|
||||||
|
using NzbDrone.Test.Common;
|
||||||
|
|
||||||
|
namespace NzbDrone.Integration.Test
|
||||||
|
{
|
||||||
|
[TestFixture]
|
||||||
|
public class SeriesEditorIntegrationTest : IntegrationTest
|
||||||
|
{
|
||||||
|
private void GivenExistingSeries()
|
||||||
|
{
|
||||||
|
foreach (var title in new[] { "90210", "Dexter" })
|
||||||
|
{
|
||||||
|
var newSeries = Series.Lookup(title).First();
|
||||||
|
|
||||||
|
newSeries.QualityProfileId = 1;
|
||||||
|
newSeries.Path = String.Format(@"C:\Test\{0}", title).AsOsAgnostic();
|
||||||
|
|
||||||
|
Series.Post(newSeries);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void should_be_able_to_update_multiple_series()
|
||||||
|
{
|
||||||
|
GivenExistingSeries();
|
||||||
|
|
||||||
|
var series = Series.All();
|
||||||
|
|
||||||
|
foreach (var s in series)
|
||||||
|
{
|
||||||
|
s.QualityProfileId = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
var result = Series.Editor(series);
|
||||||
|
|
||||||
|
result.Should().HaveCount(2);
|
||||||
|
result.TrueForAll(s => s.QualityProfileId == 2).Should().BeTrue();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -45,7 +45,6 @@ public void should_be_able_to_add_and_delete_series()
|
|||||||
Series.All().Should().BeEmpty();
|
Series.All().Should().BeEmpty();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void should_be_able_to_find_series_by_id()
|
public void should_be_able_to_find_series_by_id()
|
||||||
{
|
{
|
||||||
@ -61,7 +60,6 @@ public void should_be_able_to_find_series_by_id()
|
|||||||
Series.Get(series.Id).Should().NotBeNull();
|
Series.Get(series.Id).Should().NotBeNull();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void invalid_id_should_return_404()
|
public void invalid_id_should_return_404()
|
||||||
{
|
{
|
||||||
|
@ -1,20 +1,22 @@
|
|||||||
define(
|
define(
|
||||||
[
|
[
|
||||||
'marionette',
|
'marionette',
|
||||||
'Shared/Modal/ModalRegion'
|
'Shared/Modal/ModalRegion',
|
||||||
], function (Marionette, ModalRegion) {
|
'Shared/ControlPanel/ControlPanelRegion'
|
||||||
|
], function (Marionette, ModalRegion, ControlPanelRegion) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var Layout = Marionette.Layout.extend({
|
var Layout = Marionette.Layout.extend({
|
||||||
|
|
||||||
regions: {
|
regions: {
|
||||||
navbarRegion: '#nav-region',
|
navbarRegion : '#nav-region',
|
||||||
mainRegion : '#main-region'
|
mainRegion : '#main-region'
|
||||||
},
|
},
|
||||||
|
|
||||||
initialize: function () {
|
initialize: function () {
|
||||||
this.addRegions({
|
this.addRegions({
|
||||||
modalRegion: ModalRegion
|
modalRegion : ModalRegion,
|
||||||
|
controlPanelRegion: ControlPanelRegion
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
16
src/UI/Cells/SeasonFolderCell.js
Normal file
16
src/UI/Cells/SeasonFolderCell.js
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
'use strict';
|
||||||
|
define(
|
||||||
|
[
|
||||||
|
'backgrid'
|
||||||
|
], function (Backgrid) {
|
||||||
|
return Backgrid.Cell.extend({
|
||||||
|
|
||||||
|
className : 'season-folder-cell',
|
||||||
|
|
||||||
|
render: function () {
|
||||||
|
var seasonFolder = this.model.get('seasonFolder');
|
||||||
|
this.$el.html(seasonFolder.toString());
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
@ -117,4 +117,8 @@ td.delete-episode-file-cell {
|
|||||||
i {
|
i {
|
||||||
.clickable();
|
.clickable();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.series-status-cell {
|
||||||
|
width: 16px;
|
||||||
}
|
}
|
@ -6,8 +6,7 @@
|
|||||||
Licensed under the MIT @license.
|
Licensed under the MIT @license.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
.backgrid {
|
.select-row-cell, .select-all-header-cell {
|
||||||
.select-row-cell, .select-all-header-cell {
|
text-align: center;
|
||||||
text-align: center;
|
width: 16px;
|
||||||
}
|
|
||||||
}
|
}
|
5
src/UI/Content/Overrides/messenger.less
Normal file
5
src/UI/Content/Overrides/messenger.less
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
body.control-panel-visible {
|
||||||
|
ul.messenger.messenger-fixed.messenger-on-bottom {
|
||||||
|
bottom: 95px;
|
||||||
|
}
|
||||||
|
}
|
@ -2,3 +2,4 @@
|
|||||||
@import "Overrides/browser";
|
@import "Overrides/browser";
|
||||||
@import "Overrides/bootstrap.toggle-switch";
|
@import "Overrides/bootstrap.toggle-switch";
|
||||||
@import "Overrides/fullcalendar";
|
@import "Overrides/fullcalendar";
|
||||||
|
@import "Overrides/messenger";
|
||||||
|
@ -69,6 +69,12 @@
|
|||||||
color : white;
|
color : white;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.control-panel-visible {
|
||||||
|
#scroll-up {
|
||||||
|
bottom: 100px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.label-large {
|
.label-large {
|
||||||
padding : 4px 6px;
|
padding : 4px 6px;
|
||||||
font-size : 16px;
|
font-size : 16px;
|
||||||
@ -104,7 +110,7 @@ body {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
footer {
|
.footer {
|
||||||
font-size : 13px;
|
font-size : 13px;
|
||||||
font-weight : lighter;
|
font-weight : lighter;
|
||||||
padding-top : 0px;
|
padding-top : 0px;
|
||||||
@ -192,4 +198,19 @@ footer {
|
|||||||
|
|
||||||
.file-path {
|
.file-path {
|
||||||
.mono-space();
|
.mono-space();
|
||||||
|
}
|
||||||
|
|
||||||
|
.control-panel {
|
||||||
|
.card(#333333);
|
||||||
|
|
||||||
|
color: #f5f5f5;
|
||||||
|
background-color: #333333;
|
||||||
|
margin: 0px;
|
||||||
|
margin-bottom: -100px;
|
||||||
|
position: fixed;
|
||||||
|
left: 0;
|
||||||
|
bottom: 0;
|
||||||
|
width: 100%;
|
||||||
|
height: 55px;
|
||||||
|
opacity: 0;
|
||||||
}
|
}
|
@ -12,7 +12,8 @@ define(
|
|||||||
'Release/ReleaseLayout',
|
'Release/ReleaseLayout',
|
||||||
'System/SystemLayout',
|
'System/SystemLayout',
|
||||||
'SeasonPass/SeasonPassLayout',
|
'SeasonPass/SeasonPassLayout',
|
||||||
'System/Update/UpdateLayout'
|
'System/Update/UpdateLayout',
|
||||||
|
'Series/Editor/SeriesEditorLayout'
|
||||||
], function (NzbDroneController,
|
], function (NzbDroneController,
|
||||||
AppLayout,
|
AppLayout,
|
||||||
Marionette,
|
Marionette,
|
||||||
@ -24,7 +25,8 @@ define(
|
|||||||
ReleaseLayout,
|
ReleaseLayout,
|
||||||
SystemLayout,
|
SystemLayout,
|
||||||
SeasonPassLayout,
|
SeasonPassLayout,
|
||||||
UpdateLayout) {
|
UpdateLayout,
|
||||||
|
SeriesEditorLayout) {
|
||||||
return NzbDroneController.extend({
|
return NzbDroneController.extend({
|
||||||
|
|
||||||
addSeries: function (action) {
|
addSeries: function (action) {
|
||||||
@ -72,7 +74,13 @@ define(
|
|||||||
update: function () {
|
update: function () {
|
||||||
this.setTitle('Updates');
|
this.setTitle('Updates');
|
||||||
this.showMainRegion(new UpdateLayout());
|
this.showMainRegion(new UpdateLayout());
|
||||||
|
},
|
||||||
|
|
||||||
|
seriesEditor: function () {
|
||||||
|
this.setTitle('Series Editor');
|
||||||
|
this.showMainRegion(new SeriesEditorLayout());
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -21,6 +21,7 @@ define(
|
|||||||
'system' : 'system',
|
'system' : 'system',
|
||||||
'system/:action' : 'system',
|
'system/:action' : 'system',
|
||||||
'seasonpass' : 'seasonPass',
|
'seasonpass' : 'seasonPass',
|
||||||
|
'serieseditor' : 'seriesEditor',
|
||||||
':whatever' : 'showNotFound'
|
':whatever' : 'showNotFound'
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
156
src/UI/Series/Editor/SeriesEditorFooterView.js
Normal file
156
src/UI/Series/Editor/SeriesEditorFooterView.js
Normal file
@ -0,0 +1,156 @@
|
|||||||
|
'use strict';
|
||||||
|
define(
|
||||||
|
[
|
||||||
|
'underscore',
|
||||||
|
'marionette',
|
||||||
|
'backgrid',
|
||||||
|
'vent',
|
||||||
|
'Series/SeriesCollection',
|
||||||
|
'Quality/QualityProfileCollection',
|
||||||
|
'AddSeries/RootFolders/Collection',
|
||||||
|
'Shared/Toolbar/ToolbarLayout',
|
||||||
|
'AddSeries/RootFolders/Layout',
|
||||||
|
'Config'
|
||||||
|
], function (_,
|
||||||
|
Marionette,
|
||||||
|
Backgrid,
|
||||||
|
vent,
|
||||||
|
SeriesCollection,
|
||||||
|
QualityProfiles,
|
||||||
|
RootFolders,
|
||||||
|
ToolbarLayout,
|
||||||
|
RootFolderLayout,
|
||||||
|
Config) {
|
||||||
|
return Marionette.ItemView.extend({
|
||||||
|
template: 'Series/Editor/SeriesEditorFooterViewTemplate',
|
||||||
|
|
||||||
|
ui: {
|
||||||
|
monitored : '.x-monitored',
|
||||||
|
qualityProfile: '.x-quality-profiles',
|
||||||
|
seasonFolder : '.x-season-folder',
|
||||||
|
rootFolder : '.x-root-folder',
|
||||||
|
selectedCount : '.x-selected-count',
|
||||||
|
saveButton : '.x-save',
|
||||||
|
container : '.series-editor-footer'
|
||||||
|
},
|
||||||
|
|
||||||
|
events: {
|
||||||
|
'click .x-save' : '_updateAndSave',
|
||||||
|
'change .x-root-folder': '_rootFolderChanged'
|
||||||
|
},
|
||||||
|
|
||||||
|
templateHelpers: function () {
|
||||||
|
return {
|
||||||
|
qualityProfiles: QualityProfiles,
|
||||||
|
rootFolders : RootFolders.toJSON()
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
|
initialize: function (options) {
|
||||||
|
RootFolders.fetch().done(function () {
|
||||||
|
RootFolders.synced = true;
|
||||||
|
});
|
||||||
|
|
||||||
|
this.editorGrid = options.editorGrid;
|
||||||
|
this.listenTo(SeriesCollection, 'backgrid:selected', this._updateInfo);
|
||||||
|
this.listenTo(RootFolders, 'all', this.render);
|
||||||
|
},
|
||||||
|
|
||||||
|
onRender: function () {
|
||||||
|
this._updateInfo();
|
||||||
|
},
|
||||||
|
|
||||||
|
_updateAndSave: function () {
|
||||||
|
var selected = this.editorGrid.getSelectedModels();
|
||||||
|
|
||||||
|
var monitored = this.ui.monitored.val();
|
||||||
|
var profile = this.ui.qualityProfile.val();
|
||||||
|
var seasonFolder = this.ui.seasonFolder.val();
|
||||||
|
var rootFolder = this.ui.rootFolder.val();
|
||||||
|
|
||||||
|
_.each(selected, function (model) {
|
||||||
|
if (monitored === 'true') {
|
||||||
|
model.set('monitored', true);
|
||||||
|
}
|
||||||
|
|
||||||
|
else if (monitored === 'false') {
|
||||||
|
model.set('monitored', false);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (profile !== 'noChange') {
|
||||||
|
model.set('qualityProfileId', parseInt(profile, 10));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (seasonFolder === 'true') {
|
||||||
|
model.set('seasonFolder', true);
|
||||||
|
}
|
||||||
|
|
||||||
|
else if (seasonFolder === 'false') {
|
||||||
|
model.set('seasonFolder', false);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (rootFolder !== 'noChange') {
|
||||||
|
var rootFolderPath = RootFolders.get(parseInt(rootFolder, 10));
|
||||||
|
|
||||||
|
model.set('rootFolderPath', rootFolderPath.get('path'));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
SeriesCollection.save();
|
||||||
|
|
||||||
|
this.listenTo(SeriesCollection, 'save', this._afterSave);
|
||||||
|
},
|
||||||
|
|
||||||
|
_updateInfo: function () {
|
||||||
|
var selected = this.editorGrid.getSelectedModels();
|
||||||
|
var selectedCount = selected.length;
|
||||||
|
|
||||||
|
this.ui.selectedCount.html('{0} series selected'.format(selectedCount));
|
||||||
|
|
||||||
|
if (selectedCount === 0) {
|
||||||
|
this.ui.monitored.attr('disabled', '');
|
||||||
|
this.ui.qualityProfile.attr('disabled', '');
|
||||||
|
this.ui.seasonFolder.attr('disabled', '');
|
||||||
|
this.ui.rootFolder.attr('disabled', '');
|
||||||
|
this.ui.saveButton.attr('disabled', '');
|
||||||
|
}
|
||||||
|
|
||||||
|
else {
|
||||||
|
this.ui.monitored.removeAttr('disabled', '');
|
||||||
|
this.ui.qualityProfile.removeAttr('disabled', '');
|
||||||
|
this.ui.seasonFolder.removeAttr('disabled', '');
|
||||||
|
this.ui.rootFolder.removeAttr('disabled', '');
|
||||||
|
this.ui.saveButton.removeAttr('disabled', '');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
_rootFolderChanged: function () {
|
||||||
|
var rootFolderValue = this.ui.rootFolder.val();
|
||||||
|
if (rootFolderValue === 'addNew') {
|
||||||
|
var rootFolderLayout = new RootFolderLayout();
|
||||||
|
this.listenToOnce(rootFolderLayout, 'folderSelected', this._setRootFolder);
|
||||||
|
vent.trigger(vent.Commands.OpenModalCommand, rootFolderLayout);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
Config.setValue(Config.Keys.DefaultRootFolderId, rootFolderValue);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
_setRootFolder: function (options) {
|
||||||
|
vent.trigger(vent.Commands.CloseModalCommand);
|
||||||
|
this.ui.rootFolder.val(options.model.id);
|
||||||
|
this._rootFolderChanged();
|
||||||
|
},
|
||||||
|
|
||||||
|
_afterSave: function () {
|
||||||
|
this.ui.monitored.val('noChange');
|
||||||
|
this.ui.qualityProfile.val('noChange');
|
||||||
|
this.ui.seasonFolder.val('noChange');
|
||||||
|
this.ui.rootFolder.val('noChange');
|
||||||
|
|
||||||
|
SeriesCollection.each(function (model) {
|
||||||
|
model.trigger('backgrid:select', model, false);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
50
src/UI/Series/Editor/SeriesEditorFooterViewTemplate.html
Normal file
50
src/UI/Series/Editor/SeriesEditorFooterViewTemplate.html
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
<div class="series-editor-footer">
|
||||||
|
<div class="row">
|
||||||
|
<div class="span2">Monitored</div>
|
||||||
|
<div class="span2">Quality Profile</div>
|
||||||
|
<div class="span2">Season Folder</div>
|
||||||
|
<div class="span4">Root Folder</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<div class="span2">
|
||||||
|
<select class="span2 x-monitored">
|
||||||
|
<option value="noChange">No change</option>
|
||||||
|
<option value="true">Monitored</option>
|
||||||
|
<option value="false">Unmonitored</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="span2">
|
||||||
|
<select class="span2 x-quality-profiles">
|
||||||
|
<option value="noChange">No change</option>
|
||||||
|
{{#each qualityProfiles.models}}
|
||||||
|
<option value="{{id}}">{{attributes.name}}</option>
|
||||||
|
{{/each}}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="span2">
|
||||||
|
<select class="span2 x-season-folder">
|
||||||
|
<option value="noChange">No change</option>
|
||||||
|
<option value="true">Yes</option>
|
||||||
|
<option value="false">No</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="span3">
|
||||||
|
<select class="span3 x-root-folder" validation-name="RootFolderPath">
|
||||||
|
<option value="noChange">No change</option>
|
||||||
|
{{#each rootFolders}}
|
||||||
|
<option value="{{id}}">{{path}}</option>
|
||||||
|
{{/each}}
|
||||||
|
<option value="addNew">Add a different path</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<span class="pull-right">
|
||||||
|
<span class="selected-count x-selected-count">0 series selected</span>
|
||||||
|
<button class="btn btn-primary x-save">Save</button>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
148
src/UI/Series/Editor/SeriesEditorLayout.js
Normal file
148
src/UI/Series/Editor/SeriesEditorLayout.js
Normal file
@ -0,0 +1,148 @@
|
|||||||
|
'use strict';
|
||||||
|
define(
|
||||||
|
[
|
||||||
|
'vent',
|
||||||
|
'marionette',
|
||||||
|
'backgrid',
|
||||||
|
'Series/Index/EmptyView',
|
||||||
|
'Series/SeriesCollection',
|
||||||
|
'Cells/SeriesTitleCell',
|
||||||
|
'Cells/QualityProfileCell',
|
||||||
|
'Cells/SeriesStatusCell',
|
||||||
|
'Cells/SeasonFolderCell',
|
||||||
|
'Shared/Toolbar/ToolbarLayout',
|
||||||
|
'Series/Editor/SeriesEditorFooterView'
|
||||||
|
], function (vent,
|
||||||
|
Marionette,
|
||||||
|
Backgrid,
|
||||||
|
EmptyView,
|
||||||
|
SeriesCollection,
|
||||||
|
SeriesTitleCell,
|
||||||
|
QualityProfileCell,
|
||||||
|
SeriesStatusCell,
|
||||||
|
SeasonFolderCell,
|
||||||
|
ToolbarLayout,
|
||||||
|
FooterView) {
|
||||||
|
return Marionette.Layout.extend({
|
||||||
|
template: 'Series/Editor/SeriesEditorLayoutTemplate',
|
||||||
|
|
||||||
|
regions: {
|
||||||
|
seriesRegion: '#x-series-editor',
|
||||||
|
toolbar : '#x-toolbar'
|
||||||
|
},
|
||||||
|
|
||||||
|
ui: {
|
||||||
|
monitored : '.x-monitored',
|
||||||
|
qualityProfiles: '.x-quality-profiles',
|
||||||
|
rootFolder : '.x-root-folder',
|
||||||
|
selectedCount : '.x-selected-count'
|
||||||
|
},
|
||||||
|
|
||||||
|
events: {
|
||||||
|
'click .x-save' : '_updateAndSave',
|
||||||
|
'change .x-root-folder': '_rootFolderChanged'
|
||||||
|
},
|
||||||
|
|
||||||
|
columns:
|
||||||
|
[
|
||||||
|
{
|
||||||
|
name : '',
|
||||||
|
cell : 'select-row',
|
||||||
|
headerCell: 'select-all',
|
||||||
|
sortable : false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name : 'statusWeight',
|
||||||
|
label : '',
|
||||||
|
cell : SeriesStatusCell
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name : 'title',
|
||||||
|
label : 'Title',
|
||||||
|
cell : SeriesTitleCell,
|
||||||
|
cellValue: 'this'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name : 'qualityProfileId',
|
||||||
|
label: 'Quality',
|
||||||
|
cell : QualityProfileCell
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name : 'monitored',
|
||||||
|
label: 'Season Folder',
|
||||||
|
cell : SeasonFolderCell
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name : 'path',
|
||||||
|
label: 'Path',
|
||||||
|
cell : 'string'
|
||||||
|
}
|
||||||
|
],
|
||||||
|
|
||||||
|
leftSideButtons: {
|
||||||
|
type : 'default',
|
||||||
|
storeState: false,
|
||||||
|
items :
|
||||||
|
[
|
||||||
|
{
|
||||||
|
title : 'Season Pass',
|
||||||
|
icon : 'icon-bookmark',
|
||||||
|
route : 'seasonpass'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title : 'Update Library',
|
||||||
|
icon : 'icon-refresh',
|
||||||
|
command : 'refreshseries',
|
||||||
|
successMessage: 'Library was updated!',
|
||||||
|
errorMessage : 'Library update failed!'
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
|
||||||
|
onRender: function () {
|
||||||
|
this._showToolbar();
|
||||||
|
this._showTable();
|
||||||
|
|
||||||
|
this._fetchCollection();
|
||||||
|
},
|
||||||
|
|
||||||
|
onClose: function () {
|
||||||
|
vent.trigger(vent.Commands.CloseControlPanelCommand);
|
||||||
|
},
|
||||||
|
|
||||||
|
_showTable: function () {
|
||||||
|
if (SeriesCollection.length === 0) {
|
||||||
|
this.seriesRegion.show(new EmptyView());
|
||||||
|
this.toolbar.close();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.editorGrid = new Backgrid.Grid({
|
||||||
|
collection: SeriesCollection,
|
||||||
|
columns : this.columns,
|
||||||
|
className : 'table table-hover'
|
||||||
|
});
|
||||||
|
|
||||||
|
this.seriesRegion.show(this.editorGrid);
|
||||||
|
this._showFooter();
|
||||||
|
},
|
||||||
|
|
||||||
|
_fetchCollection: function () {
|
||||||
|
SeriesCollection.fetch();
|
||||||
|
},
|
||||||
|
|
||||||
|
_showToolbar: function () {
|
||||||
|
this.toolbar.show(new ToolbarLayout({
|
||||||
|
left :
|
||||||
|
[
|
||||||
|
this.leftSideButtons
|
||||||
|
],
|
||||||
|
context: this
|
||||||
|
}));
|
||||||
|
},
|
||||||
|
|
||||||
|
_showFooter: function () {
|
||||||
|
vent.trigger(vent.Commands.OpenControlPanelCommand, new FooterView({ editorGrid: this.editorGrid }));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
7
src/UI/Series/Editor/SeriesEditorLayoutTemplate.html
Normal file
7
src/UI/Series/Editor/SeriesEditorLayoutTemplate.html
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
<div id="x-toolbar"></div>
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<div class="span12">
|
||||||
|
<div id="x-series-editor" class="series-"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
@ -109,6 +109,11 @@ define(
|
|||||||
icon : 'icon-bookmark',
|
icon : 'icon-bookmark',
|
||||||
route : 'seasonpass'
|
route : 'seasonpass'
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
title : 'Series Editor',
|
||||||
|
icon : 'icon-nd-edit',
|
||||||
|
route : 'serieseditor'
|
||||||
|
},
|
||||||
{
|
{
|
||||||
title : 'RSS Sync',
|
title : 'RSS Sync',
|
||||||
icon : 'icon-rss',
|
icon : 'icon-rss',
|
||||||
|
@ -1,10 +1,11 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
define(
|
define(
|
||||||
[
|
[
|
||||||
|
'underscore',
|
||||||
'backbone',
|
'backbone',
|
||||||
'Series/SeriesModel',
|
'Series/SeriesModel',
|
||||||
'api!series'
|
'api!series'
|
||||||
], function (Backbone, SeriesModel, SeriesData) {
|
], function (_, Backbone, SeriesModel, SeriesData) {
|
||||||
var Collection = Backbone.Collection.extend({
|
var Collection = Backbone.Collection.extend({
|
||||||
url : window.NzbDrone.ApiRoot + '/series',
|
url : window.NzbDrone.ApiRoot + '/series',
|
||||||
model: SeriesModel,
|
model: SeriesModel,
|
||||||
@ -16,6 +17,31 @@ define(
|
|||||||
state: {
|
state: {
|
||||||
sortKey: 'title',
|
sortKey: 'title',
|
||||||
order : -1
|
order : -1
|
||||||
|
},
|
||||||
|
|
||||||
|
save: function () {
|
||||||
|
var self = this;
|
||||||
|
|
||||||
|
var proxy = _.extend( new Backbone.Model(),
|
||||||
|
{
|
||||||
|
id: '',
|
||||||
|
|
||||||
|
url: self.url + '/editor',
|
||||||
|
|
||||||
|
toJSON: function()
|
||||||
|
{
|
||||||
|
return self.filter(function (model) {
|
||||||
|
return model.hasChanged();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
this.listenTo(proxy, 'sync', function (proxyModel, models) {
|
||||||
|
this.add(models, { merge: true });
|
||||||
|
this.trigger('save', this);
|
||||||
|
});
|
||||||
|
|
||||||
|
return proxy.save();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -288,4 +288,17 @@
|
|||||||
font-size : 24px;
|
font-size : 24px;
|
||||||
margin-top : 3px;
|
margin-top : 3px;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Editor
|
||||||
|
|
||||||
|
.series-editor-footer {
|
||||||
|
width: 1100px;
|
||||||
|
color: #f5f5f5;
|
||||||
|
margin-left: auto;
|
||||||
|
margin-right: auto;
|
||||||
|
|
||||||
|
.selected-count {
|
||||||
|
margin-right: 10px;
|
||||||
|
}
|
||||||
}
|
}
|
24
src/UI/Shared/ControlPanel/ControlPanelController.js
Normal file
24
src/UI/Shared/ControlPanel/ControlPanelController.js
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
'use strict';
|
||||||
|
define(
|
||||||
|
[
|
||||||
|
'vent',
|
||||||
|
'AppLayout',
|
||||||
|
'marionette'
|
||||||
|
], function (vent, AppLayout, Marionette) {
|
||||||
|
|
||||||
|
return Marionette.AppRouter.extend({
|
||||||
|
|
||||||
|
initialize: function () {
|
||||||
|
vent.on(vent.Commands.OpenControlPanelCommand, this._openControlPanel, this);
|
||||||
|
vent.on(vent.Commands.CloseControlPanelCommand, this._closeControlPanel, this);
|
||||||
|
},
|
||||||
|
|
||||||
|
_openControlPanel: function (view) {
|
||||||
|
AppLayout.controlPanelRegion.show(view);
|
||||||
|
},
|
||||||
|
|
||||||
|
_closeControlPanel: function () {
|
||||||
|
AppLayout.controlPanelRegion.closePanel();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
35
src/UI/Shared/ControlPanel/ControlPanelRegion.js
Normal file
35
src/UI/Shared/ControlPanel/ControlPanelRegion.js
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
'use strict';
|
||||||
|
define(
|
||||||
|
[
|
||||||
|
'jquery',
|
||||||
|
'backbone',
|
||||||
|
'marionette'
|
||||||
|
], function ($,Backbone, Marionette) {
|
||||||
|
var region = Marionette.Region.extend({
|
||||||
|
el: '#control-panel-region',
|
||||||
|
|
||||||
|
constructor: function () {
|
||||||
|
Backbone.Marionette.Region.prototype.constructor.apply(this, arguments);
|
||||||
|
this.on('show', this.showPanel, this);
|
||||||
|
},
|
||||||
|
|
||||||
|
getEl: function (selector) {
|
||||||
|
var $el = $(selector);
|
||||||
|
|
||||||
|
return $el;
|
||||||
|
},
|
||||||
|
|
||||||
|
showPanel: function () {
|
||||||
|
$('body').addClass('control-panel-visible');
|
||||||
|
this.$el.animate({ 'margin-bottom': 0, 'opacity': 1 }, { queue: false, duration: 300 });
|
||||||
|
},
|
||||||
|
|
||||||
|
closePanel: function () {
|
||||||
|
$('body').removeClass('control-panel-visible');
|
||||||
|
this.$el.animate({ 'margin-bottom': -100, 'opacity': 0 }, { queue: false, duration: 300 });
|
||||||
|
this.reset();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return region;
|
||||||
|
});
|
@ -15,8 +15,8 @@ define(
|
|||||||
return Marionette.AppRouter.extend({
|
return Marionette.AppRouter.extend({
|
||||||
|
|
||||||
initialize: function () {
|
initialize: function () {
|
||||||
vent.on(vent.Commands.OpenModalCommand, this._openModal, this);
|
vent.on(vent.Commands.OpenModalCommand, this._openControlPanel, this);
|
||||||
vent.on(vent.Commands.CloseModalCommand, this._closeModal, this);
|
vent.on(vent.Commands.CloseModalCommand, this._closeControlPanel, this);
|
||||||
vent.on(vent.Commands.EditSeriesCommand, this._editSeries, this);
|
vent.on(vent.Commands.EditSeriesCommand, this._editSeries, this);
|
||||||
vent.on(vent.Commands.DeleteSeriesCommand, this._deleteSeries, this);
|
vent.on(vent.Commands.DeleteSeriesCommand, this._deleteSeries, this);
|
||||||
vent.on(vent.Commands.ShowEpisodeDetails, this._showEpisode, this);
|
vent.on(vent.Commands.ShowEpisodeDetails, this._showEpisode, this);
|
||||||
@ -25,12 +25,12 @@ define(
|
|||||||
vent.on(vent.Commands.ShowRenamePreview, this._showRenamePreview, this);
|
vent.on(vent.Commands.ShowRenamePreview, this._showRenamePreview, this);
|
||||||
},
|
},
|
||||||
|
|
||||||
_openModal: function (view) {
|
_openControlPanel: function (view) {
|
||||||
AppLayout.modalRegion.show(view);
|
AppLayout.modalRegion.show(view);
|
||||||
},
|
},
|
||||||
|
|
||||||
_closeModal: function () {
|
_closeControlPanel: function () {
|
||||||
AppLayout.modalRegion.closeModal();
|
AppLayout.modalRegion.closePanel();
|
||||||
},
|
},
|
||||||
|
|
||||||
_editSeries: function (options) {
|
_editSeries: function (options) {
|
||||||
|
@ -11,7 +11,7 @@ define(
|
|||||||
|
|
||||||
constructor: function () {
|
constructor: function () {
|
||||||
Backbone.Marionette.Region.prototype.constructor.apply(this, arguments);
|
Backbone.Marionette.Region.prototype.constructor.apply(this, arguments);
|
||||||
this.on('show', this.showModal, this);
|
this.on('show', this.showPanel, this);
|
||||||
},
|
},
|
||||||
|
|
||||||
getEl: function (selector) {
|
getEl: function (selector) {
|
||||||
@ -20,7 +20,7 @@ define(
|
|||||||
return $el;
|
return $el;
|
||||||
},
|
},
|
||||||
|
|
||||||
showModal: function () {
|
showPanel: function () {
|
||||||
this.$el.addClass('modal hide fade');
|
this.$el.addClass('modal hide fade');
|
||||||
|
|
||||||
//need tab index so close on escape works
|
//need tab index so close on escape works
|
||||||
@ -32,7 +32,7 @@ define(
|
|||||||
'backdrop': 'static'});
|
'backdrop': 'static'});
|
||||||
},
|
},
|
||||||
|
|
||||||
closeModal: function () {
|
closePanel: function () {
|
||||||
$(this.el).modal('hide');
|
$(this.el).modal('hide');
|
||||||
this.reset();
|
this.reset();
|
||||||
}
|
}
|
||||||
|
@ -209,13 +209,15 @@ define(
|
|||||||
'Series/SeriesController',
|
'Series/SeriesController',
|
||||||
'Router',
|
'Router',
|
||||||
'Shared/Modal/ModalController',
|
'Shared/Modal/ModalController',
|
||||||
|
'Shared/ControlPanel/ControlPanelController',
|
||||||
'System/StatusModel',
|
'System/StatusModel',
|
||||||
'Instrumentation/StringFormat',
|
'Instrumentation/StringFormat',
|
||||||
'LifeCycle'
|
'LifeCycle'
|
||||||
], function ($, Backbone, Marionette, RouteBinder, SignalRBroadcaster, NavbarView, AppLayout, SeriesController, Router, ModalController, serverStatusModel) {
|
], function ($, Backbone, Marionette, RouteBinder, SignalRBroadcaster, NavbarView, AppLayout, SeriesController, Router, ModalController, ControlPanelController, serverStatusModel) {
|
||||||
|
|
||||||
new SeriesController();
|
new SeriesController();
|
||||||
new ModalController();
|
new ModalController();
|
||||||
|
new ControlPanelController();
|
||||||
new Router();
|
new Router();
|
||||||
|
|
||||||
var app = new Marionette.Application();
|
var app = new Marionette.Application();
|
||||||
|
@ -48,7 +48,7 @@
|
|||||||
<i class="icon-circle-arrow-up"></i>
|
<i class="icon-circle-arrow-up"></i>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<footer>
|
<div class="footer">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="span12">
|
<div class="span12">
|
||||||
@ -59,7 +59,8 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</div>
|
||||||
|
<div id="control-panel-region" class="control-panel"></div>
|
||||||
</body>
|
</body>
|
||||||
<div id="errors"></div>
|
<div id="errors"></div>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
@ -16,16 +16,18 @@ define(
|
|||||||
};
|
};
|
||||||
|
|
||||||
vent.Commands = {
|
vent.Commands = {
|
||||||
EditSeriesCommand : 'EditSeriesCommand',
|
EditSeriesCommand : 'EditSeriesCommand',
|
||||||
DeleteSeriesCommand: 'DeleteSeriesCommand',
|
DeleteSeriesCommand : 'DeleteSeriesCommand',
|
||||||
OpenModalCommand : 'OpenModalCommand',
|
OpenModalCommand : 'OpenModalCommand',
|
||||||
CloseModalCommand : 'CloseModalCommand',
|
CloseModalCommand : 'CloseModalCommand',
|
||||||
ShowEpisodeDetails : 'ShowEpisodeDetails',
|
ShowEpisodeDetails : 'ShowEpisodeDetails',
|
||||||
ShowHistoryDetails : 'ShowHistoryDetails',
|
ShowHistoryDetails : 'ShowHistoryDetails',
|
||||||
ShowLogDetails : 'ShowLogDetails',
|
ShowLogDetails : 'ShowLogDetails',
|
||||||
SaveSettings : 'saveSettings',
|
SaveSettings : 'saveSettings',
|
||||||
ShowLogFile : 'showLogFile',
|
ShowLogFile : 'showLogFile',
|
||||||
ShowRenamePreview : 'showRenamePreview'
|
ShowRenamePreview : 'showRenamePreview',
|
||||||
|
OpenControlPanelCommand : 'OpenControlPanelCommand',
|
||||||
|
CloseControlPanelCommand : 'CloseControlPanelCommand'
|
||||||
};
|
};
|
||||||
|
|
||||||
return vent;
|
return vent;
|
||||||
|
Loading…
Reference in New Issue
Block a user