From cd4863b974f91224121ebabaf1a7a2c70fceb883 Mon Sep 17 00:00:00 2001 From: Tim Turner Date: Sun, 8 Jan 2017 09:16:24 -0500 Subject: [PATCH 1/5] Display UI for MovieEditor, remove reference to SeasonPass --- src/UI/Cells/MovieTitleCell.js | 8 +- src/UI/Controller.js | 6 + src/UI/Movies/Editor/MovieEditorFooterView.js | 126 +++++++++++++++ .../Editor/MovieEditorFooterViewTemplate.hbs | 54 +++++++ src/UI/Movies/Editor/MovieEditorLayout.js | 153 ++++++++++++++++++ .../Editor/MovieEditorLayoutTemplate.hbs | 7 + .../Editor/Organize/OrganizeFilesView.js | 33 ++++ .../Organize/OrganizeFilesViewTemplate.hbs | 25 +++ src/UI/Movies/Index/MoviesIndexLayout.js | 9 +- src/UI/Router.js | 2 +- 10 files changed, 411 insertions(+), 12 deletions(-) create mode 100644 src/UI/Movies/Editor/MovieEditorFooterView.js create mode 100644 src/UI/Movies/Editor/MovieEditorFooterViewTemplate.hbs create mode 100644 src/UI/Movies/Editor/MovieEditorLayout.js create mode 100644 src/UI/Movies/Editor/MovieEditorLayoutTemplate.hbs create mode 100644 src/UI/Movies/Editor/Organize/OrganizeFilesView.js create mode 100644 src/UI/Movies/Editor/Organize/OrganizeFilesViewTemplate.hbs diff --git a/src/UI/Cells/MovieTitleCell.js b/src/UI/Cells/MovieTitleCell.js index 4ae8fe20c..652d1ebf3 100644 --- a/src/UI/Cells/MovieTitleCell.js +++ b/src/UI/Cells/MovieTitleCell.js @@ -4,8 +4,8 @@ module.exports = TemplatedCell.extend({ className : 'series-title-cell', template : 'Cells/SeriesTitleTemplate', - render : function() { - this.$el.html(this.model.get("movie").get("title")); //Hack, but somehow handlebar helper does not work. - return this; - } + // render : function() { + // this.$el.html(this.model.get("movie").get("title")); //Hack, but somehow handlebar helper does not work. + // return this; + // } }); diff --git a/src/UI/Controller.js b/src/UI/Controller.js index eb5168daa..89775a3ba 100644 --- a/src/UI/Controller.js +++ b/src/UI/Controller.js @@ -11,6 +11,7 @@ var ReleaseLayout = require('./Release/ReleaseLayout'); var SystemLayout = require('./System/SystemLayout'); var SeasonPassLayout = require('./SeasonPass/SeasonPassLayout'); var SeriesEditorLayout = require('./Series/Editor/SeriesEditorLayout'); +var MovieEditorLayout = require('./Movies/Editor/MovieEditorLayout'); module.exports = NzbDroneController.extend({ addSeries : function(action) { @@ -61,5 +62,10 @@ module.exports = NzbDroneController.extend({ seriesEditor : function() { this.setTitle('Series Editor'); this.showMainRegion(new SeriesEditorLayout()); + }, + + movieEditor : function() { + this.setTitle('Movie Editor'); + this.showMainRegion(new MovieEditorLayout()); } }); diff --git a/src/UI/Movies/Editor/MovieEditorFooterView.js b/src/UI/Movies/Editor/MovieEditorFooterView.js new file mode 100644 index 000000000..d764b1aa1 --- /dev/null +++ b/src/UI/Movies/Editor/MovieEditorFooterView.js @@ -0,0 +1,126 @@ +var _ = require('underscore'); +var Marionette = require('marionette'); +var vent = require('vent'); +var Profiles = require('../../Profile/ProfileCollection'); +var RootFolders = require('../../AddMovies/RootFolders/RootFolderCollection'); +var RootFolderLayout = require('../../AddMovies/RootFolders/RootFolderLayout'); +var UpdateFilesSeriesView = require('./Organize/OrganizeFilesView'); +var Config = require('../../Config'); + +module.exports = Marionette.ItemView.extend({ + template : 'Movies/Editor/MovieEditorFooterViewTemplate', + + ui : { + monitored : '.x-monitored', + profile : '.x-profiles', + seasonFolder : '.x-season-folder', + rootFolder : '.x-root-folder', + selectedCount : '.x-selected-count', + container : '.series-editor-footer', + actions : '.x-action' + }, + + events : { + 'click .x-save' : '_updateAndSave', + 'change .x-root-folder' : '_rootFolderChanged', + 'click .x-organize-files' : '_organizeFiles' + }, + + templateHelpers : function() { + return { + profiles : Profiles, + rootFolders : RootFolders.toJSON() + }; + }, + + initialize : function(options) { + this.seriesCollection = options.collection; + + RootFolders.fetch().done(function() { + RootFolders.synced = true; + }); + + this.editorGrid = options.editorGrid; + this.listenTo(this.seriesCollection, 'backgrid:selected', this._updateInfo); + this.listenTo(RootFolders, 'all', this.render); + }, + + onRender : function() { + this._updateInfo(); + }, + + _updateAndSave : function() { + var selected = this.editorGrid.getSelectedModels(); + + var monitored = this.ui.monitored.val(); + var profile = this.ui.profile.val(); + var seasonFolder = this.ui.seasonFolder.val(); + var rootFolder = this.ui.rootFolder.val(); + + _.each(selected, function(model) { + if (monitored === 'true') { + model.set('monitored', true); + } else if (monitored === 'false') { + model.set('monitored', false); + } + + if (profile !== 'noChange') { + model.set('profileId', parseInt(profile, 10)); + } + + if (seasonFolder === 'true') { + model.set('seasonFolder', true); + } else if (seasonFolder === 'false') { + model.set('seasonFolder', false); + } + + if (rootFolder !== 'noChange') { + var rootFolderPath = RootFolders.get(parseInt(rootFolder, 10)); + + model.set('rootFolderPath', rootFolderPath.get('path')); + } + + model.edited = true; + }); + + this.seriesCollection.save(); + }, + + _updateInfo : function() { + var selected = this.editorGrid.getSelectedModels(); + var selectedCount = selected.length; + + this.ui.selectedCount.html('{0} series selected'.format(selectedCount)); + + if (selectedCount === 0) { + this.ui.actions.attr('disabled', 'disabled'); + } else { + this.ui.actions.removeAttr('disabled'); + } + }, + + _rootFolderChanged : function() { + var rootFolderValue = this.ui.rootFolder.val(); + if (rootFolderValue === 'addNew') { + var rootFolderLayout = new RootFolderLayout(); + this.listenToOnce(rootFolderLayout, 'folderSelected', this._setRootFolder); + vent.trigger(vent.Commands.OpenModalCommand, rootFolderLayout); + } else { + Config.setValue(Config.Keys.DefaultRootFolderId, rootFolderValue); + } + }, + + _setRootFolder : function(options) { + vent.trigger(vent.Commands.CloseModalCommand); + this.ui.rootFolder.val(options.model.id); + this._rootFolderChanged(); + }, + + _organizeFiles : function() { + var selected = this.editorGrid.getSelectedModels(); + var updateFilesSeriesView = new UpdateFilesSeriesView({ series : selected }); + this.listenToOnce(updateFilesSeriesView, 'updatingFiles', this._afterSave); + + vent.trigger(vent.Commands.OpenModalCommand, updateFilesSeriesView); + } +}); \ No newline at end of file diff --git a/src/UI/Movies/Editor/MovieEditorFooterViewTemplate.hbs b/src/UI/Movies/Editor/MovieEditorFooterViewTemplate.hbs new file mode 100644 index 000000000..ad81687d5 --- /dev/null +++ b/src/UI/Movies/Editor/MovieEditorFooterViewTemplate.hbs @@ -0,0 +1,54 @@ +
+
+
+ + + +
+ +
+ + + +
+ + {{!--
+ + + +
--}} + +
+ + + +
+ +
+ +
+ + +
+
+
+
diff --git a/src/UI/Movies/Editor/MovieEditorLayout.js b/src/UI/Movies/Editor/MovieEditorLayout.js new file mode 100644 index 000000000..dbbb5f4f5 --- /dev/null +++ b/src/UI/Movies/Editor/MovieEditorLayout.js @@ -0,0 +1,153 @@ +var vent = require('vent'); +var Marionette = require('marionette'); +var Backgrid = require('backgrid'); +var EmptyView = require('../Index/EmptyView'); +var MoviesCollection = require('../MoviesCollection'); +var MovieTitleCell = require('../../Cells/MovieTitleCell'); +var ProfileCell = require('../../Cells/ProfileCell'); +var SelectAllCell = require('../../Cells/SelectAllCell'); +var ToolbarLayout = require('../../Shared/Toolbar/ToolbarLayout'); +var FooterView = require('./MovieEditorFooterView'); +require('../../Mixins/backbone.signalr.mixin'); + +module.exports = Marionette.Layout.extend({ + template : 'Movies/Editor/MovieEditorLayoutTemplate', + + regions : { + seriesRegion : '#x-series-editor', + toolbar : '#x-toolbar' + }, + + ui : { + monitored : '.x-monitored', + profiles : '.x-profiles', + rootFolder : '.x-root-folder', + selectedCount : '.x-selected-count' + }, + + events : { + 'click .x-save' : '_updateAndSave', + 'change .x-root-folder' : '_rootFolderChanged' + }, + + columns : [ + { + name : '', + cell : SelectAllCell, + headerCell : 'select-all', + sortable : false + }, + { + name : 'title', + label : 'Title', + cell : MovieTitleCell, + cellValue : 'this' + }, + { + name : 'profileId', + label : 'Profile', + cell : ProfileCell + }, + { + name : 'path', + label : 'Path', + cell : 'string' + } + ], + + leftSideButtons : { + type : 'default', + storeState : false, + items : [ + { + title : 'Update Library', + icon : 'icon-sonarr-refresh', + command : 'refreshseries', + successMessage : 'Library was updated!', + errorMessage : 'Library update failed!' + } + ] + }, + + initialize : function() { + this.movieCollection = MoviesCollection.clone(); + this.movieCollection.shadowCollection.bindSignalR(); + this.listenTo(this.movieCollection, 'save', this.render); + + this.filteringOptions = { + type : 'radio', + storeState : true, + menuKey : 'serieseditor.filterMode', + defaultAction : 'all', + items : [ + { + key : 'all', + title : '', + tooltip : 'All', + icon : 'icon-sonarr-all', + callback : this._setFilter + }, + { + key : 'monitored', + title : '', + tooltip : 'Monitored Only', + icon : 'icon-sonarr-monitored', + callback : this._setFilter + } + ] + }; + }, + + onRender : function() { + this._showToolbar(); + this._showTable(); + }, + + onClose : function() { + vent.trigger(vent.Commands.CloseControlPanelCommand); + }, + + _showTable : function() { + if (this.movieCollection.shadowCollection.length === 0) { + this.seriesRegion.show(new EmptyView()); + this.toolbar.close(); + return; + } + + this.columns[0].sortedCollection = this.movieCollection; + + this.editorGrid = new Backgrid.Grid({ + collection : this.movieCollection, + columns : this.columns, + className : 'table table-hover' + }); + + this.seriesRegion.show(this.editorGrid); + this._showFooter(); + }, + + _showToolbar : function() { + this.toolbar.show(new ToolbarLayout({ + left : [ + this.leftSideButtons + ], + right : [ + this.filteringOptions + ], + context : this + })); + }, + + _showFooter : function() { + vent.trigger(vent.Commands.OpenControlPanelCommand, new FooterView({ + editorGrid : this.editorGrid, + collection : this.movieCollection + })); + }, + + _setFilter : function(buttonContext) { + var mode = buttonContext.model.get('key'); + + this.movieCollection.setFilterMode(mode); + } +}); \ No newline at end of file diff --git a/src/UI/Movies/Editor/MovieEditorLayoutTemplate.hbs b/src/UI/Movies/Editor/MovieEditorLayoutTemplate.hbs new file mode 100644 index 000000000..1d0519894 --- /dev/null +++ b/src/UI/Movies/Editor/MovieEditorLayoutTemplate.hbs @@ -0,0 +1,7 @@ +
+ +
+
+
+
+
\ No newline at end of file diff --git a/src/UI/Movies/Editor/Organize/OrganizeFilesView.js b/src/UI/Movies/Editor/Organize/OrganizeFilesView.js new file mode 100644 index 000000000..05eeb53dd --- /dev/null +++ b/src/UI/Movies/Editor/Organize/OrganizeFilesView.js @@ -0,0 +1,33 @@ +var _ = require('underscore'); +var vent = require('vent'); +var Backbone = require('backbone'); +var Marionette = require('marionette'); +var CommandController = require('../../../Commands/CommandController'); + +module.exports = Marionette.ItemView.extend({ + template : 'Movies/Editor/Organize/OrganizeFilesViewTemplate', + + events : { + 'click .x-confirm-organize' : '_organize' + }, + + initialize : function(options) { + this.series = options.series; + this.templateHelpers = { + numberOfSeries : this.series.length, + series : new Backbone.Collection(this.series).toJSON() + }; + }, + + _organize : function() { + var seriesIds = _.pluck(this.series, 'id'); + + CommandController.Execute('renameSeries', { + name : 'renameSeries', + seriesIds : seriesIds + }); + + this.trigger('organizingFiles'); + vent.trigger(vent.Commands.CloseModalCommand); + } +}); \ No newline at end of file diff --git a/src/UI/Movies/Editor/Organize/OrganizeFilesViewTemplate.hbs b/src/UI/Movies/Editor/Organize/OrganizeFilesViewTemplate.hbs new file mode 100644 index 000000000..5258e92b5 --- /dev/null +++ b/src/UI/Movies/Editor/Organize/OrganizeFilesViewTemplate.hbs @@ -0,0 +1,25 @@ +
+
+ +

Organize of Selected Movies

+
+
+
+ + Tip: To preview a rename... select "Cancel" then any movie title and use the +
+ + Are you sure you want to update all files in the {{numberOfSeries}} selected movie? + + {{debug}} +
    + {{#each series}} +
  • {{title}}
    • + {{/each}} +
+
+
+ + +
+
diff --git a/src/UI/Movies/Index/MoviesIndexLayout.js b/src/UI/Movies/Index/MoviesIndexLayout.js index 3e16a7eb7..df6c7bbdd 100644 --- a/src/UI/Movies/Index/MoviesIndexLayout.js +++ b/src/UI/Movies/Index/MoviesIndexLayout.js @@ -75,14 +75,9 @@ module.exports = Marionette.Layout.extend({ route : 'addmovies' }, { - title : 'Season Pass', - icon : 'icon-sonarr-monitored', - route : 'seasonpass' - }, - { - title : 'Series Editor', + title : 'Movie Editor', icon : 'icon-sonarr-edit', - route : 'serieseditor' + route : 'movieeditor' }, { title : 'RSS Sync', diff --git a/src/UI/Router.js b/src/UI/Router.js index ba41c0e61..c04492dba 100644 --- a/src/UI/Router.js +++ b/src/UI/Router.js @@ -21,7 +21,7 @@ module.exports = Marionette.AppRouter.extend({ 'system' : 'system', 'system/:action' : 'system', 'seasonpass' : 'seasonPass', - 'serieseditor' : 'seriesEditor', + 'movieeditor' : 'movieEditor', ':whatever' : 'showNotFound' } }); From b5d932866abb56da1781ab8051a398d345c96b1b Mon Sep 17 00:00:00 2001 From: Tim Turner Date: Sun, 8 Jan 2017 17:01:37 -0500 Subject: [PATCH 2/5] Second Pass at rename/organize --- src/NzbDrone.Api/Movies/MovieModule.cs | 11 ++ src/NzbDrone.Api/Movies/RenameMovieModule.cs | 35 +++++ .../Movies/RenameMovieResource.cs | 35 +++++ src/NzbDrone.Api/NzbDrone.Api.csproj | 3 + .../MediaFiles/Commands/RenameFilesCommand.cs | 2 +- .../MediaFiles/Commands/RenameMovieCommand.cs | 19 +++ .../Commands/RenameMovieFilesCommand.cs | 26 ++++ .../MediaFiles/MediaFileService.cs | 15 +- .../MediaFiles/RenameMovieFilePreview.cs | 15 ++ .../MediaFiles/RenameMovieFileService.cs | 134 ++++++++++++++++++ src/NzbDrone.Core/NzbDrone.Core.csproj | 4 + src/UI/Movies/Editor/MovieEditorFooterView.js | 16 +-- .../Editor/MovieEditorFooterViewTemplate.hbs | 4 +- .../Editor/Organize/OrganizeFilesView.js | 14 +- .../Organize/OrganizeFilesViewTemplate.hbs | 6 +- src/UI/Rename/RenamePreviewCollection.js | 55 +++++-- src/UI/Rename/RenamePreviewLayout.js | 34 +++-- .../Series/Editor/SeriesEditorFooterView.js | 8 +- 18 files changed, 384 insertions(+), 52 deletions(-) create mode 100644 src/NzbDrone.Api/Movies/MovieModule.cs create mode 100644 src/NzbDrone.Api/Movies/RenameMovieModule.cs create mode 100644 src/NzbDrone.Api/Movies/RenameMovieResource.cs create mode 100644 src/NzbDrone.Core/MediaFiles/Commands/RenameMovieCommand.cs create mode 100644 src/NzbDrone.Core/MediaFiles/Commands/RenameMovieFilesCommand.cs create mode 100644 src/NzbDrone.Core/MediaFiles/RenameMovieFilePreview.cs create mode 100644 src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs diff --git a/src/NzbDrone.Api/Movies/MovieModule.cs b/src/NzbDrone.Api/Movies/MovieModule.cs new file mode 100644 index 000000000..2a4d405fc --- /dev/null +++ b/src/NzbDrone.Api/Movies/MovieModule.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace NzbDrone.Api.Movies +{ + class MovieModule + { + } +} diff --git a/src/NzbDrone.Api/Movies/RenameMovieModule.cs b/src/NzbDrone.Api/Movies/RenameMovieModule.cs new file mode 100644 index 000000000..8736cccb0 --- /dev/null +++ b/src/NzbDrone.Api/Movies/RenameMovieModule.cs @@ -0,0 +1,35 @@ +using NzbDrone.Api.REST; +using NzbDrone.Core.MediaFiles; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace NzbDrone.Api.Movies +{ + public class RenameMovieModule : NzbDroneRestModule + { + private readonly IRenameMovieFileService _renameMovieFileService; + + public RenameMovieModule(IRenameMovieFileService renameMovieFileService) + : base("rename") + { + _renameMovieFileService = renameMovieFileService; + + GetResourceAll = GetMovies; //TODO: GetResourceSingle? + } + + private List GetMovies() + { + if(!Request.Query.MovieId.HasValue) + { + throw new BadRequestException("movieId is missing"); + } + + var movieId = (int)Request.Query.MovieId; + + return _renameMovieFileService.GetRenamePreviews(movieId).ToResource(); + } + + } +} diff --git a/src/NzbDrone.Api/Movies/RenameMovieResource.cs b/src/NzbDrone.Api/Movies/RenameMovieResource.cs new file mode 100644 index 000000000..d71f1bbcf --- /dev/null +++ b/src/NzbDrone.Api/Movies/RenameMovieResource.cs @@ -0,0 +1,35 @@ +using NzbDrone.Api.REST; +using System.Collections.Generic; +using System.Linq; + +namespace NzbDrone.Api.Movies +{ + public class RenameMovieResource : RestResource + { + public int MovieId { get; set; } + public int MovieFileId { get; set; } + public string ExistingPath { get; set; } + public string NewPath { get; set; } + } + + public static class RenameMovieResourceMapper + { + public static RenameMovieResource ToResource(this Core.MediaFiles.RenameMovieFilePreview model) + { + if (model == null) return null; + + return new RenameMovieResource + { + MovieId = model.MovieId, + MovieFileId = model.MovieFileId, + ExistingPath = model.ExistingPath, + NewPath = model.NewPath + }; + } + + public static List ToResource(this IEnumerable models) + { + return models.Select(ToResource).ToList(); + } + } +} diff --git a/src/NzbDrone.Api/NzbDrone.Api.csproj b/src/NzbDrone.Api/NzbDrone.Api.csproj index 455cc845a..2a3dcba5a 100644 --- a/src/NzbDrone.Api/NzbDrone.Api.csproj +++ b/src/NzbDrone.Api/NzbDrone.Api.csproj @@ -116,6 +116,9 @@ + + + diff --git a/src/NzbDrone.Core/MediaFiles/Commands/RenameFilesCommand.cs b/src/NzbDrone.Core/MediaFiles/Commands/RenameFilesCommand.cs index e0dc34e10..5cbbe7dfb 100644 --- a/src/NzbDrone.Core/MediaFiles/Commands/RenameFilesCommand.cs +++ b/src/NzbDrone.Core/MediaFiles/Commands/RenameFilesCommand.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using NzbDrone.Core.Messaging.Commands; namespace NzbDrone.Core.MediaFiles.Commands diff --git a/src/NzbDrone.Core/MediaFiles/Commands/RenameMovieCommand.cs b/src/NzbDrone.Core/MediaFiles/Commands/RenameMovieCommand.cs new file mode 100644 index 000000000..fad7b76c7 --- /dev/null +++ b/src/NzbDrone.Core/MediaFiles/Commands/RenameMovieCommand.cs @@ -0,0 +1,19 @@ +using NzbDrone.Core.Messaging.Commands; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace NzbDrone.Core.MediaFiles.Commands +{ + public class RenameMovieCommand : Command + { + public int MovieId { get; set; } + + public override bool SendUpdatesToClient => true; + + public RenameMovieCommand() + { + } + } +} diff --git a/src/NzbDrone.Core/MediaFiles/Commands/RenameMovieFilesCommand.cs b/src/NzbDrone.Core/MediaFiles/Commands/RenameMovieFilesCommand.cs new file mode 100644 index 000000000..d2781e3ab --- /dev/null +++ b/src/NzbDrone.Core/MediaFiles/Commands/RenameMovieFilesCommand.cs @@ -0,0 +1,26 @@ +using NzbDrone.Core.Messaging.Commands; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace NzbDrone.Core.MediaFiles.Commands +{ + public class RenameMovieFilesCommand : Command + { + public int MovieId { get; set; } + public List Files { get; set; } + + public override bool SendUpdatesToClient => true; + + public RenameMovieFilesCommand() + { + } + + public RenameMovieFilesCommand(int movieId, List files) + { + MovieId = movieId; + Files = files; + } + } +} diff --git a/src/NzbDrone.Core/MediaFiles/MediaFileService.cs b/src/NzbDrone.Core/MediaFiles/MediaFileService.cs index e3e82daa5..4a2dd195c 100644 --- a/src/NzbDrone.Core/MediaFiles/MediaFileService.cs +++ b/src/NzbDrone.Core/MediaFiles/MediaFileService.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; using System.Linq; using NLog; @@ -13,9 +13,9 @@ namespace NzbDrone.Core.MediaFiles { public interface IMediaFileService { - MovieFile Add(MovieFile episodeFile); - void Update(MovieFile episodeFile); - void Delete(MovieFile episodeFile, DeleteMediaFileReason reason); + MovieFile Add(MovieFile movieFile); + void Update(MovieFile movieFile); + void Delete(MovieFile movieFile, DeleteMediaFileReason reason); EpisodeFile Add(EpisodeFile episodeFile); void Update(EpisodeFile episodeFile); void Delete(EpisodeFile episodeFile, DeleteMediaFileReason reason); @@ -27,7 +27,7 @@ namespace NzbDrone.Core.MediaFiles List FilterExistingFiles(List files, Movie movie); EpisodeFile Get(int id); List Get(IEnumerable ids); - + //List Get(IEnumerable ids); } public class MediaFileService : IMediaFileService, IHandleAsync @@ -125,6 +125,11 @@ namespace NzbDrone.Core.MediaFiles return _mediaFileRepository.Get(ids).ToList(); } + //public List Get(IEnumerable ids) + //{ + // return _mediaFileRepository.Get(ids).ToList(); + //} + public void HandleAsync(SeriesDeletedEvent message) { var files = GetFilesBySeries(message.Series.Id); diff --git a/src/NzbDrone.Core/MediaFiles/RenameMovieFilePreview.cs b/src/NzbDrone.Core/MediaFiles/RenameMovieFilePreview.cs new file mode 100644 index 000000000..12f52e42a --- /dev/null +++ b/src/NzbDrone.Core/MediaFiles/RenameMovieFilePreview.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace NzbDrone.Core.MediaFiles +{ + public class RenameMovieFilePreview + { + public int MovieId { get; set; } + public int MovieFileId { get; set; } + public string ExistingPath { get; set; } + public string NewPath { get; set; } + } +} diff --git a/src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs b/src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs new file mode 100644 index 000000000..af5e48122 --- /dev/null +++ b/src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs @@ -0,0 +1,134 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.IO; +using NLog; +using NzbDrone.Core.Messaging.Commands; +using NzbDrone.Core.Messaging.Events; +using NzbDrone.Core.MediaFiles.Commands; +using NzbDrone.Core.MediaFiles.Events; +using NzbDrone.Common.Disk; +using NzbDrone.Common.Extensions; +using NzbDrone.Common.Instrumentation.Extensions; +using NzbDrone.Core.Organizer; +using NzbDrone.Core.Tv; + +namespace NzbDrone.Core.MediaFiles +{ + public interface IRenameMovieFileService + { + List GetRenamePreviews(int movieId); + } + + public class RenameMovieFileService : IRenameMovieFileService, + //IExecute, + IExecute + { + private readonly IMovieService _movieService; + private readonly IMediaFileService _mediaFileService; + private readonly IMoveMovieFiles _movieFileMover; + private readonly IEventAggregator _eventAggregator; + private readonly IBuildFileNames _filenameBuilder; + private readonly Logger _logger; + + public RenameMovieFileService(IMovieService movieService, + IMediaFileService mediaFileService, + IMoveMovieFiles movieFileMover, + IEventAggregator eventAggregator, + IBuildFileNames filenameBuilder, + Logger logger) + { + _movieService = movieService; + _mediaFileService = mediaFileService; + _movieFileMover = movieFileMover; + _eventAggregator = eventAggregator; + _filenameBuilder = filenameBuilder; + _logger = logger; + } + + public List GetRenamePreviews(int movieId) + { + var movie = _movieService.GetMovie(movieId); + var file = _mediaFileService.GetFilesByMovie(movieId); + + return GetPreviews(movie, file).OrderByDescending(m => m.MovieId).ToList(); //TODO: Would really like to not have these be lists + + } + + private IEnumerable GetPreviews(Movie movie, List files) + { + foreach(var file in files) + { + var movieFilePath = Path.Combine(movie.Path, file.RelativePath); + + var newName = _filenameBuilder.BuildFileName(movie, file); + var newPath = _filenameBuilder.BuildFilePath(movie, newName, Path.GetExtension(file.Path)); + + if(!movieFilePath.PathEquals(newPath, StringComparison.Ordinal)) + { + yield return new RenameMovieFilePreview + { + MovieId = movie.Id, + MovieFileId = file.Id, + ExistingPath = file.RelativePath, + NewPath = movie.Path.GetRelativePath(newPath) + }; + } + + } + + } + + private void RenameFiles(List movieFiles, Movie movie) + { + var renamed = new List(); + + foreach(var movieFile in movieFiles) + { + var movieFilePath = Path.Combine(movie.Path, movieFile.RelativePath); + + try + { + _logger.Debug("Renaming movie file: {0}", movieFile); + _movieFileMover.MoveMovieFile(movieFile, movie); + + _mediaFileService.Update(movieFile); + renamed.Add(movieFile); + + _logger.Debug("Renamed movie file: {0}", movieFile); + + } + catch(SameFilenameException ex) + { + _logger.Debug("File not renamed, source and destination are the same: {0}", ex.Filename); + } + catch(Exception ex) + { + _logger.Error(ex, "Failed to rename file: " + movieFilePath); + } + } + } + + //public void Execute(RenameMovieFilesCommand message) + //{ + // var movie = _movieService.GetMovie(message.MovieId); + // var movieFiles = _mediaFileService.Get(message.Files); + + // _logger.ProgressInfo("Renaming {0} files for {1}", movieFiles.Count, movie.Title); + // RenameFiles(movieFiles, movie); + // _logger.ProgressInfo("Selected movie files renamed for {0}", movie.Title); + //} + + public void Execute(RenameMovieCommand message) + { + _logger.Debug("Renaming all files for selected movie"); + var movieToRename = _movieService.GetMovie(message.MovieId); + + var movieFiles = _mediaFileService.GetFilesByMovie(movieToRename.Id); + _logger.ProgressInfo("Renaming all files in movie: {0}", movieToRename.Title); + RenameFiles(movieFiles, movieToRename); + _logger.ProgressInfo("All movie files renamed for {0}", movieToRename.Title); + } + } +} diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index 8720a43ff..1aa8b3bfd 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -710,6 +710,8 @@ + + @@ -783,6 +785,8 @@ + + diff --git a/src/UI/Movies/Editor/MovieEditorFooterView.js b/src/UI/Movies/Editor/MovieEditorFooterView.js index d764b1aa1..05983e3f6 100644 --- a/src/UI/Movies/Editor/MovieEditorFooterView.js +++ b/src/UI/Movies/Editor/MovieEditorFooterView.js @@ -4,7 +4,7 @@ var vent = require('vent'); var Profiles = require('../../Profile/ProfileCollection'); var RootFolders = require('../../AddMovies/RootFolders/RootFolderCollection'); var RootFolderLayout = require('../../AddMovies/RootFolders/RootFolderLayout'); -var UpdateFilesSeriesView = require('./Organize/OrganizeFilesView'); +var UpdateFilesMoviesView = require('./Organize/OrganizeFilesView'); var Config = require('../../Config'); module.exports = Marionette.ItemView.extend({ @@ -34,14 +34,14 @@ module.exports = Marionette.ItemView.extend({ }, initialize : function(options) { - this.seriesCollection = options.collection; + this.moviesCollection = options.collection; RootFolders.fetch().done(function() { RootFolders.synced = true; }); this.editorGrid = options.editorGrid; - this.listenTo(this.seriesCollection, 'backgrid:selected', this._updateInfo); + this.listenTo(this.moviesCollection, 'backgrid:selected', this._updateInfo); this.listenTo(RootFolders, 'all', this.render); }, @@ -83,14 +83,14 @@ module.exports = Marionette.ItemView.extend({ model.edited = true; }); - this.seriesCollection.save(); + this.moviesCollection.save(); }, _updateInfo : function() { var selected = this.editorGrid.getSelectedModels(); var selectedCount = selected.length; - this.ui.selectedCount.html('{0} series selected'.format(selectedCount)); + this.ui.selectedCount.html('{0} movies selected'.format(selectedCount)); if (selectedCount === 0) { this.ui.actions.attr('disabled', 'disabled'); @@ -118,9 +118,9 @@ module.exports = Marionette.ItemView.extend({ _organizeFiles : function() { var selected = this.editorGrid.getSelectedModels(); - var updateFilesSeriesView = new UpdateFilesSeriesView({ series : selected }); - 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, updateFilesMoviesView); } }); \ No newline at end of file diff --git a/src/UI/Movies/Editor/MovieEditorFooterViewTemplate.hbs b/src/UI/Movies/Editor/MovieEditorFooterViewTemplate.hbs index ad81687d5..5cefdae3a 100644 --- a/src/UI/Movies/Editor/MovieEditorFooterViewTemplate.hbs +++ b/src/UI/Movies/Editor/MovieEditorFooterViewTemplate.hbs @@ -44,10 +44,10 @@
- +
- +
diff --git a/src/UI/Movies/Editor/Organize/OrganizeFilesView.js b/src/UI/Movies/Editor/Organize/OrganizeFilesView.js index 05eeb53dd..2e03da618 100644 --- a/src/UI/Movies/Editor/Organize/OrganizeFilesView.js +++ b/src/UI/Movies/Editor/Organize/OrganizeFilesView.js @@ -12,19 +12,19 @@ module.exports = Marionette.ItemView.extend({ }, initialize : function(options) { - this.series = options.series; + this.movies = options.movies; this.templateHelpers = { - numberOfSeries : this.series.length, - series : new Backbone.Collection(this.series).toJSON() + numberOfMovies : this.movies.length, + movies : new Backbone.Collection(this.movies).toJSON() }; }, _organize : function() { - var seriesIds = _.pluck(this.series, 'id'); + var movieIds = _.pluck(this.movies, 'id'); - CommandController.Execute('renameSeries', { - name : 'renameSeries', - seriesIds : seriesIds + CommandController.Execute('renameMovie', { + name : 'renameMovie', + movieIds : movieIds }); this.trigger('organizingFiles'); diff --git a/src/UI/Movies/Editor/Organize/OrganizeFilesViewTemplate.hbs b/src/UI/Movies/Editor/Organize/OrganizeFilesViewTemplate.hbs index 5258e92b5..1d603d7a7 100644 --- a/src/UI/Movies/Editor/Organize/OrganizeFilesViewTemplate.hbs +++ b/src/UI/Movies/Editor/Organize/OrganizeFilesViewTemplate.hbs @@ -1,7 +1,7 @@
-

Organize of Selected Movies

+

Organize Selected Movies

@@ -9,11 +9,11 @@ Tip: To preview a rename... select "Cancel" then any movie title and use the
- Are you sure you want to update all files in the {{numberOfSeries}} selected movie? + Are you sure you want to update all files in the {{numberOfMovies}} selected movies? {{debug}}
    - {{#each series}} + {{#each movie}}
  • {{title}}
    • {{/each}}
diff --git a/src/UI/Rename/RenamePreviewCollection.js b/src/UI/Rename/RenamePreviewCollection.js index ce9f49b4a..3048dc135 100644 --- a/src/UI/Rename/RenamePreviewCollection.js +++ b/src/UI/Rename/RenamePreviewCollection.js @@ -1,3 +1,38 @@ +// var Backbone = require('backbone'); +// var RenamePreviewModel = require('./RenamePreviewModel'); + +// module.exports = Backbone.Collection.extend({ +// url : window.NzbDrone.ApiRoot + '/rename', +// model : RenamePreviewModel, + +// originalFetch : Backbone.Collection.prototype.fetch, + +// initialize : function(options) { +// if (!options.seriesId) { +// throw 'seriesId is required'; +// } + +// this.seriesId = options.seriesId; +// this.seasonNumber = options.seasonNumber; +// }, + +// fetch : function(options) { +// if (!this.seriesId) { +// throw 'seriesId is required'; +// } + +// options = options || {}; +// options.data = {}; +// options.data.seriesId = this.seriesId; + +// if (this.seasonNumber !== undefined) { +// options.data.seasonNumber = this.seasonNumber; +// } + +// return this.originalFetch.call(this, options); +// } +// }); + var Backbone = require('backbone'); var RenamePreviewModel = require('./RenamePreviewModel'); @@ -8,26 +43,26 @@ module.exports = Backbone.Collection.extend({ originalFetch : Backbone.Collection.prototype.fetch, initialize : function(options) { - if (!options.seriesId) { - throw 'seriesId is required'; + if (!options.movieId) { + throw 'movieId is required'; } - this.seriesId = options.seriesId; - this.seasonNumber = options.seasonNumber; + this.movieId = options.movieId; + //this.seasonNumber = options.seasonNumber; }, fetch : function(options) { - if (!this.seriesId) { - throw 'seriesId is required'; + if (!this.movieId) { + throw 'movieId is required'; } options = options || {}; options.data = {}; - options.data.seriesId = this.seriesId; + options.data.movieId = this.movieId; - if (this.seasonNumber !== undefined) { - options.data.seasonNumber = this.seasonNumber; - } + // if (this.seasonNumber !== undefined) { + // options.data.seasonNumber = this.seasonNumber; + //} return this.originalFetch.call(this, options); } diff --git a/src/UI/Rename/RenamePreviewLayout.js b/src/UI/Rename/RenamePreviewLayout.js index eb1cf604a..9e87dff06 100644 --- a/src/UI/Rename/RenamePreviewLayout.js +++ b/src/UI/Rename/RenamePreviewLayout.js @@ -29,12 +29,13 @@ module.exports = Marionette.Layout.extend({ }, initialize : function(options) { - this.model = options.series; + this.model = options.movie; this.seasonNumber = options.seasonNumber; var viewOptions = {}; - viewOptions.seriesId = this.model.id; - viewOptions.seasonNumber = this.seasonNumber; + //viewOptions.seriesId = this.model.id; + //viewOptions.seasonNumber = this.seasonNumber; + viewOptions.movieId = this.model.id; this.collection = new RenamePreviewCollection(viewOptions); this.listenTo(this.collection, 'sync', this._showPreviews); @@ -74,21 +75,26 @@ module.exports = Marionette.Layout.extend({ return; } - if (this.seasonNumber) { + // if (this.seasonNumber) { + // CommandController.Execute('renameFiles', { + // name : 'renameFiles', + // movieId : this.model.id, + // //seasonNumber : this.seasonNumber, + // files : files + // }); + // } else { + // CommandController.Execute('renameFiles', { + // name : 'renameFiles', + // seriesId : this.model.id, + // seasonNumber : -1, + // files : files + // }); CommandController.Execute('renameFiles', { name : 'renameFiles', - seriesId : this.model.id, - seasonNumber : this.seasonNumber, + movieId : this.model.id, files : files }); - } else { - CommandController.Execute('renameFiles', { - name : 'renameFiles', - seriesId : this.model.id, - seasonNumber : -1, - files : files - }); - } + //} vent.trigger(vent.Commands.CloseModalCommand); }, diff --git a/src/UI/Series/Editor/SeriesEditorFooterView.js b/src/UI/Series/Editor/SeriesEditorFooterView.js index 6f4f83a6c..76a53dd91 100644 --- a/src/UI/Series/Editor/SeriesEditorFooterView.js +++ b/src/UI/Series/Editor/SeriesEditorFooterView.js @@ -5,6 +5,7 @@ var Profiles = require('../../Profile/ProfileCollection'); var RootFolders = require('../../AddSeries/RootFolders/RootFolderCollection'); var RootFolderLayout = require('../../AddSeries/RootFolders/RootFolderLayout'); var UpdateFilesSeriesView = require('./Organize/OrganizeFilesView'); +var UPdateFilesMoviesView = require('./Organize/OrganizeFilesView'); var Config = require('../../Config'); module.exports = Marionette.ItemView.extend({ @@ -118,8 +119,11 @@ module.exports = Marionette.ItemView.extend({ _organizeFiles : function() { var selected = this.editorGrid.getSelectedModels(); - var updateFilesSeriesView = new UpdateFilesSeriesView({ series : selected }); - this.listenToOnce(updateFilesSeriesView, 'updatingFiles', this._afterSave); + //var updateFilesSeriesView = new UpdateFilesSeriesView({ series : selected }); + //this.listenToOnce(updateFilesSeriesView, 'updatingFiles', this._afterSave); + + var updateFilesMoviesView = new UpdateFilesMoviesView({ movies: selected }); + this.listenToOnce(updateFilesMOviesVIew, 'updatingFiles', this._afterSave); vent.trigger(vent.Commands.OpenModalCommand, updateFilesSeriesView); } From 7a45394820cd70f2b4f12852f88860d466bd76af Mon Sep 17 00:00:00 2001 From: Tim Turner Date: Sun, 8 Jan 2017 19:48:04 -0500 Subject: [PATCH 3/5] Unable to properly parse many movie titles --- src/NzbDrone.Api/Indexers/ReleaseResource.cs | 6 ++--- src/NzbDrone.Api/Series/MovieResource.cs | 21 +++++++++++++----- .../DownloadedMovieCommandService.cs | 2 +- .../EpisodeImport/ImportApprovedMovie.cs | 2 +- .../EpisodeImport/ImportDecision.cs | 4 ++-- .../EpisodeImport/ImportDecisionMaker.cs | 20 ++++++++--------- .../MediaFiles/RenameMovieFileService.cs | 2 +- .../MetadataSource/SkyHook/SkyHookProxy.cs | 2 +- src/NzbDrone.Core/Parser/Model/LocalMovie.cs | 4 ++-- .../Parser/Model/ParsedMovieInfo.cs | 8 +++---- src/NzbDrone.Core/Parser/Parser.cs | 22 +++++++++++++++++++ src/NzbDrone.Core/Parser/ParsingService.cs | 20 ++++++++--------- src/NzbDrone.Core/Tv/Movie.cs | 3 +++ 13 files changed, 76 insertions(+), 40 deletions(-) diff --git a/src/NzbDrone.Api/Indexers/ReleaseResource.cs b/src/NzbDrone.Api/Indexers/ReleaseResource.cs index 291879a44..fea1ee353 100644 --- a/src/NzbDrone.Api/Indexers/ReleaseResource.cs +++ b/src/NzbDrone.Api/Indexers/ReleaseResource.cs @@ -107,8 +107,8 @@ namespace NzbDrone.Api.Indexers ReleaseGroup = parsedMovieInfo.ReleaseGroup, ReleaseHash = parsedMovieInfo.ReleaseHash, Title = releaseInfo.Title, - FullSeason = parsedMovieInfo.FullSeason, - SeasonNumber = parsedMovieInfo.SeasonNumber, + //FullSeason = parsedMovieInfo.FullSeason, + //SeasonNumber = parsedMovieInfo.SeasonNumber, Language = parsedMovieInfo.Language, AirDate = "", SeriesTitle = parsedMovieInfo.MovieTitle, @@ -138,7 +138,7 @@ namespace NzbDrone.Api.Indexers IsDaily = false, IsAbsoluteNumbering = false, IsPossibleSpecialEpisode = false, - Special = parsedMovieInfo.Special, + //Special = parsedMovieInfo.Special, }; } diff --git a/src/NzbDrone.Api/Series/MovieResource.cs b/src/NzbDrone.Api/Series/MovieResource.cs index 32bf495a5..4733968aa 100644 --- a/src/NzbDrone.Api/Series/MovieResource.cs +++ b/src/NzbDrone.Api/Series/MovieResource.cs @@ -18,7 +18,7 @@ namespace NzbDrone.Api.Movie //Todo: Sorters should be done completely on the client //Todo: Is there an easy way to keep IgnoreArticlesWhenSorting in sync between, Series, History, Missing? //Todo: We should get the entire Profile instead of ID and Name separately - + //View Only public string Title { get; set; } public List AlternateTitles { get; set; } @@ -33,6 +33,7 @@ namespace NzbDrone.Api.Movie public bool Downloaded { get; set; } public string RemotePoster { get; set; } public int Year { get; set; } + public bool HasFile { get; set; } //View & Edit public string Path { get; set; } @@ -80,7 +81,17 @@ namespace NzbDrone.Api.Movie { if (model == null) return null; - long Size = model.MovieFile.Value != null ? model.MovieFile.Value.Size : 0; + + long size = 0; + bool downloaded = false; + + if(model.MovieFile != null && model.MovieFile.IsLoaded) + { + size = model.MovieFile.Value.Size; + downloaded = true; + } + + //long Size = model.MovieFile != null ? model.MovieFile.Value.Size : 0; return new MovieResource { @@ -91,8 +102,8 @@ namespace NzbDrone.Api.Movie SortTitle = model.SortTitle, InCinemas = model.InCinemas, PhysicalRelease = model.PhysicalRelease, - - Downloaded = model.MovieFile.Value != null, + HasFile = model.HasFile, + Downloaded = downloaded, //TotalEpisodeCount //EpisodeCount //EpisodeFileCount @@ -110,7 +121,7 @@ namespace NzbDrone.Api.Movie Monitored = model.Monitored, - SizeOnDisk = Size, + SizeOnDisk = size, Runtime = model.Runtime, LastInfoSync = model.LastInfoSync, diff --git a/src/NzbDrone.Core/MediaFiles/DownloadedMovieCommandService.cs b/src/NzbDrone.Core/MediaFiles/DownloadedMovieCommandService.cs index fcda97d24..211f6f13c 100644 --- a/src/NzbDrone.Core/MediaFiles/DownloadedMovieCommandService.cs +++ b/src/NzbDrone.Core/MediaFiles/DownloadedMovieCommandService.cs @@ -159,7 +159,7 @@ namespace NzbDrone.Core.MediaFiles } var cleanedUpName = GetCleanedUpFolderName(directoryInfo.Name); - var folderInfo = Parser.Parser.ParseTitle(directoryInfo.Name); + var folderInfo = Parser.Parser.ParseMovieTitle(directoryInfo.Name); if (folderInfo != null) { diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedMovie.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedMovie.cs index 6d766a0e3..619afe3ba 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedMovie.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedMovie.cs @@ -80,7 +80,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport episodeFile.Quality = localMovie.Quality; episodeFile.MediaInfo = localMovie.MediaInfo; episodeFile.Movie = localMovie.Movie; - episodeFile.ReleaseGroup = localMovie.ParsedEpisodeInfo.ReleaseGroup; + episodeFile.ReleaseGroup = localMovie.ParsedMovieInfo.ReleaseGroup; bool copyOnly; switch (importMode) diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecision.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecision.cs index 8bb5e78ea..9ba0cc706 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecision.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecision.cs @@ -24,12 +24,12 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport { LocalMovie = localMovie; Rejections = rejections.ToList(); - LocalEpisode = new LocalEpisode + LocalMovie = new LocalMovie { Quality = localMovie.Quality, ExistingFile = localMovie.ExistingFile, MediaInfo = localMovie.MediaInfo, - ParsedEpisodeInfo = localMovie.ParsedEpisodeInfo, + ParsedMovieInfo = localMovie.ParsedMovieInfo, Path = localMovie.Path, Size = localMovie.Size }; diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs index 52ffdfa07..5718382b7 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs @@ -19,7 +19,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport { List GetImportDecisions(List videoFiles, Series series); List GetImportDecisions(List videoFiles, Movie movie); - List GetImportDecisions(List videoFiles, Movie movie, ParsedEpisodeInfo folderInfo, bool sceneSource); //TODO: Needs changing to ParsedMovieInfo!! + List GetImportDecisions(List videoFiles, Movie movie, ParsedMovieInfo folderInfo, bool sceneSource); //TODO: Needs changing to ParsedMovieInfo!! List GetImportDecisions(List videoFiles, Series series, ParsedEpisodeInfo folderInfo, bool sceneSource); } @@ -77,7 +77,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport return decisions; } - public List GetImportDecisions(List videoFiles, Movie movie, ParsedEpisodeInfo folderInfo, bool sceneSource) + public List GetImportDecisions(List videoFiles, Movie movie, ParsedMovieInfo folderInfo, bool sceneSource) { var newFiles = _mediaFileService.FilterExistingFiles(videoFiles.ToList(), movie); @@ -94,7 +94,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport return decisions; } - private ImportDecision GetDecision(string file, Movie movie, ParsedEpisodeInfo folderInfo, bool sceneSource, bool shouldUseFolderName) + private ImportDecision GetDecision(string file, Movie movie, ParsedMovieInfo folderInfo, bool sceneSource, bool shouldUseFolderName) { ImportDecision decision = null; @@ -291,17 +291,17 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport }) == 1; } - private bool ShouldUseFolderName(List videoFiles, Movie movie, ParsedEpisodeInfo folderInfo) + private bool ShouldUseFolderName(List videoFiles, Movie movie, ParsedMovieInfo folderInfo) { if (folderInfo == null) { return false; } - if (folderInfo.FullSeason) - { - return false; - } + //if (folderInfo.FullSeason) + //{ + // return false; + //} return videoFiles.Count(file => { @@ -325,7 +325,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport }) == 1; } - private QualityModel GetQuality(ParsedEpisodeInfo folderInfo, QualityModel fileQuality, Movie movie) + private QualityModel GetQuality(ParsedMovieInfo folderInfo, QualityModel fileQuality, Movie movie) { if (UseFolderQuality(folderInfo, fileQuality, movie)) { @@ -347,7 +347,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport return fileQuality; } - private bool UseFolderQuality(ParsedEpisodeInfo folderInfo, QualityModel fileQuality, Movie movie) + private bool UseFolderQuality(ParsedMovieInfo folderInfo, QualityModel fileQuality, Movie movie) { if (folderInfo == null) { diff --git a/src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs b/src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs index af5e48122..f5ad3bf50 100644 --- a/src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs +++ b/src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs @@ -63,7 +63,7 @@ namespace NzbDrone.Core.MediaFiles var movieFilePath = Path.Combine(movie.Path, file.RelativePath); var newName = _filenameBuilder.BuildFileName(movie, file); - var newPath = _filenameBuilder.BuildFilePath(movie, newName, Path.GetExtension(file.Path)); + var newPath = _filenameBuilder.BuildFilePath(movie, newName, Path.GetExtension(movieFilePath)); if(!movieFilePath.PathEquals(newPath, StringComparison.Ordinal)) { diff --git a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs index f37184518..9926c62a8 100644 --- a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs +++ b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs @@ -254,7 +254,7 @@ namespace NzbDrone.Core.MetadataSource.SkyHook } } - var searchTerm = lowerTitle.Replace("_", "+").Replace(" ", "+"); + var searchTerm = lowerTitle.Replace("_", "+").Replace(" ", "+").Replace(".", "+"); var firstChar = searchTerm.First(); diff --git a/src/NzbDrone.Core/Parser/Model/LocalMovie.cs b/src/NzbDrone.Core/Parser/Model/LocalMovie.cs index 3f5c2344c..5ae9c481d 100644 --- a/src/NzbDrone.Core/Parser/Model/LocalMovie.cs +++ b/src/NzbDrone.Core/Parser/Model/LocalMovie.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using System.Collections.Generic; using NzbDrone.Core.Qualities; using NzbDrone.Core.Tv; @@ -14,7 +14,7 @@ namespace NzbDrone.Core.Parser.Model public string Path { get; set; } public long Size { get; set; } - public ParsedEpisodeInfo ParsedEpisodeInfo { get; set; } + public ParsedMovieInfo ParsedMovieInfo { get; set; } public Movie Movie { get; set; } public QualityModel Quality { get; set; } public MediaInfoModel MediaInfo { get; set; } diff --git a/src/NzbDrone.Core/Parser/Model/ParsedMovieInfo.cs b/src/NzbDrone.Core/Parser/Model/ParsedMovieInfo.cs index ff1f87cfd..ba4501f38 100644 --- a/src/NzbDrone.Core/Parser/Model/ParsedMovieInfo.cs +++ b/src/NzbDrone.Core/Parser/Model/ParsedMovieInfo.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using NzbDrone.Common.Extensions; using NzbDrone.Core.Qualities; @@ -9,10 +9,10 @@ namespace NzbDrone.Core.Parser.Model public string MovieTitle { get; set; } public SeriesTitleInfo MovieTitleInfo { get; set; } public QualityModel Quality { get; set; } - public int SeasonNumber { get; set; } + //public int SeasonNumber { get; set; } public Language Language { get; set; } - public bool FullSeason { get; set; } - public bool Special { get; set; } + //public bool FullSeason { get; set; } + //public bool Special { get; set; } public string ReleaseGroup { get; set; } public string ReleaseHash { get; set; } public string Edition { get; set;} diff --git a/src/NzbDrone.Core/Parser/Parser.cs b/src/NzbDrone.Core/Parser/Parser.cs index a48204a28..d2a27d215 100644 --- a/src/NzbDrone.Core/Parser/Parser.cs +++ b/src/NzbDrone.Core/Parser/Parser.cs @@ -321,6 +321,28 @@ namespace NzbDrone.Core.Parser return result; } + public static ParsedMovieInfo ParseMoviePath(string path) + { + var fileInfo = new FileInfo(path); + + var result = ParseMovieTitle(fileInfo.Name); + + if (result == null) + { + Logger.Debug("Attempting to parse episode info using directory and file names. {0}", fileInfo.Directory.Name); + result = ParseMovieTitle(fileInfo.Directory.Name + " " + fileInfo.Name); + } + + if (result == null) + { + Logger.Debug("Attempting to parse episode info using directory name. {0}", fileInfo.Directory.Name); + result = ParseMovieTitle(fileInfo.Directory.Name + fileInfo.Extension); + } + + return result; + + } + public static ParsedMovieInfo ParseMovieTitle(string title) { diff --git a/src/NzbDrone.Core/Parser/ParsingService.cs b/src/NzbDrone.Core/Parser/ParsingService.cs index bb8c794d5..27f20889f 100644 --- a/src/NzbDrone.Core/Parser/ParsingService.cs +++ b/src/NzbDrone.Core/Parser/ParsingService.cs @@ -16,7 +16,7 @@ namespace NzbDrone.Core.Parser LocalEpisode GetLocalEpisode(string filename, Series series); LocalEpisode GetLocalEpisode(string filename, Series series, ParsedEpisodeInfo folderInfo, bool sceneSource); LocalMovie GetLocalMovie(string filename, Movie movie); - LocalMovie GetLocalMovie(string filename, Movie movie, ParsedEpisodeInfo folderInfo, bool sceneSource); + LocalMovie GetLocalMovie(string filename, Movie movie, ParsedMovieInfo folderInfo, bool sceneSource); Series GetSeries(string title); Movie GetMovie(string title); RemoteEpisode Map(ParsedEpisodeInfo parsedEpisodeInfo, int tvdbId, int tvRageId, SearchCriteriaBase searchCriteria = null); @@ -120,26 +120,26 @@ namespace NzbDrone.Core.Parser return GetLocalMovie(filename, movie, null, false); } - public LocalMovie GetLocalMovie(string filename, Movie movie, ParsedEpisodeInfo folderInfo, bool sceneSource) + public LocalMovie GetLocalMovie(string filename, Movie movie, ParsedMovieInfo folderInfo, bool sceneSource) { - ParsedEpisodeInfo parsedEpisodeInfo; + ParsedMovieInfo parsedMovieInfo; if (folderInfo != null) { - parsedEpisodeInfo = folderInfo.JsonClone(); - parsedEpisodeInfo.Quality = QualityParser.ParseQuality(Path.GetFileName(filename)); + parsedMovieInfo = folderInfo.JsonClone(); + parsedMovieInfo.Quality = QualityParser.ParseQuality(Path.GetFileName(filename)); } else { - parsedEpisodeInfo = Parser.ParsePath(filename); + parsedMovieInfo = Parser.ParseMoviePath(filename); } - if (parsedEpisodeInfo == null) + if (parsedMovieInfo == null) { if (MediaFileExtensions.Extensions.Contains(Path.GetExtension(filename))) { - _logger.Warn("Unable to parse episode info from path {0}", filename); + _logger.Warn("Unable to parse movie info from path {0}", filename); } return null; @@ -148,9 +148,9 @@ namespace NzbDrone.Core.Parser return new LocalMovie { Movie = movie, - Quality = parsedEpisodeInfo.Quality, + Quality = parsedMovieInfo.Quality, Path = filename, - ParsedEpisodeInfo = parsedEpisodeInfo, + ParsedMovieInfo = parsedMovieInfo, ExistingFile = movie.Path.IsParentPath(filename) }; } diff --git a/src/NzbDrone.Core/Tv/Movie.cs b/src/NzbDrone.Core/Tv/Movie.cs index 24329b987..eadff4151 100644 --- a/src/NzbDrone.Core/Tv/Movie.cs +++ b/src/NzbDrone.Core/Tv/Movie.cs @@ -48,6 +48,9 @@ namespace NzbDrone.Core.Tv public LazyLoaded MovieFile { get; set; } public int MovieFileId { get; set; } public List AlternativeTitles { get; set; } + + public bool HasFile => MovieFileId > 0; + public override string ToString() { return string.Format("[{0}][{1}]", ImdbId, Title.NullSafe()); From 74c5664a7faa21137d2af78e7a2af922764966c2 Mon Sep 17 00:00:00 2001 From: Tim Turner Date: Sun, 8 Jan 2017 22:16:14 -0500 Subject: [PATCH 4/5] Taking another pass at organization/renaming Works once in a while --- src/NzbDrone.Core/Extras/ExtraService.cs | 12 ++++++++ .../MediaFiles/Commands/RenameMovieCommand.cs | 2 +- .../MediaFiles/DiskScanService.cs | 6 +++- .../EpisodeImport/ImportApprovedMovie.cs | 2 ++ .../EpisodeImport/ImportDecision.cs | 18 +++++------ .../EpisodeImport/ImportDecisionMaker.cs | 10 +++---- .../MediaFiles/MediaFileRepository.cs | 2 +- .../MediaFiles/MediaFileService.cs | 10 ++++--- .../MediaFiles/RenameMovieFileService.cs | 30 +++++++++++-------- src/UI/Movies/Details/MoviesDetailsLayout.js | 4 +-- .../Movies/Details/MoviesDetailsTemplate.hbs | 2 +- src/UI/Rename/RenamePreviewLayout.js | 4 +-- 12 files changed, 63 insertions(+), 39 deletions(-) diff --git a/src/NzbDrone.Core/Extras/ExtraService.cs b/src/NzbDrone.Core/Extras/ExtraService.cs index 5906de176..012e8f921 100644 --- a/src/NzbDrone.Core/Extras/ExtraService.cs +++ b/src/NzbDrone.Core/Extras/ExtraService.cs @@ -111,6 +111,18 @@ namespace NzbDrone.Core.Extras } } + //TODO: Implementing this will fix a lot of our warning exceptions + //public void Handle(MediaCoversUpdatedEvent message) + //{ + // var movie = message.Movie; + // var movieFiles = GetMovieFiles(movie.Id); + + // foreach (var extraFileManager in _extraFileManagers) + // { + // extraFileManager.CreateAfterMovieScan(movie, movieFiles); + // } + //} + public void Handle(EpisodeFolderCreatedEvent message) { var series = message.Series; diff --git a/src/NzbDrone.Core/MediaFiles/Commands/RenameMovieCommand.cs b/src/NzbDrone.Core/MediaFiles/Commands/RenameMovieCommand.cs index fad7b76c7..012a835f8 100644 --- a/src/NzbDrone.Core/MediaFiles/Commands/RenameMovieCommand.cs +++ b/src/NzbDrone.Core/MediaFiles/Commands/RenameMovieCommand.cs @@ -8,7 +8,7 @@ namespace NzbDrone.Core.MediaFiles.Commands { public class RenameMovieCommand : Command { - public int MovieId { get; set; } + public List MovieIds { get; set; } public override bool SendUpdatesToClient => true; diff --git a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs index 916c5681b..d4d2ec71c 100644 --- a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs +++ b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs @@ -38,6 +38,7 @@ namespace NzbDrone.Core.MediaFiles private readonly IDiskProvider _diskProvider; private readonly IMakeImportDecision _importDecisionMaker; private readonly IImportApprovedEpisodes _importApprovedEpisodes; + private readonly IImportApprovedMovie _importApprovedMovies; private readonly IConfigService _configService; private readonly ISeriesService _seriesService; private readonly IMediaFileTableCleanupService _mediaFileTableCleanupService; @@ -48,6 +49,7 @@ namespace NzbDrone.Core.MediaFiles public DiskScanService(IDiskProvider diskProvider, IMakeImportDecision importDecisionMaker, IImportApprovedEpisodes importApprovedEpisodes, + IImportApprovedMovie importApprovedMovies, IConfigService configService, ISeriesService seriesService, IMediaFileTableCleanupService mediaFileTableCleanupService, @@ -58,6 +60,7 @@ namespace NzbDrone.Core.MediaFiles _diskProvider = diskProvider; _importDecisionMaker = importDecisionMaker; _importApprovedEpisodes = importApprovedEpisodes; + _importApprovedMovies = importApprovedMovies; _configService = configService; _seriesService = seriesService; _mediaFileTableCleanupService = mediaFileTableCleanupService; @@ -179,7 +182,8 @@ namespace NzbDrone.Core.MediaFiles decisionsStopwatch.Stop(); _logger.Trace("Import decisions complete for: {0} [{1}]", movie, decisionsStopwatch.Elapsed); - _importApprovedEpisodes.Import(decisions, false); + //_importApprovedEpisodes.Import(decisions, false); + _importApprovedMovies.Import(decisions, false); _logger.Info("Completed scanning disk for {0}", movie.Title); _eventAggregator.PublishEvent(new MovieScannedEvent(movie)); diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedMovie.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedMovie.cs index 619afe3ba..128ca64f9 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedMovie.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedMovie.cs @@ -47,6 +47,8 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport public List Import(List decisions, bool newDownload, DownloadClientItem downloadClientItem = null, ImportMode importMode = ImportMode.Auto) { + _logger.Debug("Decisions: {0}", decisions.Count); + var qualifiedImports = decisions.Where(c => c.Approved) .GroupBy(c => c.LocalMovie.Movie.Id, (i, s) => s .OrderByDescending(c => c.LocalMovie.Quality, new QualityModelComparer(s.First().LocalMovie.Movie.Profile)) diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecision.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecision.cs index 9ba0cc706..406866b65 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecision.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecision.cs @@ -24,15 +24,15 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport { LocalMovie = localMovie; Rejections = rejections.ToList(); - LocalMovie = new LocalMovie - { - Quality = localMovie.Quality, - ExistingFile = localMovie.ExistingFile, - MediaInfo = localMovie.MediaInfo, - ParsedMovieInfo = localMovie.ParsedMovieInfo, - Path = localMovie.Path, - Size = localMovie.Size - }; + //LocalMovie = new LocalMovie + //{ + // Quality = localMovie.Quality, + // ExistingFile = localMovie.ExistingFile, + // MediaInfo = localMovie.MediaInfo, + // ParsedMovieInfo = localMovie.ParsedMovieInfo, + // Path = localMovie.Path, + // Size = localMovie.Size + //}; } } } diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs index 5718382b7..9d4abe042 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs @@ -123,18 +123,18 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport else { - var localEpisode = new LocalEpisode(); - localEpisode.Path = file; + localMovie = new LocalMovie(); + localMovie.Path = file; - decision = new ImportDecision(localEpisode, new Rejection("Unable to parse file")); + decision = new ImportDecision(localMovie, new Rejection("Unable to parse file")); } } catch (Exception e) { _logger.Error(e, "Couldn't import file. " + file); - var localEpisode = new LocalEpisode { Path = file }; - decision = new ImportDecision(localEpisode, new Rejection("Unexpected error processing file")); + var localMovie = new LocalMovie { Path = file }; + decision = new ImportDecision(localMovie, new Rejection("Unexpected error processing file")); } //LocalMovie nullMovie = null; diff --git a/src/NzbDrone.Core/MediaFiles/MediaFileRepository.cs b/src/NzbDrone.Core/MediaFiles/MediaFileRepository.cs index 206942356..3cc90af0f 100644 --- a/src/NzbDrone.Core/MediaFiles/MediaFileRepository.cs +++ b/src/NzbDrone.Core/MediaFiles/MediaFileRepository.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using NzbDrone.Core.Datastore; using NzbDrone.Core.Messaging.Events; diff --git a/src/NzbDrone.Core/MediaFiles/MediaFileService.cs b/src/NzbDrone.Core/MediaFiles/MediaFileService.cs index 4a2dd195c..0587bb793 100644 --- a/src/NzbDrone.Core/MediaFiles/MediaFileService.cs +++ b/src/NzbDrone.Core/MediaFiles/MediaFileService.cs @@ -27,6 +27,8 @@ namespace NzbDrone.Core.MediaFiles List FilterExistingFiles(List files, Movie movie); EpisodeFile Get(int id); List Get(IEnumerable ids); + List GetMovies(IEnumerable ids); + //List Get(IEnumerable ids); } @@ -125,10 +127,10 @@ namespace NzbDrone.Core.MediaFiles return _mediaFileRepository.Get(ids).ToList(); } - //public List Get(IEnumerable ids) - //{ - // return _mediaFileRepository.Get(ids).ToList(); - //} + public List GetMovies(IEnumerable ids) + { + return _movieFileRepository.Get(ids).ToList(); + } public void HandleAsync(SeriesDeletedEvent message) { diff --git a/src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs b/src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs index f5ad3bf50..cb4382a66 100644 --- a/src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs +++ b/src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs @@ -110,25 +110,29 @@ namespace NzbDrone.Core.MediaFiles } } - //public void Execute(RenameMovieFilesCommand message) - //{ - // var movie = _movieService.GetMovie(message.MovieId); - // var movieFiles = _mediaFileService.Get(message.Files); + public void Execute(RenameMovieFilesCommand message) + { + var movie = _movieService.GetMovie(message.MovieId); + var movieFiles = _mediaFileService.GetMovies(message.Files); - // _logger.ProgressInfo("Renaming {0} files for {1}", movieFiles.Count, movie.Title); - // RenameFiles(movieFiles, movie); - // _logger.ProgressInfo("Selected movie files renamed for {0}", movie.Title); - //} + _logger.ProgressInfo("Renaming {0} files for {1}", movieFiles.Count, movie.Title); + RenameFiles(movieFiles, movie); + _logger.ProgressInfo("Selected movie files renamed for {0}", movie.Title); + } public void Execute(RenameMovieCommand message) { _logger.Debug("Renaming all files for selected movie"); - var movieToRename = _movieService.GetMovie(message.MovieId); + var moviesToRename = _movieService.GetMovies(message.MovieIds); - var movieFiles = _mediaFileService.GetFilesByMovie(movieToRename.Id); - _logger.ProgressInfo("Renaming all files in movie: {0}", movieToRename.Title); - RenameFiles(movieFiles, movieToRename); - _logger.ProgressInfo("All movie files renamed for {0}", movieToRename.Title); + foreach(var movie in moviesToRename) + { + var movieFiles = _mediaFileService.GetFilesByMovie(movie.Id); + _logger.ProgressInfo("Renaming all files in movie: {0}", movie.Title); + RenameFiles(movieFiles, movie); + _logger.ProgressInfo("All movie files renamed for {0}", movie.Title); + } + } } } diff --git a/src/UI/Movies/Details/MoviesDetailsLayout.js b/src/UI/Movies/Details/MoviesDetailsLayout.js index a38793aa4..da92d260a 100644 --- a/src/UI/Movies/Details/MoviesDetailsLayout.js +++ b/src/UI/Movies/Details/MoviesDetailsLayout.js @@ -97,7 +97,7 @@ module.exports = Marionette.Layout.extend({ CommandController.bindToCommand({ element : this.ui.rename, command : { - name : 'renameFiles', + name : 'renameMovieFiles', movieId : this.model.id, seasonNumber : -1 } @@ -237,7 +237,7 @@ module.exports = Marionette.Layout.extend({ }, _commandComplete : function(options) { - if (options.command.get('name') === 'renamefiles') { + if (options.command.get('name') === 'renameMoviefiles') { if (options.command.get('moviesId') === this.model.get('id')) { this._refresh(); } diff --git a/src/UI/Movies/Details/MoviesDetailsTemplate.hbs b/src/UI/Movies/Details/MoviesDetailsTemplate.hbs index 9c3f6675a..8516e5665 100644 --- a/src/UI/Movies/Details/MoviesDetailsTemplate.hbs +++ b/src/UI/Movies/Details/MoviesDetailsTemplate.hbs @@ -15,7 +15,7 @@
- +
diff --git a/src/UI/Rename/RenamePreviewLayout.js b/src/UI/Rename/RenamePreviewLayout.js index 9e87dff06..b699a2ae0 100644 --- a/src/UI/Rename/RenamePreviewLayout.js +++ b/src/UI/Rename/RenamePreviewLayout.js @@ -89,8 +89,8 @@ module.exports = Marionette.Layout.extend({ // seasonNumber : -1, // files : files // }); - CommandController.Execute('renameFiles', { - name : 'renameFiles', + CommandController.Execute('renameMovieFiles', { + name : 'renameMovieFiles', movieId : this.model.id, files : files }); From 708db1a75c649f153abfb928b04079ecbe6fb6a5 Mon Sep 17 00:00:00 2001 From: Tim Turner Date: Mon, 9 Jan 2017 17:26:13 -0500 Subject: [PATCH 5/5] Organize & Rename work --- src/NzbDrone.Api/Series/MovieResource.cs | 6 ++++ .../MediaFiles/RenameMovieFileService.cs | 2 +- src/UI/AddMovies/SearchResultViewTemplate.hbs | 4 +-- src/UI/Rename/RenamePreviewLayout.js | 28 +++++-------------- .../Series/Editor/SeriesEditorFooterView.js | 8 ++---- 5 files changed, 18 insertions(+), 30 deletions(-) diff --git a/src/NzbDrone.Api/Series/MovieResource.cs b/src/NzbDrone.Api/Series/MovieResource.cs index f9bcf658e..70a585086 100644 --- a/src/NzbDrone.Api/Series/MovieResource.cs +++ b/src/NzbDrone.Api/Series/MovieResource.cs @@ -85,6 +85,12 @@ namespace NzbDrone.Api.Movie long size = 0; bool downloaded = false; + + if(model.MovieFile != null) + { + model.MovieFile.LazyLoad(); + } + if (model.MovieFile != null && model.MovieFile.IsLoaded && model.MovieFile.Value != null) { size = model.MovieFile.Value.Size; diff --git a/src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs b/src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs index cb4382a66..9a4019f56 100644 --- a/src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs +++ b/src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs @@ -22,7 +22,7 @@ namespace NzbDrone.Core.MediaFiles } public class RenameMovieFileService : IRenameMovieFileService, - //IExecute, + IExecute, IExecute { private readonly IMovieService _movieService; diff --git a/src/UI/AddMovies/SearchResultViewTemplate.hbs b/src/UI/AddMovies/SearchResultViewTemplate.hbs index 87e1167da..35d213adb 100644 --- a/src/UI/AddMovies/SearchResultViewTemplate.hbs +++ b/src/UI/AddMovies/SearchResultViewTemplate.hbs @@ -52,7 +52,7 @@ {{> ProfileSelectionPartial profiles}}
-
+ {{!--
@@ -65,7 +65,7 @@
-
+
--}} {{/unless}} {{#unless existing}} diff --git a/src/UI/Rename/RenamePreviewLayout.js b/src/UI/Rename/RenamePreviewLayout.js index b699a2ae0..a37ffeb37 100644 --- a/src/UI/Rename/RenamePreviewLayout.js +++ b/src/UI/Rename/RenamePreviewLayout.js @@ -67,7 +67,8 @@ module.exports = Marionette.Layout.extend({ } 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) { @@ -75,26 +76,11 @@ module.exports = Marionette.Layout.extend({ return; } - // if (this.seasonNumber) { - // CommandController.Execute('renameFiles', { - // name : 'renameFiles', - // movieId : this.model.id, - // //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 - }); - //} + CommandController.Execute('renameMovieFiles', { + name : 'renameMovieFiles', + movieId : this.model.id, + files : files + }); vent.trigger(vent.Commands.CloseModalCommand); }, diff --git a/src/UI/Series/Editor/SeriesEditorFooterView.js b/src/UI/Series/Editor/SeriesEditorFooterView.js index 76a53dd91..6f4f83a6c 100644 --- a/src/UI/Series/Editor/SeriesEditorFooterView.js +++ b/src/UI/Series/Editor/SeriesEditorFooterView.js @@ -5,7 +5,6 @@ var Profiles = require('../../Profile/ProfileCollection'); var RootFolders = require('../../AddSeries/RootFolders/RootFolderCollection'); var RootFolderLayout = require('../../AddSeries/RootFolders/RootFolderLayout'); var UpdateFilesSeriesView = require('./Organize/OrganizeFilesView'); -var UPdateFilesMoviesView = require('./Organize/OrganizeFilesView'); var Config = require('../../Config'); module.exports = Marionette.ItemView.extend({ @@ -119,11 +118,8 @@ module.exports = Marionette.ItemView.extend({ _organizeFiles : function() { var selected = this.editorGrid.getSelectedModels(); - //var updateFilesSeriesView = new UpdateFilesSeriesView({ series : selected }); - //this.listenToOnce(updateFilesSeriesView, 'updatingFiles', this._afterSave); - - var updateFilesMoviesView = new UpdateFilesMoviesView({ movies: selected }); - this.listenToOnce(updateFilesMOviesVIew, 'updatingFiles', this._afterSave); + var updateFilesSeriesView = new UpdateFilesSeriesView({ series : selected }); + this.listenToOnce(updateFilesSeriesView, 'updatingFiles', this._afterSave); vent.trigger(vent.Commands.OpenModalCommand, updateFilesSeriesView); }