Fix Issue when adding some movies.

Fix publish date for jackett #239

src/NzbDrone.Api/Movies/RenameMovieModule.cs

@@ -12,7 +12,7 @@ namespace NzbDrone.Api.Movies
         private readonly IRenameMovieFileService _renameMovieFileService;
 
         public RenameMovieModule(IRenameMovieFileService renameMovieFileService)
-            : base("rename")
+            : base("renameMovie")
         {
             _renameMovieFileService = renameMovieFileService;
 

src/NzbDrone.Core/Datastore/Migration/121_update_filedate_config.cs

@@ -0,0 +1,67 @@
+using System.Data;
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(121)]
+    public class update_filedate_config : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Execute.WithConnection(SetTitleSlug);
+        }
+
+        private void SetTitleSlug(IDbConnection conn, IDbTransaction tran)
+        {
+            using (IDbCommand getSeriesCmd = conn.CreateCommand())
+            {
+                getSeriesCmd.Transaction = tran;
+                getSeriesCmd.CommandText = @"SELECT Id, Value FROM Config WHERE Key = 'filedate'";
+                using (IDataReader seriesReader = getSeriesCmd.ExecuteReader())
+                {
+                    while (seriesReader.Read())
+                    {
+                        var id = seriesReader.GetInt32(0);
+                        var value = seriesReader.GetString(1);
+
+                        using (IDbCommand updateCmd = conn.CreateCommand())
+                        {
+                            updateCmd.Transaction = tran;
+                            updateCmd.CommandText = "UPDATE Config SET Value = 'Release' WHERE Id = ?";
+                            updateCmd.AddParameter(id);
+
+                            updateCmd.ExecuteNonQuery();
+                        }
+                    }
+                }
+            }
+        }
+
+        public static string ToUrlSlug(string value)
+        {
+            //First to lower case
+            value = value.ToLowerInvariant();
+
+            //Remove all accents
+            var bytes = Encoding.GetEncoding("Cyrillic").GetBytes(value);
+            value = Encoding.ASCII.GetString(bytes);
+
+            //Replace spaces
+            value = Regex.Replace(value, @"\s", "-", RegexOptions.Compiled);
+
+            //Remove invalid chars
+            value = Regex.Replace(value, @"[^a-z0-9\s-_]", "", RegexOptions.Compiled);
+
+            //Trim dashes from end
+            value = value.Trim('-', '_');
+
+            //Replace double occurences of - or _
+            value = Regex.Replace(value, @"([-_]){2,}", "$1", RegexOptions.Compiled);
+
+            return value;
+        }
+    }
+}

src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs

@@ -32,7 +32,7 @@ namespace NzbDrone.Core.DecisionEngine
 
         public List<DownloadDecision> GetRssDecision(List<ReleaseInfo> reports)
         {
-            return GetDecisions(reports).ToList();
+            return GetMovieDecisions(reports).ToList();
         }
 
         public List<DownloadDecision> GetSearchDecision(List<ReleaseInfo> reports, SearchCriteriaBase searchCriteriaBase)

src/NzbDrone.Core/Indexers/TorrentPotato/TorrentPotatoParser.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Net;
 using System.Text.RegularExpressions;
 using NzbDrone.Common.Http;
@@ -36,7 +37,7 @@ namespace NzbDrone.Core.Indexers.TorrentPotato
                 torrentInfo.Size = (long)torrent.size*1000*1000;
                 torrentInfo.DownloadUrl = torrent.download_url;
                 torrentInfo.InfoUrl = torrent.details_url;
-                torrentInfo.PublishDate = torrent.publishdate.ToUniversalTime();
+                torrentInfo.PublishDate = torrent.publish_date.ToUniversalTime();
                 torrentInfo.Seeders = torrent.seeders;
                 torrentInfo.Peers = torrent.leechers + torrent.seeders;
                 torrentInfo.Freeleech = torrent.freeleech;

src/NzbDrone.Core/Indexers/TorrentPotato/TorrentPotatoResponse.cs

@@ -21,7 +21,7 @@ namespace NzbDrone.Core.Indexers.TorrentPotato
         public int size { get; set; }
         public int leechers { get; set; }
         public int seeders { get; set; }
-        public DateTime publishdate { get; set; }
+        public DateTime publish_date { get; set; }
     }
 
 }

src/NzbDrone.Core/Indexers/Torznab/TorznabRssParser.cs

@@ -39,7 +39,13 @@ namespace NzbDrone.Core.Indexers.Torznab
         protected override ReleaseInfo ProcessItem(XElement item, ReleaseInfo releaseInfo)
         {
             var torrentInfo = base.ProcessItem(item, releaseInfo) as TorrentInfo;
-            torrentInfo.ImdbId = int.Parse(GetImdbId(item).Substring(2));
+            if (GetImdbId(item) != null)
+            {
+                if (torrentInfo != null)
+                {
+                    torrentInfo.ImdbId = int.Parse(GetImdbId(item).Substring(2));
+                }
+            }
             return torrentInfo;
         }
 

src/NzbDrone.Core/Jobs/TaskManager.cs

@@ -66,7 +66,7 @@ namespace NzbDrone.Core.Jobs
                     new ScheduledTask{ Interval = 6*60, TypeName = typeof(ApplicationUpdateCommand).FullName},
                     new ScheduledTask{ Interval = 3*60, TypeName = typeof(UpdateSceneMappingCommand).FullName},
                     new ScheduledTask{ Interval = 6*60, TypeName = typeof(CheckHealthCommand).FullName},
-                    new ScheduledTask{ Interval = 12*60, TypeName = typeof(RefreshSeriesCommand).FullName},
+                    new ScheduledTask{ Interval = 24*60, TypeName = typeof(RefreshMovieCommand).FullName},
                     new ScheduledTask{ Interval = 24*60, TypeName = typeof(HousekeepingCommand).FullName},
                     new ScheduledTask{ Interval = 7*24*60, TypeName = typeof(BackupCommand).FullName},
 

src/NzbDrone.Core/MediaFiles/FileDateType.cs

@@ -3,7 +3,7 @@
     public enum FileDateType
     {
         None = 0,
-        LocalAirDate = 1,
-        UtcAirDate = 2
+        Cinemas = 1,
+        Release = 2
     }
 }

src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoModel.cs

@@ -48,7 +48,11 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
                     return AudioChannelPositionsText.ContainsIgnoreCase("LFE") ? AudioChannels - 1 + 0.1m : AudioChannels;
                 }
 
-                return AudioChannelPositions.Split('/').Sum(s => decimal.Parse(s, CultureInfo.InvariantCulture));
+                decimal channels = 0;
+
+                decimal.TryParse(AudioChannelPositions.Split('/').First(), out channels);
+
+                return channels;
             }
         }
     }

src/NzbDrone.Core/MediaFiles/UpdateEpisodeFileService.cs

@@ -49,7 +49,7 @@ namespace NzbDrone.Core.MediaFiles
 
             switch (_configService.FileDate)
             {
-                case FileDateType.LocalAirDate:
+                case FileDateType.Release:
                     {
                         var airDate = episodes.First().AirDate;
                         var airTime = series.AirTime;
@@ -62,7 +62,7 @@ namespace NzbDrone.Core.MediaFiles
                         return ChangeFileDateToLocalAirDate(episodeFilePath, airDate, airTime);
                     }
 
-                case FileDateType.UtcAirDate:
+                case FileDateType.Cinemas:
                     {
                         var airDateUtc = episodes.First().AirDateUtc;
 

src/NzbDrone.Core/MediaFiles/UpdateMovieFileService.cs

@@ -20,7 +20,7 @@ namespace NzbDrone.Core.MediaFiles
     }
 
     public class UpdateMovieFileService : IUpdateMovieFileService,
-                                            IHandle<SeriesScannedEvent>
+                                            IHandle<MovieScannedEvent>
     {
         private readonly IDiskProvider _diskProvider;
         private readonly IConfigService _configService;
@@ -47,10 +47,60 @@ namespace NzbDrone.Core.MediaFiles
         {
             var movieFilePath = Path.Combine(movie.Path, movieFile.RelativePath);
 
+            switch (_configService.FileDate)
+            {
+                case FileDateType.Release:
+                    {
+                        var airDate = movie.PhysicalRelease;
+
+                        if (airDate == null)
+                        {
+                            return false;
+                        }
+
+                        return ChangeFileDate(movieFilePath, airDate.Value);
+                    }
+
+                case FileDateType.Cinemas:
+                    {
+                        var airDate = movie.InCinemas;
+
+                        if (airDate == null)
+                        {
+                            return false;
+                        }
+
+                        return ChangeFileDate(movieFilePath, airDate.Value);
+                    }
+            }
+
             return false;
         }
 
-        public void Handle(SeriesScannedEvent message)
+        private bool ChangeFileDate(string filePath, DateTime date)
+        {
+            DateTime oldDateTime = _diskProvider.FileGetLastWrite(filePath);
+
+            if (!DateTime.Equals(date, oldDateTime))
+            {
+                try
+                {
+                    _diskProvider.FileSetLastWriteTime(filePath, date);
+                    _logger.Debug("Date of file [{0}] changed from '{1}' to '{2}'", filePath, oldDateTime, date);
+
+                    return true;
+                }
+
+                catch (Exception ex)
+                {
+                    _logger.Warn(ex, "Unable to set date of file [" + filePath + "]");
+                }
+            }
+
+            return false;
+        }
+
+        public void Handle(MovieScannedEvent message)
         {
             if (_configService.FileDate == FileDateType.None)
             {

src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs

@@ -89,9 +89,9 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
             movie.TmdbId = TmdbId;
             movie.ImdbId = resource.imdb_id;
             movie.Title = resource.title;
-            movie.TitleSlug = ToUrlSlug(movie.Title);
-            movie.CleanTitle = Parser.Parser.CleanSeriesTitle(movie.Title);
-            movie.SortTitle = Parser.Parser.NormalizeTitle(movie.Title);
+            movie.TitleSlug = ToUrlSlug(resource.title);
+            movie.CleanTitle = Parser.Parser.CleanSeriesTitle(resource.title);
+            movie.SortTitle = Parser.Parser.NormalizeTitle(resource.title);
             movie.Overview = resource.overview;
             movie.Website = resource.homepage;
             if (resource.release_date.IsNotNullOrWhiteSpace())
@@ -203,7 +203,9 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
         {
             var lowerTitle = title.ToLower();
 
-            var parserResult = Parser.Parser.ParseMovieTitle(title, true);
+            lowerTitle = lowerTitle.Replace(".", "");
+
+            var parserResult = Parser.Parser.ParseMovieTitle(title.Replace(".", ""), true);
 
             var yearTerm = "";
 

src/NzbDrone.Core/NzbDrone.Core.csproj

@@ -183,6 +183,7 @@
     <Compile Include="Datastore\Migration\002_remove_tvrage_imdb_unique_constraint.cs" />
     <Compile Include="Datastore\Migration\003_remove_clean_title_from_scene_mapping.cs" />
     <Compile Include="Datastore\Migration\004_updated_history.cs" />
+    <Compile Include="Datastore\Migration\121_update_filedate_config.cs" />
     <Compile Include="Datastore\Migration\120_add_studio_to_table.cs" />
     <Compile Include="Datastore\Migration\119_add_youtube_trailer_id_table .cs" />
     <Compile Include="Datastore\Migration\118_update_movie_slug.cs" />

src/NzbDrone.Core/Organizer/FileNameBuilder.cs

@@ -318,7 +318,7 @@ namespace NzbDrone.Core.Organizer
         {
             string result = name;
             string[] badCharacters = { "\\", "/", "<", ">", "?", "*", ":", "|", "\"" };
-            string[] goodCharacters = { "+", "+", "", "", "!", "-", "-", "", "" };
+            string[] goodCharacters = { "+", "+", "", "", "!", "-", "", "", "" };
 
             for (int i = 0; i < badCharacters.Length; i++)
             {

src/UI/AddMovies/AddMoviesView.js

@@ -9,178 +9,178 @@ var ErrorView = require('./ErrorView');
 var LoadingView = require('../Shared/LoadingView');
 
 module.exports = Marionette.Layout.extend({
-    template : 'AddMovies/AddMoviesViewTemplate',
+		template : 'AddMovies/AddMoviesViewTemplate',
 
-    regions : {
-        searchResult : '#search-result'
-    },
+		regions : {
+				searchResult : '#search-result'
+		},
 
-    ui : {
-        moviesSearch : '.x-movies-search',
-        searchBar    : '.x-search-bar',
-        loadMore     : '.x-load-more'
-    },
+		ui : {
+				moviesSearch : '.x-movies-search',
+				searchBar    : '.x-search-bar',
+				loadMore     : '.x-load-more'
+		},
 
-    events : {
-        'click .x-load-more' : '_onLoadMore'
-    },
+		events : {
+				'click .x-load-more' : '_onLoadMore'
+		},
 
-    initialize : function(options) {
-        console.log(options);
-        
-        this.isExisting = options.isExisting;
-        this.collection = new AddMoviesCollection();
+		initialize : function(options) {
+				console.log(options);
 
-        if (this.isExisting) {
-            this.collection.unmappedFolderModel = this.model;
-        }
+				this.isExisting = options.isExisting;
+				this.collection = new AddMoviesCollection();
 
-        if (this.isExisting) {
-            this.className = 'existing-movies';
-        } else {
-            this.className = 'new-movies';
-        }
+				if (this.isExisting) {
+						this.collection.unmappedFolderModel = this.model;
+				}
 
-        this.listenTo(vent, vent.Events.MoviesAdded, this._onMoviesAdded);
-        this.listenTo(this.collection, 'sync', this._showResults);
+				if (this.isExisting) {
+						this.className = 'existing-movies';
+				} else {
+						this.className = 'new-movies';
+				}
 
-        this.resultCollectionView = new SearchResultCollectionView({
-            collection : this.collection,
-            isExisting : this.isExisting
-        });
+				this.listenTo(vent, vent.Events.MoviesAdded, this._onMoviesAdded);
+				this.listenTo(this.collection, 'sync', this._showResults);
 
-        this.throttledSearch = _.debounce(this.search, 1000, { trailing : true }).bind(this);
-    },
+				this.resultCollectionView = new SearchResultCollectionView({
+						collection : this.collection,
+						isExisting : this.isExisting
+				});
 
-    onRender : function() {
-        var self = this;
+				this.throttledSearch = _.debounce(this.search, 1000, { trailing : true }).bind(this);
+		},
 
-        this.$el.addClass(this.className);
+		onRender : function() {
+				var self = this;
 
-        this.ui.moviesSearch.keyup(function(e) {
+				this.$el.addClass(this.className);
 
-            if (_.contains([
-                    9,
-                    16,
-                    17,
-                    18,
-                    19,
-                    20,
-                    33,
-                    34,
-                    35,
-                    36,
-                    37,
-                    38,
-                    39,
-                    40,
-                    91,
-                    92,
-                    93
-                ], e.keyCode)) {
-                return;
-            }
+				this.ui.moviesSearch.keyup(function(e) {
 
-            self._abortExistingSearch();
-            self.throttledSearch({
-                term : self.ui.moviesSearch.val()
-            });
-        });
+						if (_.contains([
+										9,
+										16,
+										17,
+										18,
+										19,
+										20,
+										33,
+										34,
+										35,
+										36,
+										37,
+										38,
+										39,
+										40,
+										91,
+										92,
+										93
+								], e.keyCode)) {
+								return;
+						}
 
-        this._clearResults();
+						self._abortExistingSearch();
+						self.throttledSearch({
+								term : self.ui.moviesSearch.val()
+						});
+				});
 
-        if (this.isExisting) {
-            this.ui.searchBar.hide();
-        }
-    },
+				this._clearResults();
 
-    onShow : function() {
-        this.ui.moviesSearch.focus();
-    },
+				if (this.isExisting) {
+						this.ui.searchBar.hide();
+				}
+		},
 
-    search : function(options) {
-        var self = this;
+		onShow : function() {
+				this.ui.moviesSearch.focus();
+		},
 
-        this.collection.reset();
+		search : function(options) {
+				var self = this;
 
-        if (!options.term || options.term === this.collection.term) {
-            return Marionette.$.Deferred().resolve();
-        }
+				this.collection.reset();
 
-        this.searchResult.show(new LoadingView());
-        this.collection.term = options.term;
-        this.currentSearchPromise = this.collection.fetch({
-            data : { term : options.term }
-        });
+				if (!options.term || options.term === this.collection.term) {
+						return Marionette.$.Deferred().resolve();
+				}
 
-        this.currentSearchPromise.fail(function() {
-            self._showError();
-        });
+				this.searchResult.show(new LoadingView());
+				this.collection.term = options.term;
+				this.currentSearchPromise = this.collection.fetch({
+						data : { term : options.term }
+				});
 
-        return this.currentSearchPromise;
-    },
+				this.currentSearchPromise.fail(function() {
+						self._showError();
+				});
 
-    _onMoviesAdded : function(options) {
-        if (this.isExisting && options.movie.get('path') === this.model.get('folder').path) {
-            this.close();
-        }
+				return this.currentSearchPromise;
+		},
 
-        else if (!this.isExisting) {
-            this.resultCollectionView.setExisting(options.movie.get('tmdbId'));
-            /*this.collection.term = '';
-            this.collection.reset();
-            this._clearResults();
-            this.ui.moviesSearch.val('');
-            this.ui.moviesSearch.focus();*/ //TODO: Maybe add option wheter to clear search result.
-        }
-    },
+		_onMoviesAdded : function(options) {
+				if (this.isExisting && options.movie.get('path') === this.model.get('folder').path) {
+						this.close();
+				}
 
-    _onLoadMore : function() {
-        var showingAll = this.resultCollectionView.showMore();
-        this.ui.searchBar.show();
+				else if (!this.isExisting) {
+						this.resultCollectionView.setExisting(options.movie.get('tmdbId'));
+						/*this.collection.term = '';
+						this.collection.reset();
+						this._clearResults();
+						this.ui.moviesSearch.val('');
+						this.ui.moviesSearch.focus();*/ //TODO: Maybe add option wheter to clear search result.
+				}
+		},
 
-        if (showingAll) {
-            this.ui.loadMore.hide();
-        }
-    },
+		_onLoadMore : function() {
+				var showingAll = this.resultCollectionView.showMore();
+				this.ui.searchBar.show();
 
-    _clearResults : function() {
+				if (showingAll) {
+						this.ui.loadMore.hide();
+				}
+		},
 
-        if (!this.isExisting) {
-            this.searchResult.show(new EmptyView());
-        } else {
-            this.searchResult.close();
-        }
-    },
+		_clearResults : function() {
 
-    _showResults : function() {
-        if (!this.isClosed) {
-            if (this.collection.length === 0) {
-                this.ui.searchBar.show();
-                this.searchResult.show(new NotFoundView({ term : this.collection.term }));
-            } else {
-                this.searchResult.show(this.resultCollectionView);
-                if (!this.showingAll && this.isExisting) {
-                    this.ui.loadMore.show();
-                }
-            }
-        }
-    },
+				if (!this.isExisting) {
+						this.searchResult.show(new EmptyView());
+				} else {
+						this.searchResult.close();
+				}
+		},
 
-    _abortExistingSearch : function() {
-        if (this.currentSearchPromise && this.currentSearchPromise.readyState > 0 && this.currentSearchPromise.readyState < 4) {
-            console.log('aborting previous pending search request.');
-            this.currentSearchPromise.abort();
-        } else {
-            this._clearResults();
-        }
-    },
+		_showResults : function() {
+				if (!this.isClosed) {
+						if (this.collection.length === 0) {
+								this.ui.searchBar.show();
+								this.searchResult.show(new NotFoundView({ term : this.collection.term }));
+						} else {
+								this.searchResult.show(this.resultCollectionView);
+								if (!this.showingAll) {
+										this.ui.loadMore.show();
+								}
+						}
+				}
+		},
 
-    _showError : function() {
-        if (!this.isClosed) {
-            this.ui.searchBar.show();
-            this.searchResult.show(new ErrorView({ term : this.collection.term }));
-            this.collection.term = '';
-        }
-    }
+		_abortExistingSearch : function() {
+				if (this.currentSearchPromise && this.currentSearchPromise.readyState > 0 && this.currentSearchPromise.readyState < 4) {
+						console.log('aborting previous pending search request.');
+						this.currentSearchPromise.abort();
+				} else {
+						this._clearResults();
+				}
+		},
+
+		_showError : function() {
+				if (!this.isClosed) {
+						this.ui.searchBar.show();
+						this.searchResult.show(new ErrorView({ term : this.collection.term }));
+						this.collection.term = '';
+				}
+		}
 });

src/UI/AddMovies/SearchResultCollectionView.js

@@ -4,59 +4,62 @@ var MoviesCollection = require('../Movies/MoviesCollection');
 var vent = require('vent');
 
 module.exports = Marionette.CollectionView.extend({
-    itemView : SearchResultView,
+		itemView : SearchResultView,
 
-    initialize : function(options) {
-        this.showExisting = true;
-        this.isExisting = options.isExisting;
-        this.showing = 1;
-        vent.on(vent.Commands.ShowExistingCommand, this._onExistingToggle.bind(this));
-    },
+		initialize : function(options) {
+				this.showExisting = true;
+				this.isExisting = options.isExisting;
+				this.showing = 5;
+				if (this.isExisting) {
+					this.showing = 1;
+				}
+				vent.on(vent.Commands.ShowExistingCommand, this._onExistingToggle.bind(this));
+		},
 
-    _onExistingToggle : function(data) {
-        this.showExisting = data.showExisting;
+		_onExistingToggle : function(data) {
+				this.showExisting = data.showExisting;
 
-        this.render();
-    },
+				this.render();
+		},
 
-    showAll : function() {
-        this.showingAll = true;
-        this.render();
-    },
+		showAll : function() {
+				this.showingAll = true;
+				this.render();
+		},
 
-    showMore : function() {
-        this.showing += 5;
-        this.render();
+		showMore : function() {
+				this.showing += 5;
+				this.render();
 
-        return this.showing >= this.collection.length;
-    },
+				return this.showing >= this.collection.length;
+		},
 
-    setExisting : function(tmdbid) {
-        var movies = this.collection.where({ tmdbId : tmdbid });
-        console.warn(movies);
-        //debugger;
-        if (movies.length > 0) {
-            this.children.findByModel(movies[0])._configureTemplateHelpers();
-            //this.children.findByModel(movies[0])._configureTemplateHelpers();
-            this.children.findByModel(movies[0]).render();
-            //this.templateHelpers.existing = existingMovies[0].toJSON();
-        }
-    },
+		setExisting : function(tmdbid) {
+				var movies = this.collection.where({ tmdbId : tmdbid });
+				console.warn(movies);
+				//debugger;
+				if (movies.length > 0) {
+						this.children.findByModel(movies[0])._configureTemplateHelpers();
+						//this.children.findByModel(movies[0])._configureTemplateHelpers();
+						this.children.findByModel(movies[0]).render();
+						//this.templateHelpers.existing = existingMovies[0].toJSON();
+				}
+		},
 
-    appendHtml : function(collectionView, itemView, index) {
-        var tmdbId = itemView.model.get('tmdbId');
-        var existingMovies = MoviesCollection.where({ tmdbId: tmdbId });
-        if(existingMovies.length > 0) {
-            if(this.showExisting) {
-                if (index < this.showing || index === 0) {
-                    collectionView.$el.append(itemView.el);
-                }
-            }
-        } else {
-            if (index < this.showing || index === 0) {
-                collectionView.$el.append(itemView.el);
-            }
-        }
-        
-    }
+		appendHtml : function(collectionView, itemView, index) {
+				var tmdbId = itemView.model.get('tmdbId');
+				var existingMovies = MoviesCollection.where({ tmdbId: tmdbId });
+				if(existingMovies.length > 0) {
+						if(this.showExisting) {
+								if (index < this.showing || index === 0) {
+										collectionView.$el.append(itemView.el);
+								}
+						}
+				} else {
+						if (index < this.showing || index === 0) {
+								collectionView.$el.append(itemView.el);
+						}
+				}
+
+		}
 });

src/UI/Movies/Details/MoviesDetailsLayout.js

@@ -109,7 +109,7 @@ module.exports = Marionette.Layout.extend({
             element : this.ui.rename,
             command : {
                 name         : 'renameMovieFiles',
-                movieId     : this.model.id,
+                movieId      : this.model.id,
                 seasonNumber : -1
             }
         });

src/UI/Movies/Editor/Organize/OrganizeFilesViewTemplate.hbs

@@ -11,9 +11,9 @@
 
         Are you sure you want to update all files in the {{numberOfMovies}} selected movies?
 
-        {{debug}}
+        
         <ul class="selected-series">
-            {{#each movie}}
+            {{#each movies}}
             <li>{{title}}</li>
             {{/each}}
         </ul>

src/UI/Navbar/NavbarLayoutTemplate.hbs

@@ -1,44 +1,44 @@
 <!-- Static navbar -->
 <div class="navbar navbar-nzbdrone" role="navigation">
-    <div class="container-fluid">
-        <div class="navbar-header">
-            <button type="button" class="navbar-toggle navbar-inverse" data-toggle="collapse" data-target=".navbar-collapse">
-                <span class="sr-only">Toggle navigation</span>
-                <span class="icon-sonarr-navbar-collapsed fa-lg"></span>
-            </button>
-            <a class="navbar-brand" href="{{UrlBase}}/">
-                <!--<img src="{{UrlBase}}/Content/Images/logo.png?v=2" alt="Radarr">-->
-                <img src="{{UrlBase}}/Content/Images/logos/128.png" class="visible-lg"/>
-                <img src="{{UrlBase}}/Content/Images/logos/64.png" class="visible-md visible-sm"/>
-                <span class="visible-xs">
-                    <img src="{{UrlBase}}/Content/Images/logos/32.png"/>
-                    <span class="logo-text">Radarr</span>
-                </span>
+		<div class="container-fluid">
+				<div class="navbar-header">
+						<button type="button" class="navbar-toggle navbar-inverse" data-toggle="collapse" data-target=".navbar-collapse">
+								<span class="sr-only">Toggle navigation</span>
+								<span class="icon-sonarr-navbar-collapsed fa-lg"></span>
+						</button>
+						<a class="navbar-brand" href="{{UrlBase}}/">
+								<!--<img src="{{UrlBase}}/Content/Images/logo.png?v=2" alt="Radarr">-->
+								<img src="{{UrlBase}}/Content/Images/logos/128.png" class="visible-lg"/>
+								<img src="{{UrlBase}}/Content/Images/logos/64.png" class="visible-md visible-sm"/>
+								<span class="visible-xs">
+										<img src="{{UrlBase}}/Content/Images/logos/32.png"/>
+										<span class="logo-text">Radarr</span>
+								</span>
 
-            </a>
-        </div>
-        <div class="navbar-collapse collapse x-navbar-collapse">
-            <ul class="nav navbar-nav">
-                <li><a href="{{UrlBase}}/" class="x-series-nav"><i class="icon-sonarr-navbar-icon icon-sonarr-navbar-series"></i> Movies</a></li>
-                <li><a href="{{UrlBase}}/calendar" class="x-calendar-nav"><i class="icon-sonarr-navbar-icon icon-sonarr-navbar-calendar"></i> Calendar</a></li>
-                <li><a href="{{UrlBase}}/activity" class="x-activity-nav"><i class="icon-sonarr-navbar-icon icon-sonarr-navbar-activity"></i> Activity<span id="x-queue-count" class="navbar-info"></span></a></li>
-                <li><a href="{{UrlBase}}/wanted" class="x-wanted-nav"><i class="icon-sonarr-navbar-icon icon-sonarr-navbar-wanted"></i> Wanted</a></li>
-                <li><a href="{{UrlBase}}/settings" class="x-settings-nav"><i class="icon-sonarr-navbar-icon icon-sonarr-navbar-settings"></i> Settings</a></li>
-                <li><a href="{{UrlBase}}/system" class="x-system-nav"><i class="icon-sonarr-navbar-icon icon-sonarr-navbar-system"></i> System<span id="x-health" class="navbar-info"></span></a></li>
-                <li><a href="https://sonarr.tv/donate" target="_blank"><i class="icon-sonarr-navbar-icon icon-sonarr-navbar-donate"></i> Donate</a></li>
-            </ul>
-            <ul class="nav navbar-nav navbar-right">
-                <li class="active screen-size"></li>
-            </ul>
-        </div><!--/.nav-collapse -->
-    </div><!--/.container-fluid -->
+						</a>
+				</div>
+				<div class="navbar-collapse collapse x-navbar-collapse">
+						<ul class="nav navbar-nav">
+								<li><a href="{{UrlBase}}/" class="x-series-nav"><i class="icon-sonarr-navbar-icon icon-sonarr-navbar-series"></i> Movies</a></li>
+								<li><a href="{{UrlBase}}/calendar" class="x-calendar-nav"><i class="icon-sonarr-navbar-icon icon-sonarr-navbar-calendar"></i> Calendar</a></li>
+								<li><a href="{{UrlBase}}/activity" class="x-activity-nav"><i class="icon-sonarr-navbar-icon icon-sonarr-navbar-activity"></i> Activity<span id="x-queue-count" class="navbar-info"></span></a></li>
+								<li><a href="{{UrlBase}}/wanted" class="x-wanted-nav"><i class="icon-sonarr-navbar-icon icon-sonarr-navbar-wanted"></i> Wanted</a></li>
+								<li><a href="{{UrlBase}}/settings" class="x-settings-nav"><i class="icon-sonarr-navbar-icon icon-sonarr-navbar-settings"></i> Settings</a></li>
+								<li><a href="{{UrlBase}}/system" class="x-system-nav"><i class="icon-sonarr-navbar-icon icon-sonarr-navbar-system"></i> System<span id="x-health" class="navbar-info"></span></a></li>
+								<li><a href="https://radarr.video/donate.html" target="_blank"><i class="icon-sonarr-navbar-icon icon-sonarr-navbar-donate"></i> Donate</a></li>
+						</ul>
+						<ul class="nav navbar-nav navbar-right">
+								<li class="active screen-size"></li>
+						</ul>
+				</div><!--/.nav-collapse -->
+		</div><!--/.container-fluid -->
 
-    <div class="col-md-12 search">
-        <div class="col-md-6 col-md-offset-3">
-            <div class="input-group">
-                <span class="input-group-addon"><i class="fa fa-search"></i></span>
-                <input type="text" class="col-md-6 form-control x-series-search" placeholder="Search the movies in your library">
-            </div>
-        </div>
-    </div>
+		<div class="col-md-12 search">
+				<div class="col-md-6 col-md-offset-3">
+						<div class="input-group">
+								<span class="input-group-addon"><i class="fa fa-search"></i></span>
+								<input type="text" class="col-md-6 form-control x-series-search" placeholder="Search the movies in your library">
+						</div>
+				</div>
+		</div>
 </div>

src/UI/Rename/RenamePreviewCollection.js

@@ -1,43 +1,8 @@
-// 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');
 
 module.exports = Backbone.Collection.extend({
-    url   : window.NzbDrone.ApiRoot + '/rename',
+    url   : window.NzbDrone.ApiRoot + '/renameMovie',
     model : RenamePreviewModel,
 
     originalFetch : Backbone.Collection.prototype.fetch,

src/UI/Rename/RenamePreviewFormatView.js

@@ -6,10 +6,10 @@ module.exports = Marionette.ItemView.extend({
     template : 'Rename/RenamePreviewFormatViewTemplate',
 
     templateHelpers : function() {
-        var type = this.model.get('seriesType');
+        //var type = this.model.get('seriesType');
         return {
             rename : this.naming.get('renameEpisodes'),
-            format : this.naming.get(type + 'EpisodeFormat')
+            format : this.naming.get('standardMovieFormat')
         };
     },
 

src/UI/Settings/MediaManagement/FileManagement/FileManagementViewTemplate.hbs

@@ -1,98 +1,98 @@
 <fieldset>
-    <legend>File Management</legend>
+		<legend>File Management</legend>
 
-    <div class="form-group">
-        <label class="col-sm-3 control-label">Ignore Deleted Movies</label>
+		<div class="form-group">
+				<label class="col-sm-3 control-label">Ignore Deleted Movies</label>
 
-        <div class="col-sm-9">
-            <div class="input-group">
-                <label class="checkbox toggle well">
-                    <input type="checkbox" name="autoUnmonitorPreviouslyDownloadedEpisodes"/>
-                    <p>
-                        <span>Yes</span>
-                        <span>No</span>
-                    </p>
+				<div class="col-sm-9">
+						<div class="input-group">
+								<label class="checkbox toggle well">
+										<input type="checkbox" name="autoUnmonitorPreviouslyDownloadedEpisodes"/>
+										<p>
+												<span>Yes</span>
+												<span>No</span>
+										</p>
 
-                    <div class="btn btn-primary slide-button"/>
-                </label>
+										<div class="btn btn-primary slide-button"/>
+								</label>
 
-                <span class="help-inline-checkbox">
-                    <i class="icon-sonarr-form-info" title="Movies deleted from disk are automatically unmonitored in Radarr"/>
-                </span>
-            </div>
-        </div>
-    </div>
+								<span class="help-inline-checkbox">
+										<i class="icon-sonarr-form-info" title="Movies deleted from disk are automatically unmonitored in Radarr"/>
+								</span>
+						</div>
+				</div>
+		</div>
 
-    <div class="form-group advanced-setting">
-        <label class="col-sm-3 control-label">Download Propers</label>
+		<div class="form-group advanced-setting">
+				<label class="col-sm-3 control-label">Download Propers</label>
 
-        <div class="col-sm-9">
-            <div class="input-group">
-                <label class="checkbox toggle well">
-                    <input type="checkbox" name="autoDownloadPropers"/>
-                    <p>
-                        <span>Yes</span>
-                        <span>No</span>
-                    </p>
+				<div class="col-sm-9">
+						<div class="input-group">
+								<label class="checkbox toggle well">
+										<input type="checkbox" name="autoDownloadPropers"/>
+										<p>
+												<span>Yes</span>
+												<span>No</span>
+										</p>
 
-                    <div class="btn btn-primary slide-button"/>
-                </label>
+										<div class="btn btn-primary slide-button"/>
+								</label>
 
-                <span class="help-inline-checkbox">
-                    <i class="icon-sonarr-form-info" title="Should Radarr automatically upgrade to propers when available?"/>
-                </span>
-            </div>
-        </div>
-    </div>
+								<span class="help-inline-checkbox">
+										<i class="icon-sonarr-form-info" title="Should Radarr automatically upgrade to propers when available?"/>
+								</span>
+						</div>
+				</div>
+		</div>
 
-    <div class="form-group advanced-setting">
-        <label class="col-sm-3 control-label">Analyse video files</label>
+		<div class="form-group advanced-setting">
+				<label class="col-sm-3 control-label">Analyse video files</label>
 
-        <div class="col-sm-9">
-            <div class="input-group">
-                <label class="checkbox toggle well">
-                    <input type="checkbox" name="enableMediaInfo"/>
-                    <p>
-                        <span>Yes</span>
-                        <span>No</span>
-                    </p>
+				<div class="col-sm-9">
+						<div class="input-group">
+								<label class="checkbox toggle well">
+										<input type="checkbox" name="enableMediaInfo"/>
+										<p>
+												<span>Yes</span>
+												<span>No</span>
+										</p>
 
-                    <div class="btn btn-primary slide-button"/>
-                </label>
+										<div class="btn btn-primary slide-button"/>
+								</label>
 
-                <span class="help-inline-checkbox">
-                    <i class="icon-sonarr-form-info" title="Extract video information such as resolution, runtime and codec information from files. This requires Radarr to read parts of the file which may cause high disk or network activity during scans."/>
-                </span>
-            </div>
-        </div>
-    </div>
+								<span class="help-inline-checkbox">
+										<i class="icon-sonarr-form-info" title="Extract video information such as resolution, runtime and codec information from files. This requires Radarr to read parts of the file which may cause high disk or network activity during scans."/>
+								</span>
+						</div>
+				</div>
+		</div>
 
-    <div class="form-group advanced-setting">
-        <label class="col-sm-3 control-label">Change File Date</label>
+		<div class="form-group advanced-setting">
+				<label class="col-sm-3 control-label">Change File Date</label>
 
-        <div class="col-sm-1 col-sm-push-2 help-inline">
-            <i class="icon-sonarr-form-info" title="Change file date on import/rescan"/>
-        </div>
-        
-        <div class="col-sm-2 col-sm-pull-1">
-            <select class="form-control" name="fileDate">
-                <option value="none">None</option>
-                <option value="localAirDate">Local Air Date</option>
-                <option value="utcAirDate">UTC Air Date</option>
-            </select>
-        </div>
-    </div>
+				<div class="col-sm-1 col-sm-push-2 help-inline">
+						<i class="icon-sonarr-form-info" title="Change file date on import/rescan"/>
+				</div>
 
-    <div class="form-group">
-        <label class="col-sm-3 control-label">Recycling Bin</label>
+				<div class="col-sm-2 col-sm-pull-1">
+						<select class="form-control" name="fileDate">
+								<option value="none">None</option>
+								<option value="cinemas">In Cinemas Date</option>
+								<option value="release">Physical Release Date</option>
+						</select>
+				</div>
+		</div>
 
-        <div class="col-sm-1 col-sm-push-8 help-inline">
-            <i class="icon-sonarr-form-info" title="Episode files will go here when deleted instead of being permanently deleted"/>
-        </div>
+		<div class="form-group">
+				<label class="col-sm-3 control-label">Recycling Bin</label>
 
-        <div class="col-sm-8 col-sm-pull-1">
-            <input type="text" name="recycleBin" class="form-control x-path"/>
-        </div>
+				<div class="col-sm-1 col-sm-push-8 help-inline">
+						<i class="icon-sonarr-form-info" title="Episode files will go here when deleted instead of being permanently deleted"/>
+				</div>
 
-    </div>
+				<div class="col-sm-8 col-sm-pull-1">
+						<input type="text" name="recycleBin" class="form-control x-path"/>
+				</div>
+
+		</div>
 </fieldset>

src/UI/System/Info/MoreInfo/MoreInfoViewTemplate.hbs

@@ -1,32 +1,32 @@
 <fieldset>
-    <legend>More Info</legend>
+		<legend>More Info</legend>
 
-    <dl class="dl-horizontal info">
-        <dt>Discord</dt>
-        <dd><a href="https://discord.gg/AD3UP37">Radarr on Discord</a>
+		<dl class="dl-horizontal info">
+				<dt>Discord</dt>
+				<dd><a href="https://discord.gg/AD3UP37">Radarr on Discord</a>
 
-        <dt>Reddit</dt>
-        <dd><a href="https://www.reddit.com/r/radarr/">Radarr Subreddit</a>
-        {{!--<dt>Home page</dt>
-        <dd><a href="https://radarr.tdb/">radarr.tdb</a></dd>
+				<dt>Reddit</dt>
+				<dd><a href="https://www.reddit.com/r/radarr/">Radarr Subreddit</a>
+				<dt>Home page</dt>
+				<dd><a href="https://radarr.video/">radarr.video</a></dd>
 
-        <dt>Wiki</dt>
-        <dd><a href="https://wiki.radarr.tdb/">wiki.radarr.tdb</a></dd>
+				{{!--<dt>Wiki</dt>
+				<dd><a href="https://wiki.radarr.tdb/">wiki.radarr.tdb</a></dd>
 
-        <dt>Forums</dt>
-        <dd><a href="https://forums.sonarr.tv/">forums.sonarr.tv</a></dd>
+				<dt>Forums</dt>
+				<dd><a href="https://forums.sonarr.tv/">forums.sonarr.tv</a></dd>
 
-        <dt>Twitter</dt>
-        <dd><a href="https://twitter.com/sonarrtv">@sonarrtv</a></dd>
+				<dt>Twitter</dt>
+				<dd><a href="https://twitter.com/sonarrtv">@sonarrtv</a></dd>
 
-        <dt>IRC</dt>
-        <dd><a href="irc://irc.freenode.net/#sonarr">#sonarr on Freenode</a> or (<a href="http://webchat.freenode.net/?channels=#sonarr">webchat</a>)</dd>--}}
+				<dt>IRC</dt>
+				<dd><a href="irc://irc.freenode.net/#sonarr">#sonarr on Freenode</a> or (<a href="http://webchat.freenode.net/?channels=#sonarr">webchat</a>)</dd>--}}
 
-        <dt>Source</dt>
-        <dd><a href="https://github.com/Radarr/Radarr">Radarr on Github</a></dd>
+				<dt>Source</dt>
+				<dd><a href="https://github.com/Radarr/Radarr">Radarr on Github</a></dd>
 
-        <dt>Feature Requests</dt>
-        <!--<dd><a href="https://forums.sonarr.tv/">forums.sonarr.tv</a></dd>-->
-        <dd><a href="https://github.com/Radarr/Radarr/issues">Github Issues</a></dd>
-    </dl>
+				<dt>Feature Requests</dt>
+				<!--<dd><a href="https://forums.sonarr.tv/">forums.sonarr.tv</a></dd>-->
+				<dd><a href="https://github.com/Radarr/Radarr/issues">Github Issues</a></dd>
+		</dl>
 </fieldset>

src/UI/Wanted/Missing/MissingLayout.js

@@ -206,8 +206,8 @@ module.exports = Marionette.Layout.extend({
         });
     },
     _searchMissing  : function() {
-        if (window.confirm('Are you sure you want to search for {0} missing episodes? '.format(this.collection.state.totalRecords) +
-                           'One API request to each indexer will be used for each episode. ' + 'This cannot be stopped once started.')) {
+        if (window.confirm('Are you sure you want to search for {0} missing movies? '.format(this.collection.state.totalRecords) +
+                           'One API request to each indexer will be used for each movie. ' + 'This cannot be stopped once started.')) {
             CommandController.Execute('missingEpisodeSearch', { name : 'missingEpisodeSearch' });
         }
     },
@@ -237,4 +237,4 @@ module.exports = Marionette.Layout.extend({
     _manualImport : function () {
         vent.trigger(vent.Commands.ShowManualImport);
     }
-});
+});