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

@@ -1,4 +1,9 @@
-# Radarr [![Build Status](https://travis-ci.org/galli-leo/Radarr.svg?branch=develop)](https://travis-ci.org/galli-leo/Radarr)#
+# Radarr
+
+| 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-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.
 
@@ -21,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; }
@@ -27,11 +27,13 @@ namespace NzbDrone.Api.Movie
         public MovieStatusType Status { get; set; }
         public string Overview { get; set; }
         public DateTime? InCinemas { get; set; }
+        public DateTime? PhysicalRelease { get; set; }
         public List<MediaCover> Images { get; set; }
         public string Website { get; set; }
-
+        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; }
@@ -53,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)
 
@@ -79,6 +82,24 @@ namespace NzbDrone.Api.Movie
         {
             if (model == null) return null;
 
+
+            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();
+            }
+
             return new MovieResource
             {
                 Id = model.Id,
@@ -87,6 +108,9 @@ namespace NzbDrone.Api.Movie
                 //AlternateTitles
                 SortTitle = model.SortTitle,
                 InCinemas = model.InCinemas,
+                PhysicalRelease = model.PhysicalRelease,
+                HasFile = model.HasFile,
+                Downloaded = downloaded,
                 //TotalEpisodeCount
                 //EpisodeCount
                 //EpisodeFileCount
@@ -104,6 +128,8 @@ namespace NzbDrone.Api.Movie
                 
                 Monitored = model.Monitored,
 
+                SizeOnDisk = size,
+
                 Runtime = model.Runtime,
                 LastInfoSync = model.LastInfoSync,
                 CleanTitle = model.CleanTitle,
@@ -117,7 +143,8 @@ namespace NzbDrone.Api.Movie
                 Added = model.Added,
                 AddOptions = model.AddOptions,
                 AlternativeTitles = model.AlternativeTitles,
-                Ratings = model.Ratings
+                Ratings = model.Ratings,
+                MovieFile = movieFile
             };
         }
 
@@ -134,6 +161,7 @@ namespace NzbDrone.Api.Movie
                 //AlternateTitles
                 SortTitle = resource.SortTitle,
                 InCinemas = resource.InCinemas,
+                PhysicalRelease = resource.PhysicalRelease,
                 //TotalEpisodeCount
                 //EpisodeCount
                 //EpisodeFileCount

src/NzbDrone.Common/Cloud/SonarrCloudRequestBuilder.cs

@@ -14,7 +14,7 @@ namespace NzbDrone.Common.Cloud
     {
         public SonarrCloudRequestBuilder()
         {
-            Services = new HttpRequestBuilder("https://radarr.aeonlucid.com/v1/")
+            Services = new HttpRequestBuilder("http://radarr.aeonlucid.com/v1/")
                 .CreateFactory();
 
             SkyHookTvdb = new HttpRequestBuilder("http://skyhook.sonarr.tv/v1/tvdb/{route}/{language}/")

src/NzbDrone.Common/Extensions/PathExtensions.cs

@@ -16,10 +16,10 @@ namespace NzbDrone.Common.Extensions
         private const string UPDATE_CLIENT_EXE = "Radarr.Update.exe";
         private const string BACKUP_FOLDER = "Backups";
 
-        private static readonly string UPDATE_SANDBOX_FOLDER_NAME = "nzbdrone_update" + Path.DirectorySeparatorChar;
-        private static readonly string UPDATE_PACKAGE_FOLDER_NAME = "";
-        private static readonly string UPDATE_BACKUP_FOLDER_NAME = "nzbdrone_backup" + Path.DirectorySeparatorChar;
-        private static readonly string UPDATE_BACKUP_APPDATA_FOLDER_NAME = "nzbdrone_appdata_backup" + Path.DirectorySeparatorChar;
+        private static readonly string UPDATE_SANDBOX_FOLDER_NAME = "radarr_update" + Path.DirectorySeparatorChar;
+        private static readonly string UPDATE_PACKAGE_FOLDER_NAME = "Radarr" + Path.DirectorySeparatorChar;
+        private static readonly string UPDATE_BACKUP_FOLDER_NAME = "radarr_backup" + Path.DirectorySeparatorChar;
+        private static readonly string UPDATE_BACKUP_APPDATA_FOLDER_NAME = "radarr_appdata_backup" + Path.DirectorySeparatorChar;
         private static readonly string UPDATE_CLIENT_FOLDER_NAME = "NzbDrone.Update" + Path.DirectorySeparatorChar;
         private static readonly string UPDATE_LOG_FOLDER_NAME = "UpdateLogs" + Path.DirectorySeparatorChar;
 

src/NzbDrone.Common/ServiceProvider.cs

@@ -25,7 +25,7 @@ namespace NzbDrone.Common
 
     public class ServiceProvider : IServiceProvider
     {
-        public const string NZBDRONE_SERVICE_NAME = "NzbDrone";
+        public const string NZBDRONE_SERVICE_NAME = "Radarr";
 
         private readonly IProcessProvider _processProvider;
         private readonly Logger _logger;
@@ -78,7 +78,7 @@ namespace NzbDrone.Common
             serviceInstaller.Context = context;
             serviceInstaller.DisplayName = serviceName;
             serviceInstaller.ServiceName = serviceName;
-            serviceInstaller.Description = "NzbDrone Application Server";
+            serviceInstaller.Description = "Radarr Application Server";
             serviceInstaller.StartType = ServiceStartMode.Automatic;
             serviceInstaller.ServicesDependedOn = new[] { "EventLog", "Tcpip", "http" };
 

src/NzbDrone.Core.Test/IndexerTests/BitMeTvTests/BitMeTvFixture.cs

@@ -1,57 +0,0 @@
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Indexers.BitMeTv;
-using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Test.Framework;
-using System;
-using System.Linq;
-using FluentAssertions;
-
-namespace NzbDrone.Core.Test.IndexerTests.BitMeTvTests
-{
-    [TestFixture]
-    public class BitMeTvFixture : CoreTest<BitMeTv>
-    {
-        [SetUp]
-        public void Setup()
-        {
-            Subject.Definition = new IndexerDefinition()
-                                     {
-                                         Name = "BitMeTV",
-                                         Settings = new BitMeTvSettings() { Cookie = "uid=123" }
-                                     };
-        }
-
-        [Test]
-        public void should_parse_recent_feed_from_BitMeTv()
-        {
-            var recentFeed = ReadAllText(@"Files/Indexers/BitMeTv/BitMeTv.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(5);
-            releases.First().Should().BeOfType<TorrentInfo>();
-
-            var torrentInfo = releases.First() as TorrentInfo;
-
-            torrentInfo.Title.Should().Be("Total.Divas.S02E08.HDTV.x264-CRiMSON");
-            torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
-            torrentInfo.DownloadUrl.Should().Be("http://www.bitmetv.org/download.php/12/Total.Divas.S02E08.HDTV.x264-CRiMSON.torrent");
-            torrentInfo.InfoUrl.Should().BeNullOrEmpty();
-            torrentInfo.CommentUrl.Should().BeNullOrEmpty();
-            torrentInfo.Indexer.Should().Be(Subject.Definition.Name);
-            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2014/05/13 17:04:29"));
-            torrentInfo.Size.Should().Be(395009065);
-            torrentInfo.InfoHash.Should().Be(null);
-            torrentInfo.MagnetUrl.Should().Be(null);
-            torrentInfo.Peers.Should().Be(null);
-            torrentInfo.Seeders.Should().Be(null);
-        }
-    }
-}

src/NzbDrone.Core.Test/IndexerTests/BroadcastheNetTests/BroadcastheNetFixture.cs

@@ -1,161 +0,0 @@
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Indexers.BroadcastheNet;
-using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Test.Common;
-using System;
-using System.Linq;
-using FluentAssertions;
-
-namespace NzbDrone.Core.Test.IndexerTests.BroadcastheNetTests
-{
-    [TestFixture]
-    public class BroadcastheNetFixture : CoreTest<BroadcastheNet>
-    {
-        [SetUp]
-        public void Setup()
-        {
-            Subject.Definition = new IndexerDefinition()
-                {
-                    Name = "BroadcastheNet",
-                    Settings = new BroadcastheNetSettings() { ApiKey = "abc", BaseUrl = "https://api.btnapps.net/" }
-                };
-        }
-
-        [Test]
-        public void should_parse_recent_feed_from_BroadcastheNet()
-        {
-            var recentFeed = ReadAllText(@"Files/Indexers/BroadcastheNet/RecentFeed.json");
-
-            Mocker.GetMock<IHttpClient>()
-                .Setup(o => o.Execute(It.Is<HttpRequest>(v => v.Method == HttpMethod.POST)))
-                .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), recentFeed));
-
-            var releases = Subject.FetchRecent();
-
-            releases.Should().HaveCount(2);
-            releases.First().Should().BeOfType<TorrentInfo>();
-
-            var torrentInfo = releases.First() as TorrentInfo;
-
-            torrentInfo.Guid.Should().Be("BTN-123");
-            torrentInfo.Title.Should().Be("Jimmy.Kimmel.2014.09.15.Jane.Fonda.HDTV.x264-aAF");
-            torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
-            torrentInfo.DownloadUrl.Should().Be("https://broadcasthe.net/torrents.php?action=download&id=123&authkey=123&torrent_pass=123");
-            torrentInfo.InfoUrl.Should().Be("https://broadcasthe.net/torrents.php?id=237457&torrentid=123");
-            torrentInfo.CommentUrl.Should().BeNullOrEmpty();
-            torrentInfo.Indexer.Should().Be(Subject.Definition.Name);
-            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2014/09/16 21:15:33"));
-            torrentInfo.Size.Should().Be(505099926);
-            torrentInfo.InfoHash.Should().Be("123");
-            torrentInfo.TvdbId.Should().Be(71998);
-            torrentInfo.TvRageId.Should().Be(4055);
-            torrentInfo.MagnetUrl.Should().BeNullOrEmpty();
-            torrentInfo.Peers.Should().Be(40+9);
-            torrentInfo.Seeders.Should().Be(40);
-
-            torrentInfo.Origin.Should().Be("Scene");
-            torrentInfo.Source.Should().Be("HDTV");
-            torrentInfo.Container.Should().Be("MP4");
-            torrentInfo.Codec.Should().Be("x264");
-            torrentInfo.Resolution.Should().Be("SD");
-        }
-
-        private void VerifyBackOff()
-        {
-            Mocker.GetMock<IIndexerStatusService>()
-                .Verify(v => v.RecordFailure(It.IsAny<int>(), It.IsAny<TimeSpan>()), Times.Once());
-        }
-
-        [Test]
-        public void should_back_off_on_bad_request()
-        {
-            Mocker.GetMock<IHttpClient>()
-                .Setup(v => v.Execute(It.IsAny<HttpRequest>()))
-                .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), new byte[0], System.Net.HttpStatusCode.BadRequest));
-
-            var results = Subject.FetchRecent();
-
-            results.Should().BeEmpty();
-
-            VerifyBackOff();
-
-            ExceptionVerification.ExpectedWarns(1);
-        }
-
-        [Test]
-        public void should_back_off_and_report_api_key_invalid()
-        {
-            Mocker.GetMock<IHttpClient>()
-                .Setup(v => v.Execute(It.IsAny<HttpRequest>()))
-                .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), new byte[0], System.Net.HttpStatusCode.Unauthorized));
-
-            var results = Subject.FetchRecent();
-
-            results.Should().BeEmpty();
-
-            VerifyBackOff();
-
-            ExceptionVerification.ExpectedWarns(1);
-        }
-
-        [Test]
-        public void should_back_off_on_unknown_method()
-        {
-            Mocker.GetMock<IHttpClient>()
-                .Setup(v => v.Execute(It.IsAny<HttpRequest>()))
-                .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), new byte[0], System.Net.HttpStatusCode.NotFound));
-
-            var results = Subject.FetchRecent();
-
-            results.Should().BeEmpty();
-
-            VerifyBackOff();
-
-            ExceptionVerification.ExpectedWarns(1);
-        }
-
-        [Test]
-        public void should_back_off_api_limit_reached()
-        {
-            Mocker.GetMock<IHttpClient>()
-                .Setup(v => v.Execute(It.IsAny<HttpRequest>()))
-                .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), new byte[0], System.Net.HttpStatusCode.ServiceUnavailable));
-
-            var results = Subject.FetchRecent();
-
-            results.Should().BeEmpty();
-
-            VerifyBackOff();
-
-            ExceptionVerification.ExpectedWarns(1);
-        }
-
-        [Test]
-        public void should_replace_https_http_as_needed()
-        {
-            var recentFeed = ReadAllText(@"Files/Indexers/BroadcastheNet/RecentFeed.json");
-
-            (Subject.Definition.Settings as BroadcastheNetSettings).BaseUrl = "http://api.btnapps.net/";
-
-            recentFeed = recentFeed.Replace("http:", "https:");
-
-            Mocker.GetMock<IHttpClient>()
-                .Setup(o => o.Execute(It.Is<HttpRequest>(v => v.Method == HttpMethod.POST)))
-                .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), recentFeed));
-
-            var releases = Subject.FetchRecent();
-
-            releases.Should().HaveCount(2);
-            releases.First().Should().BeOfType<TorrentInfo>();
-
-            var torrentInfo = releases.First() as TorrentInfo;
-
-            torrentInfo.DownloadUrl.Should().Be("http://broadcasthe.net/torrents.php?action=download&id=123&authkey=123&torrent_pass=123");
-            torrentInfo.InfoUrl.Should().Be("http://broadcasthe.net/torrents.php?id=237457&torrentid=123");
-        }
-    }
-}

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/IndexerTests/TorrentleechTests/TorrentleechFixture.cs

@@ -1,57 +0,0 @@
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Indexers.Torrentleech;
-using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Test.Framework;
-using System;
-using System.Linq;
-using FluentAssertions;
-
-namespace NzbDrone.Core.Test.IndexerTests.TorrentleechTests
-{
-    [TestFixture]
-    public class TorrentleechFixture : CoreTest<Torrentleech>
-    {
-        [SetUp]
-        public void Setup()
-        {
-            Subject.Definition = new IndexerDefinition()
-                {
-                    Name = "Torrentleech",
-                    Settings = new TorrentleechSettings()
-                };
-        }
-
-        [Test]
-        public void should_parse_recent_feed_from_Torrentleech()
-        {
-            var recentFeed = ReadAllText(@"Files/Indexers/Torrentleech/Torrentleech.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(5);
-            releases.First().Should().BeOfType<TorrentInfo>();
-
-            var torrentInfo = releases.First() as TorrentInfo;
-
-            torrentInfo.Title.Should().Be("Classic Car Rescue S02E04 720p HDTV x264-C4TV");
-            torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
-            torrentInfo.DownloadUrl.Should().Be("http://www.torrentleech.org/rss/download/513575/1234/Classic.Car.Rescue.S02E04.720p.HDTV.x264-C4TV.torrent");
-            torrentInfo.InfoUrl.Should().Be("http://www.torrentleech.org/torrent/513575");
-            torrentInfo.CommentUrl.Should().Be("http://www.torrentleech.org/torrent/513575#comments");
-            torrentInfo.Indexer.Should().Be(Subject.Definition.Name);
-            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2014/05/12 19:15:28"));
-            torrentInfo.Size.Should().Be(0);
-            torrentInfo.InfoHash.Should().Be(null);
-            torrentInfo.MagnetUrl.Should().Be(null);
-            torrentInfo.Peers.Should().Be(7+1);
-            torrentInfo.Seeders.Should().Be(1);
-        }
-    }
-}

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

@@ -237,8 +237,6 @@
     <Compile Include="IndexerSearchTests\NzbSearchServiceFixture.cs" />
     <Compile Include="IndexerSearchTests\SearchDefinitionFixture.cs" />
     <Compile Include="IndexerTests\BasicRssParserFixture.cs" />
-    <Compile Include="IndexerTests\BitMeTvTests\BitMeTvFixture.cs" />
-    <Compile Include="IndexerTests\BroadcastheNetTests\BroadcastheNetFixture.cs" />
     <Compile Include="IndexerTests\HDBitsTests\HDBitsFixture.cs" />
     <Compile Include="IndexerTests\IndexerServiceFixture.cs" />
     <Compile Include="IndexerTests\IndexerStatusServiceFixture.cs" />
@@ -251,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" />
@@ -259,7 +256,6 @@
     <Compile Include="IndexerTests\IPTorrentsTests\IPTorrentsFixture.cs" />
     <Compile Include="IndexerTests\KickassTorrentsTests\KickassTorrentsFixture.cs" />
     <Compile Include="IndexerTests\NyaaTests\NyaaFixture.cs" />
-    <Compile Include="IndexerTests\TorrentleechTests\TorrentleechFixture.cs" />
     <Compile Include="IndexerTests\TorrentRssIndexerTests\TorrentRssIndexerFixture.cs" />
     <Compile Include="IndexerTests\TorrentRssIndexerTests\TestTorrentRssIndexer.cs" />
     <Compile Include="IndexerTests\WomblesTests\WomblesFixture.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/Configuration/ConfigFileProvider.cs

@@ -161,7 +161,8 @@ namespace NzbDrone.Core.Configuration
 
         public bool AnalyticsEnabled => GetValueBoolean("AnalyticsEnabled", true, persist: false);
 
-        public string Branch => GetValue("Branch", "master").ToLowerInvariant();
+        // TODO: Change back to "master" for the first stable release.
+        public string Branch => GetValue("Branch", "develop").ToLowerInvariant();
 
         public string LogLevel => GetValue("LogLevel", "Info");
 

src/NzbDrone.Core/Datastore/Migration/110_add_physical_release_to_table.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+using System.Data;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(110)]
+    public class add_phyiscal_release : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Alter.Table("Movies").AddColumn("PhysicalRelease").AsDateTime().Nullable();
+
+        }
+
+        
+        
+    }
+}

src/NzbDrone.Core/Datastore/Migration/111_remove_bitmetv.cs

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

src/NzbDrone.Core/Datastore/Migration/112_remove_torrentleech.cs

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

src/NzbDrone.Core/Datastore/Migration/113_remove_broadcasthenet.cs

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

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/BitMeTv/BitMeTv.cs

@@ -1,32 +0,0 @@
-using NzbDrone.Common.Http;
-using NzbDrone.Core.Configuration;
-using NLog;
-using NzbDrone.Core.Parser;
-
-namespace NzbDrone.Core.Indexers.BitMeTv
-{
-    public class BitMeTv : HttpIndexerBase<BitMeTvSettings>
-    {
-        public override string Name => "BitMeTV";
-
-        public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
-        public override bool SupportsSearch => false;
-        public override int PageSize => 0;
-
-        public BitMeTv(IHttpClient httpClient, IIndexerStatusService indexerStatusService, IConfigService configService, IParsingService parsingService, Logger logger)
-            : base(httpClient, indexerStatusService, configService, parsingService, logger)
-        {
-
-        }
-
-        public override IIndexerRequestGenerator GetRequestGenerator()
-        {
-            return new BitMeTvRequestGenerator() { Settings = Settings };
-        }
-
-        public override IParseIndexerResponse GetParser()
-        {
-            return new TorrentRssParser() { ParseSizeInDescription = true };
-        }
-    }
-}

src/NzbDrone.Core/Indexers/BitMeTv/BitMeTvSettings.cs

@@ -1,52 +0,0 @@
-using System.Text.RegularExpressions;
-using FluentValidation;
-using NzbDrone.Core.Annotations;
-using NzbDrone.Core.ThingiProvider;
-using NzbDrone.Core.Validation;
-
-namespace NzbDrone.Core.Indexers.BitMeTv
-{
-    public class BitMeTvSettingsValidator : AbstractValidator<BitMeTvSettings>
-    {
-        public BitMeTvSettingsValidator()
-        {
-            RuleFor(c => c.BaseUrl).ValidRootUrl();
-            RuleFor(c => c.UserId).NotEmpty();
-            RuleFor(c => c.RssPasskey).NotEmpty();
-
-            RuleFor(c => c.Cookie).NotEmpty();
-
-            RuleFor(c => c.Cookie)
-                .Matches(@"pass=[0-9a-f]{32}", RegexOptions.IgnoreCase)
-                .WithMessage("Wrong pattern")
-                .AsWarning();
-        }
-    }
-
-    public class BitMeTvSettings : IProviderConfig
-    {
-        private static readonly BitMeTvSettingsValidator Validator = new BitMeTvSettingsValidator();
-
-        public BitMeTvSettings()
-        {
-            BaseUrl = "https://www.bitmetv.org";
-        }
-
-        [FieldDefinition(0, Label = "Website URL")]
-        public string BaseUrl { get; set; }
-
-        [FieldDefinition(1, Label = "UserId")]
-        public string UserId { get; set; }
-
-        [FieldDefinition(2, Label = "RSS Passkey")]
-        public string RssPasskey { get; set; }
-
-        [FieldDefinition(3, Label = "Cookie", HelpText = "BitMeTv uses a login cookie needed to access the rss, you'll have to retrieve it via a browser.")]
-        public string Cookie { get; set; }
-
-        public NzbDroneValidationResult Validate()
-        {
-            return new NzbDroneValidationResult(Validator.Validate(this));
-        }
-    }
-}

src/NzbDrone.Core/Indexers/BroadcastheNet/BroadcastheNet.cs

@@ -1,45 +0,0 @@
-using NLog;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Parser;
-
-namespace NzbDrone.Core.Indexers.BroadcastheNet
-{
-    public class BroadcastheNet : HttpIndexerBase<BroadcastheNetSettings>
-    {
-        public override string Name => "BroadcastheNet";
-
-        public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
-        public override bool SupportsRss => true;
-        public override bool SupportsSearch => true;
-        public override int PageSize => 100;
-
-        public BroadcastheNet(IHttpClient httpClient, IIndexerStatusService indexerStatusService, IConfigService configService, IParsingService parsingService, Logger logger)
-            : base(httpClient, indexerStatusService, configService, parsingService, logger)
-        {
-
-        }
-
-        public override IIndexerRequestGenerator GetRequestGenerator()
-        {
-            var requestGenerator = new BroadcastheNetRequestGenerator() { Settings = Settings, PageSize = PageSize };
-
-            var releaseInfo = _indexerStatusService.GetLastRssSyncReleaseInfo(Definition.Id);
-            if (releaseInfo != null)
-            {
-                int torrentID;
-                if (int.TryParse(releaseInfo.Guid.Replace("BTN-", string.Empty), out torrentID))
-                {
-                    requestGenerator.LastRecentTorrentID = torrentID;
-                }
-            }
-
-            return requestGenerator;
-        }
-
-        public override IParseIndexerResponse GetParser()
-        {
-            return new BroadcastheNetParser();
-        }
-    }
-}

src/NzbDrone.Core/Indexers/BroadcastheNet/BroadcastheNetParser.cs

@@ -1,91 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Text.RegularExpressions;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.Indexers.Exceptions;
-using NzbDrone.Core.Parser.Model;
-
-namespace NzbDrone.Core.Indexers.BroadcastheNet
-{
-    public class BroadcastheNetParser : IParseIndexerResponse
-    {
-        private static readonly Regex RegexProtocol = new Regex("^https?:", RegexOptions.Compiled);
-
-        public IList<ReleaseInfo> ParseResponse(IndexerResponse indexerResponse)
-        {
-            var results = new List<ReleaseInfo>();
-
-            switch (indexerResponse.HttpResponse.StatusCode)
-            {
-                case HttpStatusCode.Unauthorized:
-                    throw new ApiKeyException("API Key invalid or not authorized");
-                case HttpStatusCode.NotFound:
-                    throw new IndexerException(indexerResponse, "Indexer API call returned NotFound, the Indexer API may have changed.");
-                case HttpStatusCode.ServiceUnavailable:
-                    throw new RequestLimitReachedException("Cannot do more than 150 API requests per hour.");
-                default:
-                    if (indexerResponse.HttpResponse.StatusCode != HttpStatusCode.OK)
-                    {
-                        throw new IndexerException(indexerResponse, "Indexer API call returned an unexpected StatusCode [{0}]", indexerResponse.HttpResponse.StatusCode);
-                    }
-                    break;
-            }
-
-            if (indexerResponse.Content == "Query execution was interrupted")
-            {
-                throw new IndexerException(indexerResponse, "Indexer API returned an internal server error");
-            }
-
-
-            JsonRpcResponse<BroadcastheNetTorrents> jsonResponse = new HttpResponse<JsonRpcResponse<BroadcastheNetTorrents>>(indexerResponse.HttpResponse).Resource;
-
-            if (jsonResponse.Error != null || jsonResponse.Result == null)
-            {
-                throw new IndexerException(indexerResponse, "Indexer API call returned an error [{0}]", jsonResponse.Error);
-            }
-            
-            if (jsonResponse.Result.Results == 0)
-            {
-                return results;
-            }
-
-            var protocol = indexerResponse.HttpRequest.Url.Scheme + ":";
-
-            foreach (var torrent in jsonResponse.Result.Torrents.Values)
-            {
-                var torrentInfo = new TorrentInfo();
-
-                torrentInfo.Guid = string.Format("BTN-{0}", torrent.TorrentID);
-                torrentInfo.Title = torrent.ReleaseName;
-                torrentInfo.Size = torrent.Size;
-                torrentInfo.DownloadUrl = RegexProtocol.Replace(torrent.DownloadURL, protocol);
-                torrentInfo.InfoUrl = string.Format("{0}//broadcasthe.net/torrents.php?id={1}&torrentid={2}", protocol, torrent.GroupID, torrent.TorrentID);
-                //torrentInfo.CommentUrl =
-                if (torrent.TvdbID.HasValue)
-                {
-                    torrentInfo.TvdbId = torrent.TvdbID.Value;
-                }
-                if (torrent.TvrageID.HasValue)
-                {
-                    torrentInfo.TvRageId = torrent.TvrageID.Value;
-                }
-                torrentInfo.PublishDate = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc).ToUniversalTime().AddSeconds(torrent.Time);
-                //torrentInfo.MagnetUrl = 
-                torrentInfo.InfoHash = torrent.InfoHash;
-                torrentInfo.Seeders = torrent.Seeders;
-                torrentInfo.Peers = torrent.Leechers + torrent.Seeders;
-
-                torrentInfo.Origin = torrent.Origin;
-                torrentInfo.Source = torrent.Source;
-                torrentInfo.Container = torrent.Container;
-                torrentInfo.Codec = torrent.Codec;
-                torrentInfo.Resolution = torrent.Resolution;
-
-                results.Add(torrentInfo);
-            }
-
-            return results;
-        }
-    }
-}

src/NzbDrone.Core/Indexers/BroadcastheNet/BroadcastheNetRequestGenerator.cs

@@ -1,199 +0,0 @@
-using System.Linq;
-using System.Collections.Generic;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.IndexerSearch.Definitions;
-using System;
-
-namespace NzbDrone.Core.Indexers.BroadcastheNet
-{
-    public class BroadcastheNetRequestGenerator : IIndexerRequestGenerator
-    {
-        public int MaxPages { get; set; }
-        public int PageSize { get; set; }
-        public BroadcastheNetSettings Settings { get; set; }
-
-        public int? LastRecentTorrentID { get; set; }
-
-        public BroadcastheNetRequestGenerator()
-        {
-            MaxPages = 10;
-            PageSize = 100;
-        }
-
-        public virtual IndexerPageableRequestChain GetRecentRequests()
-        {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            if (LastRecentTorrentID.HasValue)
-            {
-                pageableRequests.Add(GetPagedRequests(MaxPages, new BroadcastheNetTorrentQuery()
-                {
-                    Id = ">=" + (LastRecentTorrentID.Value - 100)
-                }));
-            }
-            
-            pageableRequests.AddTier(GetPagedRequests(MaxPages, new BroadcastheNetTorrentQuery()
-            {
-                Age = "<=86400"
-            }));
-
-            return pageableRequests;
-        }
-
-        public virtual IndexerPageableRequestChain GetSearchRequests(SingleEpisodeSearchCriteria searchCriteria)
-        {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            var parameters = new BroadcastheNetTorrentQuery();
-            if (AddSeriesSearchParameters(parameters, searchCriteria))
-            {
-                foreach (var episode in searchCriteria.Episodes)
-                {
-                    parameters = parameters.Clone();
-
-                    parameters.Category = "Episode";
-                    parameters.Name = string.Format("S{0:00}%E{1:00}%", episode.SeasonNumber, episode.EpisodeNumber);
-
-                    pageableRequests.Add(GetPagedRequests(MaxPages, parameters));
-                }
-
-                foreach (var seasonNumber in searchCriteria.Episodes.Select(v => v.SeasonNumber).Distinct())
-                {
-                    parameters = parameters.Clone();
-
-                    parameters.Category = "Season";
-                    parameters.Name = string.Format("Season {0}", seasonNumber);
-
-                    pageableRequests.Add(GetPagedRequests(MaxPages, parameters));
-                }
-            }
-
-            return pageableRequests;
-        }
-
-        public virtual IndexerPageableRequestChain GetSearchRequests(SeasonSearchCriteria searchCriteria)
-        {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            var parameters = new BroadcastheNetTorrentQuery();
-            if (AddSeriesSearchParameters(parameters, searchCriteria))
-            {
-                foreach (var seasonNumber in searchCriteria.Episodes.Select(v => v.SeasonNumber).Distinct())
-                {
-                    parameters.Category = "Season";
-                    parameters.Name = string.Format("Season {0}", seasonNumber);
-
-                    pageableRequests.Add(GetPagedRequests(MaxPages, parameters));
-
-                    parameters = parameters.Clone();
-
-                    parameters.Category = "Episode";
-                    parameters.Name = string.Format("S{0:00}E%", seasonNumber);
-
-                    pageableRequests.Add(GetPagedRequests(MaxPages, parameters));
-                }
-            }
-
-            return pageableRequests;
-        }
-
-        public virtual IndexerPageableRequestChain GetSearchRequests(DailyEpisodeSearchCriteria searchCriteria)
-        {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            var parameters = new BroadcastheNetTorrentQuery();
-            if (AddSeriesSearchParameters(parameters, searchCriteria))
-            {
-                parameters.Category = "Episode";
-                parameters.Name = string.Format("{0:yyyy}.{0:MM}.{0:dd}", searchCriteria.AirDate);
-
-                pageableRequests.Add(GetPagedRequests(MaxPages, parameters));
-
-                pageableRequests.AddTier();
-
-                foreach (var episode in searchCriteria.Episodes)
-                {
-                    parameters = parameters.Clone();
-
-                    parameters.Category = "Episode";
-                    parameters.Name = string.Format("S{0:00}E{1:00}", episode.SeasonNumber, episode.EpisodeNumber);
-
-                    pageableRequests.Add(GetPagedRequests(MaxPages, parameters));
-                }
-            }
-
-            return pageableRequests;
-        }
-
-        public virtual IndexerPageableRequestChain GetSearchRequests(AnimeEpisodeSearchCriteria searchCriteria)
-        {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            var parameters = new BroadcastheNetTorrentQuery();
-            if (AddSeriesSearchParameters(parameters, searchCriteria))
-            {
-                foreach (var episode in searchCriteria.Episodes)
-                {
-                    parameters = parameters.Clone();
-
-                    parameters.Category = "Episode";
-                    parameters.Name = string.Format("S{0:00}E{1:00}", episode.SeasonNumber, episode.EpisodeNumber);
-
-                    pageableRequests.Add(GetPagedRequests(MaxPages, parameters));
-                }
-
-                foreach (var seasonNumber in searchCriteria.Episodes.Select(v => v.SeasonNumber).Distinct())
-                {
-                    parameters = parameters.Clone();
-
-                    parameters.Category = "Season";
-                    parameters.Name = string.Format("Season {0}", seasonNumber);
-
-                    pageableRequests.Add(GetPagedRequests(MaxPages, parameters));
-                }
-            }
-
-            return pageableRequests;
-        }
-
-        public virtual IndexerPageableRequestChain GetSearchRequests(SpecialEpisodeSearchCriteria searchCriteria)
-        {
-            return new IndexerPageableRequestChain();
-        }
-
-        private bool AddSeriesSearchParameters(BroadcastheNetTorrentQuery parameters, SearchCriteriaBase searchCriteria)
-        {
-            if (searchCriteria.Series.TvdbId != 0)
-            {
-                parameters.Tvdb = string.Format("{0}", searchCriteria.Series.TvdbId);
-                return true;
-            }
-            if (searchCriteria.Series.TvRageId != 0)
-            {
-                parameters.Tvrage = string.Format("{0}", searchCriteria.Series.TvRageId);
-                return true;
-            }
-            // BTN is very neatly managed, so it's unlikely they map tvrage/tvdb wrongly.
-            return false;
-        }
-
-        private IEnumerable<IndexerRequest> GetPagedRequests(int maxPages, BroadcastheNetTorrentQuery parameters)
-        {
-            var builder = new JsonRpcRequestBuilder(Settings.BaseUrl)
-                .Call("getTorrents", Settings.ApiKey, parameters, PageSize, 0);
-            builder.SuppressHttpError = true;
-
-            for (var page = 0; page < maxPages; page++)
-            {
-                builder.JsonParameters[3] = page * PageSize;
-
-                yield return new IndexerRequest(builder.Build());
-            }
-        }
-
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
-        {
-            return new IndexerPageableRequestChain();
-        }
-    }
-}

src/NzbDrone.Core/Indexers/BroadcastheNet/BroadcastheNetSettings.cs

@@ -1,37 +0,0 @@
-using FluentValidation;
-using NzbDrone.Core.Annotations;
-using NzbDrone.Core.ThingiProvider;
-using NzbDrone.Core.Validation;
-
-namespace NzbDrone.Core.Indexers.BroadcastheNet
-{
-    public class BroadcastheNetSettingsValidator : AbstractValidator<BroadcastheNetSettings>
-    {
-        public BroadcastheNetSettingsValidator()
-        {
-            RuleFor(c => c.BaseUrl).ValidRootUrl();
-            RuleFor(c => c.ApiKey).NotEmpty();
-        }
-    }
-
-    public class BroadcastheNetSettings : IProviderConfig
-    {
-        private static readonly BroadcastheNetSettingsValidator Validator = new BroadcastheNetSettingsValidator();
-
-        public BroadcastheNetSettings()
-        {
-            BaseUrl = "http://api.btnapps.net/";
-        }
-
-        [FieldDefinition(0, Label = "API URL", Advanced = true, HelpText = "Do not change this unless you know what you're doing. Since your API key will be sent to that host.")]
-        public string BaseUrl { get; set; }
-
-        [FieldDefinition(1, Label = "API Key")]
-        public string ApiKey { get; set; }
-
-        public NzbDroneValidationResult Validate()
-        {
-            return new NzbDroneValidationResult(Validator.Validate(this));
-        }
-    }
-}

src/NzbDrone.Core/Indexers/BroadcastheNet/BroadcastheNetTorrent.cs

@@ -1,31 +0,0 @@
-namespace NzbDrone.Core.Indexers.BroadcastheNet
-{
-    public class BroadcastheNetTorrent
-    {
-        public string GroupName { get; set; }
-        public int GroupID { get; set; }
-        public int TorrentID { get; set; }
-        public int SeriesID { get; set; }
-        public string Series { get; set; }
-        public string SeriesBanner { get; set; }
-        public string SeriesPoster { get; set; }
-        public string YoutubeTrailer { get; set; }
-        public string Category { get; set; }
-        public int? Snatched { get; set; }
-        public int? Seeders { get; set; }
-        public int? Leechers { get; set; }
-        public string Source { get; set; }
-        public string Container { get; set; }
-        public string Codec { get; set; }
-        public string Resolution { get; set; }
-        public string Origin { get; set; }
-        public string ReleaseName { get; set; }
-        public long Size { get; set; }
-        public long Time { get; set; }
-        public int? TvdbID { get; set; }
-        public int? TvrageID { get; set; }
-        public string ImdbID { get; set; }
-        public string InfoHash { get; set; }
-        public string DownloadURL { get; set; }
-    }
-}

src/NzbDrone.Core/Indexers/BroadcastheNet/BroadcastheNetTorrentQuery.cs

@@ -1,39 +0,0 @@
-using Newtonsoft.Json;
-
-namespace NzbDrone.Core.Indexers.BroadcastheNet
-{
-    public class BroadcastheNetTorrentQuery
-    {
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
-        public string Id { get; set; }
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
-        public string Category { get; set; }
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
-        public string Name { get; set; }
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
-        public string Search { get; set; }
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
-        public string Codec { get; set; }
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
-        public string Container { get; set; }
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
-        public string Source { get; set; }
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
-        public string Resolution { get; set; }
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
-        public string Origin { get; set; }
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
-        public string Hash { get; set; }
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
-        public string Tvdb { get; set; }
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
-        public string Tvrage { get; set; }
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
-        public string Age { get; set; }
-
-        public BroadcastheNetTorrentQuery Clone()
-        {
-            return MemberwiseClone() as BroadcastheNetTorrentQuery;
-        }
-    }
-}

src/NzbDrone.Core/Indexers/BroadcastheNet/BroadcastheNetTorrents.cs

@@ -1,10 +0,0 @@
-using System.Collections.Generic;
-
-namespace NzbDrone.Core.Indexers.BroadcastheNet
-{
-    public class BroadcastheNetTorrents
-    {
-        public Dictionary<int, BroadcastheNetTorrent> Torrents { get; set; }
-        public int Results { get; set; }
-    }
-}

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/HDBits/HDBitsRequestGenerator.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Common.Http;
@@ -22,21 +22,7 @@ namespace NzbDrone.Core.Indexers.HDBits
 
         public virtual IndexerPageableRequestChain GetSearchRequests(AnimeEpisodeSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            var queryBase = new TorrentQuery();
-            if (TryAddSearchParameters(queryBase, searchCriteria))
-            {
-                foreach (var episode in searchCriteria.Episodes)
-                {
-                    var query = queryBase.Clone();
-
-                    query.TvdbInfo.Season = episode.SeasonNumber;
-                    query.TvdbInfo.Episode = episode.EpisodeNumber;
-                }
-            }
-
-            return pageableRequests;
+            return new IndexerPageableRequestChain();
         }
 
         public virtual IndexerPageableRequestChain GetSearchRequests(SpecialEpisodeSearchCriteria searchCriteria)
@@ -46,69 +32,28 @@ namespace NzbDrone.Core.Indexers.HDBits
 
         public virtual IndexerPageableRequestChain GetSearchRequests(DailyEpisodeSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            var query = new TorrentQuery();
-            if (TryAddSearchParameters(query, searchCriteria))
-            {
-                query.Search = string.Format("{0:yyyy}-{0:MM}-{0:dd}", searchCriteria.AirDate);
-
-                pageableRequests.Add(GetRequest(query));
-            }
-
-            return pageableRequests;
+            return new IndexerPageableRequestChain();
         }
 
         public virtual IndexerPageableRequestChain GetSearchRequests(SeasonSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            var queryBase = new TorrentQuery();
-            if (TryAddSearchParameters(queryBase, searchCriteria))
-            {
-                foreach (var seasonNumber in searchCriteria.Episodes.Select(e => e.SeasonNumber).Distinct())
-                {
-                    var query = queryBase.Clone();
-
-                    query.TvdbInfo.Season = seasonNumber;
-
-                    pageableRequests.Add(GetRequest(query));
-                }
-            }
-
-            return pageableRequests;
+            return new IndexerPageableRequestChain();
         }
 
         public virtual IndexerPageableRequestChain GetSearchRequests(SingleEpisodeSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            var queryBase = new TorrentQuery();
-            if (TryAddSearchParameters(queryBase, searchCriteria))
-            {
-                foreach (var episode in searchCriteria.Episodes)
-                {
-                    var query = queryBase.Clone();
-
-                    query.TvdbInfo.Season = episode.SeasonNumber;
-                    query.TvdbInfo.Episode = episode.EpisodeNumber;
-
-                    pageableRequests.Add(GetRequest(query));
-                }
-            }
-
-            return pageableRequests;
+            return new IndexerPageableRequestChain();
         }
 
-        private bool TryAddSearchParameters(TorrentQuery query, SearchCriteriaBase searchCriteria)
+        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            if (searchCriteria.Series.TvdbId != 0)
-            {
-                query.TvdbInfo = query.TvdbInfo ?? new TvdbInfo();
-                query.TvdbInfo.Id = searchCriteria.Series.TvdbId;
-                return true;
-            }
-            return false;
+
+            var pageableRequests = new IndexerPageableRequestChain();
+            var queryBase = new TorrentQuery();
+            var query = queryBase.Clone();
+            query.ImdbInfo.Id = int.Parse(searchCriteria.Movie.ImdbId.Substring(2));
+            pageableRequests.Add(GetRequest(query));
+            return pageableRequests;
         }
 
         private IEnumerable<IndexerRequest> GetRequest(TorrentQuery query)
@@ -129,10 +74,5 @@ namespace NzbDrone.Core.Indexers.HDBits
 
             yield return new IndexerRequest(request);
         }
-
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
-        {
-            return new IndexerPageableRequestChain();
-        }
     }
 }

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/Omgwtfnzbs/OmgwtfnzbsRequestGenerator.cs

@@ -92,7 +92,7 @@ namespace NzbDrone.Core.Indexers.Omgwtfnzbs
         private IEnumerable<IndexerRequest> GetPagedRequests(string query)
         {
             var url = new StringBuilder();
-            url.AppendFormat("{0}?catid=19,20&user={1}&api={2}&eng=1&delay={3}", BaseUrl, Settings.Username, Settings.ApiKey, Settings.Delay);
+            url.AppendFormat("{0}?catid=15,16,17&user={1}&api={2}&eng=1&delay={3}", BaseUrl, Settings.Username, Settings.ApiKey, Settings.Delay);
 
             if (query.IsNotNullOrWhiteSpace())
             {
@@ -105,7 +105,12 @@ namespace NzbDrone.Core.Indexers.Omgwtfnzbs
 
         public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            var pageableRequests = new IndexerPageableRequestChain();
+
+            pageableRequests.Add(GetPagedRequests(string.Format("{0}",
+                    searchCriteria.Movie.Title)));
+         
+            return pageableRequests;
         }
     }
 }

src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcorn.cs

@@ -0,0 +1,30 @@
+using NLog;
+using NzbDrone.Common.Http;
+using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Parser;
+
+namespace NzbDrone.Core.Indexers.PassThePopcorn
+{
+    public class PassThePopcorn : HttpIndexerBase<PassThePopcornSettings>
+    {
+        public override string Name => "PassThePopcorn";
+        public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
+        public override bool SupportsRss => true;
+        public override bool SupportsSearch => true;
+        public override int PageSize => 50;
+
+        public PassThePopcorn(IHttpClient httpClient, IIndexerStatusService indexerStatusService, IConfigService configService, IParsingService parsingService, Logger logger)
+            : base(httpClient, indexerStatusService, configService, parsingService, logger)
+        { }
+
+        public override IIndexerRequestGenerator GetRequestGenerator()
+        {
+            return new PassThePopcornRequestGenerator() { Settings = Settings };
+        }
+
+        public override IParseIndexerResponse GetParser()
+        {
+            return new PassThePopcornParser(Settings);
+        }
+    }
+}

src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornApi.cs

@@ -0,0 +1,59 @@
+using System;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace NzbDrone.Core.Indexers.PassThePopcorn
+{
+    public class Director
+    {
+        public string Name { get; set; }
+        public string Id { get; set; }
+    }
+
+    public class Torrent
+    {
+        public int Id { get; set; }
+        public string Quality { get; set; }
+        public string Source { get; set; }
+        public string Container { get; set; }
+        public string Codec { get; set; }
+        public string Resolution { get; set; }
+        public bool Scene { get; set; }
+        public string Size { get; set; }
+        public DateTime UploadTime { get; set; }
+        public string RemasterTitle { get; set; }
+        public string Snatched { get; set; }
+        public string Seeders { get; set; }
+        public string Leechers { get; set; }
+        public string ReleaseName { get; set; }
+        public bool Checked { get; set; }
+        public bool GoldenPopcorn { get; set; }
+    }
+
+    public class Movie
+    {
+        public string GroupId { get; set; }
+        public string Title { get; set; }
+        public string Year { get; set; }
+        public string Cover { get; set; }
+        public List<string> Tags { get; set; }
+        public List<Director> Directors { get; set; }
+        public string ImdbId { get; set; }
+        public int TotalLeechers { get; set; }
+        public int TotalSeeders { get; set; }
+        public int TotalSnatched { get; set; }
+        public long MaxSize { get; set; }
+        public string LastUploadTime { get; set; }
+        public List<Torrent> Torrents { get; set; }
+    }
+
+    public class PassThePopcornResponse
+    {
+        public string TotalResults { get; set; }
+        public List<Movie> Movies { get; set; }
+        public string Page { get; set; }
+        public string AuthKey { get; set; }
+        public string PassKey { get; set; }
+    }
+
+}

src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornInfo.cs

@@ -0,0 +1,15 @@
+using NzbDrone.Core.Parser.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NzbDrone.Core.Indexers.PassThePopcorn
+{
+    public class PassThePopcornInfo : TorrentInfo
+    {
+        public bool? Golden { get; set; }
+        public bool? Scene { get; set; }
+        public bool? Approved { get; set; }
+    }
+}

src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornParser.cs

@@ -0,0 +1,144 @@
+using System.Collections.Generic;
+using System.Net;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using NzbDrone.Common.Http;
+using NzbDrone.Core.Indexers.Exceptions;
+using NzbDrone.Core.Parser.Model;
+using System;
+using System.Linq;
+
+namespace NzbDrone.Core.Indexers.PassThePopcorn
+{
+    public class PassThePopcornParser : IParseIndexerResponse
+    {
+        private readonly PassThePopcornSettings _settings;
+
+        public PassThePopcornParser(PassThePopcornSettings settings)
+        {
+            _settings = settings;
+        }
+
+        public IList<ReleaseInfo> ParseResponse(IndexerResponse indexerResponse)
+        {
+            var torrentInfos = new List<ReleaseInfo>();
+
+            if (indexerResponse.HttpResponse.StatusCode != HttpStatusCode.OK)
+            {
+                throw new IndexerException(indexerResponse,
+                    "Unexpected response status {0} code from API request",
+                    indexerResponse.HttpResponse.StatusCode);
+            }
+
+            var jsonResponse = JsonConvert.DeserializeObject<PassThePopcornResponse>(indexerResponse.Content);
+
+            var responseData = jsonResponse.Movies;
+            if (responseData == null)
+            {
+                throw new IndexerException(indexerResponse,
+                    "Indexer API call response missing result data");
+            }
+
+            foreach (var result in responseData)
+            {
+                foreach (var torrent in result.Torrents)
+                {
+                    var id = torrent.Id;
+                    var title = torrent.ReleaseName;
+
+                    if (torrent.GoldenPopcorn)
+                    {
+                        title = $"{title} 🍿";
+                    }
+
+                    if (torrent.Checked)
+                    {
+                        title = $"{title} ✔";
+                    }
+
+                    //if (IsPropertyExist(torrent, "RemasterTitle"))
+                    //{
+                    //    if (torrent.RemasterTitle != null)
+                    //    {
+                    //        title = $"{title} - {torrent.RemasterTitle}";
+                    //    }
+                    //}
+
+                    // Only add approved torrents
+                    if (_settings.Approved && torrent.Checked)
+                    {
+                        torrentInfos.Add(new PassThePopcornInfo()
+                        {
+                            Guid = string.Format("PassThePopcorn-{0}", id),
+                            Title = title,
+                            Size = long.Parse(torrent.Size),
+                            DownloadUrl = GetDownloadUrl(id, jsonResponse.AuthKey, jsonResponse.PassKey),
+                            InfoUrl = GetInfoUrl(result.GroupId, id),
+                            Seeders = int.Parse(torrent.Seeders),
+                            Peers = int.Parse(torrent.Leechers) + int.Parse(torrent.Seeders),
+                            PublishDate = torrent.UploadTime.ToUniversalTime(),
+                            Golden = torrent.GoldenPopcorn,
+                            Scene = torrent.Scene,
+                            Approved = torrent.Checked
+                        });
+                    }
+                    // Add all torrents
+                    else if (!_settings.Approved)
+                    {
+                        torrentInfos.Add(new PassThePopcornInfo()
+                        {
+                            Guid = string.Format("PassThePopcorn-{0}", id),
+                            Title = title,
+                            Size = long.Parse(torrent.Size),
+                            DownloadUrl = GetDownloadUrl(id, jsonResponse.AuthKey, jsonResponse.PassKey),
+                            InfoUrl = GetInfoUrl(result.GroupId, id),
+                            Seeders = int.Parse(torrent.Seeders),
+                            Peers = int.Parse(torrent.Leechers) + int.Parse(torrent.Seeders),
+                            PublishDate = torrent.UploadTime.ToUniversalTime(),
+                            Golden = torrent.GoldenPopcorn,
+                            Scene = torrent.Scene,
+                            Approved = torrent.Checked
+                        });
+                    }
+                    // Don't add any torrents
+                    else if (_settings.Approved && !torrent.Checked)
+                    {
+                        continue;
+                    }
+                }
+            }
+
+            // prefer golden
+            // prefer scene
+            // require approval
+            return torrentInfos.OrderBy(o => ((dynamic)o).Golden ? 0 : 1).ThenBy(o => ((dynamic)o).Scene ? 0 : 1).ThenByDescending(o => ((dynamic)o).PublishDate).ToArray();
+        }
+
+        private string GetDownloadUrl(int torrentId, string authKey, string passKey)
+        {
+            var url = new HttpUri(_settings.BaseUrl)
+                .CombinePath("/torrents.php")
+                .AddQueryParam("action", "download")
+                .AddQueryParam("id", torrentId)
+                .AddQueryParam("authkey", authKey)
+                .AddQueryParam("torrent_pass", passKey);
+
+            return url.FullUri;
+        }
+
+        private string GetInfoUrl(string groupId, int torrentId)
+        {
+            var url = new HttpUri(_settings.BaseUrl)
+                .CombinePath("/torrents.php")
+                .AddQueryParam("id", groupId)
+                .AddQueryParam("torrentid", torrentId);
+
+            return url.FullUri;
+        }
+
+        //public static bool IsPropertyExist(dynamic torrents, string name)
+        //{
+        //    return torrents.GetType().GetProperty(name) != null;
+        //}
+    }
+}

src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornRequestGenerator.cs

@@ -1,39 +1,33 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using NzbDrone.Common.Http;
+using NzbDrone.Common.Serializer;
 using NzbDrone.Core.IndexerSearch.Definitions;
 
-namespace NzbDrone.Core.Indexers.BitMeTv
+namespace NzbDrone.Core.Indexers.PassThePopcorn
 {
-    public class BitMeTvRequestGenerator : IIndexerRequestGenerator
+    public class PassThePopcornRequestGenerator : IIndexerRequestGenerator
     {
-        public BitMeTvSettings Settings { get; set; }
-        
+        public PassThePopcornSettings Settings { get; set; }
+
         public virtual IndexerPageableRequestChain GetRecentRequests()
         {
             var pageableRequests = new IndexerPageableRequestChain();
 
-            pageableRequests.Add(GetRssRequests());
+            pageableRequests.Add(GetRequest(null));
 
             return pageableRequests;
         }
 
-        public virtual IndexerPageableRequestChain GetSearchRequests(SingleEpisodeSearchCriteria searchCriteria)
-        {
-            return new IndexerPageableRequestChain();
-        }
-
         public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            var pageableRequests = new IndexerPageableRequestChain();
+            pageableRequests.Add(GetRequest(searchCriteria.Movie.ImdbId));
+            return pageableRequests;
         }
 
-        public virtual IndexerPageableRequestChain GetSearchRequests(SeasonSearchCriteria searchCriteria)
-        {
-            return new IndexerPageableRequestChain();
-        }
-
-        public virtual IndexerPageableRequestChain GetSearchRequests(DailyEpisodeSearchCriteria searchCriteria)
+        public virtual IndexerPageableRequestChain GetSearchRequests(SingleEpisodeSearchCriteria searchCriteria)
         {
             return new IndexerPageableRequestChain();
         }
@@ -48,9 +42,19 @@ namespace NzbDrone.Core.Indexers.BitMeTv
             return new IndexerPageableRequestChain();
         }
 
-        private IEnumerable<IndexerRequest> GetRssRequests()
+        public virtual IndexerPageableRequestChain GetSearchRequests(DailyEpisodeSearchCriteria searchCriteria)
         {
-            var request = new IndexerRequest(string.Format("{0}/rss.php?uid={1}&passkey={2}", Settings.BaseUrl.Trim().TrimEnd('/'), Settings.UserId, Settings.RssPasskey), HttpAccept.Html);
+            return new IndexerPageableRequestChain();
+        }
+
+        public virtual IndexerPageableRequestChain GetSearchRequests(SeasonSearchCriteria searchCriteria)
+        {
+            return new IndexerPageableRequestChain();
+        }
+
+        private IEnumerable<IndexerRequest> GetRequest(string searchParameters)
+        {
+            var request = new IndexerRequest(string.Format("{0}/torrents.php?json=noredirect&searchstr={1}", Settings.BaseUrl.Trim().TrimEnd('/'), searchParameters), HttpAccept.Json);
 
             foreach (var cookie in HttpHeader.ParseCookies(Settings.Cookie))
             {

src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornSettings.cs

@@ -0,0 +1,52 @@
+using FluentValidation;
+using NzbDrone.Core.Annotations;
+using NzbDrone.Core.ThingiProvider;
+using NzbDrone.Core.Validation;
+using System.Text.RegularExpressions;
+
+namespace NzbDrone.Core.Indexers.PassThePopcorn
+{
+    public class PassThePopcornSettingsValidator : AbstractValidator<PassThePopcornSettings>
+    {
+        public PassThePopcornSettingsValidator()
+        {
+            RuleFor(c => c.BaseUrl).ValidRootUrl();
+            RuleFor(c => c.Cookie).NotEmpty();
+
+            RuleFor(c => c.Cookie)
+                .Matches(@"__cfduid=[0-9a-f]{43}", RegexOptions.IgnoreCase)
+                .WithMessage("Wrong pattern")
+                .AsWarning();
+        }
+    }
+
+    public class PassThePopcornSettings : IProviderConfig
+    {
+        private static readonly PassThePopcornSettingsValidator Validator = new PassThePopcornSettingsValidator();
+
+        public PassThePopcornSettings()
+        {
+            BaseUrl = "https://passthepopcorn.me";
+        }
+
+        [FieldDefinition(0, Label = "API URL", Advanced = true, HelpText = "Do not change this unless you know what you're doing. Since your cookie will be sent to that host.")]
+        public string BaseUrl { get; set; }
+
+        [FieldDefinition(1, Label = "Cookie", HelpText = "PassThePopcorn uses a login cookie needed to access the API, you'll have to retrieve it via a browser.")]
+        public string Cookie { get; set; }
+
+        [FieldDefinition(2, Type = FieldType.Checkbox, Label = "Prefer Golden", HelpText = "Favors Golden Popcorn-releases over all other releases.")]
+        public bool Golden { get; set; }
+
+        [FieldDefinition(3, Type = FieldType.Checkbox, Label = "Prefer Scene", HelpText = "Favors scene-releases over non-scene releases.")]
+        public bool Scene { get; set; }
+
+        [FieldDefinition(4, Type = FieldType.Checkbox, Label = "Require Approved", HelpText = "Require staff-approval for releases to be accepted.")]
+        public bool Approved { get; set; }
+
+        public NzbDroneValidationResult Validate()
+        {
+            return new NzbDroneValidationResult(Validator.Validate(this));
+        }
+    }
+}

src/NzbDrone.Core/Indexers/Torrentleech/Torrentleech.cs

@@ -1,32 +0,0 @@
-using NzbDrone.Common.Http;
-using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Parser;
-using NLog;
-
-namespace NzbDrone.Core.Indexers.Torrentleech
-{
-    public class Torrentleech : HttpIndexerBase<TorrentleechSettings>
-    {
-        public override string Name => "TorrentLeech";
-
-        public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
-        public override bool SupportsSearch => false;
-        public override int PageSize => 0;
-
-        public Torrentleech(IHttpClient httpClient, IIndexerStatusService indexerStatusService, IConfigService configService, IParsingService parsingService, Logger logger)
-            : base(httpClient, indexerStatusService, configService, parsingService, logger)
-        {
-
-        }
-
-        public override IIndexerRequestGenerator GetRequestGenerator()
-        {
-            return new TorrentleechRequestGenerator() { Settings = Settings };
-        }
-
-        public override IParseIndexerResponse GetParser()
-        {
-            return new TorrentRssParser() { UseGuidInfoUrl = true, ParseSeedersInDescription = true };
-        }
-    }
-}

src/NzbDrone.Core/Indexers/Torrentleech/TorrentleechRequestGenerator.cs

@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.IndexerSearch.Definitions;
-
-namespace NzbDrone.Core.Indexers.Torrentleech
-{
-    public class TorrentleechRequestGenerator : IIndexerRequestGenerator
-    {
-        public TorrentleechSettings Settings { get; set; }
-        
-        public virtual IndexerPageableRequestChain GetRecentRequests()
-        {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetRssRequests(null));
-
-            return pageableRequests;
-        }
-
-        public virtual IndexerPageableRequestChain GetSearchRequests(SingleEpisodeSearchCriteria searchCriteria)
-        {
-            return new IndexerPageableRequestChain();
-        }
-
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria 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)
-        {
-            return new IndexerPageableRequestChain();
-        }
-
-        public virtual IndexerPageableRequestChain GetSearchRequests(SpecialEpisodeSearchCriteria searchCriteria)
-        {
-            return new IndexerPageableRequestChain();
-        }
-
-        private IEnumerable<IndexerRequest> GetRssRequests(string searchParameters)
-        {
-            yield return new IndexerRequest(string.Format("{0}/{1}{2}", Settings.BaseUrl.Trim().TrimEnd('/'), Settings.ApiKey, searchParameters), HttpAccept.Rss);
-        }
-    }
-}

src/NzbDrone.Core/Indexers/Torrentleech/TorrentleechSettings.cs

@@ -1,37 +0,0 @@
-using FluentValidation;
-using NzbDrone.Core.Annotations;
-using NzbDrone.Core.ThingiProvider;
-using NzbDrone.Core.Validation;
-
-namespace NzbDrone.Core.Indexers.Torrentleech
-{
-    public class TorrentleechSettingsValidator : AbstractValidator<TorrentleechSettings>
-    {
-        public TorrentleechSettingsValidator()
-        {
-            RuleFor(c => c.BaseUrl).ValidRootUrl();
-            RuleFor(c => c.ApiKey).NotEmpty();
-        }
-    }
-
-    public class TorrentleechSettings : IProviderConfig
-    {
-        private static readonly TorrentleechSettingsValidator Validator = new TorrentleechSettingsValidator();
-
-        public TorrentleechSettings()
-        {
-            BaseUrl = "http://rss.torrentleech.org";
-        }
-
-        [FieldDefinition(0, Label = "Website URL")]
-        public string BaseUrl { get; set; }
-
-        [FieldDefinition(1, Label = "API Key")]
-        public string ApiKey { get; set; }
-
-        public NzbDroneValidationResult Validate()
-        {
-            return new NzbDroneValidationResult(Validator.Validate(this));
-        }
-    }
-}

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

@@ -6,6 +6,10 @@ using System.Text;
 namespace NzbDrone.Core.MetadataSource.SkyHook.Resource
 {
 
+    public class FindRoot
+    {
+        public MovieResult[] movie_results { get; set; }
+    }
     public class MovieSearchRoot
     {
         public int page { get; set; }
@@ -51,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; }
@@ -61,6 +65,27 @@ namespace NzbDrone.Core.MetadataSource.SkyHook.Resource
         public float vote_average { get; set; }
         public int vote_count { get; set; }
         public AlternativeTitles alternative_titles { get; set; }
+        public ReleaseDatesResource release_dates { get; set; }
+    }
+
+    public class ReleaseDatesResource
+    {
+        public List<ReleaseDates> results { get; set; }
+    }
+
+    public class ReleaseDate
+    {
+        public string certification { get; set; }
+        public string iso_639_1 { get; set; }
+        public string note { get; set; }
+        public string release_date { get; set; }
+        public int type { get; set; }
+    }
+
+    public class ReleaseDates
+    {
+        public string iso_3166_1 { get; set; }
+        public List<ReleaseDate> release_dates { get; set; }
     }
 
     public class Belongs_To_Collection

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;
         }
 
@@ -70,7 +72,7 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
                .SetSegment("route", "movie")
                .SetSegment("id", TmdbId.ToString())
                .SetSegment("secondaryRoute", "")
-               .AddQueryParam("append_to_response", "alternative_titles")
+               .AddQueryParam("append_to_response", "alternative_titles,release_dates")
                .AddQueryParam("country", "US")
                .Build();
 
@@ -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));
@@ -102,6 +114,27 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
                 movie.AlternativeTitles.Add(title.title);
             }
 
+            foreach(ReleaseDates releaseDates in resource.release_dates.results)
+            {
+                foreach(ReleaseDate releaseDate in releaseDates.release_dates)
+                {
+                    if (releaseDate.type == 5 || releaseDate.type == 4)
+                    {
+                        if (movie.PhysicalRelease.HasValue)
+                        {
+                            if (movie.PhysicalRelease.Value.After(DateTime.Parse(releaseDate.release_date)))
+                            {
+                                movie.PhysicalRelease = DateTime.Parse(releaseDate.release_date); //Use oldest release date available.
+                            }
+                        }
+                        else
+                        {
+                            movie.PhysicalRelease = DateTime.Parse(releaseDate.release_date);
+                        }
+                    }
+                }
+            }
+
             movie.Ratings = new Ratings();
             movie.Ratings.Votes = resource.vote_count;
             movie.Ratings.Value = (decimal)resource.vote_average;
@@ -125,79 +158,29 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
 
         public Movie GetMovieInfo(string ImdbId)
         {
-            var imdbRequest = new HttpRequest("http://www.omdbapi.com/?i=" + ImdbId + "&plot=full&r=json");
+            var request = _movieBuilder.Create()
+                .SetSegment("route", "find")
+                .SetSegment("id", ImdbId)
+                .SetSegment("secondaryRoute", "")
+                .AddQueryParam("external_source", "imdb_id")
+                .Build();
 
-            var httpResponse = _httpClient.Get(imdbRequest);
+            request.AllowAutoRedirect = true;
+            request.SuppressHttpError = true;
 
-            if (httpResponse.HasHttpError)
-            {
-                if (httpResponse.StatusCode == HttpStatusCode.NotFound)
-                {
-                    throw new MovieNotFoundException(ImdbId);
-                }
-                else
-                {
-                    throw new HttpException(imdbRequest, httpResponse);
-                }
-            }
+            var resources = _httpClient.Get<FindRoot>(request).Resource;
 
-            var response = httpResponse.Content;
-
-            dynamic json = JsonConvert.DeserializeObject(response);
-
-            var movie = new Movie();
-
-            movie.Title = json.Title;
-            movie.TitleSlug = movie.Title.ToLower().Replace(" ", "-");
-            movie.Overview = json.Plot;
-            movie.CleanTitle = Parser.Parser.CleanSeriesTitle(movie.Title);
-            string airDateStr = json.Released;
-            DateTime airDate = DateTime.Parse(airDateStr);
-            movie.InCinemas = airDate;
-            movie.Year = airDate.Year;
-            movie.ImdbId = ImdbId;
-            string imdbRating = json.imdbVotes;
-            if (imdbRating == "N/A")
-            {
-                movie.Status = MovieStatusType.Announced;
-            }
-            else
-            {
-                movie.Status = MovieStatusType.Released;
-            }
-            string url = json.Poster;
-            var imdbPoster = new MediaCover.MediaCover(MediaCoverTypes.Poster, url);
-            movie.Images.Add(imdbPoster);
-            string runtime = json.Runtime;
-            int runtimeNum = 0;
-            int.TryParse(runtime.Replace("min", "").Trim(), out runtimeNum);
-            movie.Runtime = runtimeNum;
-
-            return movie;
-        }
-
-        private string[] SeparateYearFromTitle(string title)
-        {
-            var yearPattern = @"((?:19|20)\d{2})";
-            var newTitle = title;
-            var substrings = Regex.Split(title, yearPattern);
-            var year = "";
-            if (substrings.Length > 1) {
-                newTitle = substrings[0].TrimEnd("(");
-                year = substrings[1];
-            }
-            
-            return new[] { newTitle.Trim(), year.Trim() };
+            return resources.movie_results.SelectList(MapMovie).FirstOrDefault();
         }
 
         private string StripTrailingTheFromTitle(string title)
         {
             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;
         }
@@ -205,10 +188,25 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
         public List<Movie> SearchForNewMovie(string title)
         {
             var lowerTitle = title.ToLower();
-            var yearCheck = SeparateYearFromTitle(lowerTitle); // TODO: Make this much less hacky!
 
-            lowerTitle = yearCheck[0];
-            var yearTerm = yearCheck[1];
+            var parserResult = Parser.Parser.ParseMovieTitle(title, true);
+
+            var yearTerm = "";
+
+            if (parserResult != null && parserResult.MovieTitle != title)
+            {
+                //Parser found something interesting!
+                lowerTitle = parserResult.MovieTitle.ToLower();
+                if (parserResult.Year > 1800)
+                {
+                    yearTerm = parserResult.Year.ToString();
+                }
+                
+                if (parserResult.ImdbId.IsNotNullOrWhiteSpace())
+                {
+                    return new List<Movie> { GetMovieInfo(parserResult.ImdbId) };
+                }
+            }
 
             lowerTitle = StripTrailingTheFromTitle(lowerTitle);
 
@@ -233,7 +231,7 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
                 }
             }
 
-            var searchTerm = lowerTitle.Replace("_", "+").Replace(" ", "+");
+            var searchTerm = lowerTitle.Replace("_", "+").Replace(" ", "+").Replace(".", "+");
 
             var firstChar = searchTerm.First();
 
@@ -269,43 +267,7 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
 
             var movieResults = response.Resource.results;
 
-            var imdbMovies = new List<Movie>();
-
-            foreach (MovieResult result in movieResults)
-            {
-                var imdbMovie = new Movie();
-                imdbMovie.TmdbId = result.id;
-                try
-                {
-                    imdbMovie.SortTitle = result.title;
-                    imdbMovie.Title = result.title;
-                    string titleSlug = result.title;
-                    imdbMovie.TitleSlug = titleSlug.ToLower().Replace(" ", "-");
-                    imdbMovie.Year = DateTime.Parse(result.release_date).Year;
-                    imdbMovie.Images = new List<MediaCover.MediaCover>();
-                    imdbMovie.Overview = result.overview;
-                    try
-                    {
-                        string url = result.poster_path;
-                        var imdbPoster = _configService.GetCoverForURL(result.poster_path, MediaCoverTypes.Poster);
-                        imdbMovie.Images.Add(imdbPoster);
-                    }
-                    catch (Exception e)
-                    {
-                        _logger.Debug(result);
-                        continue;
-                    }
-
-                    imdbMovies.Add(imdbMovie);
-                }
-                catch
-                {
-
-                }
-
-            }
-
-            return imdbMovies;
+            return movieResults.SelectList(MapMovie);
         }
 
         public List<Series> SearchForNewSeries(string title)
@@ -359,6 +321,54 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
             }
         }
 
+        private Movie MapMovie(MovieResult result)
+        {
+            var imdbMovie = new Movie();
+            imdbMovie.TmdbId = result.id;
+            try
+            {
+                imdbMovie.SortTitle = result.title;
+                imdbMovie.Title = result.title;
+                string titleSlug = result.title;
+                imdbMovie.TitleSlug = titleSlug.ToLower().Replace(" ", "-");
+
+                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
+                {
+                    string url = result.poster_path;
+                    var imdbPoster = _configService.GetCoverForURL(result.poster_path, MediaCoverTypes.Poster);
+                    imdbMovie.Images.Add(imdbPoster);
+                }
+                catch (Exception e)
+                {
+                    _logger.Debug(result);
+                }
+
+                return imdbMovie;
+            }
+            catch (Exception e)
+            {
+                _logger.Error(e, "Error occured while searching for new movies.");
+            }
+
+            return null;
+        }
+
         private static Series MapSeries(ShowResource show)
         {
             var series = new Series();

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

@@ -183,6 +183,10 @@
     <Compile Include="Datastore\Migration\002_remove_tvrage_imdb_unique_constraint.cs" />
     <Compile Include="Datastore\Migration\003_remove_clean_title_from_scene_mapping.cs" />
     <Compile Include="Datastore\Migration\004_updated_history.cs" />
+    <Compile Include="Datastore\Migration\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" />
     <Compile Include="Datastore\Migration\106_add_tmdb_stuff.cs" />
@@ -286,6 +290,7 @@
     <Compile Include="Datastore\Migration\098_remove_titans_of_tv.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Datastore\Migration\110_add_physical_release_to_table.cs" />
     <Compile Include="Datastore\Migration\109_add_movie_formats_to_naming_config.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationContext.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationController.cs" />
@@ -572,26 +577,19 @@
     <Compile Include="IndexerSearch\Definitions\MovieSearchCriteria.cs" />
     <Compile Include="IndexerSearch\MoviesSearchCommand.cs" />
     <Compile Include="IndexerSearch\MoviesSearchService.cs" />
-    <Compile Include="Indexers\BitMeTv\BitMeTv.cs" />
-    <Compile Include="Indexers\BitMeTv\BitMeTvSettings.cs" />
-    <Compile Include="Indexers\BitMeTv\BitMeTvRequestGenerator.cs" />
-    <Compile Include="Indexers\BroadcastheNet\BroadcastheNetRequestGenerator.cs" />
-    <Compile Include="Indexers\BroadcastheNet\BroadcastheNet.cs" />
-    <Compile Include="Indexers\BroadcastheNet\BroadcastheNetSettings.cs" />
-    <Compile Include="Indexers\BroadcastheNet\BroadcastheNetParser.cs" />
-    <Compile Include="Indexers\BroadcastheNet\BroadcastheNetTorrent.cs" />
-    <Compile Include="Indexers\BroadcastheNet\BroadcastheNetTorrentQuery.cs" />
-    <Compile Include="Indexers\BroadcastheNet\BroadcastheNetTorrents.cs" />
     <Compile Include="Indexers\DownloadProtocol.cs" />
     <Compile Include="Indexers\Exceptions\ApiKeyException.cs" />
     <Compile Include="Indexers\Exceptions\IndexerException.cs" />
     <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" />
+    <Compile Include="Indexers\PassThePopcorn\PassThePopcornInfo.cs" />
+    <Compile Include="Indexers\PassThePopcorn\PassThePopcornParser.cs" />
+    <Compile Include="Indexers\PassThePopcorn\PassThePopcornRequestGenerator.cs" />
+    <Compile Include="Indexers\PassThePopcorn\PassThePopcornSettings.cs" />
     <Compile Include="Indexers\HDBits\HDBits.cs" />
     <Compile Include="Indexers\HDBits\HDBitsApi.cs" />
     <Compile Include="Indexers\HDBits\HDBitsParser.cs" />
@@ -651,9 +649,6 @@
     <Compile Include="Indexers\RssSyncCommand.cs" />
     <Compile Include="Indexers\RssSyncCompleteEvent.cs" />
     <Compile Include="Indexers\RssSyncService.cs" />
-    <Compile Include="Indexers\Torrentleech\TorrentleechRequestGenerator.cs" />
-    <Compile Include="Indexers\Torrentleech\Torrentleech.cs" />
-    <Compile Include="Indexers\Torrentleech\TorrentleechSettings.cs" />
     <Compile Include="Indexers\TorrentRss\TorrentRssIndexer.cs" />
     <Compile Include="Indexers\TorrentRss\TorrentRssIndexerParserSettings.cs" />
     <Compile Include="Indexers\TorrentRss\TorrentRssIndexerRequestGenerator.cs" />
@@ -710,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" />
@@ -783,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))