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

Organize & Rename work

Browse source
This commit is contained in:
Tim Turner 2017-01-09 17:26:13 -05:00
commit 708db1a75c
5 changed files with 18 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/NzbDrone.Api/Series/MovieResource.cs
View file

@ -85,6 +85,12 @@ namespace NzbDrone.Api.Movie
long size = 0; long size = 0;
bool downloaded = false; bool downloaded = false;
if(model.MovieFile != null)
{
model.MovieFile.LazyLoad();
}
if (model.MovieFile != null && model.MovieFile.IsLoaded && model.MovieFile.Value != null) if (model.MovieFile != null && model.MovieFile.IsLoaded && model.MovieFile.Value != null)
{ {
size = model.MovieFile.Value.Size; size = model.MovieFile.Value.Size;

2
src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs
View file

@ -22,7 +22,7 @@ namespace NzbDrone.Core.MediaFiles
} }
public class RenameMovieFileService : IRenameMovieFileService, public class RenameMovieFileService : IRenameMovieFileService,
//IExecute<RenameMovieFilesCommand>, IExecute<RenameMovieFilesCommand>,
IExecute<RenameMovieCommand> IExecute<RenameMovieCommand>
{ {
private readonly IMovieService _movieService; private readonly IMovieService _movieService;

4
src/UI/AddMovies/SearchResultViewTemplate.hbs
View file

@ -52,7 +52,7 @@
{{> ProfileSelectionPartial profiles}} {{> ProfileSelectionPartial profiles}}
</div> </div>
<div class="form-group col-md-2"> {{!--<div class="form-group col-md-2">
<label>Season Folders</label> <label>Season Folders</label>
<div class="input-group"> <div class="input-group">
@ -65,7 +65,7 @@
<div class="btn btn-primary slide-button"/> <div class="btn btn-primary slide-button"/>
</label> </label>
</div> </div>
</div> </div>--}}
{{/unless}} {{/unless}}
{{#unless existing}} {{#unless existing}}

28
src/UI/Rename/RenamePreviewLayout.js
View file

@ -67,7 +67,8 @@ module.exports = Marionette.Layout.extend({
} }
var files = _.map(this.collection.where({ rename : true }), function(model) { var files = _.map(this.collection.where({ rename : true }), function(model) {
return model.get('episodeFileId'); //return model.get('episodeFileId');
return model.get('movieFileId');
}); });
if (files.length === 0) { if (files.length === 0) {
@ -75,26 +76,11 @@ module.exports = Marionette.Layout.extend({
return; return;
} }
// if (this.seasonNumber) { CommandController.Execute('renameMovieFiles', {
// CommandController.Execute('renameFiles', { name : 'renameMovieFiles',
// name : 'renameFiles', movieId : this.model.id,
// movieId : this.model.id, files : files
// //seasonNumber : this.seasonNumber, });
// files : files
// });
// } else {
// CommandController.Execute('renameFiles', {
// name : 'renameFiles',
// seriesId : this.model.id,
// seasonNumber : -1,
// files : files
// });
CommandController.Execute('renameMovieFiles', {
name : 'renameMovieFiles',
movieId : this.model.id,
files : files
});
//}
vent.trigger(vent.Commands.CloseModalCommand); vent.trigger(vent.Commands.CloseModalCommand);
}, },

8
src/UI/Series/Editor/SeriesEditorFooterView.js
View file

@ -5,7 +5,6 @@ var Profiles = require('../../Profile/ProfileCollection');
var RootFolders = require('../../AddSeries/RootFolders/RootFolderCollection'); var RootFolders = require('../../AddSeries/RootFolders/RootFolderCollection');
var RootFolderLayout = require('../../AddSeries/RootFolders/RootFolderLayout'); var RootFolderLayout = require('../../AddSeries/RootFolders/RootFolderLayout');
var UpdateFilesSeriesView = require('./Organize/OrganizeFilesView'); var UpdateFilesSeriesView = require('./Organize/OrganizeFilesView');
var UPdateFilesMoviesView = require('./Organize/OrganizeFilesView');
var Config = require('../../Config'); var Config = require('../../Config');
module.exports = Marionette.ItemView.extend({ module.exports = Marionette.ItemView.extend({
@ -119,11 +118,8 @@ module.exports = Marionette.ItemView.extend({
_organizeFiles : function() { _organizeFiles : function() {
var selected = this.editorGrid.getSelectedModels(); var selected = this.editorGrid.getSelectedModels();
//var updateFilesSeriesView = new UpdateFilesSeriesView({ series : selected }); var updateFilesSeriesView = new UpdateFilesSeriesView({ series : selected });
//this.listenToOnce(updateFilesSeriesView, 'updatingFiles', this._afterSave); this.listenToOnce(updateFilesSeriesView, 'updatingFiles', this._afterSave);
var updateFilesMoviesView = new UpdateFilesMoviesView({ movies: selected });
this.listenToOnce(updateFilesMOviesVIew, 'updatingFiles', this._afterSave);
vent.trigger(vent.Commands.OpenModalCommand, updateFilesSeriesView); vent.trigger(vent.Commands.OpenModalCommand, updateFilesSeriesView);
} }