github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-19 21:13:28 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Repurposed the Missing page to include filter options and display episodes that haven't reached cutoff.

Browse source 
--HG--
rename : src/NzbDrone.Api/Missing/MissingModule.cs => src/NzbDrone.Api/Wanted/MissingModule.cs
rename : src/UI/Missing/ControlsColumnTemplate.html => src/UI/Wanted/ControlsColumnTemplate.html
rename : src/UI/Missing/MissingCollection.js => src/UI/Wanted/Missing/MissingCollection.js
rename : src/UI/Missing/MissingLayout.js => src/UI/Wanted/WantedLayout.js
rename : src/UI/Missing/MissingLayoutTemplate.html => src/UI/Wanted/WantedLayoutTemplate.html
extra : source : 2c76f3e423d39446f3bd7799b7344d7be63c70f5
This commit is contained in:
Taloth Saldono 2014-02-09 20:03:49 +01:00 • committed by Mark McDowall
commit d416dd4177
23 changed files with 596 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/UI/.idea/runConfigurations/Debug___Chrome.xml generated
View file

@ -6,7 +6,7 @@
<mapping url="http://localhost:8989/Upcoming" local-file="$PROJECT_DIR$/Upcoming" />
<mapping url="http://localhost:8989/app.js" local-file="$PROJECT_DIR$/app.js" />
<mapping url="http://localhost:8989/Mixins" local-file="$PROJECT_DIR$/Mixins" />
<mapping url="http://localhost:8989/Missing" local-file="$PROJECT_DIR$/Missing" />
<mapping url="http://localhost:8989/Wanted" local-file="$PROJECT_DIR$/Wanted" />
<mapping url="http://localhost:8989/Quality" local-file="$PROJECT_DIR$/Quality" />
<mapping url="http://localhost:8989/Config.js" local-file="$PROJECT_DIR$/Config.js" />
<mapping url="http://localhost:8989/Shared" local-file="$PROJECT_DIR$/Shared" />

2
src/UI/.idea/runConfigurations/Debug___Firefox.xml generated
View file

@ -6,7 +6,7 @@
<mapping url="http://localhost:8989/Upcoming" local-file="$PROJECT_DIR$/Upcoming" />
<mapping url="http://localhost:8989/app.js" local-file="$PROJECT_DIR$/app.js" />
<mapping url="http://localhost:8989/Mixins" local-file="$PROJECT_DIR$/Mixins" />
<mapping url="http://localhost:8989/Missing" local-file="$PROJECT_DIR$/Missing" />
<mapping url="http://localhost:8989/Wanted" local-file="$PROJECT_DIR$/Wanted" />
<mapping url="http://localhost:8989/Config.js" local-file="$PROJECT_DIR$/Config.js" />
<mapping url="http://localhost:8989/Quality" local-file="$PROJECT_DIR$/Quality" />
<mapping url="http://localhost:8989/AddSeries" local-file="$PROJECT_DIR$/AddSeries" />

17
src/UI/Cells/EpisodeStatusCell.js
View file

@ -52,7 +52,24 @@ define(
return;
}
else if (hasFile && this.model.get('episodeFile')) {
var episodeFile = this.model.get('episodeFile');
var quality = episodeFile.quality;
var size = FormatHelpers.bytes(episodeFile.size);
var title = 'Episode downloaded';
if (quality.proper) {
title += ' [PROPER] - {0}'.format(size);
this.$el.html('<span class="badge badge-info" title="{0}">{1}</span>'.format(title, quality.quality.name));
}
else {
title += ' - {0}'.format(size);
this.$el.html('<span class="badge badge-inverse" title="{0}">{1}</span>'.format(title, quality.quality.name));
}
return;
}
else {
var model = this.model;
var downloading = QueueCollection.findEpisode(model.get('id'));

10
src/UI/Controller.js
View file

@ -7,7 +7,7 @@ define(
'History/HistoryLayout',
'Settings/SettingsLayout',
'AddSeries/AddSeriesLayout',
'Missing/MissingLayout',
'Wanted/WantedLayout',
'Calendar/CalendarLayout',
'Release/ReleaseLayout',
'System/SystemLayout',
@ -20,7 +20,7 @@ define(
HistoryLayout,
SettingsLayout,
AddSeriesLayout,
MissingLayout,
WantedLayout,
CalendarLayout,
ReleaseLayout,
SystemLayout,
@ -44,10 +44,10 @@ define(
this.showMainRegion(new SettingsLayout({ action: action }));
},
missing: function () {
this.setTitle('Missing');
wanted: function (action) {
this.setTitle('Wanted');
this.showMainRegion(new MissingLayout());
this.showMainRegion(new WantedLayout({ action: action }));
},
history: function (action) {

2
src/UI/Mixins/AsFilteredCollection.js
View file

@ -24,7 +24,7 @@ define(
};
this.prototype.setFilterMode = function(mode, options) {
this.setFilter(this.filterModes[mode], options);
return this.setFilter(this.filterModes[mode], options);
};
var originalMakeFullCollection = this.prototype._makeFullCollection;

4
src/UI/Navbar/NavbarTemplate.html
View file

@ -29,10 +29,10 @@
</a>
</li>
<li>
<a href="{{UrlBase}}/missing">
<a href="{{UrlBase}}/wanted">
<i class="icon-warning-sign"></i>
<br>
Missing
Wanted
</a>
</li>
<li>

3
src/UI/Router.js
View file

@ -14,7 +14,8 @@ define(
'calendar' : 'calendar',
'settings' : 'settings',
'settings/:action(/:query)' : 'settings',
'missing' : 'missing',
'wanted' : 'wanted',
'wanted/:action' : 'wanted',
'history' : 'history',
'history/:action' : 'history',
'rss' : 'rss',

12
src/UI/Shared/Toolbar/Radio/RadioButtonCollectionView.js
View file

@ -16,13 +16,17 @@ define(
initialize: function (options) {
this.menu = options.menu;
if (this.menu.storeState) {
this.setActive();
}
this.setActive();
},
setActive: function () {
var storedKey = Config.getValue(this.menu.menuKey, this.menu.defaultAction);
var storedKey = this.menu.defaultAction;
if (this.menu.storeState)
storedKey = Config.getValue(this.menu.menuKey, storedKey);
if (!storedKey)
return;
this.collection.each(function (model) {
if (model.get('key').toLocaleLowerCase() === storedKey.toLowerCase()) {

0
src/UI/Missing/ControlsColumnTemplate.html → src/UI/Wanted/ControlsColumnTemplate.html
View file

21
src/UI/Missing/MissingCollection.js → src/UI/Wanted/Cutoff/CutoffUnmetCollection.js
View file

@ -1,19 +1,21 @@
'use strict';
define(
[
'underscore',
'Series/EpisodeModel',
'backbone.pageable',
'Mixins/AsFilteredCollection',
'Mixins/AsPersistedStateCollection'
], function (EpisodeModel, PagableCollection, AsPersistedStateCollection) {
], function (_, EpisodeModel, PagableCollection, AsFilteredCollection, AsPersistedStateCollection) {
var collection = PagableCollection.extend({
url : window.NzbDrone.ApiRoot + '/missing',
url : window.NzbDrone.ApiRoot + '/wanted/cutoff',
model: EpisodeModel,
tableName: 'missing',
tableName: 'wanted.cutoff',
state: {
pageSize: 15,
sortKey : 'airDateUtc',
order : 1
pageSize : 15,
sortKey : 'airDateUtc',
order : 1
},
queryParams: {
@ -27,6 +29,12 @@ define(
'1' : 'desc'
}
},
// Filter Modes
filterModes: {
'monitored' : ['monitored', 'true'],
'unmonitored' : ['monitored', 'false'],
},
parseState: function (resp) {
return {totalRecords: resp.totalRecords};
@ -41,5 +49,6 @@ define(
}
});
collection = AsFilteredCollection.call(collection);
return AsPersistedStateCollection.call(collection);
});

206
src/UI/Wanted/Cutoff/CutoffUnmetLayout.js Normal file
View file

@ -0,0 +1,206 @@
'use strict';
define(
[
'underscore',
'marionette',
'backgrid',
'Wanted/Cutoff/CutoffUnmetCollection',
'Cells/SeriesTitleCell',
'Cells/EpisodeNumberCell',
'Cells/EpisodeTitleCell',
'Cells/RelativeDateCell',
'Cells/EpisodeStatusCell',
'Shared/Grid/Pager',
'Shared/Toolbar/ToolbarLayout',
'Shared/LoadingView',
'Shared/Messenger',
'Commands/CommandController',
'backgrid.selectall'
], function (_,
Marionette,
Backgrid,
CutoffUnmetCollection,
SeriesTitleCell,
EpisodeNumberCell,
EpisodeTitleCell,
RelativeDateCell,
EpisodeStatusCell,
GridPager,
ToolbarLayout,
LoadingView,
Messenger,
CommandController) {
return Marionette.Layout.extend({
template: 'Wanted/Cutoff/CutoffUnmetLayoutTemplate',
regions: {
missing: '#x-missing',
toolbar: '#x-toolbar',
pager : '#x-pager'
},
ui: {
searchSelectedButton: '.btn i.icon-search'
},
columns:
[
{
name : '',
cell : 'select-row',
headerCell: 'select-all',
sortable : false
},
{
name : 'series',
label : 'Series Title',
sortable : false,
cell : SeriesTitleCell
},
{
name : 'this',
label : 'Episode',
sortable : false,
cell : EpisodeNumberCell
},
{
name : 'this',
label : 'Episode Title',
sortable : false,
cell : EpisodeTitleCell,
},
{
name : 'airDateUtc',
label : 'Air Date',
cell : RelativeDateCell
},
{
name : 'status',
label : 'Status',
cell : EpisodeStatusCell,
sortable: false
}
],
initialize: function () {
this.collection = new CutoffUnmetCollection();
this.listenTo(this.collection, 'sync', this._showTable);
},
onShow: function () {
this.missing.show(new LoadingView());
this._showToolbar();
this.collection.fetch();
},
_showTable: function () {
this.missingGrid = new Backgrid.Grid({
columns : this.columns,
collection: this.collection,
className : 'table table-hover'
});
this.missing.show(this.missingGrid);
this.pager.show(new GridPager({
columns : this.columns,
collection: this.collection
}));
},
_showToolbar: function () {
var leftSideButtons = {
type : 'default',
storeState: false,
items :
[
{
title: 'Search Selected',
icon : 'icon-search',
callback: this._searchSelected,
ownerContext: this
},
{
title: 'Season Pass',
icon : 'icon-bookmark',
route: 'seasonpass'
}
]
};
var filterOptions = {
type : 'radio',
storeState : false,
menuKey : 'wanted.filterMode',
defaultAction : 'monitored',
items :
[
{
key : 'monitored',
title : '',
tooltip : 'Monitored Only',
icon : 'icon-nd-monitored',
callback : this._setFilter
},
{
key : 'unmonitored',
title : '',
tooltip : 'Unmonitored Only',
icon : 'icon-nd-unmonitored',
callback : this._setFilter
},
]
};
this.toolbar.show(new ToolbarLayout({
left :
[
leftSideButtons
],
right :
[
filterOptions
],
context: this
}));
CommandController.bindToCommand({
element: this.$('.x-toolbar-left-1 .btn i.icon-search'),
command: {
name: 'episodeSearch'
}
});
},
_setFilter: function(buttonContext) {
var mode = buttonContext.model.get('key');
this.collection.state.currentPage = 1;
var promise = this.collection.setFilterMode(mode);
if (buttonContext)
buttonContext.ui.icon.spinForPromise(promise);
},
_searchSelected: function () {
var selected = this.missingGrid.getSelectedModels();
if (selected.length === 0) {
Messenger.show({
type: 'error',
message: 'No episodes selected'
});
return;
}
var ids = _.pluck(selected, 'id');
CommandController.Execute('episodeSearch', {
name : 'episodeSearch',
episodeIds: ids
});
}
});
});

0
src/UI/Missing/MissingLayoutTemplate.html → src/UI/Wanted/Cutoff/CutoffUnmetLayoutTemplate.html
View file

54
src/UI/Wanted/Missing/MissingCollection.js Normal file
View file

@ -0,0 +1,54 @@
'use strict';
define(
[
'underscore',
'Series/EpisodeModel',
'backbone.pageable',
'Mixins/AsFilteredCollection',
'Mixins/AsPersistedStateCollection'
], function (_, EpisodeModel, PagableCollection, AsFilteredCollection, AsPersistedStateCollection) {
var collection = PagableCollection.extend({
url : window.NzbDrone.ApiRoot + '/wanted/missing',
model: EpisodeModel,
tableName: 'wanted.missing',
state: {
pageSize : 15,
sortKey : 'airDateUtc',
order : 1
},
queryParams: {
totalPages : null,
totalRecords: null,
pageSize : 'pageSize',
sortKey : 'sortKey',
order : 'sortDir',
directions : {
'-1': 'asc',
'1' : 'desc'
}
},
// Filter Modes
filterModes: {
'monitored' : ['monitored', 'true'],
'unmonitored' : ['monitored', 'false'],
},
parseState: function (resp) {
return {totalRecords: resp.totalRecords};
},
parseRecords: function (resp) {
if (resp) {
return resp.records;
}
return resp;
}
});
collection = AsFilteredCollection.call(collection);
return AsPersistedStateCollection.call(collection);
});

66
src/UI/Missing/MissingLayout.js → src/UI/Wanted/Missing/MissingLayout.js
View file

@ -4,11 +4,12 @@ define(
'underscore',
'marionette',
'backgrid',
'Missing/MissingCollection',
'Wanted/Missing/MissingCollection',
'Cells/SeriesTitleCell',
'Cells/EpisodeNumberCell',
'Cells/EpisodeTitleCell',
'Cells/RelativeDateCell',
'Cells/EpisodeStatusCell',
'Shared/Grid/Pager',
'Shared/Toolbar/ToolbarLayout',
'Shared/LoadingView',
@ -23,13 +24,14 @@ define(
EpisodeNumberCell,
EpisodeTitleCell,
RelativeDateCell,
EpisodeStatusCell,
GridPager,
ToolbarLayout,
LoadingView,
Messenger,
CommandController) {
return Marionette.Layout.extend({
template: 'Missing/MissingLayoutTemplate',
template: 'Wanted/Missing/MissingLayoutTemplate',
regions: {
missing: '#x-missing',
@ -52,25 +54,31 @@ define(
{
name : 'series',
label : 'Series Title',
sortable: false,
sortable : false,
cell : SeriesTitleCell
},
{
name : 'this',
label : 'Episode',
sortable: false,
sortable : false,
cell : EpisodeNumberCell
},
{
name : 'this',
label : 'Episode Title',
sortable: false,
cell : EpisodeTitleCell
sortable : false,
cell : EpisodeTitleCell,
},
{
name : 'airDateUtc',
label: 'Air Date',
cell : RelativeDateCell
name : 'airDateUtc',
label : 'Air Date',
cell : RelativeDateCell
},
{
name : 'status',
label : 'Status',
cell : EpisodeStatusCell,
sortable: false
}
],
@ -82,8 +90,8 @@ define(
onShow: function () {
this.missing.show(new LoadingView());
this.collection.fetch();
this._showToolbar();
this.collection.fetch();
},
_showTable: function () {
@ -120,12 +128,40 @@ define(
}
]
};
var filterOptions = {
type : 'radio',
storeState : false,
menuKey : 'wanted.filterMode',
defaultAction : 'monitored',
items :
[
{
key : 'monitored',
title : '',
tooltip : 'Monitored Only',
icon : 'icon-nd-monitored',
callback : this._setFilter
},
{
key : 'unmonitored',
title : '',
tooltip : 'Unmonitored Only',
icon : 'icon-nd-unmonitored',
callback : this._setFilter
},
]
};
this.toolbar.show(new ToolbarLayout({
left :
[
leftSideButtons
],
right :
[
filterOptions
],
context: this
}));
@ -136,6 +172,16 @@ define(
}
});
},
_setFilter: function(buttonContext) {
var mode = buttonContext.model.get('key');
this.collection.state.currentPage = 1;
var promise = this.collection.setFilterMode(mode);
if (buttonContext)
buttonContext.ui.icon.spinForPromise(promise);
},
_searchSelected: function () {
var selected = this.missingGrid.getSelectedModels();

11
src/UI/Wanted/Missing/MissingLayoutTemplate.html Normal file
View file

@ -0,0 +1,11 @@
<div id="x-toolbar"/>
<div class="row">
<div class="span12">
<div id="x-missing"/>
</div>
</div>
<div class="row">
<div class="span12">
<div id="x-pager"/>
</div>
</div>

69
src/UI/Wanted/WantedLayout.js Normal file
View file

@ -0,0 +1,69 @@
'use strict';
define(
[
'marionette',
'backbone',
'backgrid',
'Wanted/Missing/MissingLayout',
'Wanted/Cutoff/CutoffUnmetLayout'
], function (Marionette, Backbone, Backgrid, MissingLayout, CutoffUnmetLayout) {
return Marionette.Layout.extend({
template: 'Wanted/WantedLayoutTemplate',
regions: {
content : '#content'
//missing : '#missing',
//cutoff : '#cutoff'
},
ui: {
missingTab : '.x-missing-tab',
cutoffTab : '.x-cutoff-tab'
},
events: {
'click .x-missing-tab' : '_showMissing',
'click .x-cutoff-tab' : '_showCutoffUnmet'
},
initialize: function (options) {
if (options.action) {
this.action = options.action.toLowerCase();
}
},
onShow: function () {
switch (this.action) {
case 'cutoff':
this._showCutoffUnmet();
break;
default:
this._showMissing();
}
},
_navigate: function (route) {
Backbone.history.navigate(route);
},
_showMissing: function (e) {
if (e) {
e.preventDefault();
}
this.content.show(new MissingLayout());
this.ui.missingTab.tab('show');
this._navigate('/wanted/missing');
},
_showCutoffUnmet: function (e) {
if (e) {
e.preventDefault();
}
this.content.show(new CutoffUnmetLayout());
this.ui.cutoffTab.tab('show');
this._navigate('/wanted/cutoff');
}
});
});

10
src/UI/Wanted/WantedLayoutTemplate.html Normal file
View file

@ -0,0 +1,10 @@
<ul class="nav nav-tabs">
<li><a href="#missing" class="x-missing-tab no-router">Missing</a></li>
<li><a href="#cutoff" class="x-cutoff-tab no-router">Cutoff Unmet</a></li>
</ul>
<div class="tab-pane" id="content"></div>
<!--<div class="tab-content">
<div class="tab-pane" id="missing"></div>
<div class="tab-pane" id="cutoff"></div>
</div>-->