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

New: Series lists will auto update when files are imported/deleted

This commit is contained in:
Mark McDowall 2014-02-05 16:30:14 -08:00
parent 7261a4bd71
commit e47b4c7686
10 changed files with 131 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/NzbDrone.Api/Series/SeriesModule.cs
View File

@ -2,23 +2,39 @@
using System.Collections.Generic;
using System.Linq;
using FluentValidation;
using NzbDrone.Core.Datastore.Events;
using NzbDrone.Core.MediaCover;
using NzbDrone.Core.MediaFiles.Events;
using NzbDrone.Core.Messaging.Commands;
using NzbDrone.Core.Messaging.Events;
using NzbDrone.Core.SeriesStats;
using NzbDrone.Core.Tv;
using NzbDrone.Api.Validation;
using NzbDrone.Api.Mapping;
using NzbDrone.Core.Tv.Events;
namespace NzbDrone.Api.Series
{
public class SeriesModule : NzbDroneRestModule<SeriesResource>
public class SeriesModule : NzbDroneRestModuleWithSignalR<SeriesResource, Core.Tv.Series>,
IHandle<EpisodeImportedEvent>,
IHandle<EpisodeFileDeletedEvent>,
IHandle<SeriesUpdatedEvent>,
IHandle<SeriesEditedEvent>,
IHandle<SeriesDeletedEvent>
{
private readonly ICommandExecutor _commandExecutor;
private readonly ISeriesService _seriesService;
private readonly ISeriesStatisticsService _seriesStatisticsService;
private readonly IMapCoversToLocal _coverMapper;
public SeriesModule(ISeriesService seriesService, ISeriesStatisticsService seriesStatisticsService, IMapCoversToLocal coverMapper)
: base("/Series")
public SeriesModule(ICommandExecutor commandExecutor,
ISeriesService seriesService,
ISeriesStatisticsService seriesStatisticsService,
IMapCoversToLocal coverMapper)
: base(commandExecutor)
{
_commandExecutor = commandExecutor;
_seriesService = seriesService;
_seriesStatisticsService = seriesStatisticsService;
_coverMapper = coverMapper;
@ -74,6 +90,8 @@ namespace NzbDrone.Api.Series
private void UpdateSeries(SeriesResource seriesResource)
{
GetNewId<Core.Tv.Series>(_seriesService.UpdateSeries, seriesResource);
BroadcastResourceChange(ModelAction.Updated, seriesResource);
}
private void DeleteSeries(int id)
@ -119,5 +137,32 @@ namespace NzbDrone.Api.Series
resource.EpisodeFileCount = seriesStatistics.EpisodeFileCount;
resource.NextAiring = seriesStatistics.NextAiring;
}
public void Handle(EpisodeImportedEvent message)
{
BroadcastResourceChange(ModelAction.Updated, message.ImportedEpisode.SeriesId);
}
public void Handle(EpisodeFileDeletedEvent message)
{
if (message.ForUpgrade) return;
BroadcastResourceChange(ModelAction.Updated, message.EpisodeFile.SeriesId);
}
public void Handle(SeriesUpdatedEvent message)
{
BroadcastResourceChange(ModelAction.Updated, message.Series.Id);
}
public void Handle(SeriesEditedEvent message)
{
BroadcastResourceChange(ModelAction.Updated, message.Series.Id);
}
public void Handle(SeriesDeletedEvent message)
{
BroadcastResourceChange(ModelAction.Deleted, message.Series.InjectTo<SeriesResource>());
}
}
}

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

@ -489,6 +489,7 @@
<Compile Include="ThingiProvider\ProviderRepository.cs" />
<Compile Include="ThingiProvider\ProviderFactory.cs" />
<Compile Include="Tv\EpisodeService.cs" />
<Compile Include="Tv\Events\SeriesEditedEvent.cs" />
<Compile Include="Tv\Events\SeriesRefreshStartingEvent.cs" />
<Compile Include="Tv\Events\EpisodeInfoDeletedEvent.cs" />
<Compile Include="Tv\Events\EpisodeInfoUpdatedEvent.cs" />

14
src/NzbDrone.Core/Tv/Events/SeriesEditedEvent.cs Normal file
View File

@ -0,0 +1,14 @@
using NzbDrone.Common.Messaging;
namespace NzbDrone.Core.Tv.Events
{
public class SeriesEditedEvent : IEvent
{
public Series Series { get; private set; }
public SeriesEditedEvent(Series series)
{
Series = series;
}
}
}

7
src/NzbDrone.Core/Tv/SeriesService.cs
View File

@ -136,7 +136,10 @@ namespace NzbDrone.Core.Tv
}
}
return _seriesRepository.Update(series);
var updatedSeries = _seriesRepository.Update(series);
_eventAggregator.PublishEvent(new SeriesEditedEvent(updatedSeries));
return updatedSeries;
}
public List<Series> UpdateSeries(List<Series> series)
@ -148,6 +151,8 @@ namespace NzbDrone.Core.Tv
var folderName = new DirectoryInfo(s.Path).Name;
s.Path = Path.Combine(s.RootFolderPath, folderName);
}
_eventAggregator.PublishEvent(new SeriesEditedEvent(s));
}
_seriesRepository.UpdateMany(series);

16
src/UI/Cells/SeriesStatusCell.js
View File

@ -1,9 +1,9 @@
'use strict';
define(
[
'backgrid'
], function (Backgrid) {
return Backgrid.Cell.extend({
'Cells/NzbDroneCell'
], function (NzbDroneCell) {
return NzbDroneCell.extend({
className: 'series-status-cell',
render: function () {
@ -13,20 +13,24 @@ define(
if (status === 'ended') {
this.$el.html('<i class="icon-stop grid-icon" title="Ended"></i>');
this.model.set('statusWeight', 3);
this._setStatusWeight(3);
}
else if (!monitored) {
this.$el.html('<i class="icon-pause grid-icon" title="Not Monitored"></i>');
this.model.set('statusWeight', 2);
this._setStatusWeight(2);
}
else {
this.$el.html('<i class="icon-play grid-icon" title="Continuing"></i>');
this.model.set('statusWeight', 1);
this._setStatusWeight(1);
}
return this;
},
_setStatusWeight: function (weight) {
this.model.set('statusWeight', weight, {silent: true});
}
});
});

8
src/UI/Mixins/AsFilteredCollection.js
View File

@ -32,7 +32,7 @@ define(
this.prototype._makeFullCollection = function (models, options) {
var self = this;
self.shadowCollection = originalMakeFullCollection.apply(this, [models, options]);
self.shadowCollection = originalMakeFullCollection.call(this, models, options);
var filterModel = function(model) {
if (!self.state.filterKey || !self.state.filterValue)
@ -46,12 +46,10 @@ define(
};
var filteredModels = self.shadowCollection.filtered();
var fullCollection = originalMakeFullCollection.apply(this, [filteredModels, options]);
var fullCollection = originalMakeFullCollection.call(this, filteredModels, options);
fullCollection.resetFiltered = function(options) {
Backbone.Collection.prototype.reset.apply(this, [self.shadowCollection.filtered(), options]);
Backbone.Collection.prototype.reset.call(this, self.shadowCollection.filtered(), options);
};
fullCollection.reset = function (models, options) {

6
src/UI/Mixins/backbone.signalr.mixin.js
View File

@ -22,6 +22,12 @@ define(
return;
}
if (options.action === 'deleted') {
collection.remove(new collection.model(options.resource, {parse: true}));
return;
}
var model = new collection.model(options.resource, {parse: true});
//updateOnly will prevent the collection from adding a new item

49
src/UI/Series/Index/SeriesIndexLayout.js
View File

@ -1,6 +1,7 @@
'use strict';
define(
[
'underscore',
'marionette',
'backgrid',
'Series/Index/Posters/SeriesPostersCollectionView',
@ -16,9 +17,9 @@ define(
'Cells/SeriesStatusCell',
'Series/Index/FooterView',
'Series/Index/FooterModel',
'Shared/Toolbar/ToolbarLayout',
'underscore'
], function (Marionette,
'Shared/Toolbar/ToolbarLayout'
], function (_,
Marionette,
Backgrid,
PosterCollectionView,
ListCollectionView,
@ -33,8 +34,7 @@ define(
SeriesStatusCell,
FooterView,
FooterModel,
ToolbarLayout,
_) {
ToolbarLayout) {
return Marionette.Layout.extend({
template: 'Series/Index/SeriesIndexLayoutTemplate',
@ -131,8 +131,25 @@ define(
initialize: function () {
this.seriesCollection = SeriesCollection.clone();
this.listenTo(SeriesCollection, 'sync', this._renderView);
this.listenTo(SeriesCollection, 'remove', this._renderView);
this.listenTo(SeriesCollection, 'sync', function (model, collection, options) {
this.seriesCollection.shadowCollection.add(model, options);
this.seriesCollection.fullCollection.resetFiltered();
this._renderView();
});
this.listenTo(SeriesCollection, 'add', function (model, collection, options) {
this.seriesCollection.shadowCollection.add(model, options);
this.seriesCollection.fullCollection.resetFiltered();
this._renderView();
});
this.listenTo(SeriesCollection, 'remove', function (model, collection, options) {
this.seriesCollection.shadowCollection.remove(model, options);
this.seriesCollection.fullCollection.resetFiltered();
this._renderView();
});
this.sortingOptions = {
type : 'sorting',
@ -255,7 +272,7 @@ define(
},
_showList: function () {
this.currentView = new ListCollectionView({
this.currentView = new ListCollectionView({
collection: this.seriesCollection
});
@ -269,7 +286,7 @@ define(
this._renderView();
},
_renderView: function () {
if (SeriesCollection.length === 0) {
@ -278,6 +295,8 @@ define(
this.toolbar2.close();
}
else {
this._resetFilter();
this.seriesRegion.show(this.currentView);
this._showToolbar();
@ -295,6 +314,18 @@ define(
this.seriesCollection.setFilterMode(mode);
},
_resetFilter: function () {
var key = this.seriesCollection.state.filterKey;
var value = this.seriesCollection.state.filterValue;
this.seriesCollection.setFilter([ null, null ]);
this.seriesCollection.setFilter([ key, value ]);
},
_shadowTest: function () {
window.alert('added to shadow');
},
_showToolbar: function () {
if (this.toolbar.currentView) {

5
src/UI/Series/SeriesCollection.js
View File

@ -8,7 +8,8 @@ define(
'api!series',
'Mixins/AsFilteredCollection',
'Mixins/AsPersistedStateCollection',
'moment'
'moment',
'Mixins/backbone.signalr.mixin'
], function (_, Backbone, PageableCollection, SeriesModel, SeriesData, AsFilteredCollection, AsPersistedStateCollection, Moment) {
var Collection = PageableCollection.extend({
url : window.NzbDrone.ApiRoot + '/series',
@ -72,5 +73,5 @@ define(
var MixedIn = AsPersistedStateCollection.call(FilteredCollection);
var collection = new MixedIn(SeriesData, { full: true });
return collection;
return collection.bindSignalR();
});

1
src/UI/Shared/Toolbar/Radio/RadioButtonView.js
View File

@ -50,7 +50,6 @@ define(
throw 'ownerContext must be set.';
}
var callback = this.model.get('callback');
if (callback) {
callback.call(this.model.ownerContext, this);