Now hidden files are ignored :). Fixes #166.

Problem with Avatar (2009) #168

appveyor.yml

@@ -35,4 +35,11 @@ artifacts:
 
 cache:
   - '%USERPROFILE%\.nuget\packages'
-  - node_modules
+  - node_modules
+
+only_commits:
+  files:
+    - src/
+    - osx/
+    - gulp/
+    - logo/

readme.md

@@ -2,7 +2,7 @@
 
 | Service  | Master                      | Develop                      |
 |----------|:---------------------------:|:----------------------------:|
-| AppVeyor | [![AppVeyor](https://img.shields.io/appveyor/ci/galli-leo/Radarr/master.svg?maxAge=60&style=flat-square)](https://ci.appveyor.com/project/galli-leo/Radarr) | [![AppVeyor](https://img.shields.io/appveyor/ci/galli-leo/Radarr/develop.svg?maxAge=60&style=flat-square)](https://ci.appveyor.com/project/galli-leo/Radarr) |
+| AppVeyor | [![AppVeyor](https://img.shields.io/appveyor/ci/galli-leo/Radarr/master.svg?maxAge=60&style=flat-square)](https://ci.appveyor.com/project/galli-leo/Radarr) | [![AppVeyor](https://img.shields.io/appveyor/ci/galli-leo/Radarr-usby1/develop.svg?maxAge=60&style=flat-square)](https://ci.appveyor.com/project/galli-leo/Radarr-usby1) |
 | Travis   | [![Travis](https://img.shields.io/travis/galli-leo/Radarr/master.svg?maxAge=60&style=flat-square)](https://travis-ci.org/galli-leo/Radarr) | [![Travis](https://img.shields.io/travis/galli-leo/Radarr/develop.svg?maxAge=60&style=flat-square)](https://travis-ci.org/galli-leo/Radarr) |
 
 This fork of Sonarr aims to turn it into something like Couchpotato.
@@ -26,6 +26,11 @@ This fork of Sonarr aims to turn it into something like Couchpotato.
 ## Download
 The latest precompiled binary versions can be found here: https://github.com/galli-leo/Radarr/releases.
 
+Docker containers from [linuxserver.io](https://linuxserver.io) can be found here.
+* [Radarr (x64)](https://hub.docker.com/r/linuxserver/radarr/) 
+* [Radarr (armhf)](https://hub.docker.com/r/lsioarmhf/radarr/) 
+* [Radarr (aarch64)](https://hub.docker.com/r/lsioarmhf/radarr-aarch64/) 
+
 For more up to date versions (but also sometimes broken), daily builds can be found here:
 * [OSX](https://leonardogalli.ch/radarr/builds/latest.php?os=osx)
 * [Windows](https://leonardogalli.ch/radarr/builds/latest.php?os=windows)

src/NzbDrone.Api/Config/NamingConfigModule.cs

@@ -34,11 +34,11 @@ namespace NzbDrone.Api.Config
             Get["/samples"] = x => GetExamples(this.Bind<NamingConfigResource>());
 
             SharedValidator.RuleFor(c => c.MultiEpisodeStyle).InclusiveBetween(0, 5);
-            SharedValidator.RuleFor(c => c.StandardEpisodeFormat).ValidEpisodeFormat();
+            /*SharedValidator.RuleFor(c => c.StandardEpisodeFormat).ValidEpisodeFormat();
             SharedValidator.RuleFor(c => c.DailyEpisodeFormat).ValidDailyEpisodeFormat();
             SharedValidator.RuleFor(c => c.AnimeEpisodeFormat).ValidAnimeEpisodeFormat();
             SharedValidator.RuleFor(c => c.SeriesFolderFormat).ValidSeriesFolderFormat();
-            SharedValidator.RuleFor(c => c.SeasonFolderFormat).ValidSeasonFolderFormat();
+            SharedValidator.RuleFor(c => c.SeasonFolderFormat).ValidSeasonFolderFormat();*/
             SharedValidator.RuleFor(c => c.StandardMovieFormat).ValidMovieFormat();
             SharedValidator.RuleFor(c => c.MovieFolderFormat).ValidMovieFolderFormat();
         }

src/NzbDrone.Api/Frontend/Mappers/BackupFileMapper.cs

@@ -25,7 +25,7 @@ namespace NzbDrone.Api.Frontend.Mappers
 
         public override bool CanHandle(string resourceUrl)
         {
-            return resourceUrl.StartsWith("/backup/") && resourceUrl.ContainsIgnoreCase("nzbdrone_backup_")  && resourceUrl.EndsWith(".zip");
+            return resourceUrl.StartsWith("/backup/") && resourceUrl.ContainsIgnoreCase("radarr_backup_")  && resourceUrl.EndsWith(".zip");
         }
     }
 }

src/NzbDrone.Api/Indexers/ReleaseResource.cs

@@ -97,7 +97,7 @@ namespace NzbDrone.Api.Indexers
                 {
                     Guid = releaseInfo.Guid,
                     Quality = parsedMovieInfo.Quality,
-                    //QualityWeight
+                    QualityWeight = parsedMovieInfo.Quality.Quality.Id, //Id kinda hacky for wheight, but what you gonna do? TODO: Fix this shit!
                     Age = releaseInfo.Age,
                     AgeHours = releaseInfo.AgeHours,
                     AgeMinutes = releaseInfo.AgeMinutes,
@@ -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,
                 };
             }
 

src/NzbDrone.Api/Movies/MovieEditorModule.cs

@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+using System.Linq;
+using Nancy;
+using NzbDrone.Api.Extensions;
+using NzbDrone.Core.Tv;
+
+namespace NzbDrone.Api.Movie
+{
+    public class MovieEditorModule : NzbDroneApiModule
+    {
+        private readonly IMovieService _movieService;
+
+        public MovieEditorModule(IMovieService movieService)
+            : base("/movie/editor")
+        {
+            _movieService = movieService;
+            Put["/"] = Movie => SaveAll();
+        }
+
+        private Response SaveAll()
+        {
+            var resources = Request.Body.FromJson<List<MovieResource>>();
+
+            var Movie = resources.Select(MovieResource => MovieResource.ToModel(_movieService.GetMovie(MovieResource.Id))).ToList();
+
+            return _movieService.UpdateMovie(Movie)
+                                 .ToResource()
+                                 .AsResponse(HttpStatusCode.Accepted);
+        }
+    }
+}

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
+    {
+    }
+}

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<RenameMovieResource>
+    {
+        private readonly IRenameMovieFileService _renameMovieFileService;
+
+        public RenameMovieModule(IRenameMovieFileService renameMovieFileService)
+            : base("rename")
+        {
+            _renameMovieFileService = renameMovieFileService;
+
+            GetResourceAll = GetMovies; //TODO: GetResourceSingle?
+        }
+
+        private List<RenameMovieResource> GetMovies()
+        {
+            if(!Request.Query.MovieId.HasValue)
+            {
+                throw new BadRequestException("movieId is missing");
+            }
+
+            var movieId = (int)Request.Query.MovieId;
+
+            return _renameMovieFileService.GetRenamePreviews(movieId).ToResource();
+        }
+
+    }
+}

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<RenameMovieResource> ToResource(this IEnumerable<Core.MediaFiles.RenameMovieFilePreview> models)
+        {
+            return models.Select(ToResource).ToList();
+        }
+    }
+}

src/NzbDrone.Api/NzbDrone.Api.csproj

@@ -116,6 +116,10 @@
     <Compile Include="Frontend\Mappers\RobotsTxtMapper.cs" />
     <Compile Include="Indexers\ReleaseModuleBase.cs" />
     <Compile Include="Indexers\ReleasePushModule.cs" />
+    <Compile Include="Movies\MovieModule.cs" />
+    <Compile Include="Movies\RenameMovieModule.cs" />
+    <Compile Include="Movies\RenameMovieResource.cs" />
+    <Compile Include="Movies\MovieEditorModule.cs" />
     <Compile Include="Parse\ParseModule.cs" />
     <Compile Include="Parse\ParseResource.cs" />
     <Compile Include="ManualImport\ManualImportModule.cs" />
@@ -228,6 +232,7 @@
     <Compile Include="RootFolders\RootFolderResource.cs" />
     <Compile Include="SeasonPass\SeasonPassResource.cs" />
     <Compile Include="Series\AlternateTitleResource.cs" />
+    <Compile Include="Series\MovieFileResource.cs" />
     <Compile Include="Series\SeasonResource.cs" />
     <Compile Include="SeasonPass\SeasonPassModule.cs" />
     <Compile Include="Series\SeriesEditorModule.cs" />

src/NzbDrone.Api/Series/MovieFileResource.cs

@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NzbDrone.Api.REST;
+using NzbDrone.Core.MediaCover;
+using NzbDrone.Core.Tv;
+using NzbDrone.Core.Qualities;
+using NzbDrone.Api.Series;
+using NzbDrone.Core.MediaFiles;
+
+namespace NzbDrone.Api.Movie
+{
+    public class MovieFileResource : RestResource
+    {
+        public MovieFileResource()
+        {
+            
+        }
+
+        //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
+
+        public int MovieId { get; set; }
+        public string RelativePath { get; set; }
+        public string Path { get; set; }
+        public long Size { get; set; }
+        public DateTime DateAdded { get; set; }
+        public string SceneName { get; set; }
+        public string ReleaseGroup { get; set; }
+        public QualityModel Quality { get; set; }
+        public MovieResource Movie { get; set; }
+
+       
+
+        //TODO: Add series statistics as a property of the series (instead of individual properties)
+    }
+
+    public static class MovieFileResourceMapper
+    {
+        public static MovieFileResource ToResource(this MovieFile model)
+        {
+            if (model == null) return null;
+
+            MovieResource movie = null;
+
+            if (model.Movie != null)
+            {
+                model.Movie.LazyLoad();
+                if (model.Movie.Value != null)
+                {
+                    //movie = model.Movie.Value.ToResource();
+                }
+            }
+
+            return new MovieFileResource
+            {
+                Id = model.Id,
+                RelativePath = model.RelativePath,
+                Path = model.Path,
+                Size = model.Size,
+                DateAdded = model.DateAdded,
+                ReleaseGroup = model.ReleaseGroup,
+                Quality = model.Quality,
+                Movie = movie,
+                
+            };
+        }
+
+        public static MovieFile ToModel(this MovieFileResource resource)
+        {
+            if (resource == null) return null;
+
+            return new MovieFile
+            {
+                
+            };
+        }
+
+        public static List<MovieFileResource> ToResource(this IEnumerable<MovieFile> movies)
+        {
+            return movies.Select(ToResource).ToList();
+        }
+    }
+}

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<AlternateTitleResource> 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; }
@@ -54,6 +55,7 @@ namespace NzbDrone.Api.Movie
         public AddMovieOptions AddOptions { get; set; }
         public Ratings Ratings { get; set; }
         public List<string> AlternativeTitles { get; set; }
+        public MovieFileResource MovieFile { get; set; }
 
         //TODO: Add series statistics as a property of the series (instead of individual properties)
 
@@ -83,13 +85,20 @@ namespace NzbDrone.Api.Movie
 
             long size = 0;
             bool downloaded = false;
+            MovieFileResource movieFile = null;
+
+            
+            if(model.MovieFile != null)
+            {
+                model.MovieFile.LazyLoad();
+            }
 
             if (model.MovieFile != null && model.MovieFile.IsLoaded && model.MovieFile.Value != null)
             {
                 size = model.MovieFile.Value.Size;
                 downloaded = true;
+                movieFile = model.MovieFile.Value.ToResource();
             }
-            //long Size = model.MovieFile != null ? model.MovieFile.Value.Size : 0;
 
             return new MovieResource
             {
@@ -100,7 +109,7 @@ namespace NzbDrone.Api.Movie
                 SortTitle = model.SortTitle,
                 InCinemas = model.InCinemas,
                 PhysicalRelease = model.PhysicalRelease,
-              
+                HasFile = model.HasFile,
                 Downloaded = downloaded,
                 //TotalEpisodeCount
                 //EpisodeCount
@@ -134,7 +143,8 @@ namespace NzbDrone.Api.Movie
                 Added = model.Added,
                 AddOptions = model.AddOptions,
                 AlternativeTitles = model.AlternativeTitles,
-                Ratings = model.Ratings
+                Ratings = model.Ratings,
+                MovieFile = movieFile
             };
         }
 

src/NzbDrone.Core.Test/IndexerTests/FanzubTests/FanzubFixture.cs

@@ -1,51 +0,0 @@
-using System;
-using System.Linq;
-using FluentAssertions;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Indexers.Fanzub;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.IndexerTests.FanzubTests
-{
-    [TestFixture]
-    public class FanzubFixture : CoreTest<Fanzub>
-    {
-        [SetUp]
-        public void Setup()
-        {
-            Subject.Definition = new IndexerDefinition()
-                {
-                    Name = "Fanzub",
-                    Settings = new FanzubSettings()
-                };
-        }
-
-        [Test]
-        public void should_parse_recent_feed_from_fanzub()
-        {
-            var recentFeed = ReadAllText(@"Files/Indexers/Fanzub/fanzub.xml");
-
-            Mocker.GetMock<IHttpClient>()
-                .Setup(o => o.Execute(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET)))
-                .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), recentFeed));
-            
-            var releases = Subject.FetchRecent();
-
-            releases.Should().HaveCount(3);
-
-            var releaseInfo = releases.First();
-
-            releaseInfo.Title.Should().Be("[Vivid] Hanayamata - 10 [A33D6606]");
-            releaseInfo.DownloadProtocol.Should().Be(DownloadProtocol.Usenet);
-            releaseInfo.DownloadUrl.Should().Be("http://fanzub.com/nzb/296464/Vivid%20Hanayamata%20-%2010.nzb");
-            releaseInfo.InfoUrl.Should().BeNullOrEmpty();
-            releaseInfo.CommentUrl.Should().BeNullOrEmpty();
-            releaseInfo.Indexer.Should().Be(Subject.Definition.Name);
-            releaseInfo.PublishDate.Should().Be(DateTime.Parse("2014/09/13 12:56:53"));
-            releaseInfo.Size.Should().Be(556246858);
-        }
-    }
-}

src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj

@@ -249,7 +249,6 @@
     <Compile Include="IndexerTests\NewznabTests\NewznabFixture.cs" />
     <Compile Include="IndexerTests\NewznabTests\NewznabRequestGeneratorFixture.cs" />
     <Compile Include="IndexerTests\NewznabTests\NewznabSettingFixture.cs" />
-    <Compile Include="IndexerTests\FanzubTests\FanzubFixture.cs" />
     <Compile Include="IndexerTests\OmgwtfnzbsTests\OmgwtfnzbsFixture.cs" />
     <Compile Include="IndexerTests\SeasonSearchFixture.cs" />
     <Compile Include="IndexerTests\TestIndexer.cs" />

src/NzbDrone.Core/Backup/BackupService.cs

@@ -33,7 +33,7 @@ namespace NzbDrone.Core.Backup
 
         private string _backupTempFolder;
 
-        private static readonly Regex BackupFileRegex = new Regex(@"nzbdrone_backup_[._0-9]+\.zip", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private static readonly Regex BackupFileRegex = new Regex(@"radarr_backup_[._0-9]+\.zip", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         public BackupService(IMainDatabase maindDb,
                              IDiskTransferService diskTransferService,
@@ -49,7 +49,7 @@ namespace NzbDrone.Core.Backup
             _archiveService = archiveService;
             _logger = logger;
 
-            _backupTempFolder = Path.Combine(_appFolderInfo.TempFolder, "nzbdrone_backup");
+            _backupTempFolder = Path.Combine(_appFolderInfo.TempFolder, "radarr_backup");
         }
 
         public void Backup(BackupType backupType)
@@ -59,7 +59,7 @@ namespace NzbDrone.Core.Backup
             _diskProvider.EnsureFolder(_backupTempFolder);
             _diskProvider.EnsureFolder(GetBackupFolder(backupType));
 
-            var backupFilename = string.Format("nzbdrone_backup_{0:yyyy.MM.dd_HH.mm.ss}.zip", DateTime.Now);
+            var backupFilename = string.Format("radarr_backup_{0:yyyy.MM.dd_HH.mm.ss}.zip", DateTime.Now);
             var backupPath = Path.Combine(GetBackupFolder(backupType), backupFilename);
 
             Cleanup();

src/NzbDrone.Core/Datastore/Migration/114_remove_fanzub.cs

@@ -0,0 +1,14 @@
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(114)]
+    public class remove_fanzub : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Delete.FromTable("Indexers").Row(new { Implementation = "Fanzub" });
+        }
+    }
+}

src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs

@@ -83,7 +83,7 @@ namespace NzbDrone.Core.DecisionEngine
                         {
                             if (parsedEpisodeInfo.Quality.HardcodedSubs.IsNotNullOrWhiteSpace())
                             {
-                                remoteEpisode.DownloadAllowed = true;
+                                remoteEpisode.DownloadAllowed = false;
                                 decision = new DownloadDecision(remoteEpisode, new Rejection("Hardcoded subs found: " + parsedEpisodeInfo.Quality.HardcodedSubs));
                             }
                             else
@@ -257,7 +257,7 @@ namespace NzbDrone.Core.DecisionEngine
             }
             catch (NotImplementedException e)
             {
-                _logger.Info("Spec " + spec.GetType().Name + " does not care about movies.");
+                _logger.Trace("Spec " + spec.GetType().Name + " does not care about movies.");
             }
             catch (Exception e)
             {
@@ -265,7 +265,6 @@ namespace NzbDrone.Core.DecisionEngine
                 e.Data.Add("parsed", remoteEpisode.ParsedEpisodeInfo.ToJson());
                 _logger.Error(e, "Couldn't evaluate decision on " + remoteEpisode.Release.Title + ", with spec: " + spec.GetType().Name);
                 return new Rejection(string.Format("{0}: {1}", spec.GetType().Name, e.Message));//TODO UPDATE SPECS!
-                return null;
             }
 
             return null;

src/NzbDrone.Core/DecisionEngine/Specifications/QueueSpecification.cs

@@ -60,7 +60,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
 
             foreach (var remoteEpisode in matchingSeries)
             {
-                _logger.Debug("Checking if existing release in queue meets cutoff. Queued quality is: {0}", remoteEpisode.ParsedEpisodeInfo.Quality);
+                _logger.Debug("Checking if existing release in queue meets cutoff. Queued quality is: {0}", remoteEpisode.ParsedMovieInfo.Quality);
 
                 if (!_qualityUpgradableSpecification.CutoffNotMet(subject.Movie.Profile, remoteEpisode.ParsedMovieInfo.Quality, subject.ParsedMovieInfo.Quality))
                 {

src/NzbDrone.Core/Download/Clients/Transmission/TransmissionBase.cs

@@ -165,6 +165,31 @@ namespace NzbDrone.Core.Download.Clients.Transmission
             return hash;
         }
 
+        protected override string AddFromMagnetLink(RemoteMovie remoteMovie, string hash, string magnetLink)
+        {
+            _proxy.AddTorrentFromUrl(magnetLink, GetDownloadDirectory(), Settings);
+            if (remoteMovie.Release.Age < 14 && Settings.RecentTvPriority == (int)TransmissionPriority.First ||
+                remoteMovie.Release.Age > 14 && Settings.OlderTvPriority == (int)TransmissionPriority.First)
+            {
+                _proxy.MoveTorrentToTopInQueue(hash, Settings);
+            }
+
+            return hash;
+        }
+
+        protected override string AddFromTorrentFile(RemoteMovie remoteMovie, string hash, string filename, byte[] fileContent)
+        {
+            _proxy.AddTorrentFromData(fileContent, GetDownloadDirectory(), Settings);
+
+            if (remoteMovie.Release.Age < 14 && Settings.RecentTvPriority == (int)TransmissionPriority.First ||
+                remoteMovie.Release.Age > 14 && Settings.OlderTvPriority == (int)TransmissionPriority.First)
+            {
+                _proxy.MoveTorrentToTopInQueue(hash, Settings);
+            }
+
+            return hash;
+        }
+
         protected override void Test(List<ValidationFailure> failures)
         {
             failures.AddIfNotNull(TestConnection());

src/NzbDrone.Core/Download/Clients/Transmission/TransmissionSettings.cs

@@ -56,10 +56,10 @@ namespace NzbDrone.Core.Download.Clients.Transmission
         [FieldDefinition(6, Label = "Directory", Type = FieldType.Textbox, Advanced = true, HelpText = "Optional location to put downloads in, leave blank to use the default Transmission location")]
         public string TvDirectory { get; set; }
 
-        [FieldDefinition(7, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(TransmissionPriority), HelpText = "Priority to use when grabbing episodes that aired within the last 14 days")]
+        [FieldDefinition(7, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(TransmissionPriority), HelpText = "Priority to use when grabbing movies that we're released within the last 14 days")]
         public int RecentTvPriority { get; set; }
 
-        [FieldDefinition(8, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(TransmissionPriority), HelpText = "Priority to use when grabbing episodes that aired over 14 days ago")]
+        [FieldDefinition(8, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(TransmissionPriority), HelpText = "Priority to use when grabbing movies that we're released over 14 days ago")]
         public int OlderTvPriority { get; set; }
 
         [FieldDefinition(9, Label = "Use SSL", Type = FieldType.Checkbox)]

src/NzbDrone.Core/Download/CompletedDownloadService.cs

@@ -94,7 +94,6 @@ namespace NzbDrone.Core.Download
                     return;
                 }
 
-
                 var series = _parsingService.GetSeries(trackedDownload.DownloadItem.Title);
 
                 if (series == null)
@@ -156,7 +155,7 @@ namespace NzbDrone.Core.Download
                     trackedDownload.Warn(statusMessages);
                 }
             }
-            else
+            else if (trackedDownload.RemoteEpisode.Series != null)
             {
                 var importResults = _downloadedEpisodesImportService.ProcessPath(outputPath, ImportMode.Auto, trackedDownload.RemoteEpisode.Series, trackedDownload.DownloadItem);
 

src/NzbDrone.Core/Download/DownloadFailedEvent.cs

@@ -13,6 +13,7 @@ namespace NzbDrone.Core.Download
         }
 
         public int SeriesId { get; set; }
+        public int MovieId { get; set; }
         public List<int> EpisodeIds { get; set; }
         public QualityModel Quality { get; set; }
         public string SourceTitle { get; set; }

src/NzbDrone.Core/Download/FailedDownloadService.cs

@@ -88,6 +88,7 @@ namespace NzbDrone.Core.Download
             var downloadFailedEvent = new DownloadFailedEvent
             {
                 SeriesId = historyItem.SeriesId,
+                MovieId = historyItem.MovieId,
                 EpisodeIds = historyItems.Select(h => h.EpisodeId).ToList(),
                 Quality = historyItem.Quality,
                 SourceTitle = historyItem.SourceTitle,

src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs

@@ -51,6 +51,12 @@ namespace NzbDrone.Core.Download
                         continue;
                     }
 
+                    if (report.Rejections.Any())
+                    {
+                        _logger.Debug("Rejecting release {0} because {1}", report.ToString(), report.Rejections.First().Reason);
+                        continue;
+                    }
+
                     if (remoteMovie == null || remoteMovie.Movie == null)
                     {
                         continue;

src/NzbDrone.Core/Download/RedownloadFailedDownloadService.cs

@@ -34,6 +34,15 @@ namespace NzbDrone.Core.Download
                 return;
             }
 
+            if (message.MovieId != 0)
+            {
+                _logger.Debug("Failed download contains a movie, searching again.");
+
+                _commandQueueManager.Push(new MoviesSearchCommand { MovieId = message.MovieId });
+
+                return;
+            }
+
             if (message.EpisodeIds.Count == 1)
             {
                 _logger.Debug("Failed download only contains one episode, searching again");

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;

src/NzbDrone.Core/Indexers/Fanzub/Fanzub.cs

@@ -1,30 +0,0 @@
-using NLog;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Parser;
-
-namespace NzbDrone.Core.Indexers.Fanzub
-{
-    public class Fanzub : HttpIndexerBase<FanzubSettings>
-    {
-        public override string Name => "Fanzub";
-
-        public override DownloadProtocol Protocol => DownloadProtocol.Usenet;
-
-        public Fanzub(IHttpClient httpClient, IIndexerStatusService indexerStatusService, IConfigService configService, IParsingService parsingService, Logger logger)
-            : base(httpClient, indexerStatusService, configService, parsingService, logger)
-        {
-
-        }
-
-        public override IIndexerRequestGenerator GetRequestGenerator()
-        {
-            return new FanzubRequestGenerator() { Settings = Settings };
-        }
-
-        public override IParseIndexerResponse GetParser()
-        {
-            return new RssParser() { UseEnclosureUrl = true, UseEnclosureLength = true };
-        }
-    }
-}

src/NzbDrone.Core/Indexers/Fanzub/FanzubRequestGenerator.cs

@@ -1,94 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using NzbDrone.Common.Extensions;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.IndexerSearch.Definitions;
-
-namespace NzbDrone.Core.Indexers.Fanzub
-{
-    public class FanzubRequestGenerator : IIndexerRequestGenerator
-    {
-        private static readonly Regex RemoveCharactersRegex = new Regex(@"[!?`]", RegexOptions.Compiled);
-
-        public FanzubSettings Settings { get; set; }
-        public int PageSize { get; set; }
-
-        public FanzubRequestGenerator()
-        {
-            PageSize = 100;
-        }
-
-        public virtual IndexerPageableRequestChain GetRecentRequests()
-        {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(null));
-
-            return pageableRequests;
-        }
-
-        public virtual IndexerPageableRequestChain GetSearchRequests(SingleEpisodeSearchCriteria searchCriteria)
-        {
-            return new IndexerPageableRequestChain();
-        }
-
-        public virtual IndexerPageableRequestChain GetSearchRequests(SeasonSearchCriteria searchCriteria)
-        {
-            return new IndexerPageableRequestChain();
-        }
-
-        public virtual IndexerPageableRequestChain GetSearchRequests(DailyEpisodeSearchCriteria searchCriteria)
-        {
-            return new IndexerPageableRequestChain();
-        }
-
-        public virtual IndexerPageableRequestChain GetSearchRequests(AnimeEpisodeSearchCriteria searchCriteria)
-        {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            var searchTitles = searchCriteria.QueryTitles.SelectMany(v => GetTitleSearchStrings(v, searchCriteria.AbsoluteEpisodeNumber)).ToList();
-
-            pageableRequests.Add(GetPagedRequests(string.Join("|", searchTitles)));
-
-            return pageableRequests;
-        }
-
-        public virtual IndexerPageableRequestChain GetSearchRequests(SpecialEpisodeSearchCriteria searchCriteria)
-        {
-            return new IndexerPageableRequestChain();
-        }
-
-        private IEnumerable<IndexerRequest> GetPagedRequests(string query)
-        {
-            var url = new StringBuilder();
-            url.AppendFormat("{0}?cat=anime&max={1}", Settings.BaseUrl, PageSize);
-
-            if (query.IsNotNullOrWhiteSpace())
-            {
-                url.AppendFormat("&q={0}", query);
-            }
-
-            yield return new IndexerRequest(url.ToString(), HttpAccept.Rss);
-        }
-
-        private IEnumerable<string> GetTitleSearchStrings(string title, int absoluteEpisodeNumber)
-        {
-            var formats = new[] { "{0}%20{1:00}", "{0}%20-%20{1:00}" };
-
-            return formats.Select(s => "\"" + string.Format(s, CleanTitle(title), absoluteEpisodeNumber) + "\"");
-        }
-
-        private string CleanTitle(string title)
-        {
-            return RemoveCharactersRegex.Replace(title, "");
-        }
-
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
-        {
-            return new IndexerPageableRequestChain();
-        }
-    }
-}

src/NzbDrone.Core/Indexers/Fanzub/FanzubSettings.cs

@@ -1,33 +0,0 @@
-using FluentValidation;
-using NzbDrone.Core.Annotations;
-using NzbDrone.Core.ThingiProvider;
-using NzbDrone.Core.Validation;
-
-namespace NzbDrone.Core.Indexers.Fanzub
-{
-    public class FanzubSettingsValidator : AbstractValidator<FanzubSettings>
-    {
-        public FanzubSettingsValidator()
-        {
-            RuleFor(c => c.BaseUrl).ValidRootUrl();
-        }
-    }
-
-    public class FanzubSettings : IProviderConfig
-    {
-        private static readonly FanzubSettingsValidator Validator = new FanzubSettingsValidator();
-
-        public FanzubSettings()
-        {
-            BaseUrl = "http://fanzub.com/rss/";
-        }
-
-        [FieldDefinition(0, Label = "Rss URL", HelpText = "Enter to URL to an Fanzub compatible RSS feed")]
-        public string BaseUrl { get; set; }
-
-        public NzbDroneValidationResult Validate()
-        {
-            return new NzbDroneValidationResult(Validator.Validate(this));
-        }
-    }
-}

src/NzbDrone.Core/Indexers/Newznab/Newznab.cs

@@ -106,8 +106,8 @@ namespace NzbDrone.Core.Indexers.Newznab
                 }
 
                 if (capabilities.SupportedTvSearchParameters != null &&
-                    new[] { "q", "imdb" }.Any(v => capabilities.SupportedMovieSearchParamters.Contains(v)) &&
-                    new[] { "imdbtitle", "imdbyear" }.All(v => capabilities.SupportedMovieSearchParamters.Contains(v)))
+                    new[] { "q", "imdbid" }.Any(v => capabilities.SupportedMovieSearchParameters.Contains(v)) &&
+                    new[] { "imdbtitle", "imdbyear" }.All(v => capabilities.SupportedMovieSearchParameters.Contains(v)))
                 {
                     return null;
                 }

src/NzbDrone.Core/Indexers/Newznab/NewznabCapabilities.cs

@@ -8,7 +8,7 @@ namespace NzbDrone.Core.Indexers.Newznab
         public int MaxPageSize { get; set; }
         public string[] SupportedSearchParameters { get; set; }
         public string[] SupportedTvSearchParameters { get; set; }
-        public string[] SupportedMovieSearchParamters { get; set; }
+        public string[] SupportedMovieSearchParameters { get; set; }
         public bool SupportsAggregateIdSearch { get; set; }
         public List<NewznabCategory> Categories { get; set; }
 
@@ -17,7 +17,7 @@ namespace NzbDrone.Core.Indexers.Newznab
             DefaultPageSize = 100;
             MaxPageSize = 100;
             SupportedSearchParameters = new[] { "q" };
-            SupportedMovieSearchParamters = new[] { "q", "imdb", "imdbtitle", "imdbyear" };
+            SupportedMovieSearchParameters = new[] { "q", "imdbid", "imdbtitle", "imdbyear" };
             SupportedTvSearchParameters = new[] { "q", "rid", "season", "ep" }; // This should remain 'rid' for older newznab installs.
             SupportsAggregateIdSearch = false;
             Categories = new List<NewznabCategory>();

src/NzbDrone.Core/Indexers/Newznab/NewznabCapabilitiesProvider.cs

@@ -102,11 +102,11 @@ namespace NzbDrone.Core.Indexers.Newznab
                 var xmlMovieSearch = xmlSearching.Element("movie-search");
                 if (xmlMovieSearch == null || xmlMovieSearch.Attribute("available").Value != "yes")
                 {
-                    capabilities.SupportedMovieSearchParamters = null;
+                    capabilities.SupportedMovieSearchParameters = null;
                 }
                 else if (xmlMovieSearch.Attribute("supportedParams") != null)
                 {
-                    capabilities.SupportedMovieSearchParamters = xmlMovieSearch.Attribute("supportedParams").Value.Split(',');
+                    capabilities.SupportedMovieSearchParameters = xmlMovieSearch.Attribute("supportedParams").Value.Split(',');
                     capabilities.SupportsAggregateIdSearch = true;
                 }
             }

src/NzbDrone.Core/Indexers/Newznab/NewznabRequestGenerator.cs

@@ -91,8 +91,8 @@ namespace NzbDrone.Core.Indexers.Newznab
             {
                 var capabilities = _capabilitiesProvider.GetCapabilities(Settings);
 
-                return capabilities.SupportedMovieSearchParamters != null &&
-                       capabilities.SupportedMovieSearchParamters.Contains("imdb");
+                return capabilities.SupportedMovieSearchParameters != null &&
+                       capabilities.SupportedMovieSearchParameters.Contains("imdbid");
             }
         }
 
@@ -112,7 +112,7 @@ namespace NzbDrone.Core.Indexers.Newznab
 
             var capabilities = _capabilitiesProvider.GetCapabilities(Settings);
 
-            if (capabilities.SupportedMovieSearchParamters != null)
+            if (capabilities.SupportedMovieSearchParameters != null)
             {
                 pageableRequests.Add(GetPagedRequests(MaxPages, Settings.Categories.Concat(Settings.AnimeCategories), "movie", ""));
             }
@@ -124,7 +124,7 @@ namespace NzbDrone.Core.Indexers.Newznab
         {
             var pageableRequests = new IndexerPageableRequestChain();
 
-            if(SupportsMovieSearch)
+            if (SupportsMovieSearch)
             {
                 pageableRequests.Add(GetPagedRequests(MaxPages, Settings.Categories, "movie",
                         string.Format("&imdbid={0}", searchCriteria.Movie.ImdbId.Substring(2)))); //strip off the "tt" - VERY HACKY

src/NzbDrone.Core/Indexers/Newznab/NewznabRssParser.cs

@@ -48,9 +48,7 @@ namespace NzbDrone.Core.Indexers.Newznab
         protected override ReleaseInfo ProcessItem(XElement item, ReleaseInfo releaseInfo)
         {
             releaseInfo = base.ProcessItem(item, releaseInfo);
-
-            releaseInfo.TvdbId = GetTvdbId(item);
-            releaseInfo.TvRageId = GetTvRageId(item);
+            releaseInfo.ImdbId = GetImdbId(item);
 
             return releaseInfo;
         }
@@ -114,27 +112,14 @@ namespace NzbDrone.Core.Indexers.Newznab
             return url;
         }
 
-        protected virtual int GetTvdbId(XElement item)
+        protected virtual int GetImdbId(XElement item)
         {
-            var tvdbIdString = TryGetNewznabAttribute(item, "tvdbid");
-            int tvdbId;
+            var imdbIdString = TryGetNewznabAttribute(item, "imdb");
+            int imdbId;
 
-            if (!tvdbIdString.IsNullOrWhiteSpace() && int.TryParse(tvdbIdString, out tvdbId))
+            if (!imdbIdString.IsNullOrWhiteSpace() && int.TryParse(imdbIdString, out imdbId))
             {
-                return tvdbId;
-            }
-
-            return 0;
-        }
-
-        protected virtual int GetTvRageId(XElement item)
-        {
-            var tvRageIdString = TryGetNewznabAttribute(item, "rageid");
-            int tvRageId;
-
-            if (!tvRageIdString.IsNullOrWhiteSpace() && int.TryParse(tvRageIdString, out tvRageId))
-            {
-                return tvRageId;
+                return imdbId;
             }
 
             return 0;

src/NzbDrone.Core/Indexers/Newznab/NewznabSettings.cs

@@ -60,7 +60,7 @@ namespace NzbDrone.Core.Indexers.Newznab
 
         public NewznabSettings()
         {
-            Categories = new[] { 2030, 2040, 2050 };
+            Categories = new[] { 2030, 2035, 2040, 2050 };
             AnimeCategories = Enumerable.Empty<int>();
         }
 

src/NzbDrone.Core/Indexers/Wombles/Wombles.cs

@@ -24,7 +24,7 @@ namespace NzbDrone.Core.Indexers.Wombles
 
         public override IIndexerRequestGenerator GetRequestGenerator()
         {
-            return new RssIndexerRequestGenerator("http://newshost.co.za/rss/?sec=TV&fr=false");
+            return new RssIndexerRequestGenerator("http://newshost.co.za/rss/?sec=Movies&fr=false");
         }
 
         public Wombles(IHttpClient httpClient, IIndexerStatusService indexerStatusService, IConfigService configService, IParsingService parsingService, Logger logger)

src/NzbDrone.Core/MediaFiles/Commands/DownloadedMovieScanCommand.cs

@@ -0,0 +1,17 @@
+using NzbDrone.Core.MediaFiles.EpisodeImport;
+using NzbDrone.Core.Messaging.Commands;
+
+namespace NzbDrone.Core.MediaFiles.Commands
+{
+    public class DownloadedMovieScanCommand : Command
+    {
+        public override bool SendUpdatesToClient => SendUpdates;
+
+        public bool SendUpdates { get; set; }
+
+        // Properties used by third-party apps, do not modify.
+        public string Path { get; set; }
+        public string DownloadClientId { get; set; }
+        public ImportMode ImportMode { get; set; }
+    }
+}

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

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 List<int> MovieIds { get; set; }
+
+        public override bool SendUpdatesToClient => true;
+
+        public RenameMovieCommand()
+        {
+        }
+    }
+}

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<int> Files { get; set; }
+
+        public override bool SendUpdatesToClient => true;
+
+        public RenameMovieFilesCommand()
+        {
+        }
+
+        public RenameMovieFilesCommand(int movieId, List<int> files)
+        {
+            MovieId = movieId;
+            Files = files;
+        }
+    }
+}

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));

src/NzbDrone.Core/MediaFiles/DownloadedMovieCommandService.cs

@@ -1,265 +1,107 @@
-using System.Collections.Generic;
+using NLog;
+using NzbDrone.Common.Disk;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Download.TrackedDownloads;
+using NzbDrone.Core.MediaFiles.Commands;
+using NzbDrone.Core.MediaFiles.EpisodeImport;
+using NzbDrone.Core.Messaging.Commands;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using NLog;
-using NzbDrone.Common.Disk;
-using NzbDrone.Core.DecisionEngine;
-using NzbDrone.Core.MediaFiles.EpisodeImport;
-using NzbDrone.Core.Parser;
-using NzbDrone.Core.Tv;
-using NzbDrone.Core.Download;
-using NzbDrone.Core.Parser.Model;
+using System.Text;
 
 namespace NzbDrone.Core.MediaFiles
 {
-    public interface IDownloadedMovieImportService
-    {
-        List<ImportResult> ProcessRootFolder(DirectoryInfo directoryInfo);
-        List<ImportResult> ProcessPath(string path, ImportMode importMode = ImportMode.Auto, Movie movie = null, DownloadClientItem downloadClientItem = null);
-        bool ShouldDeleteFolder(DirectoryInfo directoryInfo, Movie movie);
-    }
-
-    public class DownloadedMovieImportService : IDownloadedMovieImportService
+    public class DownloadedMovieCommandService : IExecute<DownloadedMovieScanCommand>
     {
+        private readonly IDownloadedMovieImportService _downloadedMovieImportService;
+        private readonly ITrackedDownloadService _trackedDownloadService;
         private readonly IDiskProvider _diskProvider;
-        private readonly IDiskScanService _diskScanService;
-        private readonly IMovieService _movieService;
-        private readonly IParsingService _parsingService;
-        private readonly IMakeImportDecision _importDecisionMaker;
-        private readonly IImportApprovedMovie _importApprovedMovie;
-        private readonly IDetectSample _detectSample;
+        private readonly IConfigService _configService;
         private readonly Logger _logger;
 
-        public DownloadedMovieImportService(IDiskProvider diskProvider,
-                                               IDiskScanService diskScanService,
-                                               IMovieService movieService,
-                                               IParsingService parsingService,
-                                               IMakeImportDecision importDecisionMaker,
-                                               IImportApprovedMovie importApprovedMovie,
-                                               IDetectSample detectSample,
-                                               Logger logger)
+        public DownloadedMovieCommandService(IDownloadedMovieImportService downloadedMovieImportService,
+                                                ITrackedDownloadService trackedDownloadService,
+                                                IDiskProvider diskProvider,
+                                                IConfigService configService,
+                                                Logger logger)
         {
+            _downloadedMovieImportService = downloadedMovieImportService;
+            _trackedDownloadService = trackedDownloadService;
             _diskProvider = diskProvider;
-            _diskScanService = diskScanService;
-            _movieService = movieService;
-            _parsingService = parsingService;
-            _importDecisionMaker = importDecisionMaker;
-            _importApprovedMovie = importApprovedMovie;
-            _detectSample = detectSample;
+            _configService = configService;
             _logger = logger;
         }
 
-        public List<ImportResult> ProcessRootFolder(DirectoryInfo directoryInfo)
+        private List<ImportResult> ProcessDroneFactoryFolder()
         {
-            var results = new List<ImportResult>();
+            var downloadedEpisodesFolder = _configService.DownloadedEpisodesFolder;
 
-            foreach (var subFolder in _diskProvider.GetDirectories(directoryInfo.FullName))
+            if (string.IsNullOrEmpty(downloadedEpisodesFolder))
             {
-                var folderResults = ProcessFolder(new DirectoryInfo(subFolder), ImportMode.Auto, null);
-                results.AddRange(folderResults);
-            }
-
-            foreach (var videoFile in _diskScanService.GetVideoFiles(directoryInfo.FullName, false))
-            {
-                var fileResults = ProcessFile(new FileInfo(videoFile), ImportMode.Auto, null);
-                results.AddRange(fileResults);
-            }
-
-            return results;
-        }
-
-        public List<ImportResult> ProcessPath(string path, ImportMode importMode = ImportMode.Auto, Movie movie = null, DownloadClientItem downloadClientItem = null)
-        {
-            if (_diskProvider.FolderExists(path))
-            {
-                var directoryInfo = new DirectoryInfo(path);
-
-                if (movie == null)
-                {
-                    return ProcessFolder(directoryInfo, importMode, downloadClientItem);
-                }
-
-                return ProcessFolder(directoryInfo, importMode, movie, downloadClientItem);
-            }
-
-            if (_diskProvider.FileExists(path))
-            {
-                var fileInfo = new FileInfo(path);
-
-                if (movie == null)
-                {
-                    return ProcessFile(fileInfo, importMode, downloadClientItem);
-                }
-
-                return ProcessFile(fileInfo, importMode, movie, downloadClientItem);
-            }
-
-            _logger.Error("Import failed, path does not exist or is not accessible by Sonarr: {0}", path);
-            return new List<ImportResult>();
-        }
-
-        public bool ShouldDeleteFolder(DirectoryInfo directoryInfo, Movie movie)
-        {
-            var videoFiles = _diskScanService.GetVideoFiles(directoryInfo.FullName);
-            var rarFiles = _diskProvider.GetFiles(directoryInfo.FullName, SearchOption.AllDirectories).Where(f => Path.GetExtension(f) == ".rar");
-
-            foreach (var videoFile in videoFiles)
-            {
-                var episodeParseResult = Parser.Parser.ParseTitle(Path.GetFileName(videoFile));
-
-                if (episodeParseResult == null)
-                {
-                    _logger.Warn("Unable to parse file on import: [{0}]", videoFile);
-                    return false;
-                }
-
-                var size = _diskProvider.GetFileSize(videoFile);
-                var quality = QualityParser.ParseQuality(videoFile);
-
-                if (!_detectSample.IsSample(movie, quality, videoFile, size, episodeParseResult.IsPossibleSpecialEpisode))
-                {
-                    _logger.Warn("Non-sample file detected: [{0}]", videoFile);
-                    return false;
-                }
-            }
-
-            if (rarFiles.Any(f => _diskProvider.GetFileSize(f) > 10.Megabytes()))
-            {
-                _logger.Warn("RAR file detected, will require manual cleanup");
-                return false;
-            }
-
-            return true;
-        }
-
-        private List<ImportResult> ProcessFolder(DirectoryInfo directoryInfo, ImportMode importMode, DownloadClientItem downloadClientItem)
-        {
-            var cleanedUpName = GetCleanedUpFolderName(directoryInfo.Name);
-            var movie = _parsingService.GetMovie(cleanedUpName);
-
-            if (movie == null)
-            {
-                _logger.Debug("Unknown Movie {0}", cleanedUpName);
-
-                return new List<ImportResult>
-                       {
-                           UnknownMovieResult("Unknown Movie")
-                       };
-            }
-
-            return ProcessFolder(directoryInfo, importMode, movie, downloadClientItem);
-        }
-
-        private List<ImportResult> ProcessFolder(DirectoryInfo directoryInfo, ImportMode importMode, Movie movie, DownloadClientItem downloadClientItem)
-        {
-            if (_movieService.MoviePathExists(directoryInfo.FullName))
-            {
-                _logger.Warn("Unable to process folder that is mapped to an existing show");
+                _logger.Trace("Drone Factory folder is not configured");
                 return new List<ImportResult>();
             }
 
-            var cleanedUpName = GetCleanedUpFolderName(directoryInfo.Name);
-            var folderInfo = Parser.Parser.ParseTitle(directoryInfo.Name);
-
-            if (folderInfo != null)
+            if (!_diskProvider.FolderExists(downloadedEpisodesFolder))
             {
-                _logger.Debug("{0} folder quality: {1}", cleanedUpName, folderInfo.Quality);
+                _logger.Warn("Drone Factory folder [{0}] doesn't exist.", downloadedEpisodesFolder);
+                return new List<ImportResult>();
             }
 
-            var videoFiles = _diskScanService.GetVideoFiles(directoryInfo.FullName);
+            return _downloadedMovieImportService.ProcessRootFolder(new DirectoryInfo(downloadedEpisodesFolder));
+        }
 
-            if (downloadClientItem == null)
+        private List<ImportResult> ProcessPath(DownloadedMovieScanCommand message)
+        {
+            if (!_diskProvider.FolderExists(message.Path) && !_diskProvider.FileExists(message.Path))
             {
-                foreach (var videoFile in videoFiles)
+                _logger.Warn("Folder/File specified for import scan [{0}] doesn't exist.", message.Path);
+                return new List<ImportResult>();
+            }
+
+            if (message.DownloadClientId.IsNotNullOrWhiteSpace())
+            {
+                var trackedDownload = _trackedDownloadService.Find(message.DownloadClientId);
+
+                if (trackedDownload != null)
                 {
-                    if (_diskProvider.IsFileLocked(videoFile))
-                    {
-                        return new List<ImportResult>
-                               {
-                                   FileIsLockedResult(videoFile)
-                               };
-                    }
+                    _logger.Debug("External directory scan request for known download {0}. [{1}]", message.DownloadClientId, message.Path);
+
+                    return _downloadedMovieImportService.ProcessPath(message.Path, message.ImportMode, trackedDownload.RemoteMovie.Movie, trackedDownload.DownloadItem);
+                }
+                else
+                {
+                    _logger.Warn("External directory scan request for unknown download {0}, attempting normal import. [{1}]", message.DownloadClientId, message.Path);
+
+                    return _downloadedMovieImportService.ProcessPath(message.Path, message.ImportMode);
                 }
             }
 
-            var decisions = _importDecisionMaker.GetImportDecisions(videoFiles.ToList(), movie, folderInfo, true);
-            var importResults = _importApprovedMovie.Import(decisions, true, downloadClientItem, importMode);
+            return _downloadedMovieImportService.ProcessPath(message.Path, message.ImportMode);
+        }
 
-            if ((downloadClientItem == null || !downloadClientItem.IsReadOnly) &&
-                importResults.Any(i => i.Result == ImportResultType.Imported) &&
-                ShouldDeleteFolder(directoryInfo, movie))
+        public void Execute(DownloadedMovieScanCommand message)
+        {
+            List<ImportResult> importResults;
+
+            if (message.Path.IsNotNullOrWhiteSpace())
             {
-                _logger.Debug("Deleting folder after importing valid files");
-                _diskProvider.DeleteFolder(directoryInfo.FullName, true);
+                importResults = ProcessPath(message);
+            }
+            else
+            {
+                importResults = ProcessDroneFactoryFolder();
             }
 
-            return importResults;
-        }
-
-        private List<ImportResult> ProcessFile(FileInfo fileInfo, ImportMode importMode, DownloadClientItem downloadClientItem)
-        {
-            var movie = _parsingService.GetMovie(Path.GetFileNameWithoutExtension(fileInfo.Name));
-
-            if (movie == null)
+            if (importResults == null || importResults.All(v => v.Result != ImportResultType.Imported))
             {
-                _logger.Debug("Unknown Movie for file: {0}", fileInfo.Name);
-
-                return new List<ImportResult>
-                       {
-                           UnknownMovieResult(string.Format("Unknown Movie for file: {0}", fileInfo.Name), fileInfo.FullName)
-                       };
+                // Atm we don't report it as a command failure, coz that would cause the download to be failed.
+                // Changing the message won't do a thing either, coz it will get set to 'Completed' a msec later.
+                //message.SetMessage("Failed to import");
             }
-
-            return ProcessFile(fileInfo, importMode, movie, downloadClientItem);
-        }
-
-        private List<ImportResult> ProcessFile(FileInfo fileInfo, ImportMode importMode, Movie movie, DownloadClientItem downloadClientItem)
-        {
-            if (Path.GetFileNameWithoutExtension(fileInfo.Name).StartsWith("._"))
-            {
-                _logger.Debug("[{0}] starts with '._', skipping", fileInfo.FullName);
-
-                return new List<ImportResult>
-                       {
-                           new ImportResult(new ImportDecision(new LocalEpisode { Path = fileInfo.FullName }, new Rejection("Invalid video file, filename starts with '._'")), "Invalid video file, filename starts with '._'")
-                       };
-            }
-
-            if (downloadClientItem == null)
-            {
-                if (_diskProvider.IsFileLocked(fileInfo.FullName))
-                {
-                    return new List<ImportResult>
-                           {
-                               FileIsLockedResult(fileInfo.FullName)
-                           };
-                }
-            }
-
-            var decisions = _importDecisionMaker.GetImportDecisions(new List<string>() { fileInfo.FullName }, movie, null, true);
-
-            return _importApprovedMovie.Import(decisions, true, downloadClientItem, importMode);
-        }
-
-        private string GetCleanedUpFolderName(string folder)
-        {
-            folder = folder.Replace("_UNPACK_", "")
-                           .Replace("_FAILED_", "");
-
-            return folder;
-        }
-
-        private ImportResult FileIsLockedResult(string videoFile)
-        {
-            _logger.Debug("[{0}] is currently locked by another process, skipping", videoFile);
-            return new ImportResult(new ImportDecision(new LocalEpisode { Path = videoFile }, new Rejection("Locked file, try again later")), "Locked file, try again later");
-        }
-
-        private ImportResult UnknownMovieResult(string message, string videoFile = null)
-        {
-            var localEpisode = videoFile == null ? null : new LocalEpisode { Path = videoFile };
-
-            return new ImportResult(new ImportDecision(localEpisode, new Rejection("Unknown Movie")), message);
         }
     }
 }

src/NzbDrone.Core/MediaFiles/DownloadedMovieImportService.cs

@@ -0,0 +1,266 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using NLog;
+using NzbDrone.Common.Disk;
+using NzbDrone.Core.DecisionEngine;
+using NzbDrone.Core.MediaFiles.EpisodeImport;
+using NzbDrone.Core.Parser;
+using NzbDrone.Core.Tv;
+using NzbDrone.Core.Download;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.MediaFiles.Commands;
+
+namespace NzbDrone.Core.MediaFiles
+{
+    public interface IDownloadedMovieImportService
+    {
+        List<ImportResult> ProcessRootFolder(DirectoryInfo directoryInfo);
+        List<ImportResult> ProcessPath(string path, ImportMode importMode = ImportMode.Auto, Movie movie = null, DownloadClientItem downloadClientItem = null);
+        bool ShouldDeleteFolder(DirectoryInfo directoryInfo, Movie movie);
+    }
+
+    public class DownloadedMovieImportService : IDownloadedMovieImportService
+    {
+        private readonly IDiskProvider _diskProvider;
+        private readonly IDiskScanService _diskScanService;
+        private readonly IMovieService _movieService;
+        private readonly IParsingService _parsingService;
+        private readonly IMakeImportDecision _importDecisionMaker;
+        private readonly IImportApprovedMovie _importApprovedMovie;
+        private readonly IDetectSample _detectSample;
+        private readonly Logger _logger;
+
+        public DownloadedMovieImportService(IDiskProvider diskProvider,
+                                               IDiskScanService diskScanService,
+                                               IMovieService movieService,
+                                               IParsingService parsingService,
+                                               IMakeImportDecision importDecisionMaker,
+                                               IImportApprovedMovie importApprovedMovie,
+                                               IDetectSample detectSample,
+                                               Logger logger)
+        {
+            _diskProvider = diskProvider;
+            _diskScanService = diskScanService;
+            _movieService = movieService;
+            _parsingService = parsingService;
+            _importDecisionMaker = importDecisionMaker;
+            _importApprovedMovie = importApprovedMovie;
+            _detectSample = detectSample;
+            _logger = logger;
+        }
+
+        public List<ImportResult> ProcessRootFolder(DirectoryInfo directoryInfo)
+        {
+            var results = new List<ImportResult>();
+
+            foreach (var subFolder in _diskProvider.GetDirectories(directoryInfo.FullName))
+            {
+                var folderResults = ProcessFolder(new DirectoryInfo(subFolder), ImportMode.Auto, null);
+                results.AddRange(folderResults);
+            }
+
+            foreach (var videoFile in _diskScanService.GetVideoFiles(directoryInfo.FullName, false))
+            {
+                var fileResults = ProcessFile(new FileInfo(videoFile), ImportMode.Auto, null);
+                results.AddRange(fileResults);
+            }
+
+            return results;
+        }
+
+        public List<ImportResult> ProcessPath(string path, ImportMode importMode = ImportMode.Auto, Movie movie = null, DownloadClientItem downloadClientItem = null)
+        {
+            if (_diskProvider.FolderExists(path))
+            {
+                var directoryInfo = new DirectoryInfo(path);
+
+                if (movie == null)
+                {
+                    return ProcessFolder(directoryInfo, importMode, downloadClientItem);
+                }
+
+                return ProcessFolder(directoryInfo, importMode, movie, downloadClientItem);
+            }
+
+            if (_diskProvider.FileExists(path))
+            {
+                var fileInfo = new FileInfo(path);
+
+                if (movie == null)
+                {
+                    return ProcessFile(fileInfo, importMode, downloadClientItem);
+                }
+
+                return ProcessFile(fileInfo, importMode, movie, downloadClientItem);
+            }
+
+            _logger.Error("Import failed, path does not exist or is not accessible by Radarr: {0}", path);
+            return new List<ImportResult>();
+        }
+
+        public bool ShouldDeleteFolder(DirectoryInfo directoryInfo, Movie movie)
+        {
+            var videoFiles = _diskScanService.GetVideoFiles(directoryInfo.FullName);
+            var rarFiles = _diskProvider.GetFiles(directoryInfo.FullName, SearchOption.AllDirectories).Where(f => Path.GetExtension(f) == ".rar");
+
+            foreach (var videoFile in videoFiles)
+            {
+                var episodeParseResult = Parser.Parser.ParseTitle(Path.GetFileName(videoFile));
+
+                if (episodeParseResult == null)
+                {
+                    _logger.Warn("Unable to parse file on import: [{0}]", videoFile);
+                    return false;
+                }
+
+                var size = _diskProvider.GetFileSize(videoFile);
+                var quality = QualityParser.ParseQuality(videoFile);
+
+                if (!_detectSample.IsSample(movie, quality, videoFile, size, episodeParseResult.IsPossibleSpecialEpisode))
+                {
+                    _logger.Warn("Non-sample file detected: [{0}]", videoFile);
+                    return false;
+                }
+            }
+
+            if (rarFiles.Any(f => _diskProvider.GetFileSize(f) > 10.Megabytes()))
+            {
+                _logger.Warn("RAR file detected, will require manual cleanup");
+                return false;
+            }
+
+            return true;
+        }
+
+        private List<ImportResult> ProcessFolder(DirectoryInfo directoryInfo, ImportMode importMode, DownloadClientItem downloadClientItem)
+        {
+            var cleanedUpName = GetCleanedUpFolderName(directoryInfo.Name);
+            var movie = _parsingService.GetMovie(cleanedUpName);
+
+            if (movie == null)
+            {
+                _logger.Debug("Unknown Movie {0}", cleanedUpName);
+
+                return new List<ImportResult>
+                       {
+                           UnknownMovieResult("Unknown Movie")
+                       };
+            }
+
+            return ProcessFolder(directoryInfo, importMode, movie, downloadClientItem);
+        }
+
+        private List<ImportResult> ProcessFolder(DirectoryInfo directoryInfo, ImportMode importMode, Movie movie, DownloadClientItem downloadClientItem)
+        {
+            if (_movieService.MoviePathExists(directoryInfo.FullName))
+            {
+                _logger.Warn("Unable to process folder that is mapped to an existing show");
+                return new List<ImportResult>();
+            }
+
+            var cleanedUpName = GetCleanedUpFolderName(directoryInfo.Name);
+            var folderInfo = Parser.Parser.ParseMovieTitle(directoryInfo.Name);
+
+            if (folderInfo != null)
+            {
+                _logger.Debug("{0} folder quality: {1}", cleanedUpName, folderInfo.Quality);
+            }
+
+            var videoFiles = _diskScanService.GetVideoFiles(directoryInfo.FullName);
+
+            if (downloadClientItem == null)
+            {
+                foreach (var videoFile in videoFiles)
+                {
+                    if (_diskProvider.IsFileLocked(videoFile))
+                    {
+                        return new List<ImportResult>
+                               {
+                                   FileIsLockedResult(videoFile)
+                               };
+                    }
+                }
+            }
+
+            var decisions = _importDecisionMaker.GetImportDecisions(videoFiles.ToList(), movie, folderInfo, true);
+            var importResults = _importApprovedMovie.Import(decisions, true, downloadClientItem, importMode);
+
+            if ((downloadClientItem == null || !downloadClientItem.IsReadOnly) &&
+                importResults.Any(i => i.Result == ImportResultType.Imported) &&
+                ShouldDeleteFolder(directoryInfo, movie))
+            {
+                _logger.Debug("Deleting folder after importing valid files");
+                _diskProvider.DeleteFolder(directoryInfo.FullName, true);
+            }
+
+            return importResults;
+        }
+
+        private List<ImportResult> ProcessFile(FileInfo fileInfo, ImportMode importMode, DownloadClientItem downloadClientItem)
+        {
+            var movie = _parsingService.GetMovie(Path.GetFileNameWithoutExtension(fileInfo.Name));
+
+            if (movie == null)
+            {
+                _logger.Debug("Unknown Movie for file: {0}", fileInfo.Name);
+
+                return new List<ImportResult>
+                       {
+                           UnknownMovieResult(string.Format("Unknown Movie for file: {0}", fileInfo.Name), fileInfo.FullName)
+                       };
+            }
+
+            return ProcessFile(fileInfo, importMode, movie, downloadClientItem);
+        }
+
+        private List<ImportResult> ProcessFile(FileInfo fileInfo, ImportMode importMode, Movie movie, DownloadClientItem downloadClientItem)
+        {
+            if (Path.GetFileNameWithoutExtension(fileInfo.Name).StartsWith("._"))
+            {
+                _logger.Debug("[{0}] starts with '._', skipping", fileInfo.FullName);
+
+                return new List<ImportResult>
+                       {
+                           new ImportResult(new ImportDecision(new LocalEpisode { Path = fileInfo.FullName }, new Rejection("Invalid video file, filename starts with '._'")), "Invalid video file, filename starts with '._'")
+                       };
+            }
+
+            if (downloadClientItem == null)
+            {
+                if (_diskProvider.IsFileLocked(fileInfo.FullName))
+                {
+                    return new List<ImportResult>
+                           {
+                               FileIsLockedResult(fileInfo.FullName)
+                           };
+                }
+            }
+
+            var decisions = _importDecisionMaker.GetImportDecisions(new List<string>() { fileInfo.FullName }, movie, null, true);
+
+            return _importApprovedMovie.Import(decisions, true, downloadClientItem, importMode);
+        }
+
+        private string GetCleanedUpFolderName(string folder)
+        {
+            folder = folder.Replace("_UNPACK_", "")
+                           .Replace("_FAILED_", "");
+
+            return folder;
+        }
+
+        private ImportResult FileIsLockedResult(string videoFile)
+        {
+            _logger.Debug("[{0}] is currently locked by another process, skipping", videoFile);
+            return new ImportResult(new ImportDecision(new LocalEpisode { Path = videoFile }, new Rejection("Locked file, try again later")), "Locked file, try again later");
+        }
+
+        private ImportResult UnknownMovieResult(string message, string videoFile = null)
+        {
+            var localEpisode = videoFile == null ? null : new LocalEpisode { Path = videoFile };
+
+            return new ImportResult(new ImportDecision(localEpisode, new Rejection("Unknown Movie")), message);
+        }
+    }
+}

src/NzbDrone.Core/MediaFiles/EpisodeImport/DetectSample.cs

@@ -153,7 +153,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport
 
         private int GetMinimumAllowedRuntime(Movie movie)
         {
-            return 120; //2 minutes
+            return 360; //6 minutes
         }
 
         private int GetMinimumAllowedRuntime(Series series)

src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedMovie.cs

@@ -47,6 +47,8 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport
 
         public List<ImportResult> Import(List<ImportDecision> 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))
@@ -80,7 +82,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)

src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecision.cs

@@ -24,15 +24,15 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport
         {
             LocalMovie = localMovie;
             Rejections = rejections.ToList();
-            LocalEpisode = new LocalEpisode
-            {
-                Quality = localMovie.Quality,
-                ExistingFile = localMovie.ExistingFile,
-                MediaInfo = localMovie.MediaInfo,
-                ParsedEpisodeInfo = localMovie.ParsedEpisodeInfo,
-                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
+            //};
         }
     }
 }

src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs

@@ -19,7 +19,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport
     {
         List<ImportDecision> GetImportDecisions(List<string> videoFiles, Series series);
         List<ImportDecision> GetImportDecisions(List<string> videoFiles, Movie movie);
-        List<ImportDecision> GetImportDecisions(List<string> videoFiles, Movie movie, ParsedEpisodeInfo folderInfo, bool sceneSource); //TODO: Needs changing to ParsedMovieInfo!!
+        List<ImportDecision> GetImportDecisions(List<string> videoFiles, Movie movie, ParsedMovieInfo folderInfo, bool sceneSource); //TODO: Needs changing to ParsedMovieInfo!!
         List<ImportDecision> GetImportDecisions(List<string> videoFiles, Series series, ParsedEpisodeInfo folderInfo, bool sceneSource);
     }
 
@@ -77,7 +77,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport
             return decisions;
         }
 
-        public List<ImportDecision> GetImportDecisions(List<string> videoFiles, Movie movie, ParsedEpisodeInfo folderInfo, bool sceneSource)
+        public List<ImportDecision> GetImportDecisions(List<string> 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;
 
@@ -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;
@@ -291,17 +291,17 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport
             }) == 1;
         }
 
-        private bool ShouldUseFolderName(List<string> videoFiles, Movie movie, ParsedEpisodeInfo folderInfo)
+        private bool ShouldUseFolderName(List<string> 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)
             {

src/NzbDrone.Core/MediaFiles/EpisodeImport/Manual/ManualImportFile.cs

@@ -10,5 +10,6 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Manual
         public List<int> EpisodeIds { get; set; }
         public QualityModel Quality { get; set; }
         public string DownloadId { get; set; }
+        public int MovieId { get; set; }
     }
 }

src/NzbDrone.Core/MediaFiles/EpisodeImport/Manual/ManualImportItem.cs

@@ -17,5 +17,6 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Manual
         public QualityModel Quality { get; set; }
         public string DownloadId { get; set; }
         public IEnumerable<Rejection> Rejections { get; set; }
+        public Movie Movie { get; set; }
     }
 }

src/NzbDrone.Core/MediaFiles/EpisodeImport/Manual/ManualImportService.cs

@@ -30,11 +30,14 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Manual
         private readonly IDiskScanService _diskScanService;
         private readonly IMakeImportDecision _importDecisionMaker;
         private readonly ISeriesService _seriesService;
+        private readonly IMovieService _movieService;
         private readonly IEpisodeService _episodeService;
         private readonly IVideoFileInfoReader _videoFileInfoReader;
         private readonly IImportApprovedEpisodes _importApprovedEpisodes;
+        private readonly IImportApprovedMovie _importApprovedMovie;
         private readonly ITrackedDownloadService _trackedDownloadService;
         private readonly IDownloadedEpisodesImportService _downloadedEpisodesImportService;
+        private readonly IDownloadedMovieImportService _downloadedMovieImportService;
         private readonly IEventAggregator _eventAggregator;
         private readonly Logger _logger;
 
@@ -43,11 +46,14 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Manual
                                    IDiskScanService diskScanService,
                                    IMakeImportDecision importDecisionMaker,
                                    ISeriesService seriesService,
+                                   IMovieService movieService,
                                    IEpisodeService episodeService,
                                    IVideoFileInfoReader videoFileInfoReader,
                                    IImportApprovedEpisodes importApprovedEpisodes,
+                                   IImportApprovedMovie importApprovedMovie,
                                    ITrackedDownloadService trackedDownloadService,
                                    IDownloadedEpisodesImportService downloadedEpisodesImportService,
+                                   IDownloadedMovieImportService downloadedMovieImportService,
                                    IEventAggregator eventAggregator,
                                    Logger logger)
         {
@@ -56,11 +62,14 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Manual
             _diskScanService = diskScanService;
             _importDecisionMaker = importDecisionMaker;
             _seriesService = seriesService;
+            _movieService = movieService;
             _episodeService = episodeService;
             _videoFileInfoReader = videoFileInfoReader;
             _importApprovedEpisodes = importApprovedEpisodes;
+            _importApprovedMovie = importApprovedMovie;
             _trackedDownloadService = trackedDownloadService;
             _downloadedEpisodesImportService = downloadedEpisodesImportService;
+            _downloadedMovieImportService = downloadedMovieImportService;
             _eventAggregator = eventAggregator;
             _logger = logger;
         }
@@ -126,62 +135,128 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Manual
 
             var relativeFile = folder.GetRelativePath(file);
 
-            var series = _parsingService.GetSeries(relativeFile.Split('\\', '/')[0]);
+            var movie = _parsingService.GetMovie(relativeFile.Split('\\', '/')[0]);
 
-            if (series == null)
+            if (movie == null)
             {
-                series = _parsingService.GetSeries(relativeFile);
+                movie = _parsingService.GetMovie(relativeFile);
             }
 
-            if (series == null && downloadId.IsNotNullOrWhiteSpace())
+            if (movie == null && downloadId.IsNotNullOrWhiteSpace())
             {
                 var trackedDownload = _trackedDownloadService.Find(downloadId);
-                series = trackedDownload.RemoteEpisode.Series;
+                movie = trackedDownload.RemoteMovie.Movie;
             }
 
-            if (series == null)
+            if (movie == null)
             {
-                var localEpisode = new LocalEpisode();
-                localEpisode.Path = file;
-                localEpisode.Quality = QualityParser.ParseQuality(file);
-                localEpisode.Size = _diskProvider.GetFileSize(file);
+                var localMovie = new LocalMovie()
+                {
+                    Path = file,
+                    Quality = QualityParser.ParseQuality(file),
+                    Size = _diskProvider.GetFileSize(file)
+                };
 
-                return MapItem(new ImportDecision(localEpisode, new Rejection("Unknown Series")), folder, downloadId);
+                return MapItem(new ImportDecision(localMovie, new Rejection("Unknown Movie")), folder, downloadId);
             }
 
-            var importDecisions = _importDecisionMaker.GetImportDecisions(new List<string> {file},
-                series, null, SceneSource(series, folder));
+            var importDecisions = _importDecisionMaker.GetImportDecisions(new List<string> { file },
+                movie, null, SceneSource(movie, folder));
 
             return importDecisions.Any() ? MapItem(importDecisions.First(), folder, downloadId) : null;
         }
 
+        //private ManualImportItem ProcessFile(string file, string downloadId, string folder = null)
+        //{
+        //    if (folder.IsNullOrWhiteSpace())
+        //    {
+        //        folder = new FileInfo(file).Directory.FullName;
+        //    }
+
+        //    var relativeFile = folder.GetRelativePath(file);
+
+        //    var series = _parsingService.GetSeries(relativeFile.Split('\\', '/')[0]);
+
+        //    if (series == null)
+        //    {
+        //        series = _parsingService.GetSeries(relativeFile);
+        //    }
+
+        //    if (series == null && downloadId.IsNotNullOrWhiteSpace())
+        //    {
+        //        var trackedDownload = _trackedDownloadService.Find(downloadId);
+        //        series = trackedDownload.RemoteEpisode.Series;
+        //    }
+
+        //    if (series == null)
+        //    {
+        //        var localEpisode = new LocalEpisode();
+        //        localEpisode.Path = file;
+        //        localEpisode.Quality = QualityParser.ParseQuality(file);
+        //        localEpisode.Size = _diskProvider.GetFileSize(file);
+
+        //        return MapItem(new ImportDecision(localEpisode, new Rejection("Unknown Series")), folder, downloadId);
+        //    }
+
+        //    var importDecisions = _importDecisionMaker.GetImportDecisions(new List<string> {file},
+        //        series, null, SceneSource(series, folder));
+
+        //    return importDecisions.Any() ? MapItem(importDecisions.First(), folder, downloadId) : null;
+        //}
+
         private bool SceneSource(Series series, string folder)
         {
             return !(series.Path.PathEquals(folder) || series.Path.IsParentPath(folder));
         }
 
+        private bool SceneSource(Movie movie, string folder)
+        {
+            return !(movie.Path.PathEquals(folder) || movie.Path.IsParentPath(folder));
+        }
+
+        //private ManualImportItem MapItem(ImportDecision decision, string folder, string downloadId)
+        //{
+        //    var item = new ManualImportItem();
+
+        //    item.Path = decision.LocalEpisode.Path;
+        //    item.RelativePath = folder.GetRelativePath(decision.LocalEpisode.Path);
+        //    item.Name = Path.GetFileNameWithoutExtension(decision.LocalEpisode.Path);
+        //    item.DownloadId = downloadId;
+
+        //    if (decision.LocalEpisode.Series != null)
+        //    {
+        //        item.Series = decision.LocalEpisode.Series;
+        //    }
+
+        //    if (decision.LocalEpisode.Episodes.Any())
+        //    {
+        //        item.SeasonNumber = decision.LocalEpisode.SeasonNumber;
+        //        item.Episodes = decision.LocalEpisode.Episodes;
+        //    }
+
+        //    item.Quality = decision.LocalEpisode.Quality;
+        //    item.Size = _diskProvider.GetFileSize(decision.LocalEpisode.Path);
+        //    item.Rejections = decision.Rejections;
+
+        //    return item;
+        //}
+
         private ManualImportItem MapItem(ImportDecision decision, string folder, string downloadId)
         {
             var item = new ManualImportItem();
 
-            item.Path = decision.LocalEpisode.Path;
-            item.RelativePath = folder.GetRelativePath(decision.LocalEpisode.Path);
-            item.Name = Path.GetFileNameWithoutExtension(decision.LocalEpisode.Path);
+            item.Path = decision.LocalMovie.Path;
+            item.RelativePath = folder.GetRelativePath(decision.LocalMovie.Path);
+            item.Name = Path.GetFileNameWithoutExtension(decision.LocalMovie.Path);
             item.DownloadId = downloadId;
 
-            if (decision.LocalEpisode.Series != null)
+            if (decision.LocalMovie.Movie != null)
             {
-                item.Series = decision.LocalEpisode.Series;
+                item.Movie = decision.LocalMovie.Movie;
             }
 
-            if (decision.LocalEpisode.Episodes.Any())
-            {
-                item.SeasonNumber = decision.LocalEpisode.SeasonNumber;
-                item.Episodes = decision.LocalEpisode.Episodes;
-            }
-
-            item.Quality = decision.LocalEpisode.Quality;
-            item.Size = _diskProvider.GetFileSize(decision.LocalEpisode.Path);
+            item.Quality = decision.LocalMovie.Quality;
+            item.Size = _diskProvider.GetFileSize(decision.LocalMovie.Path);
             item.Rejections = decision.Rejections;
 
             return item;
@@ -199,45 +274,43 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Manual
                 _logger.ProgressTrace("Processing file {0} of {1}", i + 1, message.Files.Count);
 
                 var file = message.Files[i];
-                var series = _seriesService.GetSeries(file.SeriesId);
-                var episodes = _episodeService.GetEpisodes(file.EpisodeIds);
-                var parsedEpisodeInfo = Parser.Parser.ParsePath(file.Path) ?? new ParsedEpisodeInfo();
+                var movie = _movieService.GetMovie(file.MovieId);
+                var parsedMovieInfo = Parser.Parser.ParseMoviePath(file.Path) ?? new ParsedMovieInfo();
                 var mediaInfo = _videoFileInfoReader.GetMediaInfo(file.Path);
-                var existingFile = series.Path.IsParentPath(file.Path);
+                var existingFile = movie.Path.IsParentPath(file.Path);
 
-                var localEpisode = new LocalEpisode
+                var localMovie = new LocalMovie
                 {
                     ExistingFile = false,
-                    Episodes = episodes,
                     MediaInfo = mediaInfo,
-                    ParsedEpisodeInfo = parsedEpisodeInfo,
+                    ParsedMovieInfo = parsedMovieInfo,
                     Path = file.Path,
                     Quality = file.Quality,
-                    Series = series,
+                    Movie = movie,
                     Size = 0
                 };
 
                 //TODO: Cleanup non-tracked downloads
 
-                var importDecision = new ImportDecision(localEpisode);
+                var importDecision = new ImportDecision(localMovie);
 
                 if (file.DownloadId.IsNullOrWhiteSpace())
                 {
-                    imported.AddRange(_importApprovedEpisodes.Import(new List<ImportDecision> { importDecision }, !existingFile, null, message.ImportMode));
+                    imported.AddRange(_importApprovedMovie.Import(new List<ImportDecision> { importDecision }, !existingFile, null, message.ImportMode));
                 }
 
                 else
                 {
                     var trackedDownload = _trackedDownloadService.Find(file.DownloadId);
-                    var importResult = _importApprovedEpisodes.Import(new List<ImportDecision> { importDecision }, true, trackedDownload.DownloadItem, message.ImportMode).First();
+                    var importResult = _importApprovedMovie.Import(new List<ImportDecision> { importDecision }, true, trackedDownload.DownloadItem, message.ImportMode).First();
 
                     imported.Add(importResult);
 
                     importedTrackedDownload.Add(new ManuallyImportedFile
-                                                {
-                                                    TrackedDownload = trackedDownload,
-                                                    ImportResult = importResult
-                                                });
+                    {
+                        TrackedDownload = trackedDownload,
+                        ImportResult = importResult
+                    });
                 }
             }
 
@@ -249,20 +322,98 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Manual
 
                 if (_diskProvider.FolderExists(trackedDownload.DownloadItem.OutputPath.FullPath))
                 {
-                    if (_downloadedEpisodesImportService.ShouldDeleteFolder(
+                    if (_downloadedMovieImportService.ShouldDeleteFolder(
                             new DirectoryInfo(trackedDownload.DownloadItem.OutputPath.FullPath),
-                            trackedDownload.RemoteEpisode.Series) && !trackedDownload.DownloadItem.IsReadOnly)
+                            trackedDownload.RemoteMovie.Movie) && !trackedDownload.DownloadItem.IsReadOnly)
                     {
                         _diskProvider.DeleteFolder(trackedDownload.DownloadItem.OutputPath.FullPath, true);
                     }
                 }
 
-                if (groupedTrackedDownload.Select(c => c.ImportResult).Count(c => c.Result == ImportResultType.Imported) >= Math.Max(1, trackedDownload.RemoteEpisode.Episodes.Count))
+                if (groupedTrackedDownload.Select(c => c.ImportResult).Count(c => c.Result == ImportResultType.Imported) >= Math.Max(1, 1)) //TODO: trackedDownload.RemoteMovie.Movie.Count is always 1?
                 {
                     trackedDownload.State = TrackedDownloadStage.Imported;
                     _eventAggregator.PublishEvent(new DownloadCompletedEvent(trackedDownload));
                 }
             }
         }
+
+        //public void Execute(ManualImportCommand message)
+        //{
+        //    _logger.ProgressTrace("Manually importing {0} files using mode {1}", message.Files.Count, message.ImportMode);
+
+        //    var imported = new List<ImportResult>();
+        //    var importedTrackedDownload = new List<ManuallyImportedFile>();
+
+        //    for (int i = 0; i < message.Files.Count; i++)
+        //    {
+        //        _logger.ProgressTrace("Processing file {0} of {1}", i + 1, message.Files.Count);
+
+        //        var file = message.Files[i];
+        //        var series = _seriesService.GetSeries(file.SeriesId);
+        //        var episodes = _episodeService.GetEpisodes(file.EpisodeIds);
+        //        var parsedEpisodeInfo = Parser.Parser.ParsePath(file.Path) ?? new ParsedEpisodeInfo();
+        //        var mediaInfo = _videoFileInfoReader.GetMediaInfo(file.Path);
+        //        var existingFile = series.Path.IsParentPath(file.Path);
+
+        //        var localEpisode = new LocalEpisode
+        //        {
+        //            ExistingFile = false,
+        //            Episodes = episodes,
+        //            MediaInfo = mediaInfo,
+        //            ParsedEpisodeInfo = parsedEpisodeInfo,
+        //            Path = file.Path,
+        //            Quality = file.Quality,
+        //            Series = series,
+        //            Size = 0
+        //        };
+
+        //        //TODO: Cleanup non-tracked downloads
+
+        //        var importDecision = new ImportDecision(localEpisode);
+
+        //        if (file.DownloadId.IsNullOrWhiteSpace())
+        //        {
+        //            imported.AddRange(_importApprovedEpisodes.Import(new List<ImportDecision> { importDecision }, !existingFile, null, message.ImportMode));
+        //        }
+
+        //        else
+        //        {
+        //            var trackedDownload = _trackedDownloadService.Find(file.DownloadId);
+        //            var importResult = _importApprovedEpisodes.Import(new List<ImportDecision> { importDecision }, true, trackedDownload.DownloadItem, message.ImportMode).First();
+
+        //            imported.Add(importResult);
+
+        //            importedTrackedDownload.Add(new ManuallyImportedFile
+        //                                        {
+        //                                            TrackedDownload = trackedDownload,
+        //                                            ImportResult = importResult
+        //                                        });
+        //        }
+        //    }
+
+        //    _logger.ProgressTrace("Manually imported {0} files", imported.Count);
+
+        //    foreach (var groupedTrackedDownload in importedTrackedDownload.GroupBy(i => i.TrackedDownload.DownloadItem.DownloadId).ToList())
+        //    {
+        //        var trackedDownload = groupedTrackedDownload.First().TrackedDownload;
+
+        //        if (_diskProvider.FolderExists(trackedDownload.DownloadItem.OutputPath.FullPath))
+        //        {
+        //            if (_downloadedEpisodesImportService.ShouldDeleteFolder(
+        //                    new DirectoryInfo(trackedDownload.DownloadItem.OutputPath.FullPath),
+        //                    trackedDownload.RemoteEpisode.Series) && !trackedDownload.DownloadItem.IsReadOnly)
+        //            {
+        //                _diskProvider.DeleteFolder(trackedDownload.DownloadItem.OutputPath.FullPath, true);
+        //            }
+        //        }
+
+        //        if (groupedTrackedDownload.Select(c => c.ImportResult).Count(c => c.Result == ImportResultType.Imported) >= Math.Max(1, trackedDownload.RemoteEpisode.Episodes.Count))
+        //        {
+        //            trackedDownload.State = TrackedDownloadStage.Imported;
+        //            _eventAggregator.PublishEvent(new DownloadCompletedEvent(trackedDownload));
+        //        }
+        //    }
+        //}
     }
 }

src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotSampleSpecification.cs

@@ -40,12 +40,6 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications
 
         public Decision IsSatisfiedBy(LocalMovie localEpisode)
         {
-            if (localEpisode.ExistingFile)
-            {
-                _logger.Debug("Existing file, skipping sample check");
-                return Decision.Accept();
-            }
-
             var sample = _detectSample.IsSample(localEpisode.Movie,
                                                 localEpisode.Quality,
                                                 localEpisode.Path,

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;
 

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,9 @@ namespace NzbDrone.Core.MediaFiles
         List<string> FilterExistingFiles(List<string> files, Movie movie);
         EpisodeFile Get(int id);
         List<EpisodeFile> Get(IEnumerable<int> ids);
+        List<MovieFile> GetMovies(IEnumerable<int> ids);
 
+        //List<MovieFile> Get(IEnumerable<int> ids);
     }
 
     public class MediaFileService : IMediaFileService, IHandleAsync<SeriesDeletedEvent>
@@ -125,6 +127,11 @@ namespace NzbDrone.Core.MediaFiles
             return _mediaFileRepository.Get(ids).ToList();
         }
 
+        public List<MovieFile> GetMovies(IEnumerable<int> ids)
+        {
+            return _movieFileRepository.Get(ids).ToList();
+        }
+
         public void HandleAsync(SeriesDeletedEvent message)
         {
             var files = GetFilesBySeries(message.Series.Id);

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; }
+    }
+}

src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs

@@ -0,0 +1,138 @@
+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<RenameMovieFilePreview> GetRenamePreviews(int movieId);
+    }
+
+    public class RenameMovieFileService : IRenameMovieFileService,
+                                          IExecute<RenameMovieFilesCommand>,
+                                          IExecute<RenameMovieCommand>
+    {
+        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<RenameMovieFilePreview> 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<RenameMovieFilePreview> GetPreviews(Movie movie, List<MovieFile> 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(movieFilePath));
+
+                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<MovieFile> movieFiles, Movie movie)
+        {
+            var renamed = new List<MovieFile>();
+
+            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.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);
+        }
+
+        public void Execute(RenameMovieCommand message)
+        {
+            _logger.Debug("Renaming all files for selected movie");
+            var moviesToRename = _movieService.GetMovies(message.MovieIds);
+
+            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);
+            }
+            
+        }
+    }
+}

src/NzbDrone.Core/MetadataSource/SkyHook/Resource/TMDBResources.cs

@@ -55,7 +55,7 @@ namespace NzbDrone.Core.MetadataSource.SkyHook.Resource
         public Production_Companies[] production_companies { get; set; }
         public Production_Countries[] production_countries { get; set; }
         public string release_date { get; set; }
-        public int revenue { get; set; }
+        public long revenue { get; set; }
         public int runtime { get; set; }
         public Spoken_Languages[] spoken_languages { get; set; }
         public string status { get; set; }

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

@@ -24,13 +24,15 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
         private readonly IHttpRequestBuilderFactory _requestBuilder;
         private readonly IHttpRequestBuilderFactory _movieBuilder;
         private readonly ITmdbConfigService _configService;
+        private readonly IMovieService _movieService;
 
-        public SkyHookProxy(IHttpClient httpClient, ISonarrCloudRequestBuilder requestBuilder, ITmdbConfigService configService, Logger logger)
+        public SkyHookProxy(IHttpClient httpClient, ISonarrCloudRequestBuilder requestBuilder, ITmdbConfigService configService, IMovieService movieService, Logger logger)
         {
             _httpClient = httpClient;
              _requestBuilder = requestBuilder.SkyHookTvdb;
             _movieBuilder = requestBuilder.TMDB;
             _configService = configService;
+            _movieService = movieService;
             _logger = logger;
         }
 
@@ -90,8 +92,18 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
             movie.CleanTitle = Parser.Parser.CleanSeriesTitle(movie.Title);
             movie.Overview = resource.overview;
             movie.Website = resource.homepage;
-            movie.InCinemas = DateTime.Parse(resource.release_date);
-            movie.Year = movie.InCinemas.Value.Year;
+            if (resource.release_date.IsNotNullOrWhiteSpace())
+            {
+                movie.InCinemas = DateTime.Parse(resource.release_date);
+                movie.Year = movie.InCinemas.Value.Year;
+            }
+
+            var slugResult = _movieService.FindByTitleSlug(movie.TitleSlug);
+            if (slugResult != null)
+            {
+                _logger.Debug("Movie with this title slug already exists. Adding year...");
+            }
+            movie.TitleSlug += "-" + movie.Year.ToString();
 
             movie.Images.Add(_configService.GetCoverForURL(resource.poster_path, MediaCoverTypes.Poster));//TODO: Update to load image specs from tmdb page!
             movie.Images.Add(_configService.GetCoverForURL(resource.backdrop_path, MediaCoverTypes.Banner));
@@ -165,10 +177,10 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
         {
             if(title.EndsWith(",the"))
             {
-                title = title.Substring(title.Length - 4);
+                title = title.Substring(0, title.Length - 4);
             } else if(title.EndsWith(", the"))
             {
-                title = title.Substring(title.Length - 5);
+                title = title.Substring(0, title.Length - 5);
             }
             return title;
         }
@@ -177,7 +189,7 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
         {
             var lowerTitle = title.ToLower();
 
-            var parserResult = Parser.Parser.ParseMovieTitle(title);
+            var parserResult = Parser.Parser.ParseMovieTitle(title, true);
 
             var yearTerm = "";
 
@@ -319,7 +331,21 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
                 imdbMovie.Title = result.title;
                 string titleSlug = result.title;
                 imdbMovie.TitleSlug = titleSlug.ToLower().Replace(" ", "-");
-                imdbMovie.Year = DateTime.Parse(result.release_date).Year;
+
+                if (result.release_date.IsNotNullOrWhiteSpace())
+                {
+                    imdbMovie.Year = DateTime.Parse(result.release_date).Year;
+                }
+
+
+
+                var slugResult = _movieService.FindByTitleSlug(imdbMovie.TitleSlug);
+                if (slugResult != null)
+                {
+                    _logger.Debug("Movie with this title slug already exists. Adding year...");
+                }
+                imdbMovie.TitleSlug += "-" + imdbMovie.Year.ToString();
+
                 imdbMovie.Images = new List<MediaCover.MediaCover>();
                 imdbMovie.Overview = result.overview;
                 try

src/NzbDrone.Core/Notifications/Boxcar/BoxcarProxy.cs

@@ -43,7 +43,7 @@ namespace NzbDrone.Core.Notifications.Boxcar
             try
             {
                 const string title = "Test Notification";
-                const string body = "This is a test message from Sonarr";
+                const string body = "This is a test message from Radarr";
 
                 SendNotification(title, body, settings);
                 return null;

src/NzbDrone.Core/Notifications/Growl/GrowlService.cs

@@ -146,7 +146,7 @@ namespace NzbDrone.Core.Notifications.Growl
                 Register(settings.Host, settings.Port, settings.Password);
 
                 const string title = "Test Notification";
-                const string body = "This is a test message from Sonarr";
+                const string body = "This is a test message from Radarr";
 
                 SendNotification(title, body, "TEST", settings.Host, settings.Port, settings.Password);
             }

src/NzbDrone.Core/Notifications/Join/JoinProxy.cs

@@ -41,7 +41,7 @@ namespace NzbDrone.Core.Notifications.Join
         public ValidationFailure Test(JoinSettings settings)
         {
             const string title = "Test Notification";
-            const string body = "This is a test message from Sonarr.";
+            const string body = "This is a test message from Radarr.";
 
             try
             {

src/NzbDrone.Core/Notifications/NotifyMyAndroid/NotifyMyAndroidProxy.cs

@@ -69,7 +69,7 @@ namespace NzbDrone.Core.Notifications.NotifyMyAndroid
             try
             {
                 const string title = "Test Notification";
-                const string body = "This is a test message from Sonarr";
+                const string body = "This is a test message from Radarr";
                 Verify(settings.ApiKey);
                 SendNotification(title, body, settings.ApiKey, (NotifyMyAndroidPriority)settings.Priority);
             }

src/NzbDrone.Core/Notifications/Plex/PlexServerProxy.cs

@@ -48,7 +48,7 @@ namespace NzbDrone.Core.Notifications.Plex
             {
                 return Json.Deserialize<PlexMediaContainerLegacy>(response.Content)
                     .Sections
-                    .Where(d => d.Type == "show")
+                    .Where(d => d.Type == "movie")
                     .Select(s => new PlexSection
                                  {
                                      Id = s.Id,
@@ -62,7 +62,7 @@ namespace NzbDrone.Core.Notifications.Plex
             return Json.Deserialize<PlexResponse<PlexSectionsContainer>>(response.Content)
                        .MediaContainer
                        .Sections
-                       .Where(d => d.Type == "show")
+                       .Where(d => d.Type == "movie")
                        .ToList();
         }
 

src/NzbDrone.Core/Notifications/Prowl/ProwlService.cs

@@ -88,7 +88,7 @@ namespace NzbDrone.Core.Notifications.Prowl
                 Verify(settings.ApiKey);
 
                 const string title = "Test Notification";
-                const string body = "This is a test message from Sonarr";
+                const string body = "This is a test message from Radarr";
 
                 SendNotification(title, body, settings.ApiKey);
             }

src/NzbDrone.Core/Notifications/PushBullet/PushBulletProxy.cs

@@ -93,7 +93,7 @@ namespace NzbDrone.Core.Notifications.PushBullet
             try
             {
                 const string title = "Sonarr - Test Notification";
-                const string body = "This is a test message from Sonarr";
+                const string body = "This is a test message from Radarr";
 
                 SendNotification(title, body, settings);
             }

src/NzbDrone.Core/Notifications/Pushalot/PushalotProxy.cs

@@ -65,7 +65,7 @@ namespace NzbDrone.Core.Notifications.Pushalot
             try
             {
                 const string title = "Test Notification";
-                const string body = "This is a test message from Sonarr";
+                const string body = "This is a test message from Radarr";
 
                 SendNotification(title, body, settings);
             }

src/NzbDrone.Core/Notifications/Pushover/PushoverService.cs

@@ -53,7 +53,7 @@ namespace NzbDrone.Core.Notifications.Pushover
             try
             {
                 const string title = "Test Notification";
-                const string body = "This is a test message from Sonarr";
+                const string body = "This is a test message from Radarr";
 
                 SendNotification(title, body, settings);
             }

src/NzbDrone.Core/Notifications/Telegram/TelegramService.cs

@@ -45,7 +45,7 @@ namespace NzbDrone.Core.Notifications.Telegram
             try
             {
                 const string title = "Test Notification";
-                const string body = "This is a test message from Sonarr";
+                const string body = "This is a test message from Radarr";
 
                 SendNotification(title, body, settings);
             }

src/NzbDrone.Core/NzbDrone.Core.csproj

@@ -185,6 +185,7 @@
     <Compile Include="Datastore\Migration\004_updated_history.cs" />
     <Compile Include="Datastore\Migration\111_remove_bitmetv.cs" />
     <Compile Include="Datastore\Migration\112_remove_torrentleech.cs" />
+    <Compile Include="Datastore\Migration\114_remove_fanzub.cs" />
     <Compile Include="Datastore\Migration\113_remove_broadcasthenet.cs" />
     <Compile Include="Datastore\Migration\108_update_schedule_interval.cs" />
     <Compile Include="Datastore\Migration\107_fix_movie_files.cs" />
@@ -582,9 +583,6 @@
     <Compile Include="Indexers\Exceptions\RequestLimitReachedException.cs" />
     <Compile Include="Indexers\Exceptions\UnsupportedFeedException.cs" />
     <Compile Include="Indexers\EzrssTorrentRssParser.cs" />
-    <Compile Include="Indexers\Fanzub\Fanzub.cs" />
-    <Compile Include="Indexers\Fanzub\FanzubRequestGenerator.cs" />
-    <Compile Include="Indexers\Fanzub\FanzubSettings.cs" />
     <Compile Include="Indexers\FetchAndParseRssService.cs" />
     <Compile Include="Indexers\PassThePopcorn\PassThePopcorn.cs" />
     <Compile Include="Indexers\PassThePopcorn\PassThePopcornApi.cs" />
@@ -707,8 +705,12 @@
     <Compile Include="MediaFiles\Commands\BackendCommandAttribute.cs" />
     <Compile Include="MediaFiles\Commands\CleanUpRecycleBinCommand.cs" />
     <Compile Include="MediaFiles\Commands\DownloadedEpisodesScanCommand.cs" />
+    <Compile Include="MediaFiles\Commands\DownloadedMovieScanCommand.cs" />
+    <Compile Include="MediaFiles\Commands\RenameMovieCommand.cs" />
+    <Compile Include="MediaFiles\Commands\RenameMovieFilesCommand.cs" />
     <Compile Include="MediaFiles\Commands\RescanMovieCommand.cs" />
     <Compile Include="MediaFiles\DownloadedMovieCommandService.cs" />
+    <Compile Include="MediaFiles\DownloadedMovieImportService.cs" />
     <Compile Include="MediaFiles\MovieFileMovingService.cs" />
     <Compile Include="MediaFiles\Events\MovieDownloadedEvent.cs" />
     <Compile Include="MediaFiles\Events\MovieFileAddedEvent.cs" />
@@ -780,6 +782,8 @@
     <Compile Include="MediaFiles\RecycleBinProvider.cs" />
     <Compile Include="MediaFiles\RenameEpisodeFilePreview.cs" />
     <Compile Include="MediaFiles\RenameEpisodeFileService.cs" />
+    <Compile Include="MediaFiles\RenameMovieFilePreview.cs" />
+    <Compile Include="MediaFiles\RenameMovieFileService.cs" />
     <Compile Include="MediaFiles\SameFilenameException.cs" />
     <Compile Include="MediaFiles\UpdateMovieFileService.cs" />
     <Compile Include="MediaFiles\UpdateEpisodeFileService.cs" />

src/NzbDrone.Core/Organizer/FileNameValidation.cs

@@ -67,6 +67,8 @@ namespace NzbDrone.Core.Organizer
         {
             var value = context.PropertyValue as string;
 
+            return true;
+
             if (!FileNameBuilder.SeasonEpisodePatternRegex.IsMatch(value) &&
                 !FileNameValidation.OriginalTokenRegex.IsMatch(value))
             {
@@ -89,6 +91,8 @@ namespace NzbDrone.Core.Organizer
         {
             var value = context.PropertyValue as string;
 
+            return true;
+
             if (!FileNameBuilder.SeasonEpisodePatternRegex.IsMatch(value) &&
                 !FileNameBuilder.AirDateRegex.IsMatch(value) &&
                 !FileNameValidation.OriginalTokenRegex.IsMatch(value))
@@ -112,6 +116,8 @@ namespace NzbDrone.Core.Organizer
         {
             var value = context.PropertyValue as string;
 
+            return true;
+
             if (!FileNameBuilder.SeasonEpisodePatternRegex.IsMatch(value) &&
                 !FileNameBuilder.AbsoluteEpisodePatternRegex.IsMatch(value) &&
                 !FileNameValidation.OriginalTokenRegex.IsMatch(value))

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; }

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;}

src/NzbDrone.Core/Parser/Model/ReleaseInfo.cs

@@ -17,6 +17,7 @@ namespace NzbDrone.Core.Parser.Model
         public DownloadProtocol DownloadProtocol { get; set; }
         public int TvdbId { get; set; }
         public int TvRageId { get; set; }
+        public int ImdbId { get; set; }
         public DateTime PublishDate { get; set; }
 
         public string Origin { get; set; }
@@ -82,6 +83,7 @@ namespace NzbDrone.Core.Parser.Model
                     stringBuilder.AppendLine("DownloadProtocol: " + DownloadProtocol ?? "Empty");
                     stringBuilder.AppendLine("TvdbId: " + TvdbId ?? "Empty");
                     stringBuilder.AppendLine("TvRageId: " + TvRageId ?? "Empty");
+                    stringBuilder.AppendLine("ImdbId: " + ImdbId ?? "Empty");
                     stringBuilder.AppendLine("PublishDate: " + PublishDate ?? "Empty");
                     return stringBuilder.ToString();
                 default:

src/NzbDrone.Core/Parser/Parser.cs

@@ -36,6 +36,15 @@ namespace NzbDrone.Core.Parser
         //PassThePopcorn Torrent names: Star.Wars[PassThePopcorn]
              new Regex(@"^(?<title>.+?)?(?:(?:[-_\W](?<![()\[!]))*(?<year>(\[\w *\])))+(\W+|_|$)(?!\\)",
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
+             //That did not work? Maybe some tool uses [] for years. Who would do that?
+              new Regex(@"^(?<title>.+?)?(?:(?:[-_\W](?<![)!]))*(?<year>(19|20)\d{2}(?!p|i|\d+|\W\d+)))+(\W+|_|$)(?!\\)",
+                          RegexOptions.IgnoreCase | RegexOptions.Compiled),
+        };
+
+        private static readonly Regex[] ReportMovieTitleFolderRegex = new[]
+        {
+            //When year comes first.
+            new Regex(@"^(?:(?:[-_\W](?<![)!]))*(?<year>(19|20)\d{2}(?!p|i|\d+|\W\d+)))+(\W+|_|$)(?<title>.+?)?$")
         };
 
         private static readonly Regex[] ReportTitleRegex = new[]
@@ -323,7 +332,29 @@ namespace NzbDrone.Core.Parser
             return result;
         }
 
-        public static ParsedMovieInfo ParseMovieTitle(string title)
+        public static ParsedMovieInfo ParseMoviePath(string path)
+        {
+            var fileInfo = new FileInfo(path);
+
+            var result = ParseMovieTitle(fileInfo.Name, true);
+
+            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, bool isDir = false)
         {
 
             ParsedMovieInfo realResult = null;
@@ -354,7 +385,14 @@ namespace NzbDrone.Core.Parser
 
                 simpleTitle = CleanTorrentSuffixRegex.Replace(simpleTitle, string.Empty);
 
-                foreach (var regex in ReportMovieTitleRegex)
+                var allRegexes = ReportMovieTitleRegex.ToList();
+
+                if (isDir)
+                {
+                    allRegexes.AddRange(ReportMovieTitleFolderRegex);
+                }
+
+                foreach (var regex in allRegexes)
                 {
                     var match = regex.Matches(simpleTitle);
 

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)
             };
         }
@@ -192,6 +192,11 @@ namespace NzbDrone.Core.Parser
                                                     parsedEpisodeInfo.MovieTitleInfo.Year);
             }
 
+            if (series == null)
+            {
+                series = _movieService.FindByTitle(parsedEpisodeInfo.MovieTitle.Replace("DC", "").Trim());
+            }
+
             return series;
         }
 

src/NzbDrone.Core/RootFolders/RootFolderService.cs

@@ -149,7 +149,11 @@ namespace NzbDrone.Core.RootFolders
             foreach (string unmappedFolder in unmappedFolders)
             {
                 var di = new DirectoryInfo(unmappedFolder.Normalize());
-                results.Add(new UnmappedFolder { Name = di.Name, Path = di.FullName });
+                if (!di.Attributes.HasFlag(FileAttributes.System) && !di.Attributes.HasFlag(FileAttributes.Hidden))
+                {
+                    results.Add(new UnmappedFolder { Name = di.Name, Path = di.FullName });
+                }
+
             }
 
             var setToRemove = SpecialFolders;

src/NzbDrone.Core/Tv/Movie.cs

@@ -48,6 +48,9 @@ namespace NzbDrone.Core.Tv
         public LazyLoaded<MovieFile> MovieFile { get; set; }
         public int MovieFileId { get; set; }
         public List<string> AlternativeTitles { get; set; }
+
+        public bool HasFile => MovieFileId > 0;
+
         public override string ToString()
         {
             return string.Format("[{0}][{1}]", ImdbId, Title.NullSafe());

src/NzbDrone.Core/Tv/MovieRepository.cs

@@ -13,6 +13,7 @@ namespace NzbDrone.Core.Tv
         Movie FindByTitle(string cleanTitle);
         Movie FindByTitle(string cleanTitle, int year);
         Movie FindByImdbId(string imdbid);
+        Movie FindByTitleSlug(string slug);
         List<Movie> GetMoviesByFileId(int fileId);
         void SetFileId(int fileId, int movieId);
     }
@@ -62,11 +63,11 @@ namespace NzbDrone.Core.Tv
                 cleanNum = cleanNum.Replace(roman, num);
             }
 
-            var result = Query.Where(s => s.CleanTitle == cleanTitle).SingleOrDefault();
+            var result = Query.Where(s => s.CleanTitle == cleanTitle).FirstOrDefault();
 
             if (result == null)
             {
-                result = Query.Where(s => s.CleanTitle == cleanNum).OrWhere(s => s.CleanTitle == cleanRoman).SingleOrDefault();
+                result = Query.Where(s => s.CleanTitle == cleanNum).OrWhere(s => s.CleanTitle == cleanRoman).FirstOrDefault();
 
                 if (result == null)
                 {
@@ -74,7 +75,7 @@ namespace NzbDrone.Core.Tv
 
                     result = movies.Where(m => m.AlternativeTitles.Any(t => Parser.Parser.CleanSeriesTitle(t.ToLower()) == cleanTitle ||
                     Parser.Parser.CleanSeriesTitle(t.ToLower()) == cleanRoman ||
-                    Parser.Parser.CleanSeriesTitle(t.ToLower()) == cleanNum)).SingleOrDefault();
+                    Parser.Parser.CleanSeriesTitle(t.ToLower()) == cleanNum)).FirstOrDefault();
 
                     return result;
                 }
@@ -114,5 +115,9 @@ namespace NzbDrone.Core.Tv
             SetFields(new Movie { Id = episodeId, MovieFileId = fileId }, movie => movie.MovieFileId);
         }
 
+        public Movie FindByTitleSlug(string slug)
+        {
+            return Query.Where(m => m.TitleSlug == slug).FirstOrDefault();
+        }
     }
 }

src/NzbDrone.Core/Tv/MovieService.cs

@@ -24,6 +24,7 @@ namespace NzbDrone.Core.Tv
         Movie FindByTitle(string title);
         Movie FindByTitle(string title, int year);
         Movie FindByTitleInexact(string title);
+        Movie FindByTitleSlug(string slug);
         Movie GetMovieByFileId(int fileId);
         void DeleteMovie(int movieId, bool deleteFiles);
         List<Movie> GetAllMovies();
@@ -218,5 +219,10 @@ namespace NzbDrone.Core.Tv
         {
             return _movieRepository.GetMoviesByFileId(fileId).First();
         }
+
+        public Movie FindByTitleSlug(string slug)
+        {
+            return _movieRepository.FindByTitleSlug(slug);
+        }
     }
 }

src/UI/Activity/History/HistoryLayout.js

@@ -2,7 +2,7 @@ var Marionette = require('marionette');
 var Backgrid = require('backgrid');
 var HistoryCollection = require('./HistoryCollection');
 var EventTypeCell = require('../../Cells/EventTypeCell');
-var MovieTitleCell = require('../../Cells/MovieTitleCell');
+var MovieTitleCell = require('../../Cells/MovieTitleHistoryCell');
 var EpisodeNumberCell = require('../../Cells/EpisodeNumberCell');
 var EpisodeTitleCell = require('../../Cells/EpisodeTitleCell');
 var HistoryQualityCell = require('./HistoryQualityCell');
@@ -31,7 +31,7 @@ module.exports = Marionette.Layout.extend({
         {
             name  : 'movies',
             label : 'Movie Title',
-            cell  : MovieTitleCell
+            cell  : MovieTitleCell,
         },
         /*{
             name     : 'episode',

src/UI/AddMovies/SearchResultView.js

@@ -58,7 +58,7 @@ var view = Marionette.ItemView.extend({
         var defaultProfile = Config.getValue(Config.Keys.DefaultProfileId);
         var defaultRoot = Config.getValue(Config.Keys.DefaultRootFolderId);
         var useSeasonFolder = Config.getValueBoolean(Config.Keys.UseSeasonFolder, true);
-        var defaultMonitorEpisodes = Config.getValue(Config.Keys.MonitorEpisodes, 'missing');
+        var defaultMonitorEpisodes = Config.getValue(Config.Keys.MonitorEpisodes, 'all');
 
         if (Profiles.get(defaultProfile)) {
             this.ui.profile.val(defaultProfile);
@@ -169,6 +169,7 @@ var view = Marionette.ItemView.extend({
 
         var profile = this.ui.profile.val();
         var rootFolderPath = this.ui.rootFolder.children(':selected').text();
+        var monitor = this.ui.monitor.val();
 
         var options = this._getAddMoviesOptions();
         options.searchForMovie = searchForMovie;
@@ -178,7 +179,7 @@ var view = Marionette.ItemView.extend({
             profileId      : profile,
             rootFolderPath : rootFolderPath,
             addOptions     : options,
-            monitored      : true
+            monitored      : (monitor === 'all' ? true : false)
         }, { silent : true });
 
         var self = this;
@@ -229,44 +230,10 @@ var view = Marionette.ItemView.extend({
     },
 
     _getAddMoviesOptions : function() {
-        var monitor = this.ui.monitor.val();
-
-        var options = {
+        return {
             ignoreEpisodesWithFiles    : false,
             ignoreEpisodesWithoutFiles : false
         };
-
-        if (monitor === 'all') {
-            return options;
-        }
-
-        else if (monitor === 'future') {
-            options.ignoreEpisodesWithFiles = true;
-            options.ignoreEpisodesWithoutFiles = true;
-        }
-
-        // else if (monitor === 'latest') {
-        //     this.model.setSeasonPass(lastSeason.seasonNumber);
-        // }
-
-        // else if (monitor === 'first') {
-        //     this.model.setSeasonPass(lastSeason.seasonNumber + 1);
-        //     this.model.setSeasonMonitored(firstSeason.seasonNumber);
-        // }
-
-        else if (monitor === 'missing') {
-            options.ignoreEpisodesWithFiles = true;
-        }
-
-        else if (monitor === 'existing') {
-            options.ignoreEpisodesWithoutFiles = true;
-        }
-
-        // else if (monitor === 'none') {
-        //     this.model.setSeasonPass(lastSeason.seasonNumber + 1);
-        // }
-
-        return options;
     }
 });
 

src/UI/AddMovies/SearchResultViewTemplate.hbs

@@ -1,7 +1,7 @@
 <div class="search-item {{#unless isExisting}}search-item-new{{/unless}}">
     <div class="row">
         <div class="col-md-2">
-            <a href="{{imdbUrl}}" target="_blank">
+            <a href="{{tmdbUrl}}" target="_blank">
               {{#if remotePoster}}
                 {{remotePoster}}
               {{else}}
@@ -41,9 +41,9 @@
                     <div class="form-group col-md-2">
                         <label>Monitor <i class="icon-sonarr-form-info monitor-tooltip x-monitor-tooltip"></i></label>
                         <select class="form-control col-md-2 x-monitor">
-                            <option value="all">All</option>
-                            <option value="missing">Missing</option>
-                            <option value="none">None</option>
+                            <option value="all">Yes</option>
+                            <!-- <option value="missing">Missing</option> -->
+                            <option value="none">No</option>
                         </select>
                     </div>
 
@@ -52,7 +52,7 @@
                         {{> ProfileSelectionPartial profiles}}
                     </div>
 
-                    <div class="form-group col-md-2">
+                    {{!--<div class="form-group col-md-2">
                         <label>Season Folders</label>
 
                         <div class="input-group">
@@ -65,7 +65,7 @@
                                 <div class="btn btn-primary slide-button"/>
                             </label>
                         </div>
-                    </div>
+                    </div>--}}
                 {{/unless}}
 
                 {{#unless existing}}

src/UI/Cells/InCinemasCell.js

@@ -7,10 +7,16 @@ module.exports = TemplatedCell.extend({
       var monthNames = ["January", "February", "March", "April", "May", "June",
       "July", "August", "September", "October", "November", "December"
     ];
-      var cinemasDate = new Date(this.model.get("inCinemas"));
-      var year = cinemasDate.getFullYear();
-      var month = monthNames[cinemasDate.getMonth()];
-        this.$el.html(month + " " + year); //Hack, but somehow handlebar helper does not work.
-        return this;
+
+      this.$el.html("");
+
+      if (this.model.get("inCinemas")) {
+        var cinemasDate = new Date(this.model.get("inCinemas"));
+        var year = cinemasDate.getFullYear();
+        var month = monthNames[cinemasDate.getMonth()];
+          this.$el.html(month + " " + year); //Hack, but somehow handlebar helper does not work.
+      }
+
+      return this;
     }
 });

src/UI/Cells/MovieActionCell.js

@@ -33,7 +33,7 @@ module.exports = NzbDroneCell.extend({
     },
 
     _editSeries : function() {
-        vent.trigger(vent.Commands.EditSeriesCommand, { series : this.model });
+        vent.trigger(vent.Commands.EditMovieCommand, { movie : this.model });
     },
 
     _refreshSeries : function() {

src/UI/Cells/MovieDownloadStatusTemplate.hbs

@@ -1 +1 @@
-<span class="label label-{{DownloadedStatusColor}}">{{DownloadedStatus}}</span>
+<span class="label label-{{DownloadedStatusColor}}" title="{{DownloadedQuality}}">{{DownloadedStatus}}</span>

src/UI/Cells/MovieTitleCell.js

@@ -4,8 +4,4 @@ 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;
-    }
 });

src/UI/Cells/MovieTitleCell2.js

@@ -1,6 +0,0 @@
-var TemplatedCell = require('./TemplatedCell');
-
-module.exports = TemplatedCell.extend({
-    className : 'series-title-cell',
-    template  : 'Cells/SeriesTitleTemplate',
-});

src/UI/Cells/MovieTitleHistoryCell.js

@@ -0,0 +1,14 @@
+var TemplatedCell = require('./TemplatedCell');
+
+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.
+                    debugger;
+             return this;
+
+         }
+});

src/UI/Cells/QualityCell.js

@@ -4,5 +4,7 @@ var QualityCellEditor = require('./Edit/QualityCellEditor');
 module.exports = TemplatedCell.extend({
     className : 'quality-cell',
     template  : 'Cells/QualityCellTemplate',
-    editor    : QualityCellEditor
-});
+    editor    : QualityCellEditor,
+
+
+});

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());
     }
 });

src/UI/Handlebars/Helpers/Series.js

@@ -161,6 +161,14 @@ Handlebars.registerHelper('DownloadedStatus', function() {
   return "Missing";
 });
 
+Handlebars.registerHelper("DownloadedQuality", function() {
+  if (this.movieFile) {
+    return this.movieFile.quality.quality.name;
+  }
+
+  return "";
+})
+
 
 Handlebars.registerHelper('inCinemas', function() {
   var monthNames = ["January", "February", "March", "April", "May", "June",
@@ -173,10 +181,13 @@ Handlebars.registerHelper('inCinemas', function() {
     var year = d.getFullYear();
     return "Available: " + day + ". " + month + " " + year;
   }
-  var cinemasDate = new Date(this.inCinemas);
-  var year = cinemasDate.getFullYear();
-  var month = monthNames[cinemasDate.getMonth()];
-  return "In Cinemas: " + month + " " + year;
+  if (this.inCinemas) {
+    var cinemasDate = new Date(this.inCinemas);
+    var year = cinemasDate.getFullYear();
+    var month = monthNames[cinemasDate.getMonth()];
+    return "In Cinemas: " + month + " " + year;
+  }
+  return "To be announced";
 });
 
 Handlebars.registerHelper('tvRageUrl', function() {

src/UI/ManualImport/Cells/MovieCell.js

@@ -0,0 +1,43 @@
+var vent = require('../../vent');
+var NzbDroneCell = require('../../Cells/NzbDroneCell');
+var SelectMovieLayout = require('../Movie/SelectMovieLayout');
+
+module.exports = NzbDroneCell.extend({
+    className : 'series-title-cell editable',
+
+    events : {
+        'click' : '_onClick'
+    },
+
+    render : function() {
+        this.$el.empty();
+
+        var movie = this.model.get('movie');
+
+        if (movie)
+        {
+            this.$el.html(movie.title + " (" + movie.year + ")" );
+        }
+
+        this.delegateEvents();
+        return this;
+    },
+
+    _onClick : function () {
+        var view = new SelectMovieLayout();
+
+        this.listenTo(view, 'manualimport:selected:movie', this._setMovie);
+
+        vent.trigger(vent.Commands.OpenModal2Command, view);
+    },
+
+    _setMovie : function (e) {
+        if (this.model.has('movie') && e.model.id === this.model.get('movie').id) {
+            return;
+        }
+
+        this.model.set({
+            movie       : e.model.toJSON()
+        });
+    }
+});

src/UI/ManualImport/ManualImportLayout.js

@@ -16,6 +16,7 @@ var QualityCell = require('./Cells/QualityCell');
 var FileSizeCell = require('../Cells/FileSizeCell');
 var ApprovalStatusCell = require('../Cells/ApprovalStatusCell');
 var ManualImportCollection = require('./ManualImportCollection');
+var MovieCell = require('./Cells/MovieCell');
 var Messenger = require('../Shared/Messenger');
 
 module.exports = Marionette.Layout.extend({
@@ -49,23 +50,29 @@ module.exports = Marionette.Layout.extend({
             sortable   : true
         },
         {
-            name       : 'series',
-            label      : 'Series',
-            cell       : SeriesCell,
+            name       : 'movie',
+            label      : 'Movie',
+            cell       : MovieCell,
             sortable   : true
         },
-        {
-            name       : 'seasonNumber',
-            label      : 'Season',
-            cell       : SeasonCell,
-            sortable   : true
-        },
-        {
-            name       : 'episodes',
-            label      : 'Episode(s)',
-            cell       : EpisodesCell,
-            sortable   : false
-        },
+        // {
+        //     name       : 'series',
+        //     label      : 'Series',
+        //     cell       : SeriesCell,
+        //     sortable   : true
+        // },
+        // {
+        //     name       : 'seasonNumber',
+        //     label      : 'Season',
+        //     cell       : SeasonCell,
+        //     sortable   : true
+        // },
+        // {
+        //     name       : 'episodes',
+        //     label      : 'Episode(s)',
+        //     cell       : EpisodesCell,
+        //     sortable   : false
+        // },
         {
             name       : 'quality',
             label      : 'Quality',
@@ -161,8 +168,8 @@ module.exports = Marionette.Layout.extend({
     },
 
     _automaticImport : function (e) {
-        CommandController.Execute('downloadedEpisodesScan', {
-            name : 'downloadedEpisodesScan',
+        CommandController.Execute('downloadedMovieScan', {
+            name : 'downloadedMovieScan',
             path : e.folder
         });
 
@@ -176,29 +183,36 @@ module.exports = Marionette.Layout.extend({
             return;
         }
 
-        if (_.any(selected, function (model) {
-                return !model.has('series');
-            })) {
-
-            this._showErrorMessage('Series must be chosen for each selected file');
+        if(_.any(selected, function(model) {
+            return !model.has('movie');
+        })) {
+            this._showErrorMessage('Movie must be chosen for each selected file');
             return;
         }
 
-        if (_.any(selected, function (model) {
-                return !model.has('seasonNumber');
-            })) {
+        // if (_.any(selected, function (model) {
+        //         return !model.has('series');
+        //     })) {
 
-            this._showErrorMessage('Season must be chosen for each selected file');
-            return;
-        }
+        //     this._showErrorMessage('Series must be chosen for each selected file');
+        //     return;
+        // }
 
-        if (_.any(selected, function (model) {
-                return !model.has('episodes') || model.get('episodes').length === 0;
-            })) {
+        // if (_.any(selected, function (model) {
+        //         return !model.has('seasonNumber');
+        //     })) {
 
-            this._showErrorMessage('One or more episodes must be chosen for each selected file');
-            return;
-        }
+        //     this._showErrorMessage('Season must be chosen for each selected file');
+        //     return;
+        // }
+
+        // if (_.any(selected, function (model) {
+        //         return !model.has('episodes') || model.get('episodes').length === 0;
+        //     })) {
+
+        //     this._showErrorMessage('One or more episodes must be chosen for each selected file');
+        //     return;
+        // }
 
         var importMode = this.ui.importMode.val();
 
@@ -207,8 +221,9 @@ module.exports = Marionette.Layout.extend({
             files : _.map(selected, function (file) {
                 return {
                     path       : file.get('path'),
-                    seriesId   : file.get('series').id,
-                    episodeIds : _.map(file.get('episodes'), 'id'),
+                    movieId    : file.get('movie').id,
+                    // seriesId   : file.get('series').id,
+                    // episodeIds : _.map(file.get('episodes'), 'id'),
                     quality    : file.get('quality'),
                     downloadId : file.get('downloadId')
                 };

src/UI/ManualImport/Movie/SelectMovieLayout.js

@@ -0,0 +1,101 @@
+var _ = require('underscore');
+var vent = require('vent');
+var Marionette = require('marionette');
+var Backgrid = require('backgrid');
+var MoviesCollection = require('../../Movies/MoviesCollection');
+var SelectRow = require('./SelectMovieRow');
+
+module.exports = Marionette.Layout.extend({
+    template  : 'ManualImport/Movie/SelectMovieLayoutTemplate',
+
+    regions : {
+        movie : '.x-movie'
+    },
+
+    ui : {
+        filter : '.x-filter'
+    },
+
+    columns : [
+        {
+            name      : 'title',
+            label     : 'Title',
+            cell      : 'String',
+            sortValue : 'sortTitle'
+        }
+    ],
+
+    initialize : function() {
+        this.movieCollection = MoviesCollection.clone();
+        this._setModelCollection();
+
+        this.listenTo(this.movieCollection, 'row:selected', this._onSelected);
+        this.listenTo(this, 'modal:afterShow', this._setFocus);
+    },
+
+    onRender : function() {
+        this.movieView = new Backgrid.Grid({
+            columns    : this.columns,
+            collection : this.movieCollection,
+            className  : 'table table-hover season-grid',
+            row        : SelectRow
+        });
+
+        this.movie.show(this.movieView);
+        this._setupFilter();
+    },
+
+    _setupFilter : function () {
+        var self = this;
+
+        //TODO: This should be a mixin (same as Add Series searching)
+        this.ui.filter.keyup(function(e) {
+            if (_.contains([
+                    9,
+                    16,
+                    17,
+                    18,
+                    19,
+                    20,
+                    33,
+                    34,
+                    35,
+                    36,
+                    37,
+                    38,
+                    39,
+                    40,
+                    91,
+                    92,
+                    93
+                ], e.keyCode)) {
+                return;
+            }
+
+            self._filter(self.ui.filter.val());
+        });
+    },
+
+    _filter : function (term) {
+        this.movieCollection.setFilter(['title', term, 'contains']);
+        this._setModelCollection();
+    },
+
+    _onSelected : function (e) {
+        this.trigger('manualimport:selected:movie', { model: e.model });
+
+        vent.trigger(vent.Commands.CloseModal2Command);
+    },
+
+    _setFocus : function () {
+        this.ui.filter.focus();
+    },
+    
+    _setModelCollection: function () {
+        var self = this;
+        
+        _.each(this.movieCollection.models, function (model) {
+            model.collection = self.movieCollection;
+        });
+    }
+});

src/UI/ManualImport/Movie/SelectMovieLayoutTemplate.hbs

@@ -0,0 +1,30 @@
+<div class="modal-content">
+    <div class="manual-import-modal">
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+
+            <h3>
+                Manual Import - Select Movie
+            </h3>
+
+        </div>
+        <div class="modal-body">
+            <div class="row">
+                <div class="col-md-12">
+                    <div class="form-group">
+                        <input type="text" class="form-control x-filter" placeholder="Filter movies" />
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-md-12 x-movie"></div>
+            </div>
+        </div>
+        <div class="modal-footer">
+            <button class="btn btn-default" data-dismiss="modal">Cancel</button>
+        </div>
+    </div>
+</div>
+
+

src/UI/ManualImport/Movie/SelectMovieRow.js

@@ -0,0 +1,13 @@
+var Backgrid = require('backgrid');
+
+module.exports = Backgrid.Row.extend({
+    className : 'select-row select-series-row',
+
+    events : {
+        'click' : '_onClick'
+    },
+
+    _onClick : function() {
+        this.model.collection.trigger('row:selected', { model: this.model });
+    }
+});

src/UI/ManualImport/Summary/ManualImportSummaryView.js

@@ -4,16 +4,25 @@ var Marionette = require('marionette');
 module.exports = Marionette.ItemView.extend({
     template  : 'ManualImport/Summary/ManualImportSummaryViewTemplate',
 
+    // initialize : function (options) {
+    //     var episodes = _.map(options.episodes, function (episode) {
+    //             return episode.toJSON();
+    //         });
+
+    //     this.templateHelpers = {
+    //         file     : options.file,
+    //         series   : options.series,
+    //         season   : options.season,
+    //         episodes : episodes,
+    //         quality  : options.quality
+    //     };
+    // }
+
     initialize : function (options) {
-        var episodes = _.map(options.episodes, function (episode) {
-                return episode.toJSON();
-            });
 
         this.templateHelpers = {
             file     : options.file,
-            series   : options.series,
-            season   : options.season,
-            episodes : episodes,
+            movie    : options.movie,
             quality  : options.quality
         };
     }

src/UI/ManualImport/Summary/ManualImportSummaryViewTemplate.hbs

@@ -3,16 +3,8 @@
     <dt>Path:</dt>
     <dd>{{file}}</dd>
 
-    <dt>Series:</dt>
-    <dd>{{series.title}}</dd>
-
-    <dt>Season:</dt>
-    <dd>{{season.seasonNumber}}</dd>
-
-    {{#each episodes}}
-        <dt>Episode:</dt>
-        <dd>{{episodeNumber}} - {{title}}</dd>
-    {{/each}}
+    <dt>Movie:</dt>
+    <dd>{{movie.title}} ({{movie.year}})</dd>
 
     <dt>Quality:</dt>
     <dd>{{quality.name}}</dd>

src/UI/Movies/Details/InfoViewTemplate.hbs

@@ -26,7 +26,7 @@
         {{else}}
             <span class="label label-default">Announced</span>
         {{/if_eq}}
-        <span class="label label-{{DownloadedStatusColor}}">{{DownloadedStatus}}</span>
+        <span class="label label-{{DownloadedStatusColor}}" title="{{DownloadedQuality}}">{{DownloadedStatus}}</span>
     </div>
     <div class="col-md-4">
         <span class="series-info-links">

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();
             }

src/UI/Movies/Details/MoviesDetailsTemplate.hbs

@@ -15,7 +15,7 @@
                         <i class="icon-sonarr-refresh icon-can-spin" title="Update movie info and scan disk"/>
                     </div>
                     <div class="x-rename">
-                        <i class="icon-sonarr-rename" title="Preview rename for all episodes"/>
+                        <i class="icon-sonarr-rename" title="Preview rename for movie"/>
                     </div>
                     <div class="x-search">
                         <i class="icon-sonarr-search" title="Search for movie"/>