self-hosted/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2024-12-16 11:37:58 +02:00
Code Issues Releases Activity

UI Cleanup - Updated Activity subtree.

Browse Source
This commit is contained in:
Taloth Saldono 2015-02-13 22:03:50 +01:00
parent b308f06af3
commit b556eda4a0
25 changed files with 659 additions and 510 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/UI/.idea/codeStyleSettings.xml generated
View File

@ -21,6 +21,7 @@
<option name="ALIGN_OBJECT_PROPERTIES" value="2" />
<option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
<option name="OBJECT_LITERAL_WRAP" value="2" />
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
</JSCodeStyleSettings>
<XML>
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
@ -34,15 +35,18 @@
<option name="LINE_COMMENT_AT_FIRST_COLUMN" value="true" />
<option name="KEEP_LINE_BREAKS" value="false" />
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
<option name="ELSE_ON_NEW_LINE" value="true" />
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
<option name="CATCH_ON_NEW_LINE" value="true" />
<option name="FINALLY_ON_NEW_LINE" value="true" />
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
<option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
<option name="SPACE_BEFORE_METHOD_PARENTHESES" value="true" />
<option name="SPACE_BEFORE_IF_PARENTHESES" value="false" />
<option name="SPACE_BEFORE_METHOD_LBRACE" value="false" />
<option name="CALL_PARAMETERS_WRAP" value="1" />
<option name="BINARY_OPERATION_WRAP" value="1" />
<option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
<option name="ARRAY_INITIALIZER_WRAP" value="1" />
<option name="ARRAY_INITIALIZER_WRAP" value="2" />
<option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
<option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
<option name="IF_BRACE_FORCE" value="3" />
<option name="DOWHILE_BRACE_FORCE" value="3" />
<option name="WHILE_BRACE_FORCE" value="3" />

46
src/UI/Activity/ActivityLayout.js
View File

@ -6,28 +6,33 @@ var BlacklistLayout = require('./Blacklist/BlacklistLayout');
var QueueLayout = require('./Queue/QueueLayout');
module.exports = Marionette.Layout.extend({
template : 'Activity/ActivityLayoutTemplate',
regions : {
template : 'Activity/ActivityLayoutTemplate',
regions : {
queueRegion : '#queue',
history : '#history',
blacklist : '#blacklist'
},
ui : {
ui : {
queueTab : '.x-queue-tab',
historyTab : '.x-history-tab',
blacklistTab : '.x-blacklist-tab'
},
events : {
"click .x-queue-tab" : '_showQueue',
"click .x-history-tab" : '_showHistory',
"click .x-blacklist-tab" : '_showBlacklist'
events : {
'click .x-queue-tab' : '_showQueue',
'click .x-history-tab' : '_showHistory',
'click .x-blacklist-tab' : '_showBlacklist'
},
initialize : function(options){
if(options.action) {
initialize : function(options) {
if (options.action) {
this.action = options.action.toLowerCase();
}
},
onShow : function(){
onShow : function() {
switch (this.action) {
case 'history':
this._showHistory();
@ -39,32 +44,39 @@ module.exports = Marionette.Layout.extend({
this._showQueue();
}
},
_navigate : function(route){
_navigate : function(route) {
Backbone.history.navigate(route, {
trigger : false,
replace : true
});
},
_showHistory : function(e){
if(e) {
_showHistory : function(e) {
if (e) {
e.preventDefault();
}
this.history.show(new HistoryLayout());
this.ui.historyTab.tab('show');
this._navigate('/activity/history');
},
_showBlacklist : function(e){
if(e) {
_showBlacklist : function(e) {
if (e) {
e.preventDefault();
}
this.blacklist.show(new BlacklistLayout());
this.ui.blacklistTab.tab('show');
this._navigate('/activity/blacklist');
},
_showQueue : function(e){
if(e) {
_showQueue : function(e) {
if (e) {
e.preventDefault();
}
this.queueRegion.show(new QueueLayout());
this.ui.queueTab.tab('show');
this._navigate('/activity/queue');

12
src/UI/Activity/Blacklist/BlacklistActionsCell.js
View File

@ -2,15 +2,19 @@ var NzbDroneCell = require('../../Cells/NzbDroneCell');
module.exports = NzbDroneCell.extend({
className : 'blacklist-controls-cell',
events : {
events : {
'click' : '_delete'
},
render : function(){
render : function() {
this.$el.empty();
this.$el.html('<i class="icon-nd-delete"></i>');
return this;
},
_delete : function(){
_delete : function() {
this.model.destroy();
}
});
});

74
src/UI/Activity/Blacklist/BlacklistCollection.js
View File

@ -3,37 +3,45 @@ var PageableCollection = require('backbone.pageable');
var AsSortedCollection = require('../../Mixins/AsSortedCollection');
var AsPersistedStateCollection = require('../../Mixins/AsPersistedStateCollection');
module.exports = (function(){
var Collection = PageableCollection.extend({
url : window.NzbDrone.ApiRoot + '/blacklist',
model : BlacklistModel,
state : {
pageSize : 15,
sortKey : 'date',
order : 1
},
queryParams : {
totalPages : null,
totalRecords : null,
pageSize : 'pageSize',
sortKey : 'sortKey',
order : 'sortDir',
directions : {
'-1' : 'asc',
'1' : 'desc'
}
},
sortMappings : {'series' : {sortKey : 'series.sortTitle'}},
parseState : function(resp){
return {totalRecords : resp.totalRecords};
},
parseRecords : function(resp){
if(resp) {
return resp.records;
}
return resp;
var Collection = PageableCollection.extend({
url : window.NzbDrone.ApiRoot + '/blacklist',
model : BlacklistModel,
state : {
pageSize : 15,
sortKey : 'date',
order : 1
},
queryParams : {
totalPages : null,
totalRecords : null,
pageSize : 'pageSize',
sortKey : 'sortKey',
order : 'sortDir',
directions : {
'-1' : 'asc',
'1' : 'desc'
}
});
Collection = AsSortedCollection.call(Collection);
return AsPersistedStateCollection.call(Collection);
}).call(this);
},
sortMappings : {
'series' : { sortKey : 'series.sortTitle' }
},
parseState : function(resp) {
return { totalRecords : resp.totalRecords };
},
parseRecords : function(resp) {
if (resp) {
return resp.records;
}
return resp;
}
});
Collection = AsSortedCollection.call(Collection);
Collection = AsPersistedStateCollection.call(Collection);
module.exports = Collection;

107
src/UI/Activity/Blacklist/BlacklistLayout.js
View File

@ -11,81 +11,104 @@ var LoadingView = require('../../Shared/LoadingView');
var ToolbarLayout = require('../../Shared/Toolbar/ToolbarLayout');
module.exports = Marionette.Layout.extend({
template : 'Activity/Blacklist/BlacklistLayoutTemplate',
regions : {
template : 'Activity/Blacklist/BlacklistLayoutTemplate',
regions : {
blacklist : '#x-blacklist',
toolbar : '#x-toolbar',
pager : '#x-pager'
},
columns : [{
name : 'series',
label : 'Series',
cell : SeriesTitleCell
}, {
name : 'sourceTitle',
label : 'Source Title',
cell : 'string'
}, {
name : 'quality',
label : 'Quality',
cell : QualityCell,
sortable : false
}, {
name : 'date',
label : 'Date',
cell : RelativeDateCell
}, {
name : 'this',
label : '',
cell : BlacklistActionsCell,
sortable : false
}],
initialize : function(){
this.collection = new BlacklistCollection({tableName : 'blacklist'});
columns : [
{
name : 'series',
label : 'Series',
cell : SeriesTitleCell
},
{
name : 'sourceTitle',
label : 'Source Title',
cell : 'string'
},
{
name : 'quality',
label : 'Quality',
cell : QualityCell,
sortable : false
},
{
name : 'date',
label : 'Date',
cell : RelativeDateCell
},
{
name : 'this',
label : '',
cell : BlacklistActionsCell,
sortable : false
}
],
initialize : function() {
this.collection = new BlacklistCollection({ tableName : 'blacklist' });
this.listenTo(this.collection, 'sync', this._showTable);
this.listenTo(vent, vent.Events.CommandComplete, this._commandComplete);
},
onShow : function(){
onShow : function() {
this.blacklist.show(new LoadingView());
this._showToolbar();
this.collection.fetch();
},
_showTable : function(collection){
_showTable : function(collection) {
this.blacklist.show(new Backgrid.Grid({
columns : this.columns,
collection : collection,
className : 'table table-hover'
}));
this.pager.show(new GridPager({
columns : this.columns,
collection : collection
}));
},
_showToolbar : function(){
_showToolbar : function() {
var leftSideButtons = {
type : 'default',
storeState : false,
items : [{
title : 'Clear Blacklist',
icon : 'icon-trash',
command : 'clearBlacklist'
}]
items : [
{
title : 'Clear Blacklist',
icon : 'icon-trash',
command : 'clearBlacklist'
}
]
};
this.toolbar.show(new ToolbarLayout({
left : [leftSideButtons],
left : [
leftSideButtons
],
context : this
}));
},
_refreshTable : function(buttonContext){
_refreshTable : function(buttonContext) {
this.collection.state.currentPage = 1;
var promise = this.collection.fetch({reset : true});
if(buttonContext) {
var promise = this.collection.fetch({ reset : true });
if (buttonContext) {
buttonContext.ui.icon.spinForPromise(promise);
}
},
_commandComplete : function(options){
if(options.command.get('name') === 'clearblacklist') {
_commandComplete : function(options) {
if (options.command.get('name') === 'clearblacklist') {
this._refreshTable();
}
}
});
});

9
src/UI/Activity/Blacklist/BlacklistModel.js
View File

@ -2,12 +2,15 @@ var Backbone = require('backbone');
var SeriesCollection = require('../../Series/SeriesCollection');
module.exports = Backbone.Model.extend({
initialize : function(){
this.url = function(){
//Hack to deal with Backbone 1.0's bug
initialize : function() {
this.url = function() {
return this.collection.url + '/' + this.get('id');
};
},
parse : function(model){
parse : function(model) {
model.series = SeriesCollection.get(model.seriesId);
return model;
}

23
src/UI/Activity/History/Details/HistoryDetailsAge.js
View File

@ -1,13 +1,14 @@
var Handlebars = require('handlebars');
module.exports = (function(){
Handlebars.registerHelper('historyAge', function(){
var unit = 'days';
var age = this.age;
if(age < 2) {
unit = 'hours';
age = parseFloat(this.ageHours).toFixed(1);
}
return new Handlebars.SafeString('<dt>Age (when grabbed):</dt><dd>{0} {1}</dd>'.format(age, unit));
});
}).call(this);
Handlebars.registerHelper('historyAge', function() {
var unit = 'days';
var age = this.age;
if (age < 2) {
unit = 'hours';
age = parseFloat(this.ageHours).toFixed(1);
}
return new Handlebars.SafeString('<dt>Age (when grabbed):</dt><dd>{0} {1}</dd>'.format(age, unit));
});

26
src/UI/Activity/History/Details/HistoryDetailsLayout.js
View File

@ -4,20 +4,32 @@ var Marionette = require('marionette');
var HistoryDetailsView = require('./HistoryDetailsView');
module.exports = Marionette.Layout.extend({
template : 'Activity/History/Details/HistoryDetailsLayoutTemplate',
regions : {bodyRegion : '.modal-body'},
events : {"click .x-mark-as-failed" : '_markAsFailed'},
onShow : function(){
this.bodyRegion.show(new HistoryDetailsView({model : this.model}));
template : 'Activity/History/Details/HistoryDetailsLayoutTemplate',
regions : {
bodyRegion : '.modal-body'
},
_markAsFailed : function(){
events : {
'click .x-mark-as-failed' : '_markAsFailed'
},
onShow : function() {
this.bodyRegion.show(new HistoryDetailsView({ model : this.model }));
},
_markAsFailed : function() {
var url = window.NzbDrone.ApiRoot + '/history/failed';
var data = {id : this.model.get('id')};
var data = {
id : this.model.get('id')
};
$.ajax({
url : url,
type : 'POST',
data : data
});
vent.trigger(vent.Commands.CloseModalCommand);
}
});

4
src/UI/Activity/History/Details/HistoryDetailsView.js
View File

@ -1,4 +1,6 @@
var Marionette = require('marionette');
require('./HistoryDetailsAge');
module.exports = Marionette.ItemView.extend({template : 'Activity/History/Details/HistoryDetailsViewTemplate'});
module.exports = Marionette.ItemView.extend({
template : 'Activity/History/Details/HistoryDetailsViewTemplate'
});

125
src/UI/Activity/History/HistoryCollection.js
View File

@ -4,53 +4,80 @@ var AsFilteredCollection = require('../../Mixins/AsFilteredCollection');
var AsSortedCollection = require('../../Mixins/AsSortedCollection');
var AsPersistedStateCollection = require('../../Mixins/AsPersistedStateCollection');
module.exports = (function(){
var Collection = PageableCollection.extend({
url : window.NzbDrone.ApiRoot + '/history',
model : HistoryModel,
state : {
pageSize : 15,
sortKey : 'date',
order : 1
},
queryParams : {
totalPages : null,
totalRecords : null,
pageSize : 'pageSize',
sortKey : 'sortKey',
order : 'sortDir',
directions : {
"-1" : 'asc',
"1" : 'desc'
}
},
filterModes : {
"all" : [null, null],
"grabbed" : ['eventType', '1'],
"imported" : ['eventType', '3'],
"failed" : ['eventType', '4'],
"deleted" : ['eventType', '5']
},
sortMappings : {"series" : {sortKey : 'series.sortTitle'}},
initialize : function(options){
delete this.queryParams.episodeId;
if(options) {
if(options.episodeId) {
this.queryParams.episodeId = options.episodeId;
}
}
},
parseState : function(resp){
return {totalRecords : resp.totalRecords};
},
parseRecords : function(resp){
if(resp) {
return resp.records;
}
return resp;
var Collection = PageableCollection.extend({
url : window.NzbDrone.ApiRoot + '/history',
model : HistoryModel,
state : {
pageSize : 15,
sortKey : 'date',
order : 1
},
queryParams : {
totalPages : null,
totalRecords : null,
pageSize : 'pageSize',
sortKey : 'sortKey',
order : 'sortDir',
directions : {
'-1' : 'asc',
'1' : 'desc'
}
});
Collection = AsFilteredCollection.call(Collection);
Collection = AsSortedCollection.call(Collection);
return AsPersistedStateCollection.call(Collection);
}).call(this);
},
filterModes : {
'all' : [
null,
null
],
'grabbed' : [
'eventType',
'1'
],
'imported' : [
'eventType',
'3'
],
'failed' : [
'eventType',
'4'
],
'deleted' : [
'eventType',
'5'
]
},
sortMappings : {
'series' : { sortKey : 'series.sortTitle' }
},
initialize : function(options) {
delete this.queryParams.episodeId;
if (options) {
if (options.episodeId) {
this.queryParams.episodeId = options.episodeId;
}
}
},
parseState : function(resp) {
return { totalRecords : resp.totalRecords };
},
parseRecords : function(resp) {
if (resp) {
return resp.records;
}
return resp;
}
});
Collection = AsFilteredCollection.call(Collection);
Collection = AsSortedCollection.call(Collection);
Collection = AsPersistedStateCollection.call(Collection);
module.exports = Collection;

16
src/UI/Activity/History/HistoryDetailsCell.js
View File

@ -2,14 +2,20 @@ var vent = require('vent');
var NzbDroneCell = require('../../Cells/NzbDroneCell');
module.exports = NzbDroneCell.extend({
className : 'history-details-cell',
events : {"click" : '_showDetails'},
render : function(){
className : 'history-details-cell',
events : {
'click' : '_showDetails'
},
render : function() {
this.$el.empty();
this.$el.html('<i class="icon-info-sign"></i>');
return this;
},
_showDetails : function(){
vent.trigger(vent.Commands.ShowHistoryDetails, {model : this.model});
_showDetails : function() {
vent.trigger(vent.Commands.ShowHistoryDetails, { model : this.model });
}
});

180
src/UI/Activity/History/HistoryLayout.js
View File

@ -13,114 +13,142 @@ var ToolbarLayout = require('../../Shared/Toolbar/ToolbarLayout');
var LoadingView = require('../../Shared/LoadingView');
module.exports = Marionette.Layout.extend({
template : 'Activity/History/HistoryLayoutTemplate',
regions : {
template : 'Activity/History/HistoryLayoutTemplate',
regions : {
history : '#x-history',
toolbar : '#x-history-toolbar',
pager : '#x-history-pager'
},
columns : [{
name : 'eventType',
label : '',
cell : EventTypeCell,
cellValue : 'this'
}, {
name : 'series',
label : 'Series',
cell : SeriesTitleCell
}, {
name : 'episode',
label : 'Episode',
cell : EpisodeNumberCell,
sortable : false
}, {
name : 'episode',
label : 'Episode Title',
cell : EpisodeTitleCell,
sortable : false
}, {
name : 'this',
label : 'Quality',
cell : HistoryQualityCell,
sortable : false
}, {
name : 'date',
label : 'Date',
cell : RelativeDateCell
}, {
name : 'this',
label : '',
cell : HistoryDetailsCell,
sortable : false
}],
initialize : function(){
this.collection = new HistoryCollection({tableName : 'history'});
columns : [
{
name : 'eventType',
label : '',
cell : EventTypeCell,
cellValue : 'this'
},
{
name : 'series',
label : 'Series',
cell : SeriesTitleCell
},
{
name : 'episode',
label : 'Episode',
cell : EpisodeNumberCell,
sortable : false
},
{
name : 'episode',
label : 'Episode Title',
cell : EpisodeTitleCell,
sortable : false
},
{
name : 'this',
label : 'Quality',
cell : HistoryQualityCell,
sortable : false
},
{
name : 'date',
label : 'Date',
cell : RelativeDateCell
},
{
name : 'this',
label : '',
cell : HistoryDetailsCell,
sortable : false
}
],
initialize : function() {
this.collection = new HistoryCollection({ tableName : 'history' });
this.listenTo(this.collection, 'sync', this._showTable);
},
onShow : function(){
onShow : function() {
this.history.show(new LoadingView());
this._showToolbar();
},
_showTable : function(collection){
_showTable : function(collection) {
this.history.show(new Backgrid.Grid({
columns : this.columns,
collection : collection,
className : 'table table-hover'
}));
this.pager.show(new GridPager({
columns : this.columns,
collection : collection
}));
},
_showToolbar : function(){
_showToolbar : function() {
var filterOptions = {
type : 'radio',
storeState : true,
menuKey : 'history.filterMode',
defaultAction : 'all',
items : [{
key : 'all',
title : '',
tooltip : 'All',
icon : 'icon-circle-blank',
callback : this._setFilter
}, {
key : 'grabbed',
title : '',
tooltip : 'Grabbed',
icon : 'icon-nd-downloading',
callback : this._setFilter
}, {
key : 'imported',
title : '',
tooltip : 'Imported',
icon : 'icon-nd-imported',
callback : this._setFilter
}, {
key : 'failed',
title : '',
tooltip : 'Failed',
icon : 'icon-nd-download-failed',
callback : this._setFilter
}, {
key : 'deleted',
title : '',
tooltip : 'Deleted',
icon : 'icon-nd-deleted',
callback : this._setFilter
}]
items : [
{
key : 'all',
title : '',
tooltip : 'All',
icon : 'icon-circle-blank',
callback : this._setFilter
},
{
key : 'grabbed',
title : '',
tooltip : 'Grabbed',
icon : 'icon-nd-downloading',
callback : this._setFilter
},
{
key : 'imported',
title : '',
tooltip : 'Imported',
icon : 'icon-nd-imported',
callback : this._setFilter
},
{
key : 'failed',
title : '',
tooltip : 'Failed',
icon : 'icon-nd-download-failed',
callback : this._setFilter
},
{
key : 'deleted',
title : '',
tooltip : 'Deleted',
icon : 'icon-nd-deleted',
callback : this._setFilter
}
]
};
this.toolbar.show(new ToolbarLayout({
right : [filterOptions],
right : [
filterOptions
],
context : this
}));
},
_setFilter : function(buttonContext){
_setFilter : function(buttonContext) {
var mode = buttonContext.model.get('key');
this.collection.state.currentPage = 1;
var promise = this.collection.setFilterMode(mode);
if(buttonContext) {
if (buttonContext) {
buttonContext.ui.icon.spinForPromise(promise);
}
}
});
});

2
src/UI/Activity/History/HistoryModel.js
View File

@ -3,7 +3,7 @@ var SeriesModel = require('../../Series/SeriesModel');
var EpisodeModel = require('../../Series/EpisodeModel');
module.exports = Backbone.Model.extend({
parse : function(model){
parse : function(model) {
model.series = new SeriesModel(model.series);
model.episode = new EpisodeModel(model.episode);
model.episode.set('series', model.series);

18
src/UI/Activity/History/HistoryQualityCell.js
View File

@ -2,23 +2,29 @@ var NzbDroneCell = require('../../Cells/NzbDroneCell');
module.exports = NzbDroneCell.extend({
className : 'history-quality-cell',
render : function(){
render : function() {
var title = '';
var quality = this.model.get('quality');
var revision = quality.revision;
if(revision.real && revision.real > 0) {
if (revision.real && revision.real > 0) {
title += ' REAL';
}
if(revision.version && revision.version > 1) {
if (revision.version && revision.version > 1) {
title += ' PROPER';
}
title = title.trim();
if(this.model.get('qualityCutoffNotMet')) {
if (this.model.get('qualityCutoffNotMet')) {
this.$el.html('<span class="badge badge-inverse" title="{0}">{1}</span>'.format(title, quality.quality.name));
}
else {
} else {
this.$el.html('<span class="badge" title="{0}">{1}</span>'.format(title, quality.quality.name));
}
return this;
}
});

19
src/UI/Activity/Queue/ProgressCell.js
View File

@ -2,15 +2,22 @@ var NzbDroneCell = require('../../Cells/NzbDroneCell');
module.exports = NzbDroneCell.extend({
className : 'progress-cell',
render : function(){
render : function() {
this.$el.empty();
if(this.cellValue) {
if (this.cellValue) {
var status = this.model.get('status').toLowerCase();
if(status === 'downloading') {
var progress = 100 - this.model.get('sizeleft') / this.model.get('size') * 100;
this.$el.html('<div class="progress" title="{0}%">'.format(progress.toFixed(1)) + '<div class="progress-bar progress-bar-purple" style="width: {0}%;"></div></div>'.format(progress));
if (status === 'downloading') {
var progress = 100 - (this.model.get('sizeleft') / this.model.get('size') * 100);
this.$el.html('<div class="progress" title="{0}%">'.format(progress.toFixed(1)) +
'<div class="progress-bar progress-bar-purple" style="width: {0}%;"></div></div>'.format(progress));
}
}
return this;
}
});
});

113
src/UI/Activity/Queue/QueueActionsCell.js
View File

@ -1,68 +1,67 @@
'use strict';
define(
[
'jquery',
'marionette',
'Cells/TemplatedCell',
'Activity/Queue/RemoveFromQueueView',
'vent'
], function ($, Marionette, TemplatedCell, RemoveFromQueueView, vent) {
return TemplatedCell.extend({
var $ = require('jquery');
var vent = require('../../vent');
var Marionette = require('marionette');
var TemplatedCell = require('../../Cells/TemplatedCell');
var RemoveFromQueueView = require('./RemoveFromQueueView');
template : 'Activity/Queue/QueueActionsCellTemplate',
className : 'queue-actions-cell',
module.exports = TemplatedCell.extend({
events: {
'click .x-remove' : '_remove',
'click .x-import' : '_import',
'click .x-grab' : '_grab'
},
template : 'Activity/Queue/QueueActionsCellTemplate',
className : 'queue-actions-cell',
ui: {
import : '.x-import',
grab : '.x-grab'
},
events : {
'click .x-remove' : '_remove',
'click .x-import' : '_import',
'click .x-grab' : '_grab'
},
_remove : function () {
ui : {
import : '.x-import',
grab : '.x-grab'
},
var showBlacklist = this.model.get('status') !== 'Pending';
_remove : function() {
var showBlacklist = this.model.get('status') !== 'Pending';
vent.trigger(vent.Commands.OpenModalCommand, new RemoveFromQueueView({ model: this.model, showBlacklist: showBlacklist }));
},
vent.trigger(vent.Commands.OpenModalCommand, new RemoveFromQueueView({
model : this.model,
showBlacklist : showBlacklist
}));
},
_import : function () {
var self = this;
_import : function() {
var self = this;
var promise = $.ajax({
url: window.NzbDrone.ApiRoot + '/queue/import',
type: 'POST',
data: JSON.stringify(this.model.toJSON())
});
$(this.ui.import).spinForPromise(promise);
promise.success(function () {
//find models that have the same series id and episode ids and remove them
self.model.trigger('destroy', self.model);
});
},
_grab : function () {
var self = this;
var promise = $.ajax({
url: window.NzbDrone.ApiRoot + '/queue/grab',
type: 'POST',
data: JSON.stringify(this.model.toJSON())
});
$(this.ui.grab).spinForPromise(promise);
promise.success(function () {
//find models that have the same series id and episode ids and remove them
self.model.trigger('destroy', self.model);
});
}
var promise = $.ajax({
url : window.NzbDrone.ApiRoot + '/queue/import',
type : 'POST',
data : JSON.stringify(this.model.toJSON())
});
});
$(this.ui.import).spinForPromise(promise);
promise.success(function() {
//find models that have the same series id and episode ids and remove them
self.model.trigger('destroy', self.model);
});
},
_grab : function() {
var self = this;
var promise = $.ajax({
url : window.NzbDrone.ApiRoot + '/queue/grab',
type : 'POST',
data : JSON.stringify(this.model.toJSON())
});
$(this.ui.grab).spinForPromise(promise);
promise.success(function() {
//find models that have the same series id and episode ids and remove them
self.model.trigger('destroy', self.model);
});
}
});

2
src/UI/Activity/Queue/QueueActionsCellTemplate.hbs
View File

@ -1,4 +1,4 @@
{{#if_eq status compare="Completed"}}
{{#if_eq status compare="Completed"}}
{{#if_eq trackedDownloadStatus compare="Warning"}}
<i class="icon-inbox x-import" title="Force import"></i>
{{/if_eq}}

37
src/UI/Activity/Queue/QueueCollection.js
View File

@ -4,19 +4,24 @@ var PageableCollection = require('backbone.pageable');
var QueueModel = require('./QueueModel');
require('../../Mixins/backbone.signalr.mixin');
module.exports = (function(){
var QueueCollection = PageableCollection.extend({
url : window.NzbDrone.ApiRoot + '/queue',
model : QueueModel,
state : {pageSize : 15},
mode : 'client',
findEpisode : function(episodeId){
return _.find(this.fullCollection.models, function(queueModel){
return queueModel.get('episode').id === episodeId;
});
}
});
var collection = new QueueCollection().bindSignalR();
collection.fetch();
return collection;
}).call(this);
var QueueCollection = PageableCollection.extend({
url : window.NzbDrone.ApiRoot + '/queue',
model : QueueModel,
state : {
pageSize : 15
},
mode : 'client',
findEpisode : function(episodeId) {
return _.find(this.fullCollection.models, function(queueModel) {
return queueModel.get('episode').id === episodeId;
});
}
});
var collection = new QueueCollection().bindSignalR();
collection.fetch();
module.exports = collection;

203
src/UI/Activity/Queue/QueueLayout.js
View File

@ -1,116 +1,99 @@
'use strict';
define(
[
'marionette',
'backgrid',
'Activity/Queue/QueueCollection',
'Cells/SeriesTitleCell',
'Cells/EpisodeNumberCell',
'Cells/EpisodeTitleCell',
'Cells/QualityCell',
'Activity/Queue/QueueStatusCell',
'Activity/Queue/QueueActionsCell',
'Activity/Queue/TimeleftCell',
'Activity/Queue/ProgressCell',
'Release/ProtocolCell',
'Shared/Grid/Pager'
], function (Marionette,
Backgrid,
QueueCollection,
SeriesTitleCell,
EpisodeNumberCell,
EpisodeTitleCell,
QualityCell,
QueueStatusCell,
QueueActionsCell,
TimeleftCell,
ProgressCell,
ProtocolCell,
GridPager) {
return Marionette.Layout.extend({
template: 'Activity/Queue/QueueLayoutTemplate',
var Marionette = require('marionette');
var Backgrid = require('backgrid');
var QueueCollection = require('./QueueCollection');
var SeriesTitleCell = require('../../Cells/SeriesTitleCell');
var EpisodeNumberCell = require('../../Cells/EpisodeNumberCell');
var EpisodeTitleCell = require('../../Cells/EpisodeTitleCell');
var QualityCell = require('../../Cells/QualityCell');
var QueueStatusCell = require('./QueueStatusCell');
var QueueActionsCell = require('./QueueActionsCell');
var TimeleftCell = require('./TimeleftCell');
var ProgressCell = require('./ProgressCell');
var ProtocolCell = require('../../Release/ProtocolCell');
var GridPager = require('../../Shared/Grid/Pager');
regions: {
table: '#x-queue',
pager: '#x-queue-pager'
},
module.exports = Marionette.Layout.extend({
template : 'Activity/Queue/QueueLayoutTemplate',
columns:
[
{
name : 'status',
label : '',
cell : QueueStatusCell,
cellValue : 'this'
},
{
name : 'series',
label : 'Series',
cell : SeriesTitleCell,
sortable : false
},
{
name : 'episode',
label : 'Episode',
cell : EpisodeNumberCell,
sortable : false
},
{
name : 'episode',
label : 'Episode Title',
cell : EpisodeTitleCell,
sortable : false
},
{
name : 'quality',
label : 'Quality',
cell : QualityCell,
sortable : false
},
{
name : 'protocol',
label : 'Protocol',
cell : ProtocolCell
},
{
name : 'timeleft',
label : 'Timeleft',
cell : TimeleftCell,
cellValue : 'this'
},
{
name : 'episode',
label : 'Progress',
cell : ProgressCell,
cellValue : 'this'
},
{
name : 'status',
label : '',
cell : QueueActionsCell,
cellValue : 'this'
}
],
regions : {
table : '#x-queue',
pager : '#x-queue-pager'
},
initialize: function () {
this.listenTo(QueueCollection, 'sync', this._showTable);
},
columns : [
{
name : 'status',
label : '',
cell : QueueStatusCell,
cellValue : 'this'
},
{
name : 'series',
label : 'Series',
cell : SeriesTitleCell,
sortable : false
},
{
name : 'episode',
label : 'Episode',
cell : EpisodeNumberCell,
sortable : false
},
{
name : 'episode',
label : 'Episode Title',
cell : EpisodeTitleCell,
sortable : false
},
{
name : 'quality',
label : 'Quality',
cell : QualityCell,
sortable : false
},
{
name : 'protocol',
label : 'Protocol',
cell : ProtocolCell
},
{
name : 'timeleft',
label : 'Timeleft',
cell : TimeleftCell,
cellValue : 'this'
},
{
name : 'episode',
label : 'Progress',
cell : ProgressCell,
cellValue : 'this'
},
{
name : 'status',
label : '',
cell : QueueActionsCell,
cellValue : 'this'
}
],
onShow: function () {
this._showTable();
},
initialize : function() {
this.listenTo(QueueCollection, 'sync', this._showTable);
},
_showTable: function () {
this.table.show(new Backgrid.Grid({
columns : this.columns,
collection: QueueCollection,
className : 'table table-hover'
}));
onShow : function() {
this._showTable();
},
this.pager.show(new GridPager({
columns : this.columns,
collection: QueueCollection
}));
}
});
});
_showTable : function() {
this.table.show(new Backgrid.Grid({
columns : this.columns,
collection : QueueCollection,
className : 'table table-hover'
}));
this.pager.show(new GridPager({
columns : this.columns,
collection : QueueCollection
}));
}
});

2
src/UI/Activity/Queue/QueueLayoutTemplate.hbs
View File

@ -1,4 +1,4 @@
<div class="row">
<div class="row">
<div class="col-md-12 table-responsive">
<div id="x-queue" class="queue"/>
</div>

2
src/UI/Activity/Queue/QueueModel.js
View File

@ -3,7 +3,7 @@ var SeriesModel = require('../../Series/SeriesModel');
var EpisodeModel = require('../../Series/EpisodeModel');
module.exports = Backbone.Model.extend({
parse : function(model){
parse : function(model) {
model.series = new SeriesModel(model.series);
model.episode = new EpisodeModel(model.episode);
model.episode.set('series', model.series);

38
src/UI/Activity/Queue/QueueStatusCell.js
View File

@ -4,56 +4,68 @@ var NzbDroneCell = require('../../Cells/NzbDroneCell');
module.exports = NzbDroneCell.extend({
className : 'queue-status-cell',
template : 'Activity/Queue/QueueStatusCellTemplate',
render : function(){
render : function() {
this.$el.empty();
if(this.cellValue) {
if (this.cellValue) {
var status = this.cellValue.get('status').toLowerCase();
var trackedDownloadStatus = this.cellValue.has('trackedDownloadStatus') ? this.cellValue.get('trackedDownloadStatus').toLowerCase() : 'ok';
var icon = 'icon-nd-downloading';
var title = 'Downloading';
var itemTitle = this.cellValue.get('title');
var content = itemTitle;
if(status === 'paused') {
if (status === 'paused') {
icon = 'icon-pause';
title = 'Paused';
}
if(status === 'queued') {
if (status === 'queued') {
icon = 'icon-cloud';
title = 'Queued';
}
if(status === 'completed') {
if (status === 'completed') {
icon = 'icon-inbox';
title = 'Downloaded';
}
if(status === 'pending') {
if (status === 'pending') {
icon = 'icon-time';
title = 'Pending';
}
if(status === 'failed') {
if (status === 'failed') {
icon = 'icon-nd-download-failed';
title = 'Download failed';
}
if(status === 'warning') {
if (status === 'warning') {
icon = 'icon-nd-download-warning';
title = 'Download warning: check download client for more details';
}
if(trackedDownloadStatus === 'warning') {
if (trackedDownloadStatus === 'warning') {
icon += ' icon-nd-warning';
this.templateFunction = Marionette.TemplateCache.get(this.template);
content = this.templateFunction(this.cellValue.toJSON());
}
if(trackedDownloadStatus === 'error') {
if(status === 'completed') {
if (trackedDownloadStatus === 'error') {
if (status === 'completed') {
icon = 'icon-nd-import-failed';
title = 'Import failed: ' + itemTitle;
}
else {
} else {
icon = 'icon-nd-download-failed';
title = 'Download failed';
}
this.templateFunction = Marionette.TemplateCache.get(this.template);
content = this.templateFunction(this.cellValue.toJSON());
}
this.$el.html('<i class="{0}"></i>'.format(icon));
this.$el.popover({
content : content,

25
src/UI/Activity/Queue/QueueView.js
View File

@ -3,30 +3,37 @@ var Marionette = require('marionette');
var QueueCollection = require('./QueueCollection');
module.exports = Marionette.ItemView.extend({
tagName : 'span',
initialize : function(){
tagName : 'span',
initialize : function() {
this.listenTo(QueueCollection, 'sync', this.render);
QueueCollection.fetch();
},
render : function(){
render : function() {
this.$el.empty();
if(QueueCollection.length === 0) {
if (QueueCollection.length === 0) {
return this;
}
var count = QueueCollection.fullCollection.length;
var label = 'label-info';
var errors = QueueCollection.fullCollection.some(function(model){
var errors = QueueCollection.fullCollection.some(function(model) {
return model.has('trackedDownloadStatus') && model.get('trackedDownloadStatus').toLowerCase() === 'error';
});
var warnings = QueueCollection.fullCollection.some(function(model){
var warnings = QueueCollection.fullCollection.some(function(model) {
return model.has('trackedDownloadStatus') && model.get('trackedDownloadStatus').toLowerCase() === 'warning';
});
if(errors) {
if (errors) {
label = 'label-danger';
}
else if(warnings) {
} else if (warnings) {
label = 'label-warning';
}
this.$el.html('<span class="label {0}">{1}</span>'.format(label, count));
return this;
}

57
src/UI/Activity/Queue/RemoveFromQueueView.js
View File

@ -1,39 +1,34 @@
'use strict';
define(
[
'vent',
'marionette'
], function (vent, Marionette) {
var vent = require('../../vent');
var Marionette = require('marionette');
return Marionette.ItemView.extend({
template: 'Activity/Queue/RemoveFromQueueViewTemplate',
module.exports = Marionette.ItemView.extend({
template : 'Activity/Queue/RemoveFromQueueViewTemplate',
events: {
'click .x-confirm-remove' : 'removeItem'
},
events : {
'click .x-confirm-remove' : 'removeItem'
},
ui: {
blacklist : '.x-blacklist',
indicator : '.x-indicator'
},
ui : {
blacklist : '.x-blacklist',
indicator : '.x-indicator'
},
initialize: function (options) {
this.templateHelpers = {
showBlacklist: options.showBlacklist
};
},
initialize : function(options) {
this.templateHelpers = {
showBlacklist : options.showBlacklist
};
},
removeItem: function () {
var blacklist = this.ui.blacklist.prop('checked') || false;
removeItem : function() {
var blacklist = this.ui.blacklist.prop('checked') || false;
this.ui.indicator.show();
this.ui.indicator.show();
this.model.destroy({
data: { 'blacklist': blacklist },
wait: true
}).done(function () {
vent.trigger(vent.Commands.CloseModalCommand);
});
}
this.model.destroy({
data : { 'blacklist' : blacklist },
wait : true
}).done(function() {
vent.trigger(vent.Commands.CloseModalCommand);
});
});
}
});

17
src/UI/Activity/Queue/TimeleftCell.js
View File

@ -6,26 +6,31 @@ var FormatHelpers = require('../../Shared/FormatHelpers');
module.exports = NzbDroneCell.extend({
className : 'timeleft-cell',
render : function(){
render : function() {
this.$el.empty();
if(this.cellValue) {
if(this.cellValue.get('status').toLowerCase() === 'pending') {
if (this.cellValue) {
if (this.cellValue.get('status').toLowerCase() === 'pending') {
var ect = this.cellValue.get('estimatedCompletionTime');
var time = '{0} at {1}'.format(FormatHelpers.relativeDate(ect), moment(ect).format(UiSettingsModel.time(true, false)));
this.$el.html('-');
this.$el.attr('title', 'Will be processed during the first RSS Sync after {0}'.format(time));
return this;
}
var timeleft = this.cellValue.get('timeleft');
var totalSize = fileSize(this.cellValue.get('size'), 1, false);
var remainingSize = fileSize(this.cellValue.get('sizeleft'), 1, false);
if(timeleft === undefined) {
if (timeleft === undefined) {
this.$el.html('-');
}
else {
} else {
this.$el.html('<span title="{1} / {2}">{0}</span>'.format(timeleft, remainingSize, totalSize));
}
}
return this;
}
});