mirror
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Releases Wiki Activity

refresh series details after rename/refresh 

Fixed: Refresh series details after series refresh and rename
This commit is contained in:
Mark McDowall 2013-09-29 01:48:47 -07:00
parent c2129054a0
commit bd1a9db0ef
4 changed files with 64 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
UI/Commands/CommandController.js
View File

@ -1,56 +1,66 @@
'use strict';
define(
[
'app',
'Commands/CommandModel',
'Commands/CommandCollection',
'underscore',
'jQuery/jquery.spin'
], function (CommandModel, CommandCollection, _) {
], function (App, CommandModel, CommandCollection, _) {
return{
var singleton = function () {
Execute: function (name, properties) {
return {
var attr = _.extend({name: name.toLocaleLowerCase()}, properties);
Execute: function (name, properties) {
var commandModel = new CommandModel(attr);
var attr = _.extend({name: name.toLocaleLowerCase()}, properties);
return commandModel.save().success(function () {
CommandCollection.add(commandModel);
});
},
var commandModel = new CommandModel(attr);
bindToCommand: function (options) {
return commandModel.save().success(function () {
CommandCollection.add(commandModel);
});
},
var self = this;
bindToCommand: function (options) {
var existingCommand = CommandCollection.findCommand(options.command);
var self = this;
if (existingCommand) {
this._bindToCommandModel.call(this, existingCommand, options);
}
var existingCommand = CommandCollection.findCommand(options.command);
CommandCollection.bind('add sync', function (model) {
if (model.isSameCommand(options.command)) {
self._bindToCommandModel.call(self, model, options);
if (existingCommand) {
this._bindToCommandModel.call(this, existingCommand, options);
}
});
},
_bindToCommandModel: function bindToCommand(model, options) {
CommandCollection.bind('add sync', function (model) {
if (model.isSameCommand(options.command)) {
self._bindToCommandModel.call(self, model, options);
}
});
},
if (!model.isActive()) {
options.element.stopSpin();
return;
}
_bindToCommandModel: function bindToCommand(model, options) {
model.bind('change:state', function (model) {
if (!model.isActive()) {
options.element.stopSpin();
return;
}
});
options.element.startSpin();
}
model.bind('change:state', function (model) {
if (!model.isActive()) {
options.element.stopSpin();
if (model.isComplete()) {
App.vent.trigger(App.Events.CommandComplete, { command: model, model: options.model });
}
}
});
options.element.startSpin();
}
};
};
return singleton();
});

14
UI/Commands/CommandModel.js
View File

@ -11,13 +11,9 @@ define(
return response;
},
isActive: function () {
return this.get('state') !== 'completed' && this.get('state') !== 'failed';
},
isSameCommand: function (command) {
if (command.name.toLocaleLowerCase() != this.get('name').toLocaleLowerCase()) {
if (command.name.toLocaleLowerCase() !== this.get('name').toLocaleLowerCase()) {
return false;
}
@ -28,6 +24,14 @@ define(
}
return true;
},
isActive: function () {
return this.get('state') !== 'completed' && this.get('state') !== 'failed';
},
isComplete: function () {
return this.get('state') === 'completed';
}
});
});

12
UI/Series/Details/SeriesDetailsLayout.js
View File

@ -44,6 +44,8 @@ define(
this.listenTo(this.model, 'change:monitored', this._setMonitoredState);
this.listenTo(App.vent, App.Events.SeriesDeleted, this._onSeriesDeleted);
this.listenTo(App.vent, App.Events.SeasonRenamed, this._onSeasonRenamed);
App.vent.on(App.Events.CommandComplete, this._commandComplete, this);
},
onShow: function () {
@ -195,6 +197,16 @@ define(
if (this.model.get('id') === event.series.get('id')) {
this.episodeFileCollection.fetch();
}
},
_commandComplete: function (options) {
if (options.command.get('name') === 'refreshseries' || options.command.get('name') === 'renameseries') {
if (options.command.get('seriesId') === this.model.get('id')) {
this._showSeasons();
this._setMonitoredState();
this._showInfo();
}
}
}
});
});

8
UI/app.js
View File

@ -25,7 +25,6 @@ require.config({
'jquery.knob' : 'JsLibraries/jquery.knob',
'jquery.dotdotdot' : 'JsLibraries/jquery.dotdotdot',
'libs' : 'JsLibraries/'
},
shim: {
@ -191,9 +190,10 @@ define(
var app = new Marionette.Application();
app.Events = {
SeriesAdded : 'series:added',
SeriesDeleted: 'series:deleted',
SeasonRenamed: 'season:renamed'
SeriesAdded : 'series:added',
SeriesDeleted : 'series:deleted',
SeasonRenamed : 'season:renamed',
CommandComplete: 'command:complete'
};
app.Commands = {