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

revert some changes -- use FullCollection (maybe just for now)

Browse source
This commit is contained in:
geogolem 2017-03-01 22:59:00 -05:00
commit 897d76c4a2
10 changed files with 102 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/UI/AddMovies/BulkImport/BulkImportSelectAllCell.js
View file

@ -2,8 +2,7 @@ var $ = require('jquery');
var _ = require('underscore');
var SelectAllCell = require('../../Cells/SelectAllCell');
var Backgrid = require('backgrid');
//var FullMovieCollection = require('../../Movies/FullMovieCollection');
var MoviesCollectionClient = require('../../Movies/MoviesCollectionClient');
var FullMovieCollection = require('../../Movies/FullMovieCollection');
module.exports = SelectAllCell.extend({
@ -15,7 +14,7 @@ module.exports = SelectAllCell.extend({
this._originalInit.apply(this, arguments);
var tmdbId = this.model.get('tmdbId');
var existingMovie = MoviesCollectionClient.fullCollection.where({ tmdbId: tmdbId });
var existingMovie = FullMovieCollection.where({ tmdbId: tmdbId });
this.isDuplicate = existingMovie.length > 0 ? true : false;
this.listenTo(this.model, 'change', this._refresh);

5
src/UI/AddMovies/SearchResultCollectionView.js
View file

@ -1,7 +1,6 @@
var Marionette = require('marionette');
var SearchResultView = require('./SearchResultView');
//var FullMovieCollection = require('../Movies/FullMovieCollection');
var MoviesCollectionClient = require('../Movies/MoviesCollectionClient');
var FullMovieCollection = require('../Movies/FullMovieCollection');
var vent = require('vent');
module.exports = Marionette.CollectionView.extend({
@ -49,7 +48,7 @@ module.exports = Marionette.CollectionView.extend({
appendHtml : function(collectionView, itemView, index) {
var tmdbId = itemView.model.get('tmdbId');
var existingMovies = MoviesCollectionClient.fullCollection.where({ tmdbId: tmdbId });
var existingMovies = FullMovieCollection.where({ tmdbId: tmdbId });
if(existingMovies.length > 0) {
if(this.showExisting) {
if (index < this.showing || index === 0) {

7
src/UI/AddMovies/SearchResultView.js
View file

@ -6,8 +6,7 @@ var Marionette = require('marionette');
var Profiles = require('../Profile/ProfileCollection');
var RootFolders = require('./RootFolders/RootFolderCollection');
var RootFolderLayout = require('./RootFolders/RootFolderLayout');
//var FullMovieCollection = require('../Movies/FullMovieCollection');
var MoviesCollectionClient = require('../Movies/MoviesCollectionClient');
var FullMovieCollection = require('../Movies/FullMovieCollection');
var Config = require('../Config');
var Messenger = require('../Shared/Messenger');
var AsValidatedView = require('../Mixins/AsValidatedView');
@ -107,7 +106,7 @@ var view = Marionette.ItemView.extend({
},
_configureTemplateHelpers : function() {
var existingMovies = MoviesCollectionClient.fullCollection.where({ tmdbId : this.model.get('tmdbId') });
var existingMovies = FullMovieCollection.where({ tmdbId : this.model.get('tmdbId') });
if (existingMovies.length > 0) {
this.templateHelpers.existing = existingMovies[0].toJSON();
}
@ -218,7 +217,7 @@ var view = Marionette.ItemView.extend({
});
promise.done(function() {
MoviesCollectionClient.fullCollection.add(self.model);
FullMovieCollection.add(self.model);
self.close();

48
src/UI/Movies/Editor/MovieEditorFooterView.js
View file

@ -6,6 +6,7 @@ var RootFolders = require('../../AddMovies/RootFolders/RootFolderCollection');
var RootFolderLayout = require('../../AddMovies/RootFolders/RootFolderLayout');
var UpdateFilesMoviesView = require('./Organize/OrganizeFilesView');
var Config = require('../../Config');
var FullMovieCollection = require('../FullMovieCollection');
module.exports = Marionette.ItemView.extend({
template : 'Movies/Editor/MovieEditorFooterViewTemplate',
@ -44,11 +45,16 @@ module.exports = Marionette.ItemView.extend({
this.listenTo(this.moviesCollection, 'backgrid:selected', function(model, selected) {
var m = this.moviesCollection.fullCollection.findWhere({ tmdbId : model.get('tmdbId') });
var m = FullMovieCollection.findWhere({ tmdbId : model.get('tmdbId') });
m.set('selected', selected);
this._updateInfo();
});
this.listenTo(FullMovieCollection, 'save', function() {
window.alert(' Done Saving');
var selected = FullMovieCollection.where({ selected : true });
});
this.listenTo(RootFolders, 'all', this.render);
@ -61,14 +67,19 @@ module.exports = Marionette.ItemView.extend({
_updateAndSave : function() {
//var selected = this.editorGrid.getSelectedModels();
var selected = this.moviesCollection.fullCollection.where({ selected : true });
var selected = FullMovieCollection.where({ selected : true });
var monitored = this.ui.monitored.val();
var minAvail = this.ui.minimumAvailability.val();
var profile = this.ui.profile.val();
var seasonFolder = this.ui.seasonFolder.val();
var rootFolder = this.ui.rootFolder.val();
var i = 0;
var b = [];
_.each(selected, function(model) {
b[i] = model.get('tmdbId');
i++;
if (monitored === 'true') {
model.set('monitored', true);
} else if (monitored === 'false') {
@ -96,7 +107,38 @@ module.exports = Marionette.ItemView.extend({
}
model.edited = true;
});
this.moviesCollection.save();
for (var j=0; j<i; j++) {
var m = this.moviesCollection.fullCollection.findWhere({ tmdbId : b[j] });
if (m!== undefined) {
if (monitored === 'true') {
m.set('monitored', true);
} else if (monitored === 'false') {
m.set('monitored', false);
}
if (minAvail !=='noChange') {
m.set('minimumAvailability', minAvail);
}
if (profile !== 'noChange') {
m.set('profileId', parseInt(profile, 10));
}
if (seasonFolder === 'true') {
m.set('seasonFolder', true);
} else if (seasonFolder === 'false') {
m.set('seasonFolder', false);
}
if (rootFolder !== 'noChange') {
var rootFolderPath = RootFolders.get(parseInt(rootFolder, 10));
m.set('rootFolderPath', rootFolderPath.get('path'));
}
}
}
FullMovieCollection.save();
},
_updateInfo : function() {

22
src/UI/Movies/Editor/MovieEditorLayout.js
View file

@ -2,6 +2,7 @@ var vent = require('vent');
var Marionette = require('marionette');
var Backgrid = require('backgrid');
var EmptyView = require('../Index/EmptyView');
var FullMovieCollection = require ('../FullMovieCollection');
var MoviesCollection = require('../MoviesCollectionClient');
var MovieTitleCell = require('../../Cells/MovieTitleCell');
var DownloadedQualityCell = require('../../Cells/DownloadedQualityCell');
@ -12,7 +13,6 @@ var FooterView = require('./MovieEditorFooterView');
var GridPager = require('../../Shared/Grid/Pager');
require('../../Mixins/backbone.signalr.mixin');
//require('../Globals');
window.shownOnce = false;
module.exports = Marionette.Layout.extend({
template : 'Movies/Editor/MovieEditorLayoutTemplate',
@ -81,31 +81,27 @@ module.exports = Marionette.Layout.extend({
},
initialize : function() {
this.tableShown = window.shownOnce; //false;
this.movieCollection = MoviesCollection;
this.movieCollection.bindSignalR();
//this.movieCollection.switchMode('client');
this.movieCollection.fullCollection.bindSignalR();
var selected = this.movieCollection.fullCollection.where( { selected : true });
var selected = FullMovieCollection.where( { selected : true });
_.each(selected, function(model) {
model.set('selected', false);
});
this.listenTo(this.movieCollection, 'sync', function() {
this._showToolbar();
if (!this.tableShown) {
this._showTable();
this._showPager();
}
});
this.listenTo(this.movieCollection.fullCollection, 'sync', function() {
});
this.listenTo(this.movieCollection, 'save', function() {
window.alert('Done Saving');
});
//this.listenTo(FullMovieCollection, 'save', function() {
// window.alert('Done Saving');
//});
this.filteringOptions = {
type : 'radio',
@ -157,15 +153,16 @@ module.exports = Marionette.Layout.extend({
}
]
};
window.shownOnce = true;
},
onRender : function() {
if (this.tableShown) {
this._showToolbar();
this._showTable();
this._showPager();
if (window.shownOnce){
this.movieCollection.fetch();
}
window.shownOnce = true;
},
onClose : function() {
@ -191,7 +188,6 @@ module.exports = Marionette.Layout.extend({
this.toolbar.close();
return;
}
this.tableShown = true;
this.columns[0].sortedCollection = this.movieCollection;
this.editorGrid = new Backgrid.Grid({
@ -226,6 +222,6 @@ module.exports = Marionette.Layout.extend({
_setFilter : function(buttonContext) {
var mode = buttonContext.model.get('key');
this.movieCollection.setFilterMode(mode, { reset : false });
this.movieCollection.setFilterMode(mode);
}
});

8
src/UI/Movies/FullMovieCollection.js
View file

@ -1,12 +1,12 @@
/*var movieCollection = require('./MoviesCollection');
var movieCollection = require('./MoviesCollection');
var fullCollection = movieCollection.clone();
fullCollection.bindSignalR();
fullCollection.state.pageSize = 100000;
fullCollection.fetch({reset : true});
module.exports = fullCollection;*/
module.exports = fullCollection;
var movieCollection = require('./MoviesCollectionClient');
/*var movieCollection = require('./MoviesCollectionClient');
movieCollection.bindSignalR();
module.exports = movieCollection.fullCollection;
module.exports = movieCollection.fullCollection;*/

54
src/UI/Movies/Index/MoviesIndexLayout.js
View file

@ -5,7 +5,7 @@ var PosterCollectionView = require('./Posters/SeriesPostersCollectionView');
var ListCollectionView = require('./Overview/SeriesOverviewCollectionView');
var EmptyView = require('./EmptyView');
var MoviesCollection = require('../MoviesCollection');
//var FullMovieCollection = require('../FullMovieCollection');
var FullMovieCollection = require('../FullMovieCollection');
var InCinemasCell = require('../../Cells/InCinemasCell');
var MovieTitleCell = require('../../Cells/MovieTitleCell');
var TemplatedCell = require('../../Cells/TemplatedCell');
@ -21,7 +21,7 @@ var FooterModel = require('./FooterModel');
var ToolbarLayout = require('../../Shared/Toolbar/ToolbarLayout');
require('../../Mixins/backbone.signalr.mixin');
var MoviesCollectionClient = require('../MoviesCollectionClient');
//var MoviesCollectionClient = require('../MoviesCollectionClient');
//this variable prevents double fetching the FullMovieCollection on first load
@ -128,47 +128,28 @@ module.exports = Marionette.Layout.extend({
initialize : function() {
//this variable prevents us from showing the list before seriesCollection has been fetched the first time
this.renderedOnce = false;
this.seriesCollection = MoviesCollection;//.clone();
this.seriesCollection.bindSignalR();
/*var selected = MoviesCollectionClient.fullCollection.where( { saved : true });
_.each(selected, function(model) {
model.set('saved', false);
});*/
//if (window.shownOnce) {
// FullMovieCollection.fetch({reset : true});
//}
this.listenTo(MoviesCollectionClient, 'sync', function(eventName) {
this.listenTo(FullMovieCollection, 'sync', function() {
this._showFooter();
window.shownOnce = true;
});
this.listenTo(this.seriesCollection, 'sync', function(model, collection, options) {
this._renderView();
//MoviesCollectionClient.fetch();
this.renderedOnce = true;
});
this.listenTo(this.seriesCollection, "change", function(model) {
if (model.get('saved')) {
model.set('saved', false);
this.seriesCollection.fetch();
//FullMovieCollection.fetch({reset : true });
//this._showFooter();
var m = MoviesCollectionClient.fullCollection.findWhere( { tmdbId : model.get('tmdbId') });
var m = FullMovieCollection.findWhere( { tmdbId : model.get('tmdbId') });
m.set('monitored', model.get('monitored'));
m.set('minimumAvailability', model.get('minimumAvailability'));
m.set( {profileId : model.get('profileId') } );
this._showFooter();
}
});
@ -178,7 +159,7 @@ module.exports = Marionette.Layout.extend({
if (model.get('deleted')) {
this.seriesCollection.fetch(); //need to do this so that the page shows a full page and the 'total records' number is updated
//FullMovieCollection.fetch({reset : true}); //need to do this to update the footer
MoviesCollectionClient.fullCollection.remove(model);
FullMovieCollection.remove(model);
this._showFooter();
}
@ -297,10 +278,11 @@ module.exports = Marionette.Layout.extend({
onShow : function() {
this._showToolbar();
//if (window.shownOnce) {
this._fetchCollection();
if (window.shownOnce) {
this._showFooter();
//}
//this._fetchCollection();
}
window.shownOnce = true;
},
_showTable : function() {
@ -310,10 +292,8 @@ module.exports = Marionette.Layout.extend({
className : 'table table-hover'
});
//this._showPager();
if (this.renderedOnce) {
this._showPager();
this._renderView();
}
},
_showList : function() {
@ -344,13 +324,19 @@ module.exports = Marionette.Layout.extend({
this.toolbar.close();
this.toolbar2.close();
} else {
this.renderedOnce = true;
this.seriesRegion.show(this.currentView);
this._showToolbar();
this.listenTo(this.currentView.collection, 'sync', function(eventName){
this._showPager();
});
this._showToolbar();
}
},
_fetchCollection : function() {
this.seriesCollection.fetch();
},
_setFilter : function(buttonContext) {
var mode = buttonContext.model.get('key');
this.seriesCollection.setFilterMode(mode);
@ -395,7 +381,7 @@ module.exports = Marionette.Layout.extend({
_showFooter : function() {
var footerModel = new FooterModel();
var movies = MoviesCollectionClient.fullCollection.models.length;
var movies = FullMovieCollection.models.length;
//instead of all the counters could do something like this with different query in the where...
//var releasedMovies = FullMovieCollection.where({ 'released' : this.model.get('released') });
// releasedMovies.length
@ -415,7 +401,7 @@ module.exports = Marionette.Layout.extend({
var downloadedMonitored=0;
var downloadedNotMonitored=0;
_.each(MoviesCollectionClient.fullCollection.models, function(model) {
_.each(FullMovieCollection.models, function(model) {
if (model.get('status').toLowerCase() === 'released') {
released++;

9
src/UI/Movies/MoviesCollectionClient.js
View file

@ -1,7 +1,6 @@
var movieCollection = require('./MoviesCollection');
var GCCollection = movieCollection.clone();
GCCollection.bindSignalR();
GCCollection.switchMode('client'); //state.pageSize = 100000;
//CCollection.fetch();
module.exports = GCCollection;
var ClientCollection = movieCollection.clone();
ClientCollection.bindSignalR();
ClientCollection.switchMode('client'); //state.pageSize = 100000;
module.exports = ClientCollection;

5
src/UI/Movies/MoviesController.js
View file

@ -1,8 +1,7 @@
var NzbDroneController = require('../Shared/NzbDroneController');
var AppLayout = require('../AppLayout');
var MoviesCollection = require('./MoviesCollection');
//var FullMovieCollection = require("./FullMovieCollection");
var MoviesCollectionClient = require('./MoviesCollectionClient');
var FullMovieCollection = require("./FullMovieCollection");
var MoviesIndexLayout = require('./Index/MoviesIndexLayout');
var MoviesDetailsLayout = require('./Details/MoviesDetailsLayout');
var SeriesDetailsLayout = require('../Series/Details/SeriesDetailsLayout');
@ -24,7 +23,7 @@ module.exports = NzbDroneController.extend({
},
seriesDetails : function(query) {
var series = MoviesCollectionClient.fullCollection.where({ titleSlug : query });
var series = FullMovieCollection.where({ titleSlug : query });
if (series.length !== 0) {
var targetMovie = series[0];
console.log(AppLayout.mainRegion);

5
src/UI/Navbar/Search.js
View file

@ -2,8 +2,7 @@ var _ = require('underscore');
var $ = require('jquery');
var vent = require('vent');
var Backbone = require('backbone');
//var FullMovieCollection = require('../Movies/FullMovieCollection');
var MoviesCollectionClient = require('../Movies/MoviesCollectionClient');
var FullMovieCollection = require('../Movies/FullMovieCollection');
require('typeahead');
vent.on(vent.Hotkeys.NavbarSearch, function() {
@ -12,7 +11,7 @@ vent.on(vent.Hotkeys.NavbarSearch, function() {
var substringMatcher = function() {
return function findMatches (q, cb) {
var matches = _.select(MoviesCollectionClient.fullCollection.toJSON(), function(series) {
var matches = _.select(FullMovieCollection.toJSON(), function(series) {
return series.title.toLowerCase().indexOf(q.toLowerCase()) > -1;
});
cb(matches);