Full page searching for missing episodes
New: Search for an entire page of missing episodes
This commit is contained in:
Mark McDowall
parent
cf2ca6aa32
commit
7798e8b591
|
|
@ -22,6 +22,9 @@ module.exports = function (grunt) {
|
|||
'src/UI/JsLibraries/backbone.backgrid.paginator.js' : 'http://raw.github.com/wyuenho/backgrid/master/lib/extensions/paginator/backgrid-paginator.js',
|
||||
'src/UI/JsLibraries/backbone.backgrid.filter.js' : 'http://raw.github.com/wyuenho/backgrid/master/lib/extensions/filter/backgrid-filter.js',
|
||||
|
||||
'src/UI/JsLibraries/backbone.backgrid.selectall.js' : 'http://raw.github.com/wyuenho/backgrid-select-all/master/backgrid-select-all.js',
|
||||
'src/UI/Content/Backgrid/selectall.css' : 'http://raw.github.com/wyuenho/backgrid-select-all/master/backgrid-select-all.css',
|
||||
|
||||
'src/UI/JsLibraries/backbone.validation.js' : 'https://raw.github.com/thedersen/backbone.validation/master/dist/backbone-validation.js',
|
||||
|
||||
'src/UI/JsLibraries/handlebars.runtime.js' : 'http://raw.github.com/wycats/handlebars.js/master/dist/handlebars.runtime.js',
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
using NzbDrone.Core.Messaging.Commands;
|
||||
using System.Collections.Generic;
|
||||
using NzbDrone.Core.Messaging.Commands;
|
||||
|
||||
namespace NzbDrone.Core.IndexerSearch
|
||||
{
|
||||
public class EpisodeSearchCommand : Command
|
||||
{
|
||||
public int EpisodeId { get; set; }
|
||||
public List<int> EpisodeIds { get; set; }
|
||||
|
||||
public override bool SendUpdatesToClient
|
||||
{
|
||||
|
|
|
|||
|
|
@ -22,10 +22,13 @@ namespace NzbDrone.Core.IndexerSearch
|
|||
|
||||
public void Execute(EpisodeSearchCommand message)
|
||||
{
|
||||
var decisions = _nzbSearchService.EpisodeSearch(message.EpisodeId);
|
||||
var downloaded = _downloadApprovedReports.DownloadApproved(decisions);
|
||||
foreach (var episodeId in message.EpisodeIds)
|
||||
{
|
||||
var decisions = _nzbSearchService.EpisodeSearch(episodeId);
|
||||
var downloaded = _downloadApprovedReports.DownloadApproved(decisions);
|
||||
|
||||
_logger.ProgressInfo("Episode search completed. {0} reports downloaded.", downloaded.Count);
|
||||
_logger.ProgressInfo("Episode search completed. {0} reports downloaded.", downloaded.Count);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ define(
|
|||
_automaticSearch: function () {
|
||||
CommandController.Execute('episodeSearch', {
|
||||
name : 'episodeSearch',
|
||||
episodeId: this.model.get('id')
|
||||
episodeIds: [ this.model.get('id') ]
|
||||
});
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
@import "filter";
|
||||
@import "paginator";
|
||||
@import (css) "selectall.css";
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
/*
|
||||
backgrid-select-all
|
||||
http://github.com/wyuenho/backgrid
|
||||
|
||||
Copyright (c) 2013 Jimmy Yuen Ho Wong and contributors
|
||||
Licensed under the MIT @license.
|
||||
*/
|
||||
|
||||
.backgrid .select-row-cell,
|
||||
.backgrid .select-all-header-cell {
|
||||
text-align: center;
|
||||
}
|
||||
|
|
@ -44,7 +44,7 @@ define(
|
|||
}
|
||||
|
||||
CommandController.Execute('episodeSearch', {
|
||||
episodeId: this.model.get('id')
|
||||
episodeIds: [ this.model.get('id') ]
|
||||
});
|
||||
|
||||
App.vent.trigger(App.Commands.CloseModalCommand);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,243 @@
|
|||
/*
|
||||
backgrid-select-all
|
||||
http://github.com/wyuenho/backgrid
|
||||
|
||||
Copyright (c) 2013 Jimmy Yuen Ho Wong and contributors
|
||||
Licensed under the MIT @license.
|
||||
*/
|
||||
(function (factory) {
|
||||
|
||||
// CommonJS
|
||||
if (typeof exports == "object") {
|
||||
module.exports = factory(require("backbone"), require("backgrid"));
|
||||
}
|
||||
// Browser
|
||||
else if (typeof Backbone !== "undefined" && typeof Backgrid !== "undefined") {
|
||||
factory(Backbone, Backgrid);
|
||||
}
|
||||
|
||||
}(function (Backbone, Backgrid) {
|
||||
|
||||
"use strict";
|
||||
|
||||
var $ = Backbone.$;
|
||||
|
||||
/**
|
||||
Renders a checkbox for row selection.
|
||||
|
||||
@class Backgrid.Extension.SelectRowCell
|
||||
@extends Backbone.View
|
||||
*/
|
||||
var SelectRowCell = Backgrid.Extension.SelectRowCell = Backbone.View.extend({
|
||||
|
||||
/** @property */
|
||||
className: "select-row-cell",
|
||||
|
||||
/** @property */
|
||||
tagName: "td",
|
||||
|
||||
/** @property */
|
||||
events: {
|
||||
"keydown :checkbox": "onKeydown",
|
||||
"change :checkbox": "onChange",
|
||||
"click :checkbox": "enterEditMode"
|
||||
},
|
||||
|
||||
/**
|
||||
Initializer. If the underlying model triggers a `select` event, this cell
|
||||
will change its checked value according to the event's `selected` value.
|
||||
|
||||
@param {Object} options
|
||||
@param {Backgrid.Column} options.column
|
||||
@param {Backbone.Model} options.model
|
||||
*/
|
||||
initialize: function (options) {
|
||||
|
||||
this.column = options.column;
|
||||
if (!(this.column instanceof Backgrid.Column)) {
|
||||
this.column = new Backgrid.Column(this.column);
|
||||
}
|
||||
|
||||
this.listenTo(this.model, "backgrid:select", function (model, selected) {
|
||||
this.$el.find(":checkbox").prop("checked", selected).change();
|
||||
});
|
||||
|
||||
var column = this.column, $el = this.$el;
|
||||
this.listenTo(column, "change:renderable", function (column, renderable) {
|
||||
$el.toggleClass("renderable", renderable);
|
||||
});
|
||||
|
||||
if (column.get("renderable")) $el.addClass("renderable");
|
||||
},
|
||||
|
||||
/**
|
||||
Focuses the checkbox.
|
||||
*/
|
||||
enterEditMode: function () {
|
||||
this.$el.find(":checkbox").focus();
|
||||
},
|
||||
|
||||
/**
|
||||
Unfocuses the checkbox.
|
||||
*/
|
||||
exitEditMode: function () {
|
||||
this.$el.find(":checkbox").blur();
|
||||
},
|
||||
|
||||
/**
|
||||
Process keyboard navigation.
|
||||
*/
|
||||
onKeydown: function (e) {
|
||||
var command = new Backgrid.Command(e);
|
||||
if (command.passThru()) return true; // skip ahead to `change`
|
||||
if (command.cancel()) {
|
||||
e.stopPropagation();
|
||||
this.$el.find(":checkbox").blur();
|
||||
}
|
||||
else if (command.save() || command.moveLeft() || command.moveRight() ||
|
||||
command.moveUp() || command.moveDown()) {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
this.model.trigger("backgrid:edited", this.model, this.column, command);
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
When the checkbox's value changes, this method will trigger a Backbone
|
||||
`backgrid:selected` event with a reference of the model and the
|
||||
checkbox's `checked` value.
|
||||
*/
|
||||
onChange: function (e) {
|
||||
var checked = $(e.target).prop('checked');
|
||||
this.$el.parent().toggleClass('selected', checked);
|
||||
this.model.trigger("backgrid:selected", this.model, checked);
|
||||
},
|
||||
|
||||
/**
|
||||
Renders a checkbox in a table cell.
|
||||
*/
|
||||
render: function () {
|
||||
this.$el.empty().append('<input tabindex="-1" type="checkbox" />');
|
||||
this.delegateEvents();
|
||||
return this;
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
/**
|
||||
Renders a checkbox to select all rows on the current page.
|
||||
|
||||
@class Backgrid.Extension.SelectAllHeaderCell
|
||||
@extends Backgrid.Extension.SelectRowCell
|
||||
*/
|
||||
var SelectAllHeaderCell = Backgrid.Extension.SelectAllHeaderCell = SelectRowCell.extend({
|
||||
|
||||
/** @property */
|
||||
className: "select-all-header-cell",
|
||||
|
||||
/** @property */
|
||||
tagName: "th",
|
||||
|
||||
/**
|
||||
Initializer. When this cell's checkbox is checked, a Backbone
|
||||
`backgrid:select` event will be triggered for each model for the current
|
||||
page in the underlying collection. If a `SelectRowCell` instance exists
|
||||
for the rows representing the models, they will check themselves. If any
|
||||
of the SelectRowCell instances trigger a Backbone `backgrid:selected`
|
||||
event with a `false` value, this cell will uncheck its checkbox. In the
|
||||
event of a Backbone `backgrid:refresh` event, which is triggered when the
|
||||
body refreshes its rows, which can happen under a number of conditions
|
||||
such as paging or the columns were reset, this cell will still remember
|
||||
the previously selected models and trigger a Backbone `backgrid:select`
|
||||
event on them such that the SelectRowCells can recheck themselves upon
|
||||
refreshing.
|
||||
|
||||
@param {Object} options
|
||||
@param {Backgrid.Column} options.column
|
||||
@param {Backbone.Collection} options.collection
|
||||
*/
|
||||
initialize: function (options) {
|
||||
|
||||
this.column = options.column;
|
||||
if (!(this.column instanceof Backgrid.Column)) {
|
||||
this.column = new Backgrid.Column(this.column);
|
||||
}
|
||||
|
||||
var collection = this.collection;
|
||||
var selectedModels = this.selectedModels = {};
|
||||
this.listenTo(collection, "backgrid:selected", function (model, selected) {
|
||||
if (selected) selectedModels[model.id || model.cid] = model;
|
||||
else {
|
||||
delete selectedModels[model.id || model.cid];
|
||||
this.$el.find(":checkbox").prop("checked", false);
|
||||
}
|
||||
});
|
||||
|
||||
this.listenTo(collection, "remove", function (model) {
|
||||
delete selectedModels[model.id || model.cid];
|
||||
});
|
||||
|
||||
this.listenTo(collection, "backgrid:refresh", function () {
|
||||
this.$el.find(":checkbox").prop("checked", false);
|
||||
for (var i = 0; i < collection.length; i++) {
|
||||
var model = collection.at(i);
|
||||
if (selectedModels[model.id || model.cid]) {
|
||||
model.trigger('backgrid:select', model, true);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
var column = this.column, $el = this.$el;
|
||||
this.listenTo(column, "change:renderable", function (column, renderable) {
|
||||
$el.toggleClass("renderable", renderable);
|
||||
});
|
||||
|
||||
if (column.get("renderable")) $el.addClass("renderable");
|
||||
},
|
||||
|
||||
/**
|
||||
Progagates the checked value of this checkbox to all the models of the
|
||||
underlying collection by triggering a Backbone `backgrid:select` event on
|
||||
the models themselves, passing each model and the current `checked` value
|
||||
of the checkbox in each event.
|
||||
*/
|
||||
onChange: function (e) {
|
||||
var checked = $(e.target).prop("checked");
|
||||
|
||||
var collection = this.collection;
|
||||
collection.each(function (model) {
|
||||
model.trigger("backgrid:select", model, checked);
|
||||
});
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
/**
|
||||
Convenient method to retrieve a list of selected models. This method only
|
||||
exists when the `SelectAll` extension has been included.
|
||||
|
||||
@member Backgrid.Grid
|
||||
@return {Array.<Backbone.Model>}
|
||||
*/
|
||||
Backgrid.Grid.prototype.getSelectedModels = function () {
|
||||
var selectAllHeaderCell;
|
||||
var headerCells = this.header.row.cells;
|
||||
for (var i = 0, l = headerCells.length; i < l; i++) {
|
||||
var headerCell = headerCells[i];
|
||||
if (headerCell instanceof SelectAllHeaderCell) {
|
||||
selectAllHeaderCell = headerCell;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
var result = [];
|
||||
if (selectAllHeaderCell) {
|
||||
for (var modelId in selectAllHeaderCell.selectedModels) {
|
||||
result.push(this.collection.get(modelId));
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
};
|
||||
|
||||
}));
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
'use strict';
|
||||
define(
|
||||
[
|
||||
'underscore',
|
||||
'marionette',
|
||||
'backgrid',
|
||||
'Missing/Collection',
|
||||
|
|
@ -10,8 +11,23 @@ define(
|
|||
'Cells/RelativeDateCell',
|
||||
'Shared/Grid/Pager',
|
||||
'Shared/Toolbar/ToolbarLayout',
|
||||
'Shared/LoadingView'
|
||||
], function (Marionette, Backgrid, MissingCollection, SeriesTitleCell, EpisodeNumberCell, EpisodeTitleCell, RelativeDateCell, GridPager, ToolbarLayout, LoadingView) {
|
||||
'Shared/LoadingView',
|
||||
'Shared/Messenger',
|
||||
'Commands/CommandController',
|
||||
'backgrid.selectall'
|
||||
], function (_,
|
||||
Marionette,
|
||||
Backgrid,
|
||||
MissingCollection,
|
||||
SeriesTitleCell,
|
||||
EpisodeNumberCell,
|
||||
EpisodeTitleCell,
|
||||
RelativeDateCell,
|
||||
GridPager,
|
||||
ToolbarLayout,
|
||||
LoadingView,
|
||||
Messenger,
|
||||
CommandController) {
|
||||
return Marionette.Layout.extend({
|
||||
template: 'Missing/MissingLayoutTemplate',
|
||||
|
||||
|
|
@ -21,8 +37,18 @@ define(
|
|||
pager : '#x-pager'
|
||||
},
|
||||
|
||||
ui: {
|
||||
searchSelectedButton: '.btn i.icon-search'
|
||||
},
|
||||
|
||||
columns:
|
||||
[
|
||||
{
|
||||
name : '',
|
||||
cell : 'select-row',
|
||||
headerCell: 'select-all',
|
||||
sortable : false
|
||||
},
|
||||
{
|
||||
name : 'series',
|
||||
label : 'Series Title',
|
||||
|
|
@ -48,54 +74,88 @@ define(
|
|||
}
|
||||
],
|
||||
|
||||
leftSideButtons: {
|
||||
type : 'default',
|
||||
storeState: false,
|
||||
items :
|
||||
[
|
||||
{
|
||||
title : 'Season Pass',
|
||||
icon : 'icon-bookmark',
|
||||
route : 'seasonpass'
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
_showTable: function () {
|
||||
this.missing.show(new Backgrid.Grid({
|
||||
columns : this.columns,
|
||||
collection: this.missingCollection,
|
||||
className : 'table table-hover'
|
||||
}));
|
||||
|
||||
this.pager.show(new GridPager({
|
||||
columns : this.columns,
|
||||
collection: this.missingCollection
|
||||
}));
|
||||
},
|
||||
|
||||
|
||||
initialize: function () {
|
||||
this.missingCollection = new MissingCollection();
|
||||
this.collection = new MissingCollection();
|
||||
|
||||
this.listenTo(this.missingCollection, 'sync', this._showTable);
|
||||
this.listenTo(this.collection, 'sync', this._showTable);
|
||||
},
|
||||
|
||||
|
||||
onShow: function () {
|
||||
this.missing.show(new LoadingView());
|
||||
this.missingCollection.fetch();
|
||||
this.collection.fetch();
|
||||
this._showToolbar();
|
||||
},
|
||||
|
||||
_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'
|
||||
}
|
||||
]
|
||||
};
|
||||
|
||||
|
||||
this.toolbar.show(new ToolbarLayout({
|
||||
left :
|
||||
[
|
||||
this.leftSideButtons
|
||||
leftSideButtons
|
||||
],
|
||||
context: this
|
||||
}));
|
||||
|
||||
CommandController.bindToCommand({
|
||||
element: this.$('.x-toolbar-left-1 .btn i.icon-search'),
|
||||
command: {
|
||||
name: 'episodeSearch'
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
_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
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ define(
|
|||
], function (App, Marionette, QualityProfiles, AsModelBoundView, AsValidatedView) {
|
||||
|
||||
var view = Marionette.ItemView.extend({
|
||||
template: 'Series/Edit/EditSeriesTemplate',
|
||||
template: 'Series/Edit/EditSeriesViewTemplate',
|
||||
|
||||
ui: {
|
||||
qualityProfile: '.x-quality-profile',
|
||||
|
|
|
|||
|
|
@ -10,6 +10,6 @@
|
|||
{{/each}}
|
||||
</ul>
|
||||
|
||||
<span class="total-records">
|
||||
Total Records: {{Number state.totalRecords}}
|
||||
</span>
|
||||
<span class="total-records">
|
||||
Total Records: {{Number state.totalRecords}}
|
||||
</span>
|
||||
|
|
@ -16,6 +16,7 @@ require.config({
|
|||
'backbone.modelbinder': 'JsLibraries/backbone.modelbinder',
|
||||
'backgrid' : 'JsLibraries/backbone.backgrid',
|
||||
'backgrid.paginator' : 'JsLibraries/backbone.backgrid.paginator',
|
||||
'backgrid.selectall' : 'JsLibraries/backbone.backgrid.selectall',
|
||||
'fullcalendar' : 'JsLibraries/fullcalendar',
|
||||
'backstrech' : 'JsLibraries/jquery.backstretch',
|
||||
'$' : 'JsLibraries/jquery',
|
||||
|
|
@ -172,6 +173,15 @@ require.config({
|
|||
|
||||
exports: 'Backgrid.Extension.Paginator',
|
||||
|
||||
deps:
|
||||
[
|
||||
'backgrid'
|
||||
]
|
||||
},
|
||||
'backgrid.selectall': {
|
||||
|
||||
exports: 'Backgrid.Extension.SelectAll',
|
||||
|
||||
deps:
|
||||
[
|
||||
'backgrid'
|
||||
|
|
@ -197,13 +207,13 @@ define(
|
|||
};
|
||||
|
||||
app.Commands = {
|
||||
EditSeriesCommand : 'EditSeriesCommand',
|
||||
DeleteSeriesCommand: 'DeleteSeriesCommand',
|
||||
CloseModalCommand : 'CloseModalCommand',
|
||||
ShowEpisodeDetails : 'ShowEpisodeDetails',
|
||||
ShowHistoryDetails : 'ShowHistryDetails',
|
||||
SaveSettings : 'saveSettings',
|
||||
ShowLogFile : 'showLogFile'
|
||||
EditSeriesCommand : 'EditSeriesCommand',
|
||||
DeleteSeriesCommand : 'DeleteSeriesCommand',
|
||||
CloseModalCommand : 'CloseModalCommand',
|
||||
ShowEpisodeDetails : 'ShowEpisodeDetails',
|
||||
ShowHistoryDetails : 'ShowHistoryDetails',
|
||||
SaveSettings : 'saveSettings',
|
||||
ShowLogFile : 'showLogFile'
|
||||
};
|
||||
|
||||
app.Reqres = {
|
||||
|
|
@ -214,7 +224,7 @@ define(
|
|||
console.log('starting application');
|
||||
});
|
||||
|
||||
app.addInitializer(SignalRBroadcaster.appInitializer, {app: app});
|
||||
app.addInitializer(SignalRBroadcaster.appInitializer, { app: app });
|
||||
|
||||
app.addRegions({
|
||||
navbarRegion: '#nav-region',
|
||||
|
|
|
|||
Loading…
Reference in New Issue