mirror of
https://github.com/Radarr/Radarr
synced 2025-01-18 21:52:10 +00:00
refresh series details after rename/refresh
Fixed: Refresh series details after series refresh and rename
This commit is contained in:
parent
c2129054a0
commit
bd1a9db0ef
4 changed files with 64 additions and 38 deletions
|
@ -1,56 +1,66 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
define(
|
define(
|
||||||
[
|
[
|
||||||
|
'app',
|
||||||
'Commands/CommandModel',
|
'Commands/CommandModel',
|
||||||
'Commands/CommandCollection',
|
'Commands/CommandCollection',
|
||||||
'underscore',
|
'underscore',
|
||||||
'jQuery/jquery.spin'
|
'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 () {
|
var commandModel = new CommandModel(attr);
|
||||||
CommandCollection.add(commandModel);
|
|
||||||
});
|
|
||||||
},
|
|
||||||
|
|
||||||
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) {
|
var existingCommand = CommandCollection.findCommand(options.command);
|
||||||
this._bindToCommandModel.call(this, existingCommand, options);
|
|
||||||
}
|
|
||||||
|
|
||||||
CommandCollection.bind('add sync', function (model) {
|
if (existingCommand) {
|
||||||
if (model.isSameCommand(options.command)) {
|
this._bindToCommandModel.call(this, existingCommand, options);
|
||||||
self._bindToCommandModel.call(self, model, 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()) {
|
_bindToCommandModel: function bindToCommand(model, options) {
|
||||||
options.element.stopSpin();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
model.bind('change:state', function (model) {
|
|
||||||
if (!model.isActive()) {
|
if (!model.isActive()) {
|
||||||
options.element.stopSpin();
|
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();
|
||||||
});
|
});
|
||||||
|
|
|
@ -11,13 +11,9 @@ define(
|
||||||
return response;
|
return response;
|
||||||
},
|
},
|
||||||
|
|
||||||
isActive: function () {
|
|
||||||
return this.get('state') !== 'completed' && this.get('state') !== 'failed';
|
|
||||||
},
|
|
||||||
|
|
||||||
isSameCommand: function (command) {
|
isSameCommand: function (command) {
|
||||||
|
|
||||||
if (command.name.toLocaleLowerCase() != this.get('name').toLocaleLowerCase()) {
|
if (command.name.toLocaleLowerCase() !== this.get('name').toLocaleLowerCase()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -28,6 +24,14 @@ define(
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
},
|
||||||
|
|
||||||
|
isActive: function () {
|
||||||
|
return this.get('state') !== 'completed' && this.get('state') !== 'failed';
|
||||||
|
},
|
||||||
|
|
||||||
|
isComplete: function () {
|
||||||
|
return this.get('state') === 'completed';
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -44,6 +44,8 @@ define(
|
||||||
this.listenTo(this.model, 'change:monitored', this._setMonitoredState);
|
this.listenTo(this.model, 'change:monitored', this._setMonitoredState);
|
||||||
this.listenTo(App.vent, App.Events.SeriesDeleted, this._onSeriesDeleted);
|
this.listenTo(App.vent, App.Events.SeriesDeleted, this._onSeriesDeleted);
|
||||||
this.listenTo(App.vent, App.Events.SeasonRenamed, this._onSeasonRenamed);
|
this.listenTo(App.vent, App.Events.SeasonRenamed, this._onSeasonRenamed);
|
||||||
|
|
||||||
|
App.vent.on(App.Events.CommandComplete, this._commandComplete, this);
|
||||||
},
|
},
|
||||||
|
|
||||||
onShow: function () {
|
onShow: function () {
|
||||||
|
@ -195,6 +197,16 @@ define(
|
||||||
if (this.model.get('id') === event.series.get('id')) {
|
if (this.model.get('id') === event.series.get('id')) {
|
||||||
this.episodeFileCollection.fetch();
|
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();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -25,7 +25,6 @@ require.config({
|
||||||
'jquery.knob' : 'JsLibraries/jquery.knob',
|
'jquery.knob' : 'JsLibraries/jquery.knob',
|
||||||
'jquery.dotdotdot' : 'JsLibraries/jquery.dotdotdot',
|
'jquery.dotdotdot' : 'JsLibraries/jquery.dotdotdot',
|
||||||
'libs' : 'JsLibraries/'
|
'libs' : 'JsLibraries/'
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
shim: {
|
shim: {
|
||||||
|
@ -191,9 +190,10 @@ define(
|
||||||
var app = new Marionette.Application();
|
var app = new Marionette.Application();
|
||||||
|
|
||||||
app.Events = {
|
app.Events = {
|
||||||
SeriesAdded : 'series:added',
|
SeriesAdded : 'series:added',
|
||||||
SeriesDeleted: 'series:deleted',
|
SeriesDeleted : 'series:deleted',
|
||||||
SeasonRenamed: 'season:renamed'
|
SeasonRenamed : 'season:renamed',
|
||||||
|
CommandComplete: 'command:complete'
|
||||||
};
|
};
|
||||||
|
|
||||||
app.Commands = {
|
app.Commands = {
|
||||||
|
|
Loading…
Reference in a new issue