Merge pull request #598 from vertigo235/delay-profile-patch

Delay Profile: Upgradable Check Fix

.github/ISSUE_TEMPLATE.md

@@ -1,6 +1,8 @@
 
 
 
+Please use the search bar and make sure you are not submitting an already submitted issue.
+
 Provide a description of the feature request or bug, the more details the better.
 When possible include a log!
 

README.md

@@ -12,7 +12,9 @@
 | 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/Radarr/Radarr/master.svg?maxAge=60&style=flat-square)](https://travis-ci.org/Radarr/Radarr) | [![Travis](https://img.shields.io/travis/Radarr/Radarr/develop.svg?maxAge=60&style=flat-square)](https://travis-ci.org/Radarr/Radarr) |
 
-This fork of Sonarr aims to turn it into something like CouchPotato.
+A fork of [Sonarr](https://github.com/Sonarr/Sonarr) to work with movies à la Couchpotato.
+
+**This fork works independently of Sonarr and will not interfere with it.**
 
 ## Downloads
 
@@ -34,34 +36,34 @@ To connect to the UI, fire up your browser and open <http://localhost:7878> or <
 
 ## Features
 
-### Currently Working
-
-* Adding new movies
-* Manually searching for releases of movies
-* Automatically searching for releases
-* Automatically importing downloaded movies
-* Recognizing Special Editions, Director's Cut, etc.
-* Identifying releases with hardcoded subs
-* Rarbg.to, Torznab and Newznab Indexer
-* QBittorrent and Deluge download client (Other clients are coming)
-* New TorrentPotato Indexer (Works well with [Jackett](https://github.com/Jackett/Jackett))
-
-### Planned Features
-
-* Scanning PreDB to know when a new release is available
-* Fixing the other Indexers and download clients
-* Importing of Sonarr config
-
-### Major Features
+### Current Features
 
+* Adding new movies with lots of information, such as trailers, ratings, etc.
 * Support for major platforms: Windows, Linux, macOS, Raspberry Pi, etc.
 * Can watch for better quality of the movies you have and do an automatic upgrade. *eg. from DVD to Blu-Ray*
 * Automatic failed download handling will try another release if one fails
 * Manual search so you can pick any release or to see why a release was not downloaded automatically
 * Full integration with SABnzbd and NZBGet
-* Full integration with Kodi, Plex (notification, library update, metadata)
+* Automatically searching for releases as well as RSS Sync
+* Automatically importing downloaded movies
+* Recognizing Special Editions, Director's Cut, etc.
+* Identifying releases with hardcoded subs
+* All indexers supported by Sonarr also supported
+* New PassThePopcorn Indexer
+* QBittorrent, Deluge, rTorrent, Transmission and uTorrent download client (Other clients are coming)
+* New TorrentPotato Indexer (Works well with [Jackett](https://github.com/Jackett/Jackett))
 * And a beautiful UI
 
+### Planned Features
+
+* Scanning PreDB to know when a new release is available
+* Fixing the other Indexers and download clients
+* Importing movies from various online sources, such as IMDb Watchlists (A complete list can be found [here](https://github.com/Radarr/Radarr/issues/114))
+* Full integration with Kodi, Plex (notification, library update, metadata)
+
+##Feature Requests
+[![Feature Requests](http://feathub.com/Radarr/Radarr?format=svg)](http://feathub.com/Radarr/Radarr)
+
 ## Configuring Development Environment
 
 ### Requirements

src/NzbDrone.Api/Authentication/EnableAuthInNancy.cs

@@ -64,6 +64,8 @@ namespace NzbDrone.Api.Authentication
                     new DefaultHmacProvider(new PassphraseKeyGenerator(_configService.HmacPassphrase, Encoding.ASCII.GetBytes(_configService.HmacSalt)))
                 );
 
+            FormsAuthentication.FormsAuthenticationCookieName = "_ncfaradarr"; //For those people that both have sonarr and radarr.
+
             FormsAuthentication.Enable(pipelines, new FormsAuthenticationConfiguration
             {
                 RedirectUrl = _configFileProvider.UrlBase + "/login",

src/NzbDrone.Api/Blacklist/BlacklistResource.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using NzbDrone.Api.Movie;
 using NzbDrone.Api.REST;
 using NzbDrone.Core.Qualities;
 using NzbDrone.Api.Series;
@@ -11,13 +12,14 @@ namespace NzbDrone.Api.Blacklist
     {
         public int SeriesId { get; set; }
         public List<int> EpisodeIds { get; set; }
+        public int MovieId { get; set; }
         public string SourceTitle { get; set; }
         public QualityModel Quality { get; set; }
         public DateTime Date { get; set; }
         public DownloadProtocol Protocol { get; set; }
         public string Indexer { get; set; }
         public string Message { get; set; }
-
+        public MovieResource Movie { get; set; }
         public SeriesResource Series { get; set; }
     }
 
@@ -30,7 +32,7 @@ namespace NzbDrone.Api.Blacklist
             return new BlacklistResource
             {
                 Id = model.Id,
-
+                MovieId = model.MovieId,
                 SeriesId = model.SeriesId,
                 EpisodeIds = model.EpisodeIds,
                 SourceTitle = model.SourceTitle,
@@ -39,7 +41,7 @@ namespace NzbDrone.Api.Blacklist
                 Protocol = model.Protocol,
                 Indexer = model.Indexer,
                 Message = model.Message,
-
+                Movie = model.Movie.ToResource(),
                 Series = model.Series.ToResource()
             };
         }

src/NzbDrone.Api/ClientSchema/SchemaBuilder.cs

@@ -1,11 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using Newtonsoft.Json.Linq;
 using NzbDrone.Common.EnsureThat;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Reflection;
 using NzbDrone.Core.Annotations;
+using NzbDrone.Core.Qualities;
+using NzbDrone.Core.Profiles;
 
 namespace NzbDrone.Api.ClientSchema
 {
@@ -73,14 +76,14 @@ namespace NzbDrone.Api.ClientSchema
 
                     if (propertyInfo.PropertyType == typeof(int))
                     {
-                        var value = Convert.ToInt32(field.Value);
-                        propertyInfo.SetValue(target, value, null);
+                        var value = field.Value.ToString().ParseInt32();
+                        propertyInfo.SetValue(target, value ?? 0, null);
                     }
 
                     else if (propertyInfo.PropertyType == typeof(long))
                     {
-                        var value = Convert.ToInt64(field.Value);
-                        propertyInfo.SetValue(target, value, null);
+                        var value = field.Value.ToString().ParseInt64();
+                        propertyInfo.SetValue(target, value ?? 0, null);
                     }
 
                     else if (propertyInfo.PropertyType == typeof(int?))
@@ -147,6 +150,18 @@ namespace NzbDrone.Api.ClientSchema
 
         private static List<SelectOption> GetSelectOptions(Type selectOptions)
         {
+            if (selectOptions == typeof(Profile))
+            {
+                return new List<SelectOption>();
+            }
+
+            if (selectOptions == typeof(Quality))
+            {
+                var qOptions = from Quality q in selectOptions.GetProperties(BindingFlags.Static | BindingFlags.Public)
+                    select new SelectOption {Name = q.Name, Value = q.Id};
+                return qOptions.OrderBy(o => o.Value).ToList();
+            }
+
             var options = from Enum e in Enum.GetValues(selectOptions)
                           select new SelectOption { Value = Convert.ToInt32(e), Name = e.ToString() };
 

src/NzbDrone.Api/Config/NetImportConfigModule.cs

@@ -0,0 +1,22 @@
+using FluentValidation;
+using NzbDrone.Api.Validation;
+using NzbDrone.Core.Configuration;
+
+namespace NzbDrone.Api.Config
+{
+    public class NetImportConfigModule : NzbDroneConfigModule<NetImportConfigResource>
+    {
+
+        public NetImportConfigModule(IConfigService configService)
+            : base(configService)
+        {
+            SharedValidator.RuleFor(c => c.NetImportSyncInterval)
+               .IsValidNetImportSyncInterval();
+        }
+
+        protected override NetImportConfigResource ToResource(IConfigService model)
+        {
+            return NetImportConfigResourceMapper.ToResource(model);
+        }
+    }
+}

src/NzbDrone.Api/Config/NetImportConfigResource.cs

@@ -0,0 +1,21 @@
+using NzbDrone.Api.REST;
+using NzbDrone.Core.Configuration;
+
+namespace NzbDrone.Api.Config
+{
+    public class NetImportConfigResource : RestResource
+    {
+        public int NetImportSyncInterval { get; set; }
+    }
+
+    public static class NetImportConfigResourceMapper
+    {
+        public static NetImportConfigResource ToResource(IConfigService model)
+        {
+            return new NetImportConfigResource
+            {
+                NetImportSyncInterval = model.NetImportSyncInterval
+            };
+        }
+    }
+}

src/NzbDrone.Api/Indexers/ReleaseModuleBase.cs

@@ -25,9 +25,9 @@ namespace NzbDrone.Api.Indexers
 
             release.ReleaseWeight = initialWeight;
 
-            if (decision.RemoteEpisode.Series != null)
+            if (decision.RemoteMovie.Movie != null)
             {
-                release.QualityWeight = decision.RemoteEpisode.Series
+                release.QualityWeight = decision.RemoteMovie.Movie
                                                               .Profile.Value
                                                               .Items.FindIndex(v => v.Quality == release.Quality.Quality) * 100;
             }

src/NzbDrone.Api/Movies/MovieFileModule.cs

@@ -35,21 +35,21 @@ namespace NzbDrone.Api.EpisodeFiles
             _seriesService = seriesService;
             _qualityUpgradableSpecification = qualityUpgradableSpecification;
             _logger = logger;
-            /*GetResourceById = GetEpisodeFile;
-            GetResourceAll = GetEpisodeFiles;
+            GetResourceById = GetMovieFile;
+            /*GetResourceAll = GetEpisodeFiles;
             UpdateResource = SetQuality;*/
+            UpdateResource = SetQuality;
             DeleteResource = DeleteEpisodeFile;
         }
 
-        /*private EpisodeFileResource GetEpisodeFile(int id)
+        private MovieFileResource GetMovieFile(int id)
         {
-            var episodeFile = _mediaFileService.Get(id);
-            var series = _seriesService.GetSeries(episodeFile.SeriesId);
+            var episodeFile = _mediaFileService.GetMovie(id);
 
-            return episodeFile.ToResource(series, _qualityUpgradableSpecification);
+            return episodeFile.ToResource();
         }
 
-        private List<EpisodeFileResource> GetEpisodeFiles()
+        /*private List<EpisodeFileResource> GetEpisodeFiles()
         {
             if (!Request.Query.SeriesId.HasValue)
             {
@@ -62,13 +62,13 @@ namespace NzbDrone.Api.EpisodeFiles
 
             return _mediaFileService.GetFilesBySeries(seriesId).ConvertAll(f => f.ToResource(series, _qualityUpgradableSpecification));
         }
-
-        private void SetQuality(EpisodeFileResource episodeFileResource)
+        */
+        private void SetQuality(MovieFileResource episodeFileResource)
         {
-            var episodeFile = _mediaFileService.Get(episodeFileResource.Id);
+            var episodeFile = _mediaFileService.GetMovie(episodeFileResource.Id);
             episodeFile.Quality = episodeFileResource.Quality;
             _mediaFileService.Update(episodeFile);
-        }*/
+        }
 
         private void DeleteEpisodeFile(int id)
         {

src/NzbDrone.Api/NetImport/ListImportModule.cs

@@ -0,0 +1,34 @@
+using System.Collections.Generic;
+using System.Linq;
+using Nancy;
+using Nancy.Extensions;
+using NzbDrone.Api.Extensions;
+using NzbDrone.Api.Movie;
+using NzbDrone.Core.MetadataSource;
+using NzbDrone.Core.Tv;
+
+namespace NzbDrone.Api.NetImport
+{
+    public class ListImportModule : NzbDroneApiModule
+    {
+        private readonly IMovieService _movieService;
+        private readonly ISearchForNewMovie _movieSearch;
+
+        public ListImportModule(IMovieService movieService, ISearchForNewMovie movieSearch)
+            : base("/movie/import")
+        {
+            _movieService = movieService;
+            _movieSearch = movieSearch;
+            Put["/"] = Movie => SaveAll();
+        }
+
+        private Response SaveAll()
+        {
+            var resources = Request.Body.FromJson<List<MovieResource>>();
+
+            var Movies = resources.Select(MovieResource => _movieSearch.MapMovieToTmdbMovie(MovieResource.ToModel())).Where(m => m != null).DistinctBy(m => m.TmdbId).ToList();
+
+            return _movieService.AddMovies(Movies).ToResource().AsResponse(HttpStatusCode.Accepted);
+        }
+    }
+}

src/NzbDrone.Api/NetImport/NetImportModule.cs

@@ -0,0 +1,44 @@
+using NzbDrone.Api.ClientSchema;
+using NzbDrone.Core.NetImport;
+using NzbDrone.Core.Profiles;
+
+namespace NzbDrone.Api.NetImport
+{
+    public class NetImportModule : ProviderModuleBase<NetImportResource, INetImport, NetImportDefinition>
+    {
+        private readonly IProfileService _profileService;
+        public NetImportModule(NetImportFactory indexerFactory, IProfileService profileService)
+            : base(indexerFactory, "netimport")
+        {
+            _profileService = profileService;
+        }
+
+        protected override void MapToResource(NetImportResource resource, NetImportDefinition definition)
+        {
+            base.MapToResource(resource, definition);
+
+            resource.Enabled = definition.Enabled;
+            resource.EnableAuto = definition.EnableAuto;
+            resource.ProfileId = definition.ProfileId;
+            resource.RootFolderPath = definition.RootFolderPath;
+            resource.ShouldMonitor = definition.ShouldMonitor;
+        }
+
+        protected override void MapToModel(NetImportDefinition definition, NetImportResource resource)
+        {
+            base.MapToModel(definition, resource);
+
+            definition.Enabled = resource.Enabled;
+            definition.EnableAuto = resource.EnableAuto;
+            definition.ProfileId = resource.ProfileId;
+            definition.RootFolderPath = resource.RootFolderPath;
+            definition.ShouldMonitor = resource.ShouldMonitor;
+        }
+
+        protected override void Validate(NetImportDefinition definition, bool includeWarnings)
+        {
+            if (!definition.Enable) return;
+            base.Validate(definition, includeWarnings);
+        }
+    }
+}

src/NzbDrone.Api/NetImport/NetImportResource.cs

@@ -0,0 +1,13 @@
+using NzbDrone.Core.NetImport;
+
+namespace NzbDrone.Api.NetImport
+{
+    public class NetImportResource : ProviderResource
+    {
+        public bool Enabled { get; set; }
+        public bool EnableAuto { get; set; }
+        public bool ShouldMonitor { get; set; }
+        public string RootFolderPath { get; set; }
+        public int ProfileId { get; set; }
+    }
+}

src/NzbDrone.Api/NzbDrone.Api.csproj

@@ -109,6 +109,8 @@
     <Compile Include="ClientSchema\SelectOption.cs" />
     <Compile Include="Commands\CommandModule.cs" />
     <Compile Include="Commands\CommandResource.cs" />
+    <Compile Include="Config\NetImportConfigModule.cs" />
+    <Compile Include="Config\NetImportConfigResource.cs" />
     <Compile Include="Extensions\AccessControlHeaders.cs" />
     <Compile Include="Extensions\Pipelines\CorsPipeline.cs" />
     <Compile Include="Extensions\Pipelines\RequestLoggingPipeline.cs" />
@@ -121,6 +123,9 @@
     <Compile Include="Movies\RenameMovieModule.cs" />
     <Compile Include="Movies\RenameMovieResource.cs" />
     <Compile Include="Movies\MovieEditorModule.cs" />
+    <Compile Include="NetImport\ListImportModule.cs" />
+    <Compile Include="NetImport\NetImportModule.cs" />
+    <Compile Include="NetImport\NetImportResource.cs" />
     <Compile Include="Parse\ParseModule.cs" />
     <Compile Include="Parse\ParseResource.cs" />
     <Compile Include="ManualImport\ManualImportModule.cs" />
@@ -234,6 +239,7 @@
     <Compile Include="SeasonPass\SeasonPassResource.cs" />
     <Compile Include="Series\AlternateTitleResource.cs" />
     <Compile Include="Series\MovieFileResource.cs" />
+    <Compile Include="Series\FetchMovieListModule.cs" />
     <Compile Include="Series\SeasonResource.cs" />
     <Compile Include="SeasonPass\SeasonPassModule.cs" />
     <Compile Include="Series\SeriesEditorModule.cs" />
@@ -254,12 +260,14 @@
     <Compile Include="TinyIoCNancyBootstrapper.cs" />
     <Compile Include="Update\UpdateModule.cs" />
     <Compile Include="Update\UpdateResource.cs" />
+    <Compile Include="Validation\NetImportSyncIntervalValidator.cs" />
     <Compile Include="Validation\RssSyncIntervalValidator.cs" />
     <Compile Include="Validation\EmptyCollectionValidator.cs" />
     <Compile Include="Validation\RuleBuilderExtensions.cs" />
     <Compile Include="Wanted\CutoffModule.cs" />
     <Compile Include="Wanted\LegacyMissingModule.cs" />
     <Compile Include="Wanted\MissingModule.cs" />
+    <Compile Include="Wanted\MovieMissingModule.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />

src/NzbDrone.Api/Profiles/ProfileResource.cs

@@ -11,6 +11,7 @@ namespace NzbDrone.Api.Profiles
     {
         public string Name { get; set; }
         public Quality Cutoff { get; set; }
+        public string PreferredTags { get; set; }
         public List<ProfileQualityItemResource> Items { get; set; }
         public Language Language { get; set; }
     }
@@ -33,6 +34,7 @@ namespace NzbDrone.Api.Profiles
 
                 Name = model.Name,
                 Cutoff = model.Cutoff,
+                PreferredTags = model.PreferredTags != null ? string.Join(",", model.PreferredTags) : "",
                 Items = model.Items.ConvertAll(ToResource),
                 Language = model.Language
             };
@@ -59,6 +61,7 @@ namespace NzbDrone.Api.Profiles
 
                 Name = resource.Name,
                 Cutoff = (Quality)resource.Cutoff.Id,
+                PreferredTags = resource.PreferredTags.Split(',').ToList(),
                 Items = resource.Items.ConvertAll(ToModel),
                 Language = resource.Language
             };

src/NzbDrone.Api/RootFolders/RootFolderResource.cs

@@ -38,8 +38,8 @@ namespace NzbDrone.Api.RootFolders
                 Id = resource.Id,
 
                 Path = resource.Path,
-                //FreeSpace
-                //UnmappedFolders
+                FreeSpace = resource.FreeSpace,
+                UnmappedFolders = resource.UnmappedFolders
             };
         }
 

src/NzbDrone.Api/Series/FetchMovieListModule.cs

@@ -0,0 +1,60 @@
+using System.Collections.Generic;
+using Nancy;
+using NzbDrone.Api.Extensions;
+using NzbDrone.Core.MediaCover;
+using NzbDrone.Core.MetadataSource;
+using System.Linq;
+using NzbDrone.Core.NetImport;
+
+namespace NzbDrone.Api.Movie
+{
+    public class FetchMovieListModule : NzbDroneRestModule<MovieResource>
+    {
+        private readonly IFetchNetImport _fetchNetImport;
+        private readonly ISearchForNewMovie _movieSearch;
+
+        public FetchMovieListModule(IFetchNetImport netImport, ISearchForNewMovie movieSearch)
+            : base("/netimport/movies")
+        {
+            _fetchNetImport = netImport;
+            _movieSearch = movieSearch;
+            Get["/"] = x => Search();
+        }
+
+
+        private Response Search()
+        {
+            var results = _fetchNetImport.FetchAndFilter((int) Request.Query.listId, false);
+
+            List<Core.Tv.Movie> realResults = new List<Core.Tv.Movie>();
+
+            /*foreach (var movie in results)
+            {
+                var mapped = _movieSearch.MapMovieToTmdbMovie(movie);
+
+                if (mapped != null)
+                {
+                    realResults.Add(mapped);
+                }
+            }*/
+
+            return MapToResource(results).AsResponse();
+        }
+
+
+        private static IEnumerable<MovieResource> MapToResource(IEnumerable<Core.Tv.Movie> movies)
+        {
+            foreach (var currentSeries in movies)
+            {
+                var resource = currentSeries.ToResource();
+                var poster = currentSeries.Images.FirstOrDefault(c => c.CoverType == MediaCoverTypes.Poster);
+                if (poster != null)
+                {
+                    resource.RemotePoster = poster.Url;
+                }
+
+                yield return resource;
+            }
+        }
+    }
+}

src/NzbDrone.Api/Series/MovieModule.cs

@@ -201,6 +201,8 @@ namespace NzbDrone.Api.Movie
             //var mappings = null;//_sceneMappingService.FindByTvdbId(resource.TvdbId);
 
             //if (mappings == null) return;
+            
+            //Not necessary anymore
 
             //resource.AlternateTitles = mappings.Select(v => new AlternateTitleResource { Title = v.Title, SeasonNumber = v.SeasonNumber, SceneSeasonNumber = v.SceneSeasonNumber }).ToList();
         }
@@ -239,7 +241,7 @@ namespace NzbDrone.Api.Movie
 
         public void Handle(MediaCoversUpdatedEvent message)
         {
-            //BroadcastResourceChange(ModelAction.Updated, message.Movie.Id);
+            BroadcastResourceChange(ModelAction.Updated, message.Movie.Id);
         }
     }
 }

src/NzbDrone.Api/Series/SeriesModule.cs

@@ -236,7 +236,7 @@ namespace NzbDrone.Api.Series
 
         public void Handle(MediaCoversUpdatedEvent message)
         {
-            BroadcastResourceChange(ModelAction.Updated, message.Series.Id);
+            //BroadcastResourceChange(ModelAction.Updated, message.Series.Id);
         }
     }
 }

src/NzbDrone.Api/Validation/NetImportSyncIntervalValidator.cs

@@ -0,0 +1,34 @@
+using FluentValidation.Validators;
+
+namespace NzbDrone.Api.Validation
+{
+    public class NetImportSyncIntervalValidator : PropertyValidator
+    {
+        public NetImportSyncIntervalValidator()
+            : base("Must be between 10 and 1440 or 0 to disable")
+        {
+        }
+
+        protected override bool IsValid(PropertyValidatorContext context)
+        {
+            if (context.PropertyValue == null)
+            {
+                return true;
+            }
+
+            var value = (int)context.PropertyValue;
+
+            if (value == 0)
+            {
+                return true;
+            }
+
+            if (value >= 10 && value <= 1440)
+            {
+                return true;
+            }
+
+            return false;
+        }
+    }
+}

src/NzbDrone.Api/Validation/RssSyncIntervalValidator.cs

@@ -5,7 +5,7 @@ namespace NzbDrone.Api.Validation
     public class RssSyncIntervalValidator : PropertyValidator
     {
         public RssSyncIntervalValidator()
-            : base("Must be between 10 and 120 or 0 to disable")
+            : base("Must be between 10 and 720 or 0 to disable")
         {
         }
 
@@ -23,7 +23,7 @@ namespace NzbDrone.Api.Validation
                 return true;
             }
 
-            if (value >= 10 && value <= 120)
+            if (value >= 10 && value <= 720)
             {
                 return true;
             }

src/NzbDrone.Api/Validation/RuleBuilderExtensions.cs

@@ -36,5 +36,10 @@ namespace NzbDrone.Api.Validation
         {
             return ruleBuilder.SetValidator(new RssSyncIntervalValidator());
         }
+
+        public static IRuleBuilderOptions<T, int> IsValidNetImportSyncInterval<T>(this IRuleBuilder<T, int> ruleBuilder)
+        {
+            return ruleBuilder.SetValidator(new NetImportSyncIntervalValidator());
+        }
     }
 }

src/NzbDrone.Api/Wanted/MissingModule.cs

@@ -12,7 +12,7 @@ namespace NzbDrone.Api.Wanted
                              ISeriesService seriesService,
                              IQualityUpgradableSpecification qualityUpgradableSpecification,
                              IBroadcastSignalRMessage signalRBroadcaster)
-            : base(episodeService, seriesService, qualityUpgradableSpecification, signalRBroadcaster, "wanted/missing")
+            : base(episodeService, seriesService, qualityUpgradableSpecification, signalRBroadcaster, "wanted/missing_episodes")
         {
             GetResourcePaged = GetMissingEpisodes;
         }

src/NzbDrone.Api/Wanted/MovieMissingModule.cs

@@ -0,0 +1,77 @@
+using NzbDrone.Api.Movie;
+using NzbDrone.Api.Movies;
+using NzbDrone.Core.DecisionEngine;
+using NzbDrone.Core.Tv;
+using NzbDrone.Core.Datastore;
+using NzbDrone.SignalR;
+using NzbDrone.Core.Download;
+using NzbDrone.Core.MediaFiles.Events;
+using NzbDrone.Core.Messaging.Events;
+using System;
+using NzbDrone.Core.Datastore.Events;
+
+namespace NzbDrone.Api.Wanted
+{
+    class MovieMissingModule : NzbDroneRestModuleWithSignalR<MovieResource, Core.Tv.Movie>,
+        IHandle<MovieGrabbedEvent>,
+        IHandle<MovieDownloadedEvent>
+    {
+        protected readonly IMovieService _movieService;
+
+        public MovieMissingModule(IMovieService movieService, 
+                                  IQualityUpgradableSpecification qualityUpgradableSpecification, 
+                                  IBroadcastSignalRMessage signalRBroadcaster) 
+            : base(signalRBroadcaster, "wanted/missing")
+        {
+
+            _movieService = movieService;
+            GetResourcePaged = GetMissingMovies;
+        }
+
+        private PagingResource<MovieResource> GetMissingMovies(PagingResource<MovieResource> pagingResource)
+        {
+            var pagingSpec = pagingResource.MapToPagingSpec<MovieResource, Core.Tv.Movie>("physicalRelease", SortDirection.Descending);
+
+            if (pagingResource.FilterKey == "monitored" && pagingResource.FilterValue == "false")
+            {
+                pagingSpec.FilterExpression = v => v.Monitored == false;
+            }
+            else
+            {
+                pagingSpec.FilterExpression = v => v.Monitored == true;
+            }
+
+            var resource = ApplyToPage(_movieService.MoviesWithoutFiles, pagingSpec, v => MapToResource(v, false));
+
+            return resource;
+        }
+
+        private MovieResource GetMovie(int id)
+        {
+            var movie = _movieService.GetMovie(id);
+            var resource = MapToResource(movie, true);
+            return resource;
+        }
+
+        private MovieResource MapToResource(Core.Tv.Movie movie, bool includeMovieFile)
+        {
+            var resource = movie.ToResource();
+            return resource;
+        }
+
+        public void Handle(MovieGrabbedEvent message)
+        {
+            var resource = message.Movie.Movie.ToResource();
+
+            //add a grabbed field in MovieResource?
+            //resource.Grabbed = true;
+
+            BroadcastResourceChange(ModelAction.Updated, resource);
+        }
+
+        public void Handle(MovieDownloadedEvent message)
+        {
+            BroadcastResourceChange(ModelAction.Updated, message.Movie.Movie.Id);
+        }
+    }
+}

src/NzbDrone.Core.Test/Configuration/ConfigServiceFixture.cs

@@ -32,7 +32,7 @@ namespace NzbDrone.Core.Test.Configuration
         [Test]
         public void Get_value_should_return_default_when_no_value()
         {
-            Subject.RssSyncInterval.Should().Be(15);
+            Subject.RssSyncInterval.Should().Be(60);
         }
 
         [Test]
@@ -47,7 +47,7 @@ namespace NzbDrone.Core.Test.Configuration
         public void get_value_with_out_persist_should_not_store_default_value()
         {
             var interval = Subject.RssSyncInterval;
-            interval.Should().Be(15);
+            interval.Should().Be(60);
             Mocker.GetMock<IConfigRepository>().Verify(c => c.Insert(It.IsAny<Config>()), Times.Never());
         }
 

src/NzbDrone.Core.Test/DecisionEngineTests/AcceptableSizeSpecificationFixture.cs

@@ -196,18 +196,18 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             Subject.IsSatisfiedBy(parseResultSingle, null).Accepted.Should().BeTrue();
         }
 
-        [Test]
-        public void should_return_true_if_RAWHD()
-        {
-            parseResultSingle.ParsedEpisodeInfo.Quality = new QualityModel(Quality.RAWHD);
+        //[Test]
+        //public void should_return_true_if_RAWHD()
+        //{
+        //    parseResultSingle.ParsedEpisodeInfo.Quality = new QualityModel(Quality.RAWHD);
             
-            series.Runtime = 45;
-            parseResultSingle.Series = series;
-            parseResultSingle.Series.SeriesType = SeriesTypes.Daily;
-            parseResultSingle.Release.Size = 8000.Megabytes();
+        //    series.Runtime = 45;
+        //    parseResultSingle.Series = series;
+        //    parseResultSingle.Series.SeriesType = SeriesTypes.Daily;
+        //    parseResultSingle.Release.Size = 8000.Megabytes();
 
-            Subject.IsSatisfiedBy(parseResultSingle, null).Accepted.Should().BeTrue();
-        }
+        //    Subject.IsSatisfiedBy(parseResultSingle, null).Accepted.Should().BeTrue();
+        //}
 
         [Test]
         public void should_return_true_for_special()

src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbgetTests/NzbgetFixture.cs

@@ -92,14 +92,14 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetTests
         protected void GivenFailedDownload()
         {
             Mocker.GetMock<INzbgetProxy>()
-                .Setup(s => s.DownloadNzb(It.IsAny<byte[]>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<int>(), It.IsAny<NzbgetSettings>()))
+                .Setup(s => s.DownloadNzb(It.IsAny<byte[]>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<int>(), It.IsAny<bool>(), It.IsAny<NzbgetSettings>()))
                 .Returns((string)null);
         }
 
         protected void GivenSuccessfulDownload()
         {
             Mocker.GetMock<INzbgetProxy>()
-                .Setup(s => s.DownloadNzb(It.IsAny<byte[]>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<int>(), It.IsAny<NzbgetSettings>()))
+                .Setup(s => s.DownloadNzb(It.IsAny<byte[]>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<int>(), It.IsAny<bool>(), It.IsAny<NzbgetSettings>()))
                 .Returns(Guid.NewGuid().ToString().Replace("-", ""));
         }
 

src/NzbDrone.Core.Test/Files/couchpotato_movie_list.json

@@ -0,0 +1,449 @@
+{
+  "movies": [
+    {
+      "status": "active",
+      "info": {
+        "rating": { "imdb": [ 8.1, 228515 ] },
+        "genres": [ "Action", "Adventure", "Fantasy", "Science Fiction", "Thriller", "War", "Sci-Fi" ],
+        "tmdb_id": 330459,
+        "plot": "A rogue band of resistance fighters unite for a mission to steal the Death Star plans and bring a new hope to the galaxy.",
+        "tagline": "A Rebellion Built on Hope",
+        "release_date": {
+          "dvd": 1461016800,
+          "expires": 1486410729,
+          "theater": 1453417200,
+          "bluray": true
+        },
+        "year": 2016,
+        "original_title": "Rogue One: A Star Wars Story",
+        "actor_roles": {
+          "Warwick Davis": "Bistan",
+          "Michael Giacchino": "Stormtrooper",
+          "Lex Lang": "Stormtrooper",
+          "Samuel Witwer": "Stormtrooper",
+          "Steen Young": "Vault Officer",
+          "Russell Balogh": "X-Wing Pilot",
+          "Alan Tudyk": "K-2SO",
+          "Angus Cook": "Mechanic",
+          "David Boat": "Stormtrooper",
+          "Kevin Hickman": "Stormtrooper",
+          "Aidan Cook": "Edrio Two Tubes",
+          "Valene Kane": "Lyra Erso",
+          "Simon Farnaby": "Blue Squadron",
+          "Donnie Yen": "Chirrut Imwe",
+          "Forest Whitaker": "Saw Gerrera",
+          "Jordan Stephens": "Corporal Tonc",
+          "Verona Blue": "Stormtrooper",
+          "David Sobolov": "Stormtrooper",
+          "Attila G. Kerekes": "Rebel Marine on Yavin",
+          "Ian McElhinney": "General Dodonna",
+          "John Gilroy": "Stormtrooper",
+          "Matthew Wood": "Stormtrooper",
+          "Jiang Wen": "Baze Malbus",
+          "Sharon Duncan-Brewster": "Senator Pamlo",
+          "Christopher Scarabosio": "Stormtrooper",
+          "Stephen Stanton": "Admiral Raddus (voice)",
+          "Andrew Zographos": "X-Wing Pilot",
+          "Ben Daniels": "General Merrick",
+          "James Arnold Taylor": "Stormtrooper",
+          "Robin Atkin Downes": "Stormtrooper",
+          "Guy Henry": "Grand Moff Tarkin",
+          "Mac Pietowski": "Commi Tech / Marine Soldier",
+          "James Earl Jones": "Darth Vader (voice)",
+          "Daniel Naprous": "Darth Vader",
+          "Geraldine James": "Blue Squadron",
+          "Eugene Byrd": "Stormtrooper",
+          "Michael Donovan": "Stormtrooper",
+          "Paul Kasey": "Admiral Raddus",
+          "Fred Tatasciore": "Stormtrooper",
+          "Vanessa Lengies": "Stormtrooper",
+          "Duncan Pow": "Sergeant Melshi",
+          "Dolly Gadsdon": "Younger Jyn (as Dolly Gadson)",
+          "David Acord": "Stormtrooper",
+          "Nick Kellington": "Bistan",
+          "Julian Stone": "Stormtrooper",
+          "Christian Simpson": "Stormtrooper",
+          "Alistair Petrie": "General Draven",
+          "Ariyon Bakare": "Blue Squadron",
+          "Drewe Henley": "Red Leader Garven Dreis",
+          "Ram Bergman": "Death Star technician",
+          "Anthony Daniels": "C-3PO",
+          "Derek Arnold": "Pao",
+          "Karen Huie": "Stormtrooper",
+          "Steve Bardrack": "Stormtrooper",
+          "Jonathan Aris": "Senator Jebel",
+          "Alexi Melvin": "Stormtroooper",
+          "Emeson Nwolie": "Personnel",
+          "Tyrone Love": "Rebel Marine Commander",
+          "John S. Schwartz": "Stormtrooper",
+          "Orly Schuchmacher": "Stormtrooper",
+          "Dave Filoni": "Stormtrooper",
+          "Yuri Lowenthal": "Stormtrooper",
+          "Mads Mikkelsen": "Galen Erso",
+          "Fares Fares": "Senator Vaspar",
+          "Ian Whyte": "Moroff",
+          "Genevieve O'Reilly": "Mon Mothma",
+          "Jorge Leon Martinez": "X-Wing Pilot",
+          "Beau Gadsdon": "Young Jyn",
+          "Katie Sheridan": "Stormtrooper",
+          "Michael Smiley": "Dr. Evazan",
+          "Babou Ceesay": "Lieutenant Sefla",
+          "Tom Harrison-Read": "Stormtrooper",
+          "Spencer Wilding": "Darth Vader",
+          "Tom Kane": "Stormtrooper",
+          "Riz Ahmed": "Bodhi Rook",
+          "Ingvild Deila": "Princess Leia",
+          "Tony Gilroy": "Stormtrooper",
+          "Felicity Jones": "Jyn Erso",
+          "Jonathan Dixon": "Stormtrooper",
+          "Angus MacInnes": "Gold Leader Dutch Vander",
+          "William M. Patrick": "Stormtroooper",
+          "Diego Luna": "Captain Cassian Andor",
+          "Sam Hanover": "Imperial Officer",
+          "Jimmy Smits": "Bail Organa",
+          "Ned Dennehy": "Prisoner",
+          "Rian Johnson": "Death Star Technician",
+          "Jimmy Vee": "R2-D2",
+          "David Cowgill": "Stormtrooper",
+          "Vanessa Marshall": "Stormtrooper",
+          "Terri Douglas": "Stormtrooper",
+          "David Ankrum": "Wedge Antilles",
+          "Flora Miller": "Stormtroooper",
+          "Steve Blum": "Stormtrooper",
+          "Ben Mendelsohn": "Director Orson Krennic"
+        },
+        "via_imdb": true,
+        "images": {
+          "disc_art": [],
+          "poster": [ "https://images-na.ssl-images-amazon.com/images/M/MV5BMjEwMzMxODIzOV5BMl5BanBnXkFtZTgwNzg3OTAzMDI@._V1_SX300.jpg" ],
+          "backdrop": [ "https://image.tmdb.org/t/p/w1280/tZjVVIYXACV4IIIhXeIM59ytqwS.jpg" ],
+          "extra_thumbs": [],
+          "poster_original": [ "https://image.tmdb.org/t/p/original/qjiskwlV1qQzRCjpV0cL9pEMF9a.jpg" ],
+          "actors": {
+            "Warwick Davis": "https://image.tmdb.org/t/p/w185/5xBunTQJexQOuCmtlh8MNJerbaM.jpg",
+            "Michael Giacchino": "https://image.tmdb.org/t/p/w185/2YW8sSVvRhCwiQmsFCgtFsGkbv8.jpg",
+            "Michael Smiley": "https://image.tmdb.org/t/p/w185/muzJQpsKJ4srfVpyRa7qkrRYWSq.jpg",
+            "Babou Ceesay": "https://image.tmdb.org/t/p/w185/7HtIvbNxACa03ofJpN4EFQTNtRU.jpg",
+            "Julian Stone": "https://image.tmdb.org/t/p/w185/sNKqRYXFYHCz8lXExXl0DAl3iGD.jpg",
+            "Jordan Stephens": "https://image.tmdb.org/t/p/w185/oCQl5rkRExrDhGXNPeSxsmC5wvk.jpg",
+            "Alistair Petrie": "https://image.tmdb.org/t/p/w185/tC5CHVPnxAMqF0W0csTqcDAawwj.jpg",
+            "Samuel Witwer": "https://image.tmdb.org/t/p/w185/e4FRojd6SmiyRLo2nQQGUXwi16v.jpg",
+            "Ben Daniels": "https://image.tmdb.org/t/p/w185/x6MI4Fdz1XbERbNbXYoxTK6NAgv.jpg",
+            "Ariyon Bakare": "https://image.tmdb.org/t/p/w185/xjJlH9hU58Ocy6GxKfBlEvTif1p.jpg",
+            "James Arnold Taylor": "https://image.tmdb.org/t/p/w185/rAtyfY0diWt078qQIg0IX9xxG9F.jpg",
+            "Robin Atkin Downes": "https://image.tmdb.org/t/p/w185/pCnIQMMgrFc4hBOE4LJDdebqRZ4.jpg",
+            "Drewe Henley": "https://image.tmdb.org/t/p/w185/C28FmnpDyhI9BwD6YjagAe1U53.jpg",
+            "Spencer Wilding": "https://image.tmdb.org/t/p/w185/g3FJIpQZri7gG515rLehuo81T6W.jpg",
+            "Alan Tudyk": "https://image.tmdb.org/t/p/w185/6QuMtbD8kmhpwWhFKfNzEvHRLOu.jpg",
+            "Guy Henry": "https://image.tmdb.org/t/p/w185/zNjPC6BTZj7DZK4KFL0nMC1El2S.jpg",
+            "Angus Cook": "https://image.tmdb.org/t/p/w185/jPc794vF0h8bmslQ3sO8O3vUVIa.jpg",
+            "David Boat": "https://image.tmdb.org/t/p/w185/4ewxttZW0bhlta27oc5Tjrxel3p.jpg",
+            "Tom Kane": "https://image.tmdb.org/t/p/w185/hAyEHNuhD6PqbPdCNR7iUyM271I.jpg",
+            "Anthony Daniels": "https://image.tmdb.org/t/p/w185/cljvryjb3VwTsNR7fjQKjNPMaBB.jpg",
+            "Duncan Pow": "https://image.tmdb.org/t/p/w185/vJOzoMzxszyZGnySfql3KY9zR78.jpg",
+            "Fares Fares": "https://image.tmdb.org/t/p/w185/1BE5IG3hcFXfMjBuJJyKs2JpPjI.jpg",
+            "Tony Gilroy": "https://image.tmdb.org/t/p/w185/9HOtDgcO6F4Fa4BaIjt0t3Vbxrj.jpg",
+            "Felicity Jones": "https://image.tmdb.org/t/p/w185/9YekpRl6ndS7zpY0wwZAWcAXkl8.jpg",
+            "Eugene Byrd": "https://image.tmdb.org/t/p/w185/ab4zEcqdBSjpaz4CPQ2Z6q4rLmO.jpg",
+            "Jonathan Aris": "https://image.tmdb.org/t/p/w185/6RMuwGYfLLGq01LNGBydj9jpTWn.jpg",
+            "Valene Kane": "https://image.tmdb.org/t/p/w185/7TcV6HqGXjf28yjuSU42Z5XZRYb.jpg",
+            "Angus MacInnes": "https://image.tmdb.org/t/p/w185/qftkol8hj7yBBP3KCxRWYkhRyLC.jpg",
+            "James Earl Jones": "https://image.tmdb.org/t/p/w185/2ZuBf3ip2RXhkiQqGUjbUzAf4Nx.jpg",
+            "Emeson Nwolie": "https://image.tmdb.org/t/p/w185/dWCOK3qCOm1Vve567FXKhBp5x8B.jpg",
+            "Terri Douglas": "https://image.tmdb.org/t/p/w185/lECiABogAKm5Zl8Je6niNAoqz5N.jpg",
+            "Simon Farnaby": "https://image.tmdb.org/t/p/w185/3u1ObLUvaTyEMmpWQnkRg5Trlng.jpg",
+            "Donnie Yen": "https://image.tmdb.org/t/p/w185/vlKBbOc0htUsDGvcxeULcFXDMRo.jpg",
+            "Forest Whitaker": "https://image.tmdb.org/t/p/w185/4pMQkelS5lK661m9Kz3oIxLYiyS.jpg",
+            "Diego Luna": "https://image.tmdb.org/t/p/w185/9f1y0pLqohP8U3eEVCa4di1tESb.jpg",
+            "Dave Filoni": "https://image.tmdb.org/t/p/w185/1m7ijGgs29Emn3Sj08c1GwGTUm0.jpg",
+            "Jimmy Smits": "https://image.tmdb.org/t/p/w185/tZfr6EaIxzlT9MhY5T4C6cL3UjF.jpg",
+            "Yuri Lowenthal": "https://image.tmdb.org/t/p/w185/d5vbYEkrPYAiVdTee8e4xCm7Fg1.jpg",
+            "Verona Blue": "https://image.tmdb.org/t/p/w185/9UJiyVd65nGCVLsTuFjtF3ejCqa.jpg",
+            "David Sobolov": "https://image.tmdb.org/t/p/w185/lUXbnlyQPsfAGg0oinCtj6KlOkt.jpg",
+            "Ned Dennehy": "https://image.tmdb.org/t/p/w185/k4kgPvUND2eTrgmotrVWVJM0JUG.jpg",
+            "Ian McElhinney": "https://image.tmdb.org/t/p/w185/33RGircMDTbdvD6LUp8sLmQKWvA.jpg",
+            "Fred Tatasciore": "https://image.tmdb.org/t/p/w185/lNe4zn9fJ302GehQVaFk5BNcGGM.jpg",
+            "Mads Mikkelsen": "https://image.tmdb.org/t/p/w185/nJjN0bS6ssbOrXcnPJrNEIsbX9s.jpg",
+            "Paul Kasey": "https://image.tmdb.org/t/p/w185/56f0ouOg2ASKKKZlaywor8E5V3J.jpg",
+            "David Cowgill": "https://image.tmdb.org/t/p/w185/kcGjj4EuHfMp0VILRVoacoPqNFL.jpg",
+            "Ian Whyte": "https://image.tmdb.org/t/p/w185/6mRY7hTtHfDTGuTLmZmODOu9buF.jpg",
+            "Genevieve O'Reilly": "https://image.tmdb.org/t/p/w185/8NrrFxrGng88GU7lxwOyK3PZv05.jpg",
+            "Jorge Leon Martinez": "https://image.tmdb.org/t/p/w185/nWYveATaySCXosWAjcSS8VNPRe7.jpg",
+            "Katie Sheridan": "https://image.tmdb.org/t/p/w185/awNPsff9HU7NgAhG1qQ4Kh7pMmj.jpg",
+            "Vanessa Marshall": "https://image.tmdb.org/t/p/w185/wOXilt4TVOd0LuTw6RbWhe5DUy4.jpg",
+            "Vanessa Lengies": "https://image.tmdb.org/t/p/w185/vU4syqfb0PYE9efbBq9YZQu24cY.jpg",
+            "David Ankrum": "https://image.tmdb.org/t/p/w185/vo6JMA38exMSSbyQ3K0YCBwBrWT.jpg",
+            "Riz Ahmed": "https://image.tmdb.org/t/p/w185/yWjuIP634unLBCB4XjSgmJs5QGC.jpg",
+            "Steve Blum": "https://image.tmdb.org/t/p/w185/asCL6bWSZ7Xl2kSoRqrPB0CUUUU.jpg",
+            "Rian Johnson": "https://image.tmdb.org/t/p/w185/qWWRFkeMjTjQKoyEXhsV0QQp4qd.jpg",
+            "Matthew Wood": "https://image.tmdb.org/t/p/w185/oB9wVbEIg8fjY3ulDKjKsGn2A55.jpg",
+            "Jiang Wen": "https://image.tmdb.org/t/p/w185/sLLXxXg11VFdVYFthF9RB8wIQKv.jpg",
+            "Ben Mendelsohn": "https://image.tmdb.org/t/p/w185/nAeZkSUXh9CUAUq1cFAg77rZLIS.jpg",
+            "Geraldine James": "https://image.tmdb.org/t/p/w185/iHKFccX2qpSzMbhIBdfvr835MVg.jpg",
+            "Russell Balogh": "https://image.tmdb.org/t/p/w185/yCfE3Pf1npGB15Rw8GHt4nvgK6p.jpg"
+          },
+          "backdrop_original": [ "https://image.tmdb.org/t/p/original/tZjVVIYXACV4IIIhXeIM59ytqwS.jpg" ],
+          "clear_art": [],
+          "logo": [],
+          "banner": [],
+          "landscape": [],
+          "extra_fanart": []
+        },
+        "directors": [ "Gareth Edwards" ],
+        "titles": [ "Rogue One: A Star Wars Story", "Rogue One", "Star Wars: Rogue One", "Star Wars Anthology: Rogue One", "Rogue One: Uma História Star Wars", "星際大戰外傳：俠盜一號", "Rogue One - A Star Wars Story", "星球大战外传：侠盗一号", "Rogue One: История от Междузвездни войни", "Star Wars - Rouge One" ],
+        "imdb": "tt3748528",
+        "mpaa": "PG-13",
+        "via_tmdb": true,
+        "actors": [ "Felicity Jones", "Diego Luna", "Alan Tudyk", "Donnie Yen" ],
+        "writers": [ "Chris Weitz (screenplay)", "Tony Gilroy (screenplay)", "John Knoll (story by)", "Gary Whitta (story by)", "George Lucas (based on characters created by)" ],
+        "runtime": 133,
+        "type": "movie",
+        "released": "16 Dec 2016"
+      },
+      "_t": "media",
+      "releases": [],
+      "title": "Rogue One: A Star Wars Story",
+      "_rev": "00030f77",
+      "profile_id": "38699ec285c447bab0bc6267ffb2f3ad",
+      "_id": "d9d4e0ff9b0842518b9d5f5184a60f31",
+      "category_id": null,
+      "type": "movie",
+      "files": { "image_poster": [ "C:\\Users\\devin\\AppData\\Roaming\\CouchPotato\\cache\\2100049b45a923e858dd161ae28b1f4d.jpg" ] },
+      "identifiers": { "imdb": "tt3748528" }
+    },
+    {
+      "status": "active",
+      "info": {
+        "rating": { "imdb": [ 7.3, 16900 ] },
+        "genres": [ "Animation", "Comedy", "Family", "Music", "Drama" ],
+        "tmdb_id": 335797,
+        "plot": "In a city of humanoid animals, a hustling theater impresario's attempt to save his theater with a singing competition becomes grander than he anticipates even as its finalists' find that their lives will never be the same.",
+        "tagline": "Auditions begin 2016.",
+        "release_date": {
+          "dvd": 1490997600,
+          "expires": 1485114888,
+          "theater": 1482274800,
+          "bluray": true
+        },
+        "year": 2016,
+        "original_title": "Sing",
+        "actor_roles": {
+          "Taron Egerton": "Johnny (voice)",
+          "Catherine Cavadini": "Additional Voices (voice)",
+          "Beck Bennett": "Lance (voice)",
+          "Rhea Perlman": "Judith (voice)",
+          "Jon Robert Hall": "Frog (voice)",
+          "Abby Craden": "Additional Voices (voice)",
+          "Jim Cummings": "Additional Voices (voice)",
+          "Peter Serafinowicz": "Big Daddy (voice)",
+          "Bill Farmer": "News Reporter Dog (voice)",
+          "Jessica Rau": "Additional Voices (voice)",
+          "Townsend Coleman": "Additional Voices (voice)",
+          "Jen Faith Brown": "Singer (voice)",
+          "Brad Morris": "Baboon (voice)",
+          "Doug Burch": "Additional Voices (voice)",
+          "Jennifer Hudson": "Young Nana (voice)",
+          "Laura Dickinson": "Spider (voice)",
+          "Jeremy Maxwell": "Additional Voices (voice)",
+          "Asher Blinkoff": "Piglet (voice)",
+          "Reese Witherspoon": "Rosita (voice)",
+          "Scarlett Johansson": "Ash (voice)",
+          "Carlos Alazraqui": "Additional Voices (voice)",
+          "Edgar Wright": "Additional Voices (voice)",
+          "Asa Jennings": "Piglet (voice)",
+          "Nick Offerman": "Norman (voice)",
+          "Mickael Carreira": "Voice 3",
+          "Sara Mann": "Additional Voices (voice)",
+          "Jay Pharoah": "Meena's Grandfather (voice)",
+          "Adam Buxton": "Stan (voice)",
+          "Garth Jennings": "Miss Crawly / Additional Voices (voice)",
+          "Deolinda Kinzimba": "Voice 4",
+          "Jess Harnell": "Additional Voices (voice)",
+          "Bob Bergen": "Additional Voices (voice)",
+          "Leslie Jones": "Meena's Mother (voice)",
+          "Chris Renaud": "Additional Voices (voice)",
+          "Nick Kroll": "Gunter (voice)",
+          "Seth MacFarlane": "Mike (voice)",
+          "Marisa Liz": "Voice 2",
+          "Áurea": "Voice 1",
+          "Leo Jennings": "Piglet (voice)",
+          "Oscar Jennings": "Piglet (voice)",
+          "Tara Strong": "Additional Voices (voice)",
+          "John C. Reilly": "Eddie (voice)",
+          "Matthew McConaughey": "Buster Moon (voice)",
+          "Caspar Jennings": "Piglet (voice)",
+          "Daamen J. Krall": "Additional Voices (voice)",
+          "Tori Kelly": "Meena (voice)",
+          "Laraine Newman": "Meena's Grandmother / Additional Voices (voice)",
+          "Willow Geer": "Additional Voices (voice)",
+          "Wes Anderson": "Additional Voices (voice)",
+          "Jason Pace": "Additional Voices (voice)",
+          "Jennifer Saunders": "Nana (voice)",
+          "John DeMita": "Additional Voices (voice)"
+        },
+        "via_imdb": true,
+        "images": {
+          "disc_art": [],
+          "poster": [ "https://images-na.ssl-images-amazon.com/images/M/MV5BMTYzODYzODU2Ml5BMl5BanBnXkFtZTgwNTc1MTA2NzE@._V1_SX300.jpg" ],
+          "backdrop": [ "https://image.tmdb.org/t/p/w1280/fxDXp8un4qNY9b1dLd7SH6CKzC.jpg" ],
+          "extra_thumbs": [],
+          "poster_original": [ "https://image.tmdb.org/t/p/original/5XFchtGifv8mz4qlyT8PZ7ZsjfG.jpg" ],
+          "actors": {
+            "Taron Egerton": "https://image.tmdb.org/t/p/w185/bVsLVoO3BGoHRLjWoM4Gjav2hNb.jpg",
+            "Catherine Cavadini": "https://image.tmdb.org/t/p/w185/o2wULQltvbzCTCJitNeT72AjklR.jpg",
+            "Beck Bennett": "https://image.tmdb.org/t/p/w185/oblaqelpyBvtB5GaSgQpDrfka9M.jpg",
+            "Daamen J. Krall": "https://image.tmdb.org/t/p/w185/u0CORJ8e2vvw1dFARU4estHYS2I.jpg",
+            "Rhea Perlman": "https://image.tmdb.org/t/p/w185/cq7Cf4z3BHD9o58ki7MgCioty8q.jpg",
+            "Abby Craden": "https://image.tmdb.org/t/p/w185/biX1xErOEwsuRvidr8Pw6edEyK4.jpg",
+            "Jim Cummings": "https://image.tmdb.org/t/p/w185/i9frXvIJsGtoFikBEFVqE7uN8Bq.jpg",
+            "Peter Serafinowicz": "https://image.tmdb.org/t/p/w185/nfXHDKeetwO16agC0S7tDmLt1il.jpg",
+            "Bill Farmer": "https://image.tmdb.org/t/p/w185/4aDBlkt8nEkr1RkEhiKIbDWhpZB.jpg",
+            "Jessica Rau": "https://image.tmdb.org/t/p/w185/jBbIYc3UQf7JU8ggQVkfezpmgVZ.jpg",
+            "Townsend Coleman": "https://image.tmdb.org/t/p/w185/j7PvxQ7XuOQc1ggSRHWRP6CB8CU.jpg",
+            "Brad Morris": "https://image.tmdb.org/t/p/w185/qX6oVdAt7Vzzcnw28bdXFp05BBH.jpg",
+            "Doug Burch": "https://image.tmdb.org/t/p/w185/zwfqhPuIFrUL70bWPESdJZWXc7F.jpg",
+            "Jennifer Hudson": "https://image.tmdb.org/t/p/w185/zqTu7AANIUsVMAYz5rK1YPnvbWR.jpg",
+            "Asher Blinkoff": "https://image.tmdb.org/t/p/w185/780sIDWQoAIVVaUbAQex50Vam0V.jpg",
+            "Reese Witherspoon": "https://image.tmdb.org/t/p/w185/a3o8T1P6yy4KWL7wZG6HuDeuh5n.jpg",
+            "Scarlett Johansson": "https://image.tmdb.org/t/p/w185/f3c1rwcOoeU0v6Ak5loUvMyifR0.jpg",
+            "Carlos Alazraqui": "https://image.tmdb.org/t/p/w185/o62NevO1Vt9n1MdYsWOsDyhUt3A.jpg",
+            "Nick Offerman": "https://image.tmdb.org/t/p/w185/8rJOtmxL5GIfNdOfksVPzepQOy2.jpg",
+            "Sara Mann": "https://image.tmdb.org/t/p/w185/1TiV16ODOJtTZQrWmHRwOyQnMb0.jpg",
+            "Jay Pharoah": "https://image.tmdb.org/t/p/w185/yRD2vypRF0niEdoCCI0pNZENzvm.jpg",
+            "Tara Strong": "https://image.tmdb.org/t/p/w185/rFUZnJ4BaSaQVKW734xnUHSN9pm.jpg",
+            "Garth Jennings": "https://image.tmdb.org/t/p/w185/ahQh5uW5CXLe1LotxN4Y20aj5Gx.jpg",
+            "Jess Harnell": "https://image.tmdb.org/t/p/w185/k0BOzEyMkZ1CcoCaohjqTyQJjP1.jpg",
+            "Leslie Jones": "https://image.tmdb.org/t/p/w185/2cXrwJoX0QHGBtNMsMLqeF6bR3s.jpg",
+            "Chris Renaud": "https://image.tmdb.org/t/p/w185/yK3RxNsIEBljUe9jPG0iz53Iz6t.jpg",
+            "Nick Kroll": "https://image.tmdb.org/t/p/w185/puZov7sMmuVkvdqJvmlxtWcS1fU.jpg",
+            "Seth MacFarlane": "https://image.tmdb.org/t/p/w185/v4c6JhGYpjMRBwf95gtPxBnElNu.jpg",
+            "Bob Bergen": "https://image.tmdb.org/t/p/w185/kuWDjNTw6OVnc3q1ugMGBYpMMMa.jpg",
+            "Edgar Wright": "https://image.tmdb.org/t/p/w185/ypyH2s4egy5BkviuGDfeltpb19N.jpg",
+            "Matthew McConaughey": "https://image.tmdb.org/t/p/w185/jdRmHrG0TWXGhs4tO6TJNSoL25T.jpg",
+            "John C. Reilly": "https://image.tmdb.org/t/p/w185/kUo2TPQp4kOWWvijvkjLl0v9PQB.jpg",
+            "Adam Buxton": "https://image.tmdb.org/t/p/w185/zL31NlBBKL1NTjR48h610by5Rld.jpg",
+            "Tori Kelly": "https://image.tmdb.org/t/p/w185/dMyLOIOYqTMQtMEiK9DSxxHTz6F.jpg",
+            "Laraine Newman": "https://image.tmdb.org/t/p/w185/ApYftBOqDMBnVColOQwXIodOt5s.jpg",
+            "Willow Geer": "https://image.tmdb.org/t/p/w185/q2TjAxrQSpPPUiTUwFBXcLJ7qxc.jpg",
+            "Wes Anderson": "https://image.tmdb.org/t/p/w185/r6mr3gvbuocMznHXSlXVKDj7mEI.jpg",
+            "Jason Pace": "https://image.tmdb.org/t/p/w185/2q6KfNytYUiHuf8Rx9HyBGoD1T7.jpg",
+            "Jennifer Saunders": "https://image.tmdb.org/t/p/w185/nlxiFy0LUYGlICaFY3rF2DRovcc.jpg",
+            "John DeMita": "https://image.tmdb.org/t/p/w185/lzwHtcKVd5oenYtoFtJYeNddpwT.jpg"
+          },
+          "backdrop_original": [ "https://image.tmdb.org/t/p/original/fxDXp8un4qNY9b1dLd7SH6CKzC.jpg" ],
+          "clear_art": [],
+          "logo": [],
+          "banner": [],
+          "landscape": [],
+          "extra_fanart": []
+        },
+        "directors": [ "Christophe Lourdelet", "Garth Jennings" ],
+        "titles": [ "Sing", "Welcome to the Auditions" ],
+        "imdb": "tt3470600",
+        "mpaa": "PG",
+        "via_tmdb": true,
+        "actors": [ "Matthew McConaughey", "Reese Witherspoon", "Seth MacFarlane", "Scarlett Johansson" ],
+        "writers": [ "Garth Jennings" ],
+        "runtime": 110,
+        "type": "movie",
+        "released": "21 Dec 2016"
+      },
+      "_t": "media",
+      "releases": [],
+      "title": "Sing",
+      "_rev": "00031b86",
+      "profile_id": "38699ec285c447bab0bc6267ffb2f3ad",
+      "_id": "f12dc6bbff294daa85db0d839646442a",
+      "category_id": null,
+      "type": "movie",
+      "files": { "image_poster": [ "C:\\Users\\devin\\AppData\\Roaming\\CouchPotato\\cache\\2ad327d73e8ef4deab7a4b564d3b9cb4.jpg" ] },
+      "identifiers": { "imdb": "tt3470600" }
+    },
+    {
+      "status": "active",
+      "info": {
+        "rating": { "imdb": [ 6.4, 10027 ] },
+        "genres": [ "Action", "Horror" ],
+        "tmdb_id": 346672,
+        "plot": "Vampire death dealer Selene fends off brutal attacks from both the Lycan clan and the Vampire faction that betrayed her. With her only allies, David and his father Thomas, she must stop the eternal war between Lycans and Vampires, even if it means she has to make the ultimate sacrifice.",
+        "tagline": "Protect the Bloodline",
+        "release_date": {
+          "dvd": 1493589600,
+          "expires": 1485114954,
+          "theater": 1483657200,
+          "bluray": true
+        },
+        "year": 2016,
+        "original_title": "Underworld: Blood Wars",
+        "actor_roles": {
+          "India Eisley": "Eve",
+          "Kate Beckinsale": "Selene",
+          "Oliver Stark": "Gregor",
+          "Brian Caspe": "Hajna",
+          "Charles Dance": "Thomas",
+          "Alicia Vela-Bailey": "Safehouse Lycan",
+          "Bradley James": "Varga",
+          "David Bowles": "Grey Lycan",
+          "Theo James": "David",
+          "Lara Pulver": "Semira",
+          "Eva Larvoire": "Tech Lycan",
+          "Tobias Menzies": "Marius",
+          "Daisy Head": "Alexia",
+          "Trent Garrett": "Hybrid Michael"
+        },
+        "via_imdb": true,
+        "images": {
+          "disc_art": [],
+          "poster": [ "https://images-na.ssl-images-amazon.com/images/M/MV5BMjI5Njk0NTIyNV5BMl5BanBnXkFtZTgwNjU4MjY5MDI@._V1_SX300.jpg" ],
+          "backdrop": [ "https://image.tmdb.org/t/p/w1280/PIXSMakrO3s2dqA7mCvAAoVR0E.jpg" ],
+          "extra_thumbs": [],
+          "poster_original": [ "https://image.tmdb.org/t/p/original/nHXiMnWUAUba2LZ0dFkNDVdvJ1o.jpg" ],
+          "actors": {
+            "India Eisley": "https://image.tmdb.org/t/p/w185/njL744BT8mz9jf2TxcZDnSOEZFb.jpg",
+            "Kate Beckinsale": "https://image.tmdb.org/t/p/w185/pTRtcZn9gWQZRiet36qWKh94urn.jpg",
+            "Oliver Stark": "https://image.tmdb.org/t/p/w185/5yULYfaUMymZdSLhk2W96hZIQBP.jpg",
+            "Brian Caspe": "https://image.tmdb.org/t/p/w185/1fDVsCwZOwp97Pdl7q743seHCMP.jpg",
+            "Charles Dance": "https://image.tmdb.org/t/p/w185/bLT03rnI29YmbYWjA1JJCl4xVXw.jpg",
+            "Alicia Vela-Bailey": "https://image.tmdb.org/t/p/w185/kVuyn6sS7ZSBlXVjjxq0LSE3k4I.jpg",
+            "Bradley James": "https://image.tmdb.org/t/p/w185/4XAtJsz67pmpIsCQ9SBKfqayk2d.jpg",
+            "Trent Garrett": "https://image.tmdb.org/t/p/w185/w9J2snV7QI71B5F7rCxfPqeS7GU.jpg",
+            "Theo James": "https://image.tmdb.org/t/p/w185/hLNSoQ3gc52X5VVb172yO3CuUEq.jpg",
+            "Eva Larvoire": "https://image.tmdb.org/t/p/w185/Aq96CWP3Pub2CdWSNbL5eaTwRt0.jpg",
+            "Tobias Menzies": "https://image.tmdb.org/t/p/w185/bXUpxFsIowySRyyqchaE1XprptI.jpg",
+            "Daisy Head": "https://image.tmdb.org/t/p/w185/33JAZTxDWj646mxdW1HksqHOsiY.jpg",
+            "Lara Pulver": "https://image.tmdb.org/t/p/w185/ve68vtNYVXmKjzn81zKhI7TWEvy.jpg"
+          },
+          "backdrop_original": [ "https://image.tmdb.org/t/p/original/PIXSMakrO3s2dqA7mCvAAoVR0E.jpg" ],
+          "clear_art": [],
+          "logo": [],
+          "banner": [],
+          "landscape": [],
+          "extra_fanart": []
+        },
+        "directors": [ "Anna Foerster" ],
+        "titles": [ "Underworld: Blood Wars", "Inframundo: Guerras de Sangre", "Anjos da Noite: Guerras de Sangue", "Underworld Reboot", "Underworld: Next Generation", "決戰異世界：弒血之戰", "Інший світ 5: Кровна помста", "Інший світ 5", "Underworld 5 - Blood Wars" ],
+        "imdb": "tt3717252",
+        "mpaa": "R",
+        "via_tmdb": true,
+        "actors": [ "Kate Beckinsale", "Theo James", "Tobias Menzies", "Lara Pulver" ],
+        "writers": [ "Cory Goodman (screenplay)", "Kyle Ward (story by)", "Cory Goodman (story by)", "Kevin Grevioux (based on characters created by)", "Len Wiseman (based on characters created by)", "Danny McBride (based on characters created by)" ],
+        "runtime": 91,
+        "type": "movie",
+        "released": "06 Jan 2017"
+      },
+      "_t": "media",
+      "releases": [],
+      "title": "Underworld: Blood Wars",
+      "_rev": "00037887",
+      "profile_id": "38699ec285c447bab0bc6267ffb2f3ad",
+      "_id": "4040237fdbd349629a51e29e8ff634f2",
+      "category_id": null,
+      "type": "movie",
+      "files": { "image_poster": [ "C:\\Users\\devin\\AppData\\Roaming\\CouchPotato\\cache\\e41f29a177dd6756dce94f24148c81fe.jpg" ] },
+      "identifiers": { "imdb": "tt3717252" }
+    }
+  ],
+  "total": 3,
+  "empty": false,
+  "success": true
+}

src/NzbDrone.Core.Test/IndexerTests/BasicRssParserFixture.cs

@@ -45,6 +45,7 @@ namespace NzbDrone.Core.Test.IndexerTests
             return new IndexerResponse(new IndexerRequest(httpRequest), httpResponse);
         }
 
+
         [Test]
         public void should_handle_relative_url()
         {

src/NzbDrone.Core.Test/NetImport/CouchPotato/CouchPotatoParserFixture.cs

@@ -0,0 +1,37 @@
+using System.Linq;
+using System.Text;
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using NzbDrone.Common.Http;
+using NzbDrone.Core.Indexers;
+using NzbDrone.Core.NetImport;
+using NzbDrone.Core.NetImport.CouchPotato;
+using NzbDrone.Core.NetImport.RSSImport;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.NetImport.CouchPotato
+{
+    public class CouchPotatoTest : CoreTest<CouchPotatoParser>
+    {
+        private NetImportResponse CreateResponse(string url, string content)
+        {
+            var httpRequest = new HttpRequest(url);
+            var httpResponse = new HttpResponse(httpRequest, new HttpHeader(), Encoding.UTF8.GetBytes(content));
+
+            return new NetImportResponse(new NetImportRequest(httpRequest), httpResponse);
+        }
+
+
+        [Test]
+        public void should_parse_json_of_couchpotato()
+        {
+            var json = ReadAllText("Files/couchpotato_movie_list.json");
+
+            var result = Subject.ParseResponse(CreateResponse("http://my.indexer.com/api?q=My+Favourite+Show", json));
+
+            result.First().Title.Should().Be("Rogue One: A Star Wars Story");
+            result.First().ImdbId.Should().Be("tt3748528");
+        }
+    }
+}

src/NzbDrone.Core.Test/NetImport/RSSImportFixture.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using FizzWare.NBuilder;
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using NzbDrone.Common.Http;
+using NzbDrone.Core.Datastore;
+using NzbDrone.Core.NetImport;
+using NzbDrone.Core.NetImport.RSSImport;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.NetImport
+{
+    [TestFixture]
+    public class RSSImportFixture : CoreTest<RSSImport>
+    {
+
+        [SetUp]
+        public void Setup()
+        {
+            Subject.Definition = Subject.DefaultDefinitions.First();
+        }
+        private void GivenRecentFeedResponse(string rssXmlFile)
+        {
+            var recentFeed = ReadAllText(@"Files/" + rssXmlFile);
+
+            Mocker.GetMock<IHttpClient>()
+                .Setup(o => o.Execute(It.IsAny<HttpRequest>()))
+                .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), recentFeed));
+        }
+
+        [Test]
+        public void should_fetch_imdb_list()
+        {
+            GivenRecentFeedResponse("imdb_watchlist.xml");
+
+            var result = Subject.Fetch();
+
+            result.First().Title.Should().Be("Think Like a Man Too");
+            result.First().ImdbId.Should().Be("tt2239832");
+        }
+    }
+}

src/NzbDrone.Core.Test/NetImport/RSSImportParserFixture.cs

@@ -0,0 +1,36 @@
+using System.Linq;
+using System.Text;
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using NzbDrone.Common.Http;
+using NzbDrone.Core.Indexers;
+using NzbDrone.Core.NetImport;
+using NzbDrone.Core.NetImport.RSSImport;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.NetImport
+{
+    public class RSSImportTest : CoreTest<RSSImportParser>
+    {
+        private NetImportResponse CreateResponse(string url, string content)
+        {
+            var httpRequest = new HttpRequest(url);
+            var httpResponse = new HttpResponse(httpRequest, new HttpHeader(), Encoding.UTF8.GetBytes(content));
+
+            return new NetImportResponse(new NetImportRequest(httpRequest), httpResponse);
+        }
+
+
+        [Test]
+        public void should_parse_xml_of_imdb()
+        {
+            var xml = ReadAllText("Files/imdb_watchlist.xml");
+
+            var result = Subject.ParseResponse(CreateResponse("http://my.indexer.com/api?q=My+Favourite+Show", xml));
+
+            result.First().Title.Should().Be("Think Like a Man Too");
+            result.First().ImdbId.Should().Be("tt2239832");
+        }
+    }
+}

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

@@ -190,6 +190,9 @@
     <Compile Include="Download\Pending\PendingReleaseServiceTests\RemoveRejectedFixture.cs" />
     <Compile Include="Download\Pending\PendingReleaseServiceTests\RemoveGrabbedFixture.cs" />
     <Compile Include="Download\Pending\PendingReleaseServiceTests\AddFixture.cs" />
+    <None Include="Files\couchpotato_movie_list.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Files\Indexers\Rarbg\RecentFeed_v1.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -284,6 +287,9 @@
     <Compile Include="MetadataSource\SkyHook\SkyHookProxySearchFixture.cs" />
     <Compile Include="MetadataSource\SearchSeriesComparerFixture.cs" />
     <Compile Include="MetadataSource\SkyHook\SkyHookProxyFixture.cs" />
+    <Compile Include="NetImport\CouchPotato\CouchPotatoParserFixture.cs" />
+    <Compile Include="NetImport\RSSImportFixture.cs" />
+    <Compile Include="NetImport\RSSImportParserFixture.cs" />
     <Compile Include="NotificationTests\SynologyIndexerFixture.cs" />
     <Compile Include="OrganizerTests\FileNameBuilderTests\CleanTitleFixture.cs" />
     <Compile Include="OrganizerTests\FileNameBuilderTests\EpisodeTitleCollapseFixture.cs" />
@@ -409,6 +415,9 @@
       <Link>sqlite3.dll</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Files\imdb_watchlist.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="License.txt" />
     <None Include="Files\Indexers\BroadcastheNet\RecentFeed.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

src/NzbDrone.Core.Test/ParserTests/ExtendedQualityParserRegex.cs

@@ -47,5 +47,17 @@ namespace NzbDrone.Core.Test.ParserTests
         {
             QualityParser.ParseQuality(title).Revision.Version.Should().Be(version);
         }
+
+        [TestCase("Deadpool 2016 2160p 4K UltraHD BluRay DTS-HD MA 7 1 x264-Whatevs", 19)]
+        [TestCase("Deadpool 2016 2160p 4K UltraHD DTS-HD MA 7 1 x264-Whatevs", 16)]
+        [TestCase("Deadpool 2016 4K 2160p UltraHD BluRay AAC2 0 HEVC x265", 19)]
+        [TestCase("The Revenant 2015 2160p UHD BluRay DTS x264-Whatevs", 19)]
+        [TestCase("The Revenant 2015 2160p UHD BluRay FLAC 7 1 x264-Whatevs", 19)]
+        [TestCase("The Martian 2015 2160p Ultra HD BluRay DTS-HD MA 7 1 x264-Whatevs", 19)]
+        [TestCase("Into the Inferno 2016 2160p Netflix WEBRip DD5 1 x264-Whatevs", 18)]
+        public void should_parse_ultrahd_from_title(string title, int version)
+        {
+            QualityParser.ParseQuality(title).Quality.Id.Should().Be(version);
+        }
     }
 }

src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs

@@ -215,19 +215,19 @@ namespace NzbDrone.Core.Test.ParserTests
             ParseAndVerifyQuality(title, Quality.Bluray1080p, proper);
         }
 
-        [TestCase("POI S02E11 1080i HDTV DD5.1 MPEG2-TrollHD", false)]
-        [TestCase("How I Met Your Mother S01E18 Nothing Good Happens After 2 A.M. 720p HDTV DD5.1 MPEG2-TrollHD", false)]
-        [TestCase("The Voice S01E11 The Finals 1080i HDTV DD5.1 MPEG2-TrollHD", false)]
-        [TestCase("Californication.S07E11.1080i.HDTV.DD5.1.MPEG2-NTb.ts", false)]
-        [TestCase("Game of Thrones S04E10 1080i HDTV MPEG2 DD5.1-CtrlHD.ts", false)]
-        [TestCase("VICE.S02E05.1080i.HDTV.DD2.0.MPEG2-NTb.ts", false)]
-        [TestCase("Show - S03E01 - Episode Title Raw-HD.ts", false)]
-        [TestCase("Saturday.Night.Live.Vintage.S10E09.Eddie.Murphy.The.Honeydrippers.1080i.UPSCALE.HDTV.DD5.1.MPEG2-zebra", false)]
-        [TestCase("The.Colbert.Report.2011-08-04.1080i.HDTV.MPEG-2-CtrlHD", false)]
-        public void should_parse_raw_quality(string title, bool proper)
-        {
-            ParseAndVerifyQuality(title, Quality.RAWHD, proper);
-        }
+        //[TestCase("POI S02E11 1080i HDTV DD5.1 MPEG2-TrollHD", false)]
+        //[TestCase("How I Met Your Mother S01E18 Nothing Good Happens After 2 A.M. 720p HDTV DD5.1 MPEG2-TrollHD", false)]
+        //[TestCase("The Voice S01E11 The Finals 1080i HDTV DD5.1 MPEG2-TrollHD", false)]
+        //[TestCase("Californication.S07E11.1080i.HDTV.DD5.1.MPEG2-NTb.ts", false)]
+        //[TestCase("Game of Thrones S04E10 1080i HDTV MPEG2 DD5.1-CtrlHD.ts", false)]
+        //[TestCase("VICE.S02E05.1080i.HDTV.DD2.0.MPEG2-NTb.ts", false)]
+        //[TestCase("Show - S03E01 - Episode Title Raw-HD.ts", false)]
+        //[TestCase("Saturday.Night.Live.Vintage.S10E09.Eddie.Murphy.The.Honeydrippers.1080i.UPSCALE.HDTV.DD5.1.MPEG2-zebra", false)]
+        //[TestCase("The.Colbert.Report.2011-08-04.1080i.HDTV.MPEG-2-CtrlHD", false)]
+        //public void should_parse_raw_quality(string title, bool proper)
+        //{
+        //    ParseAndVerifyQuality(title, Quality.RAWHD, proper);
+        //}
 
         [TestCase("Sonny.With.a.Chance.S02E15", false)]
         [TestCase("Law & Order: Special Victims Unit - 11x11 - Quickie", false)]

src/NzbDrone.Core.Test/Qualities/QualityFixture.cs

@@ -23,7 +23,7 @@ namespace NzbDrone.Core.Test.Qualities
                         new object[] {7, Quality.Bluray1080p},
                         new object[] {8, Quality.WEBDL480p},
                         new object[] {9, Quality.HDTV1080p},
-                        new object[] {10, Quality.RAWHD},
+                        //new object[] {10, Quality.RAWHD},
                         new object[] {16, Quality.HDTV2160p},
                         new object[] {18, Quality.WEBDL2160p},
                         new object[] {19, Quality.Bluray2160p},
@@ -41,7 +41,7 @@ namespace NzbDrone.Core.Test.Qualities
                         new object[] {Quality.Bluray1080p, 7},
                         new object[] {Quality.WEBDL480p, 8},
                         new object[] {Quality.HDTV1080p, 9},
-                        new object[] {Quality.RAWHD, 10},
+                        //new object[] {Quality.RAWHD, 10},
                         new object[] {Quality.HDTV2160p, 16},
                         new object[] {Quality.WEBDL2160p, 18},
                         new object[] {Quality.Bluray2160p, 19},
@@ -65,20 +65,27 @@ namespace NzbDrone.Core.Test.Qualities
         {
             var qualities = new List<Quality>
             {
-                Quality.Unknown,
+                Quality.CAM,
+                Quality.TELECINE,
+                Quality.DVDSCR,
+                Quality.REGIONAL,
                 Quality.SDTV,
-                Quality.WEBDL480p,
                 Quality.DVD,
+                Quality.DVDR,
                 Quality.HDTV720p,
                 Quality.HDTV1080p,
                 Quality.HDTV2160p,
-                Quality.RAWHD,
+                Quality.WEBDL480p,
                 Quality.WEBDL720p,
                 Quality.WEBDL1080p,
                 Quality.WEBDL2160p,
+                Quality.Bluray480p,
+                Quality.Bluray576p,
                 Quality.Bluray720p,
                 Quality.Bluray1080p,
                 Quality.Bluray2160p,
+                Quality.BRDISK,
+                Quality.RAWHD
             };
 
             if (allowed.Length == 0)

src/NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/EpisodesWhereCutoffUnmetFixture.cs

@@ -33,7 +33,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeRepositoryTests
                 { 
                     new ProfileQualityItem { Allowed = true, Quality = Quality.SDTV },
                     new ProfileQualityItem { Allowed = true, Quality = Quality.WEBDL480p },
-                    new ProfileQualityItem { Allowed = true, Quality = Quality.RAWHD }
+                    //new ProfileQualityItem { Allowed = true, Quality = Quality.RAWHD }
                 }
             };
 
@@ -71,13 +71,13 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeRepositoryTests
 
             var qualityMet = new EpisodeFile { RelativePath = "a", Quality = new QualityModel { Quality = Quality.WEBDL480p } };
             var qualityUnmet = new EpisodeFile { RelativePath = "b", Quality = new QualityModel { Quality = Quality.SDTV } };
-            var qualityRawHD = new EpisodeFile { RelativePath = "c", Quality = new QualityModel { Quality = Quality.RAWHD } };
+            //var qualityRawHD = new EpisodeFile { RelativePath = "c", Quality = new QualityModel { Quality = Quality.RAWHD } };
 
             MediaFileRepository fileRepository = Mocker.Resolve<MediaFileRepository>();
 
             qualityMet = fileRepository.Insert(qualityMet);
             qualityUnmet = fileRepository.Insert(qualityUnmet);
-            qualityRawHD = fileRepository.Insert(qualityRawHD);
+            //qualityRawHD = fileRepository.Insert(qualityRawHD);
 
             var monitoredSeriesEpisodes = Builder<Episode>.CreateListOfSize(4)
                                            .All()
@@ -90,8 +90,8 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeRepositoryTests
                                            .With(e => e.Monitored = false)
                                            .With(e => e.EpisodeFileId = qualityMet.Id)
                                            .TheNext(1)
-                                           .With(e => e.EpisodeFileId = qualityRawHD.Id)
-                                           .TheLast(1)
+                                           //.With(e => e.EpisodeFileId = qualityRawHD.Id)
+                                           //.TheLast(1)
                                            .With(e => e.SeasonNumber = 0)
                                            .Build();
 

src/NzbDrone.Core/Blacklisting/Blacklist.cs

@@ -11,6 +11,8 @@ namespace NzbDrone.Core.Blacklisting
     {
         public int SeriesId { get; set; }
         public Series Series { get; set; }
+        public int MovieId { get; set; }
+        public Movie Movie { get; set; }
         public List<int> EpisodeIds { get; set; }
         public string SourceTitle { get; set; }
         public QualityModel Quality { get; set; }

src/NzbDrone.Core/Blacklisting/BlacklistRepository.cs

@@ -10,7 +10,7 @@ namespace NzbDrone.Core.Blacklisting
     {
         List<Blacklist> BlacklistedByTitle(int seriesId, string sourceTitle);
         List<Blacklist> BlacklistedByTorrentInfoHash(int seriesId, string torrentInfoHash);
-        List<Blacklist> BlacklistedBySeries(int seriesId);
+        List<Blacklist> BlacklistedByMovie(int seriesId);
     }
 
     public class BlacklistRepository : BasicRepository<Blacklist>, IBlacklistRepository
@@ -20,15 +20,15 @@ namespace NzbDrone.Core.Blacklisting
         {
         }
 
-        public List<Blacklist> BlacklistedByTitle(int seriesId, string sourceTitle)
+        public List<Blacklist> BlacklistedByTitle(int movieId, string sourceTitle)
         {
-            return Query.Where(e => e.SeriesId == seriesId)
+            return Query.Where(e => e.MovieId == movieId)
                         .AndWhere(e => e.SourceTitle.Contains(sourceTitle));
         }
 
-        public List<Blacklist> BlacklistedByTorrentInfoHash(int seriesId, string torrentInfoHash)
+        public List<Blacklist> BlacklistedByTorrentInfoHash(int movieId, string torrentInfoHash)
         {
-            return Query.Where(e => e.SeriesId == seriesId)
+            return Query.Where(e => e.MovieId == movieId)
                         .AndWhere(e => e.TorrentInfoHash.Contains(torrentInfoHash));
         }
 
@@ -37,9 +37,14 @@ namespace NzbDrone.Core.Blacklisting
             return Query.Where(b => b.SeriesId == seriesId);
         }
 
+        public List<Blacklist> BlacklistedByMovie(int movieId)
+        {
+            return Query.Where(b => b.MovieId == movieId);
+        }
+
         protected override SortBuilder<Blacklist> GetPagedQuery(QueryBuilder<Blacklist> query, PagingSpec<Blacklist> pagingSpec)
         {
-            var baseQuery = query.Join<Blacklist, Series>(JoinType.Inner, h => h.Series, (h, s) => h.SeriesId == s.Id);
+            var baseQuery = query.Join<Blacklist, Movie>(JoinType.Inner, h => h.Movie, (h, s) => h.MovieId == s.Id);
 
             return base.GetPagedQuery(baseQuery, pagingSpec);
         }

src/NzbDrone.Core/Blacklisting/BlacklistService.cs

@@ -21,7 +21,7 @@ namespace NzbDrone.Core.Blacklisting
 
                                     IExecute<ClearBlacklistCommand>,
                                     IHandle<DownloadFailedEvent>,
-                                    IHandleAsync<SeriesDeletedEvent>
+                                    IHandleAsync<MovieDeletedEvent>
     {
         private readonly IBlacklistRepository _blacklistRepository;
 
@@ -128,8 +128,9 @@ namespace NzbDrone.Core.Blacklisting
         {
             var blacklist = new Blacklist
                             {
-                                SeriesId = message.SeriesId,
+                                SeriesId = 0,
                                 EpisodeIds = message.EpisodeIds,
+                                MovieId = message.MovieId,
                                 SourceTitle = message.SourceTitle,
                                 Quality = message.Quality,
                                 Date = DateTime.UtcNow,
@@ -144,9 +145,9 @@ namespace NzbDrone.Core.Blacklisting
             _blacklistRepository.Insert(blacklist);
         }
 
-        public void HandleAsync(SeriesDeletedEvent message)
+        public void HandleAsync(MovieDeletedEvent message)
         {
-            var blacklisted = _blacklistRepository.BlacklistedBySeries(message.Series.Id);
+            var blacklisted = _blacklistRepository.BlacklistedByMovie(message.Movie.Id);
 
             _blacklistRepository.DeleteMany(blacklisted);
         }

src/NzbDrone.Core/Configuration/ConfigService.cs

@@ -100,11 +100,18 @@ namespace NzbDrone.Core.Configuration
 
         public int RssSyncInterval
         {
-            get { return GetValueInt("RssSyncInterval", 15); }
+            get { return GetValueInt("RssSyncInterval", 60); }
 
             set { SetValue("RssSyncInterval", value); }
         }
 
+        public int NetImportSyncInterval
+        {
+            get { return GetValueInt("NetImportSyncInterval", 60); }
+
+            set { SetValue("NetImportSyncInterval", value); }
+        }
+
         public int MinimumAge
         {
             get { return GetValueInt("MinimumAge", 0); }
@@ -169,7 +176,7 @@ namespace NzbDrone.Core.Configuration
 
         public int DownloadedEpisodesScanInterval
         {
-            get { return GetValueInt("DownloadedEpisodesScanInterval", 1); }
+            get { return GetValueInt("DownloadedEpisodesScanInterval", 0); }
 
             set { SetValue("DownloadedEpisodesScanInterval", value); }
         }

src/NzbDrone.Core/Configuration/IConfigService.cs

@@ -46,6 +46,8 @@ namespace NzbDrone.Core.Configuration
         int RssSyncInterval { get; set; }
         int MinimumAge { get; set; }
 
+        int NetImportSyncInterval { get; set; }
+
         //UI
         int FirstDayOfWeek { get; set; }
         string CalendarWeekColumnHeader { get; set; }

src/NzbDrone.Core/Datastore/Migration/122_add_movieid_to_blacklist.cs

@@ -0,0 +1,22 @@
+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(122)]
+    public class add_movieid_to_blacklist : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Alter.Table("Blacklist").AddColumn("MovieId").AsInt32().Nullable().WithDefaultValue(0);
+            Alter.Table("Blacklist").AlterColumn("SeriesId").AsInt32().Nullable();
+            Alter.Table("Blacklist").AlterColumn("EpisodeIds").AsString().Nullable();
+        }
+
+    }
+}

src/NzbDrone.Core/Datastore/Migration/123_create_netimport_table.cs

@@ -0,0 +1,27 @@
+using FluentMigrator;
+using FluentMigrator.Expressions;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(123)]
+    public class create_netimport_table : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            if (!this.Schema.Schema("dbo").Table("NetImport").Exists())
+            {
+                Create.TableForModel("NetImport")
+                    .WithColumn("Enabled").AsBoolean()
+                    .WithColumn("Name").AsString().Unique()
+                    .WithColumn("Implementation").AsString()
+                    .WithColumn("ConfigContract").AsString().Nullable()
+                    .WithColumn("Settings").AsString().Nullable()
+                    .WithColumn("EnableAuto").AsInt32()
+                    .WithColumn("RootFolderPath").AsString()
+                    .WithColumn("ShouldMonitor").AsInt32()
+                    .WithColumn("ProfileId").AsInt32();
+            }
+        }
+    }
+}

src/NzbDrone.Core/Datastore/Migration/124_add_preferred_tags_to_profile.cs

@@ -0,0 +1,20 @@
+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(124)]
+    public class add_preferred_tags_to_profile : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Alter.Table("Profiles").AddColumn("PreferredTags").AsString().Nullable();
+        }
+
+    }
+}

src/NzbDrone.Core/Datastore/Migration/125_fix_imdb_unique.cs

@@ -0,0 +1,31 @@
+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(125)]
+    public class fix_imdb_unique : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Execute.WithConnection(DeleteUniqueIndex);
+        }
+
+        private void DeleteUniqueIndex(IDbConnection conn, IDbTransaction tran)
+        {
+            using (IDbCommand getSeriesCmd = conn.CreateCommand())
+            {
+                getSeriesCmd.Transaction = tran;
+                getSeriesCmd.CommandText = @"DROP INDEX 'IX_Movies_ImdbId'";
+
+                getSeriesCmd.ExecuteNonQuery();
+            }
+        }
+
+    }
+}

src/NzbDrone.Core/Datastore/Migration/126_update_qualities_and_profiles.cs

@@ -0,0 +1,35 @@
+using System.Data;
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(126)]
+    public class update_qualities_and_profiles : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Execute.WithConnection(ConvertProfile);
+        }
+
+        private void ConvertProfile(IDbConnection conn, IDbTransaction tran)
+        {
+            var updater = new ProfileUpdater70(conn, tran);
+            updater.SplitQualityAppend(0, 27); // TELECINE AFTER Unknown
+            updater.SplitQualityAppend(0, 26); // TELESYNC AFTER Unknown
+            updater.SplitQualityAppend(0, 25); // CAM AFTER Unknown
+            updater.SplitQualityAppend(0, 24); // WORKPRINT AFTER Unknown
+            
+            updater.SplitQualityPrepend(2, 23); // DVDR     BEFORE     DVD
+            updater.SplitQualityPrepend(2, 28); // DVDSCR   BEFORE     DVD
+            updater.SplitQualityPrepend(2, 29); // REGIONAL BEFORE     DVD
+
+            updater.SplitQualityAppend(2, 21); // Bluray576p   AFTER     SDTV
+            updater.SplitQualityAppend(2, 20); // Bluray480p   AFTER     SDTV
+
+            updater.AppendQuality(22);
+
+            updater.Commit();
+        }
+    }
+}

src/NzbDrone.Core/Datastore/TableMapping.cs

@@ -34,6 +34,7 @@ using NzbDrone.Core.Extras.Metadata.Files;
 using NzbDrone.Core.Extras.Others;
 using NzbDrone.Core.Extras.Subtitles;
 using NzbDrone.Core.Messaging.Commands;
+using NzbDrone.Core.NetImport;
 
 namespace NzbDrone.Core.Datastore
 {
@@ -55,6 +56,11 @@ namespace NzbDrone.Core.Datastore
                   .Ignore(i => i.SupportsRss)
                   .Ignore(i => i.SupportsSearch);
 
+            Mapper.Entity<NetImportDefinition>().RegisterDefinition("NetImport")
+                .Ignore(i => i.Enable)
+                .Relationship()
+                .HasOne(n => n.Profile, n => n.ProfileId);
+
             Mapper.Entity<NotificationDefinition>().RegisterDefinition("Notifications")
                   .Ignore(i => i.SupportsOnGrab)
                   .Ignore(i => i.SupportsOnDownload)

src/NzbDrone.Core/DecisionEngine/DownloadDecisionComparer.cs

@@ -23,6 +23,7 @@ namespace NzbDrone.Core.DecisionEngine
             var comparers = new List<CompareDelegate>
             {
                 CompareQuality,
+                ComparePreferredWords,
                 CompareProtocol,
                 ComparePeersIfTorrent,
                 CompareAgeIfUsenet,
@@ -65,9 +66,40 @@ namespace NzbDrone.Core.DecisionEngine
                            CompareBy(x.RemoteEpisode, y.RemoteEpisode, remoteEpisode => remoteEpisode.ParsedEpisodeInfo.Quality.Revision.Version));
         }
 
+        private int ComparePreferredWords(DownloadDecision x, DownloadDecision y)
+        {
+            return CompareBy(x.RemoteMovie, y.RemoteMovie, remoteMovie =>
+            {
+                var title = remoteMovie.Release.Title;
+                remoteMovie.Movie.Profile.LazyLoad();
+                var preferredWords = remoteMovie.Movie.Profile.Value.PreferredTags;
+
+                if (preferredWords == null)
+                {
+                    return 0;
+                }
+
+                var num = preferredWords.AsEnumerable().Count(w => title.ToLower().Contains(w.ToLower()));
+
+                return num;
+
+            });
+;        }
+
         private int CompareProtocol(DownloadDecision x, DownloadDecision y)
         {
 
+
+            if (x.IsForMovie)
+            {
+                return CompareBy(x.RemoteMovie, y.RemoteMovie, remoteEpisode =>
+                {
+                    var delayProfile = _delayProfileService.BestForTags(remoteEpisode.Movie.Tags);
+                    var downloadProtocol = remoteEpisode.Release.DownloadProtocol;
+                    return downloadProtocol == delayProfile.PreferredProtocol;
+                });
+            }
+            
             var result = CompareBy(x.RemoteEpisode, y.RemoteEpisode, remoteEpisode =>
             {
                 var delayProfile = _delayProfileService.BestForTags(remoteEpisode.Series.Tags);
@@ -75,15 +107,7 @@ namespace NzbDrone.Core.DecisionEngine
                 return downloadProtocol == delayProfile.PreferredProtocol;
             });
 
-            if (x.IsForMovie)
-            {
-                result = CompareBy(x.RemoteMovie, y.RemoteMovie, remoteEpisode =>
-                {
-                    var delayProfile = _delayProfileService.BestForTags(remoteEpisode.Movie.Tags);
-                    var downloadProtocol = remoteEpisode.Release.DownloadProtocol;
-                    return downloadProtocol == delayProfile.PreferredProtocol;
-                });
-            }
+            
 
             return result;
         }
@@ -125,8 +149,8 @@ namespace NzbDrone.Core.DecisionEngine
 
         private int CompareAgeIfUsenet(DownloadDecision x, DownloadDecision y)
         {
-            if (x.RemoteEpisode.Release.DownloadProtocol != DownloadProtocol.Usenet ||
-                y.RemoteEpisode.Release.DownloadProtocol != DownloadProtocol.Usenet)
+            if (x.RemoteMovie.Release.DownloadProtocol != DownloadProtocol.Usenet ||
+                y.RemoteMovie.Release.DownloadProtocol != DownloadProtocol.Usenet)
             {
                 return 0;
             }

src/NzbDrone.Core/DecisionEngine/DownloadDecisionPriorizationService.cs

@@ -34,11 +34,11 @@ namespace NzbDrone.Core.DecisionEngine
         public List<DownloadDecision> PrioritizeDecisionsForMovies(List<DownloadDecision> decisions)
         {
             return decisions.Where(c => c.RemoteMovie.Movie != null)
-                            /*.GroupBy(c => c.RemoteMovie.Movie.Id, (movieId, downloadDecisions) =>
+                            .GroupBy(c => c.RemoteMovie.Movie.Id, (movieId, downloadDecisions) =>
                             {
                                 return downloadDecisions.OrderByDescending(decision => decision, new DownloadDecisionComparer(_delayProfileService));
                             })
-                            .SelectMany(c => c)*/
+                            .SelectMany(c => c)
                             .Union(decisions.Where(c => c.RemoteMovie.Movie == null))
                             .ToList();
         }

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

@@ -33,7 +33,11 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
         public Decision IsSatisfiedBy(RemoteMovie subject, SearchCriteriaBase searchCriteria)
         {
 
-            throw new NotImplementedException();
+            if (_blacklistService.Blacklisted(subject.Movie.Id, subject.Release))
+            {
+                _logger.Debug("{0} is blacklisted, rejecting.", subject.Release.Title);
+                return Decision.Reject("Release is blacklisted");
+            }
 
             return Decision.Accept();
         }

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

@@ -36,7 +36,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
             return Decision.Accept();
         }
 
-        public Decision IsSatisfiedBy(RemoteMovie subject, SearchCriteriaBase searchCriteria)
+        public virtual Decision IsSatisfiedBy(RemoteMovie subject, SearchCriteriaBase searchCriteria)
         {
             if (subject.Movie.MovieFile.Value != null)
             {

src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/DelaySpecification.cs

@@ -39,7 +39,13 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
             var profile = subject.Movie.Profile.Value;
             var delayProfile = _delayProfileService.BestForTags(subject.Movie.Tags);
             var delay = delayProfile.GetProtocolDelay(subject.Release.DownloadProtocol);
-            var isPreferredProtocol = subject.Release.DownloadProtocol == delayProfile.PreferredProtocol;
+            var isPreferredProtocol = subject.Release.DownloadProtocol == delayProfile.PreferredProtocol;
+
+            // Preferred word count 
+            var title = subject.Release.Title;
+            var preferredWords = subject.Movie.Profile.Value.PreferredTags;
+            var preferredCount = preferredWords.AsEnumerable().Count(w => title.ToLower().Contains(w.ToLower()));
+
 
             if (delay == 0)
             {
@@ -49,7 +55,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
 
             var comparer = new QualityModelComparer(profile);
 
-            if (isPreferredProtocol)
+            if (isPreferredProtocol && (subject.Movie.MovieFileId != 0) && (preferredCount > 0 || preferredWords == null))
             {
                     var upgradable = _qualityUpgradableSpecification.IsUpgradable(profile, subject.Movie.MovieFile.Value.Quality, subject.ParsedMovieInfo.Quality);
 
@@ -59,7 +65,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
 
                         if (revisionUpgrade)
                         {
-                            _logger.Debug("New quality is a better revision for existing quality, skipping delay");
+                            _logger.Debug("New quality is a better revision for existing quality and preferred word count is {0}, skipping delay", preferredCount);
                             return Decision.Accept();
                         }
                     }
@@ -68,11 +74,11 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
 
             // If quality meets or exceeds the best allowed quality in the profile accept it immediately
             var bestQualityInProfile = new QualityModel(profile.LastAllowedQuality());
-            var isBestInProfile = comparer.Compare(subject.ParsedEpisodeInfo.Quality, bestQualityInProfile) >= 0;
+            var isBestInProfile = comparer.Compare(subject.ParsedMovieInfo.Quality, bestQualityInProfile) >= 0;
 
-            if (isBestInProfile && isPreferredProtocol)
+            if (isBestInProfile && isPreferredProtocol && (preferredCount > 0  || preferredWords == null))
             {
-                _logger.Debug("Quality is highest in profile for preferred protocol, will not delay");
+                _logger.Debug("Quality is highest in profile for preferred protocol and preferred word count is {0}, will not delay.", preferredCount);
                 return Decision.Accept();
             }
 
@@ -82,13 +88,13 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
             if (oldest != null && oldest.Release.AgeMinutes > delay)
             {
                 return Decision.Accept();
-            }
+            }*/
 
             if (subject.Release.AgeMinutes < delay)
             {
                 _logger.Debug("Waiting for better quality release, There is a {0} minute delay on {1}", delay, subject.Release.DownloadProtocol);
                 return Decision.Reject("Waiting for better quality release");
-            }*/ //TODO: Update for movies!
+            } //TODO: Update for movies!
 
             return Decision.Accept();
         }

src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/MonitoredEpisodeSpecification.cs

@@ -19,7 +19,21 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
 
         public Decision IsSatisfiedBy(RemoteMovie subject, SearchCriteriaBase searchCriteria)
         {
-            throw new NotImplementedException();
+            if (searchCriteria != null)
+            {
+                if (searchCriteria.UserInvokedSearch)
+                {
+                    _logger.Debug("Skipping monitored check during search");
+                    return Decision.Accept();
+                }
+            }
+
+            if (!subject.Movie.Monitored)
+            {
+                return Decision.Reject("Movie is not monitored");
+            }
+
+            return Decision.Accept();
         }
 
         public virtual Decision IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)

src/NzbDrone.Core/Download/Clients/Deluge/DelugeSettings.cs

@@ -10,7 +10,7 @@ namespace NzbDrone.Core.Download.Clients.Deluge
         public DelugeSettingsValidator()
         {
             RuleFor(c => c.Host).ValidHost();
-            RuleFor(c => c.Port).GreaterThan(0);
+            RuleFor(c => c.Port).InclusiveBetween(1, 65535);
 
             RuleFor(c => c.MovieCategory).Matches("^[-a-z]*$").WithMessage("Allowed characters a-z and -");
         }

src/NzbDrone.Core/Download/Clients/Hadouken/HadoukenSettings.cs

@@ -10,7 +10,7 @@ namespace NzbDrone.Core.Download.Clients.Hadouken
         public HadoukenSettingsValidator()
         {
             RuleFor(c => c.Host).ValidHost();
-            RuleFor(c => c.Port).GreaterThan(0);
+            RuleFor(c => c.Port).InclusiveBetween(1, 65535);
 
             RuleFor(c => c.Username).NotEmpty()
                                     .WithMessage("Username must not be empty.");

src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexSettings.cs

@@ -10,7 +10,7 @@ namespace NzbDrone.Core.Download.Clients.NzbVortex
         public NzbVortexSettingsValidator()
         {
             RuleFor(c => c.Host).ValidHost();
-            RuleFor(c => c.Port).GreaterThan(0);
+            RuleFor(c => c.Port).InclusiveBetween(1, 65535);
 
             RuleFor(c => c.ApiKey).NotEmpty()
                                   .WithMessage("API Key is required");

src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs

@@ -32,9 +32,12 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
         protected override string AddFromNzbFile(RemoteEpisode remoteEpisode, string filename, byte[] fileContents)
         {
             var category = Settings.TvCategory;
+
             var priority = remoteEpisode.IsRecentEpisode() ? Settings.RecentTvPriority : Settings.OlderTvPriority;
 
-            var response = _proxy.DownloadNzb(fileContents, filename, category, priority, Settings);
+            var addpaused = Settings.AddPaused;
+
+            var response = _proxy.DownloadNzb(fileContents, filename, category, priority, addpaused, Settings);
 
             if (response == null)
             {
@@ -47,9 +50,12 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
         protected override string AddFromNzbFile(RemoteMovie remoteMovie, string filename, byte[] fileContents)
         {
             var category = Settings.TvCategory; // TODO: Update this to MovieCategory?
+
             var priority = Settings.RecentTvPriority;
 
-            var response = _proxy.DownloadNzb(fileContents, filename, category, priority, Settings);
+            var addpaused = Settings.AddPaused;
+
+            var response = _proxy.DownloadNzb(fileContents, filename, category, priority, addpaused, Settings);
 
             if(response == null)
             {

src/NzbDrone.Core/Download/Clients/Nzbget/NzbgetProxy.cs

@@ -11,7 +11,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
 {
     public interface INzbgetProxy
     {
-        string DownloadNzb(byte[] nzbData, string title, string category, int priority, NzbgetSettings settings);
+        string DownloadNzb(byte[] nzbData, string title, string category, int priority, bool addpaused, NzbgetSettings settings);
         NzbgetGlobalStatus GetGlobalStatus(NzbgetSettings settings);
         List<NzbgetQueueItem> GetQueue(NzbgetSettings settings);
         List<NzbgetHistoryItem> GetHistory(NzbgetSettings settings);
@@ -45,12 +45,12 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
             return version >= minimumVersion;
         }
 
-        public string DownloadNzb(byte[] nzbData, string title, string category, int priority, NzbgetSettings settings)
+        public string DownloadNzb(byte[] nzbData, string title, string category, int priority, bool addpaused, NzbgetSettings settings)
         {
             if (HasVersion(16, settings))
             {
                 var droneId = Guid.NewGuid().ToString().Replace("-", "");
-                var response = ProcessRequest<int>(settings, "append", title, nzbData, category, priority, false, false, string.Empty, 0, "all", new string[] { "drone", droneId });
+                var response = ProcessRequest<int>(settings, "append", title, nzbData, category, priority, false, addpaused, string.Empty, 0, "all", new string[] { "drone", droneId });
                 if (response <= 0)
                 {
                     return null;

src/NzbDrone.Core/Download/Clients/Nzbget/NzbgetSettings.cs

@@ -10,7 +10,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
         public NzbgetSettingsValidator()
         {
             RuleFor(c => c.Host).ValidHost();
-            RuleFor(c => c.Port).GreaterThan(0);
+            RuleFor(c => c.Port).InclusiveBetween(1, 65535);
             RuleFor(c => c.Username).NotEmpty().When(c => !string.IsNullOrWhiteSpace(c.Password));
             RuleFor(c => c.Password).NotEmpty().When(c => !string.IsNullOrWhiteSpace(c.Username));
 
@@ -57,6 +57,9 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
         [FieldDefinition(7, Label = "Use SSL", Type = FieldType.Checkbox)]
         public bool UseSsl { get; set; }
 
+        [FieldDefinition(8, Label = "Add Paused", Type = FieldType.Checkbox, HelpText = "This option requires at least NzbGet version 16.0")]
+        public bool AddPaused { get; set; }
+
         public NzbDroneValidationResult Validate()
         {
             return new NzbDroneValidationResult(Validator.Validate(this));

src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrentSettings.cs

@@ -10,7 +10,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
         public QBittorrentSettingsValidator()
         {
             RuleFor(c => c.Host).ValidHost();
-            RuleFor(c => c.Port).InclusiveBetween(0, 65535);
+            RuleFor(c => c.Port).InclusiveBetween(1, 65535);
         }
     }
 

src/NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdSettings.cs

@@ -10,7 +10,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
         public SabnzbdSettingsValidator()
         {
             RuleFor(c => c.Host).ValidHost();
-            RuleFor(c => c.Port).GreaterThan(0);
+            RuleFor(c => c.Port).InclusiveBetween(1, 65535);
 
             RuleFor(c => c.ApiKey).NotEmpty()
                                   .WithMessage("API Key is required when username/password are not configured")

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

@@ -12,7 +12,7 @@ namespace NzbDrone.Core.Download.Clients.Transmission
         public TransmissionSettingsValidator()
         {
             RuleFor(c => c.Host).ValidHost();
-            RuleFor(c => c.Port).GreaterThan(0);
+            RuleFor(c => c.Port).InclusiveBetween(1, 65535);
 
             RuleFor(c => c.UrlBase).ValidUrlBase();
 

src/NzbDrone.Core/Download/Clients/rTorrent/RTorrentSettings.cs

@@ -10,10 +10,10 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
         public RTorrentSettingsValidator()
         {
             RuleFor(c => c.Host).ValidHost();
-            RuleFor(c => c.Port).InclusiveBetween(0, 65535);
+            RuleFor(c => c.Port).InclusiveBetween(1, 65535);
             RuleFor(c => c.MovieCategory).NotEmpty()
                                       .WithMessage("A category is recommended")
-                                      .AsWarning(); 
+                                      .AsWarning();
         }
     }
 

src/NzbDrone.Core/Download/Clients/uTorrent/UTorrentSettings.cs

@@ -10,7 +10,7 @@ namespace NzbDrone.Core.Download.Clients.UTorrent
         public UTorrentSettingsValidator()
         {
             RuleFor(c => c.Host).ValidHost();
-            RuleFor(c => c.Port).InclusiveBetween(0, 65535);
+            RuleFor(c => c.Port).InclusiveBetween(1, 65535);
             RuleFor(c => c.TvCategory).NotEmpty();
         }
     }

src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs

@@ -33,7 +33,7 @@ namespace NzbDrone.Core.Download
         public ProcessedDecisions ProcessDecisions(List<DownloadDecision> decisions)
         {
             //var qualifiedReports = GetQualifiedReports(decisions);
-            var prioritizedDecisions = _prioritizeDownloadDecision.PrioritizeDecisions(decisions);
+            var prioritizedDecisions = _prioritizeDownloadDecision.PrioritizeDecisionsForMovies(decisions);
             var grabbed = new List<DownloadDecision>();
             var pending = new List<DownloadDecision>();
 

src/NzbDrone.Core/Download/RedownloadFailedDownloadService.cs

@@ -5,6 +5,7 @@ using NzbDrone.Core.IndexerSearch;
 using NzbDrone.Core.Messaging.Commands;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Tv;
+using System.Collections.Generic;
 
 namespace NzbDrone.Core.Download
 {
@@ -38,7 +39,7 @@ namespace NzbDrone.Core.Download
             {
                 _logger.Debug("Failed download contains a movie, searching again.");
 
-                _commandQueueManager.Push(new MoviesSearchCommand { MovieId = message.MovieId });
+                _commandQueueManager.Push(new MoviesSearchCommand { MovieIds = new List<int> { message.MovieId } });
 
                 return;
             }

src/NzbDrone.Core/Extras/ExtraService.cs

@@ -102,13 +102,13 @@ namespace NzbDrone.Core.Extras
 
         public void Handle(MediaCoversUpdatedEvent message)
         {
-            var series = message.Series;
-            var episodeFiles = GetEpisodeFiles(series.Id);
+            //var series = message.Series;
+            //var episodeFiles = GetEpisodeFiles(series.Id);
 
-            foreach (var extraFileManager in _extraFileManagers)
-            {
-                extraFileManager.CreateAfterSeriesScan(series, episodeFiles);
-            }
+            //foreach (var extraFileManager in _extraFileManagers)
+            //{
+            //    extraFileManager.CreateAfterSeriesScan(series, episodeFiles);
+            //}
         }
 
         //TODO: Implementing this will fix a lot of our warning exceptions

src/NzbDrone.Core/IndexerSearch/MissingMoviesSearchCommand.cs

@@ -0,0 +1,13 @@
+using NzbDrone.Core.Messaging.Commands;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NzbDrone.Core.IndexerSearch
+{
+    public class MissingMoviesSearchCommand : Command
+    {
+        public override bool SendUpdatesToClient => true;
+    }
+}

src/NzbDrone.Core/IndexerSearch/MoviesSearchCommand.cs

@@ -1,10 +1,11 @@
 using NzbDrone.Core.Messaging.Commands;
+using System.Collections.Generic;
 
 namespace NzbDrone.Core.IndexerSearch
 {
     public class MoviesSearchCommand : Command
     {
-        public int MovieId { get; set; }
+        public List<int> MovieIds { get; set; }
 
         public override bool SendUpdatesToClient => true;
     }

src/NzbDrone.Core/IndexerSearch/MoviesSearchService.cs

@@ -4,22 +4,23 @@ using NzbDrone.Common.Instrumentation.Extensions;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.Messaging.Commands;
 using NzbDrone.Core.Tv;
+using NzbDrone.Core.Datastore;
 
 namespace NzbDrone.Core.IndexerSearch
 {
-    public class MovieSearchService : IExecute<MoviesSearchCommand>
+    public class MovieSearchService : IExecute<MoviesSearchCommand>, IExecute<MissingMoviesSearchCommand>
     {
-        private readonly IMovieService _seriesService;
+        private readonly IMovieService _movieService;
         private readonly ISearchForNzb _nzbSearchService;
         private readonly IProcessDownloadDecisions _processDownloadDecisions;
         private readonly Logger _logger;
 
-        public MovieSearchService(IMovieService seriesService,
+        public MovieSearchService(IMovieService movieService,
                                    ISearchForNzb nzbSearchService,
                                    IProcessDownloadDecisions processDownloadDecisions,
                                    Logger logger)
         {
-            _seriesService = seriesService;
+            _movieService = movieService;
             _nzbSearchService = nzbSearchService;
             _processDownloadDecisions = processDownloadDecisions;
             _logger = logger;
@@ -27,20 +28,35 @@ namespace NzbDrone.Core.IndexerSearch
 
         public void Execute(MoviesSearchCommand message)
         {
-            var series = _seriesService.GetMovie(message.MovieId);
-
             var downloadedCount = 0;
-
+            foreach (var movieId in message.MovieIds)
+            {
+                var series = _movieService.GetMovie(movieId);
+                
                 if (!series.Monitored)
                 {
                     _logger.Debug("Movie {0} is not monitored, skipping search", series.Title);
                 }
 
-            var decisions = _nzbSearchService.MovieSearch(message.MovieId, false);//_nzbSearchService.SeasonSearch(message.MovieId, season.SeasonNumber, false, message.Trigger == CommandTrigger.Manual);
+                var decisions = _nzbSearchService.MovieSearch(movieId, false);//_nzbSearchService.SeasonSearch(message.MovieId, season.SeasonNumber, false, message.Trigger == CommandTrigger.Manual);
                 downloadedCount += _processDownloadDecisions.ProcessDecisions(decisions).Grabbed.Count;
-            
 
+            }
             _logger.ProgressInfo("Movie search completed. {0} reports downloaded.", downloadedCount);
         }
+
+        public void Execute(MissingMoviesSearchCommand message)
+        {
+            var movies = _movieService.MoviesWithoutFiles(new PagingSpec<Movie>
+                                                            {
+                                                                Page = 1,
+                                                                PageSize = 100000,
+                                                                SortDirection = SortDirection.Ascending,
+                                                                SortKey = "Id",
+                                                                FilterExpression =
+                                                                    v =>
+                                                                    v.Monitored == true
+                                                            }).Records.ToList();
+        }
     }
 }

src/NzbDrone.Core/Indexers/AwesomeHD/AwesomeHDRequestGenerator.cs

@@ -54,13 +54,19 @@ namespace NzbDrone.Core.Indexers.AwesomeHD
 
         private IEnumerable<IndexerRequest> GetRequest(string searchParameters)
         {
+            var onlyInternal = "";
+            if (Settings.Internal)
+            {
+                onlyInternal = "&internal=true";
+            }
+
             if (searchParameters != null)
             {
-                yield return new IndexerRequest(string.Format("{0}/searchapi.php?action=imdbsearch&passkey={1}&imdb={2}", Settings.BaseUrl.Trim().TrimEnd('/'), Settings.Passkey.Trim(), searchParameters), HttpAccept.Rss);
+                yield return new IndexerRequest($"{Settings.BaseUrl.Trim().TrimEnd('/')}/searchapi.php?action=imdbsearch&passkey={Settings.Passkey.Trim()}&imdb={searchParameters}", HttpAccept.Rss);
             }
             else
             {
-                yield return new IndexerRequest(string.Format("{0}/searchapi.php?action=latestmovies&passkey={1}", Settings.BaseUrl.Trim().TrimEnd('/'), Settings.Passkey.Trim()), HttpAccept.Rss);
+                yield return new IndexerRequest($"{Settings.BaseUrl.Trim().TrimEnd('/')}/searchapi.php?action=latestmovies&passkey={Settings.Passkey.Trim()}{onlyInternal}", HttpAccept.Rss);
             }
 
         }

src/NzbDrone.Core/Indexers/AwesomeHD/AwesomeHDSettings.cs

@@ -29,6 +29,9 @@ namespace NzbDrone.Core.Indexers.AwesomeHD
         [FieldDefinition(1, Label = "Passkey")]
         public string Passkey { get; set; }
 
+        [FieldDefinition(2, Type = FieldType.Checkbox, Label = "Require Internal", HelpText = "Will only include internal releases for RSS Sync.")]
+        public bool Internal { get; set; }
+
         public NzbDroneValidationResult Validate()
         {
             return new NzbDroneValidationResult(Validator.Validate(this));

src/NzbDrone.Core/Indexers/HDBits/HDBits.cs

@@ -27,4 +27,4 @@ namespace NzbDrone.Core.Indexers.HDBits
             return new HDBitsParser(Settings);
         }
     }
-}
+}

src/NzbDrone.Core/Indexers/HDBits/HDBitsApi.cs

@@ -129,4 +129,4 @@ namespace NzbDrone.Core.Indexers.HDBits
         ImdbImportFail = 8,
         ImdbTvNotAllowed = 9
     }
-}
+}

src/NzbDrone.Core/Indexers/HDBits/HDBitsParser.cs

@@ -87,4 +87,4 @@ namespace NzbDrone.Core.Indexers.HDBits
 
         }
     }
-}
+}

src/NzbDrone.Core/Indexers/HDBits/HDBitsRequestGenerator.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Common.Http;
@@ -45,17 +44,34 @@ namespace NzbDrone.Core.Indexers.HDBits
             return new IndexerPageableRequestChain();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public virtual IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-
             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));
+
+            if (TryAddSearchParameters(queryBase, searchCriteria))
+            {
+                var query = queryBase.Clone();
+                query.ImdbInfo.Id = int.Parse(searchCriteria.Movie.ImdbId.Substring(2));
+                pageableRequests.Add(GetRequest(query));
+            }
+
             return pageableRequests;
         }
 
+        private bool TryAddSearchParameters(TorrentQuery query, SearchCriteriaBase searchCriteria)
+        {
+            var imdbId = int.Parse(searchCriteria.Movie.ImdbId.Substring(2));
+
+            if (imdbId != 0)
+            {
+                query.ImdbInfo = query.ImdbInfo ?? new ImdbInfo();
+                query.ImdbInfo.Id = imdbId;
+                return true;
+            }
+            return false;
+        }
+
         private IEnumerable<IndexerRequest> GetRequest(TorrentQuery query)
         {
             var request = new HttpRequestBuilder(Settings.BaseUrl)
@@ -75,4 +91,4 @@ namespace NzbDrone.Core.Indexers.HDBits
             yield return new IndexerRequest(request);
         }
     }
-}
+}

src/NzbDrone.Core/Indexers/HttpIndexerBase.cs

@@ -306,6 +306,8 @@ namespace NzbDrone.Core.Indexers
                 request.HttpRequest.RateLimit = RateLimit;
             }
 
+            request.HttpRequest.AllowAutoRedirect = true;
+
             return new IndexerResponse(request, _httpClient.Execute(request.HttpRequest));
         }
 

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

@@ -1,7 +1,9 @@
 using NLog;
+using NzbDrone.Common.Cache;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Parser;
+using System.Collections.Generic;
 
 namespace NzbDrone.Core.Indexers.PassThePopcorn
 {
@@ -13,13 +15,28 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
         public override bool SupportsSearch => true;
         public override int PageSize => 50;
 
-        public PassThePopcorn(IHttpClient httpClient, IIndexerStatusService indexerStatusService, IConfigService configService, IParsingService parsingService, Logger logger)
+        private readonly ICached<Dictionary<string, string>> _authCookieCache;
+        private readonly IHttpClient _httpClient;
+        private readonly Logger _logger;
+
+        public PassThePopcorn(IHttpClient httpClient, ICacheManager cacheManager, IIndexerStatusService indexerStatusService,
+            IConfigService configService, IParsingService parsingService, Logger logger)
             : base(httpClient, indexerStatusService, configService, parsingService, logger)
-        { }
+        {
+            _httpClient = httpClient;
+            _logger = logger;
+            _authCookieCache = cacheManager.GetCache<Dictionary<string, string>>(GetType(), "authCookies");
+        }
 
         public override IIndexerRequestGenerator GetRequestGenerator()
         {
-            return new PassThePopcornRequestGenerator() { Settings = Settings };
+            return new PassThePopcornRequestGenerator()
+            {
+                Settings = Settings,
+                HttpClient = _httpClient,
+                Logger = _logger,
+                AuthCookieCache = _authCookieCache
+            };
         }
 
         public override IParseIndexerResponse GetParser()

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

@@ -56,4 +56,12 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
         public string PassKey { get; set; }
     }
 
+    public class PassThePopcornAuthResponse
+    {
+        public string Result { get; set; }
+        public string Popcron { get; set; }
+        public string AntiCsrfToken { get; set; }
+
+    }
+
 }

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

@@ -1,16 +1,30 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using NzbDrone.Common.Http;
-using NzbDrone.Common.Serializer;
 using NzbDrone.Core.IndexerSearch.Definitions;
+using NzbDrone.Common.Cache;
+using NLog;
+using NzbDrone.Common.Serializer;
 
 namespace NzbDrone.Core.Indexers.PassThePopcorn
 {
     public class PassThePopcornRequestGenerator : IIndexerRequestGenerator
     {
+
         public PassThePopcornSettings Settings { get; set; }
 
+        public ICached<Dictionary<string, string>> AuthCookieCache { get; set; }
+        public IHttpClient HttpClient { get; set; }
+        public Logger Logger { get; set; }
+
+        //public PassThePopcornRequestGenerator(ICacheManager cacheManager, IHttpClient httpClient, Logger logger)
+        //{
+        //    _httpClient = httpClient;
+        //    _logger = logger;
+
+        //    _authCookieCache = cacheManager.GetCache<Dictionary<string, string>>(GetType(), "authCookies");
+        //}
+
         public virtual IndexerPageableRequestChain GetRecentRequests()
         {
             var pageableRequests = new IndexerPageableRequestChain();
@@ -54,14 +68,70 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
 
         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);
+            Authenticate();
 
-            foreach (var cookie in HttpHeader.ParseCookies(Settings.Cookie))
+            var request =
+                new IndexerRequest(
+                    $"{Settings.BaseUrl.Trim().TrimEnd('/')}/torrents.php?json=noredirect&searchstr={searchParameters}",
+                    HttpAccept.Json);
+
+            var cookies = AuthCookieCache.Find(Settings.BaseUrl.Trim().TrimEnd('/'));
+            foreach (var cookie in cookies)
             {
                 request.HttpRequest.Cookies[cookie.Key] = cookie.Value;
             }
 
             yield return request;
         }
+
+        private void Authenticate()
+        {
+            var requestBuilder = new HttpRequestBuilder($"{Settings.BaseUrl.Trim().TrimEnd('/')}")
+            {
+                LogResponseContent = true
+            };
+
+            requestBuilder.Method = HttpMethod.POST;
+            requestBuilder.Resource("ajax.php?action=login");
+            requestBuilder.PostProcess += r => r.RequestTimeout = TimeSpan.FromSeconds(15);
+
+            var authKey = Settings.BaseUrl.Trim().TrimEnd('/');
+            var cookies = AuthCookieCache.Find(authKey);
+
+            if (cookies == null)
+            {
+                AuthCookieCache.Remove(authKey);
+                var authLoginRequest = requestBuilder
+                    .AddFormParameter("username", Settings.Username)
+                    .AddFormParameter("password", Settings.Password)
+                    .AddFormParameter("passkey", Settings.Passkey)
+                    .AddFormParameter("keeplogged", "1")
+                    .AddFormParameter("login", "Log In!")
+                    .SetHeader("Content-Type", "multipart/form-data")
+                    .Accept(HttpAccept.Json)
+                    .Build();
+
+                // authLoginRequest.Method = HttpMethod.POST;
+
+                var response = HttpClient.Execute(authLoginRequest);
+                var result = Json.Deserialize<PassThePopcornAuthResponse>(response.Content);
+
+                if (result.Result != "Ok" || string.IsNullOrWhiteSpace(result.Result))
+                {
+                    Logger.Debug("PassThePopcorn authentication failed.");
+                    throw new Exception("Failed to authenticate with PassThePopcorn.");
+                }
+
+                Logger.Debug("PassThePopcorn authentication succeeded.");
+
+                cookies = response.GetCookies();
+                AuthCookieCache.Set(authKey, cookies);
+                requestBuilder.SetCookies(cookies);
+            }
+            else
+            {
+                requestBuilder.SetCookies(cookies);
+            }
+        }
     }
 }

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

@@ -11,12 +11,9 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
         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();
+            RuleFor(c => c.Username).NotEmpty();
+            RuleFor(c => c.Password).NotEmpty();
+            RuleFor(c => c.Passkey).NotEmpty();
         }
     }
 
@@ -29,21 +26,30 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
             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.")]
+        [FieldDefinition(0, Label = "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(1, Label = "Username", HelpText = "PTP Username")]
+        public string Username { get; set; }
 
-        [FieldDefinition(2, Type = FieldType.Checkbox, Label = "Prefer Golden", HelpText = "Favors Golden Popcorn-releases over all other releases.")]
+        [FieldDefinition(2, Label = "Password", Type = FieldType.Password, HelpText = "PTP Password")]
+        public string Password { get; set; }
+
+        [FieldDefinition(3, Label = "Passkey",  HelpText = "PTP Passkey")]
+        public string Passkey { get; set; }
+
+        [FieldDefinition(4, Label = "Prefer Golden", Type = FieldType.Checkbox , 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.")]
+        [FieldDefinition(5, Label = "Prefer Scene", Type = FieldType.Checkbox, 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.")]
+        [FieldDefinition(6, Label = "Require Approved", Type = FieldType.Checkbox, HelpText = "Require staff-approval for releases to be accepted.")]
         public bool Approved { get; set; }
 
+        [FieldDefinition(7, Label = "Require Golden", Type = FieldType.Checkbox, HelpText = "Require Golden Popcorn-releases for releases to be accepted.")]
+        public bool RequireGolden { get; set; }
+
         public NzbDroneValidationResult Validate()
         {
             return new NzbDroneValidationResult(Validator.Validate(this));

src/NzbDrone.Core/Jobs/TaskManager.cs

@@ -14,6 +14,7 @@ using NzbDrone.Core.Lifecycle;
 using NzbDrone.Core.MediaFiles.Commands;
 using NzbDrone.Core.Messaging.Commands;
 using NzbDrone.Core.Messaging.Events;
+using NzbDrone.Core.NetImport;
 using NzbDrone.Core.Tv.Commands;
 using NzbDrone.Core.Update.Commands;
 
@@ -30,12 +31,14 @@ namespace NzbDrone.Core.Jobs
     {
         private readonly IScheduledTaskRepository _scheduledTaskRepository;
         private readonly IConfigService _configService;
+        private readonly IConfigFileProvider _configFileProvider;
         private readonly Logger _logger;
 
-        public TaskManager(IScheduledTaskRepository scheduledTaskRepository, IConfigService configService, Logger logger)
+        public TaskManager(IScheduledTaskRepository scheduledTaskRepository, IConfigService configService, IConfigFileProvider configFileProvider, Logger logger)
         {
             _scheduledTaskRepository = scheduledTaskRepository;
             _configService = configService;
+            _configFileProvider = configFileProvider;
             _logger = logger;
         }
 
@@ -59,12 +62,19 @@ namespace NzbDrone.Core.Jobs
 
         public void Handle(ApplicationStartedEvent message)
         {
+            float updateInterval = 6 * 60;
+
+            if (_configFileProvider.Branch == "nightly")
+            {
+                updateInterval = 30;
+            }
+
             var defaultTasks = new[]
                 {
                     new ScheduledTask{ Interval = 0.25f, TypeName = typeof(CheckForFinishedDownloadCommand).FullName},
                     new ScheduledTask{ Interval = 5, TypeName = typeof(MessagingCleanupCommand).FullName},
-                    new ScheduledTask{ Interval = 6*60, TypeName = typeof(ApplicationUpdateCommand).FullName},
-                    new ScheduledTask{ Interval = 3*60, TypeName = typeof(UpdateSceneMappingCommand).FullName},
+                    new ScheduledTask{ Interval = updateInterval, TypeName = typeof(ApplicationUpdateCommand).FullName},
+                    // new ScheduledTask{ Interval = 3*60, TypeName = typeof(UpdateSceneMappingCommand).FullName},
                     new ScheduledTask{ Interval = 6*60, TypeName = typeof(CheckHealthCommand).FullName},
                     new ScheduledTask{ Interval = 24*60, TypeName = typeof(RefreshMovieCommand).FullName},
                     new ScheduledTask{ Interval = 24*60, TypeName = typeof(HousekeepingCommand).FullName},
@@ -76,10 +86,17 @@ namespace NzbDrone.Core.Jobs
                         TypeName = typeof(RssSyncCommand).FullName
                     },
 
+                    new ScheduledTask
+                    {
+                        Interval = GetNetImportSyncInterval(),
+                        TypeName = typeof(NetImportSyncCommand).FullName
+                    },
+
                     new ScheduledTask
                     { 
                         Interval = _configService.DownloadedEpisodesScanInterval,
                         TypeName = typeof(DownloadedEpisodesScanCommand).FullName
+                        //TypeName = typeof(DownloadedMovieScanCommand).FullName
                     },
                 };
 
@@ -128,6 +145,23 @@ namespace NzbDrone.Core.Jobs
             return interval;
         }
 
+        private int GetNetImportSyncInterval()
+        {
+            var interval = _configService.NetImportSyncInterval;
+
+            if (interval > 0 && interval < 10)
+            {
+                return 10;
+            }
+
+            if (interval < 0)
+            {
+                return 0;
+            }
+
+            return interval;
+        }
+
         public void Handle(CommandExecutedEvent message)
         {
             var scheduledTask = _scheduledTaskRepository.All().SingleOrDefault(c => c.TypeName == message.Command.Body.GetType().FullName);
@@ -147,7 +181,10 @@ namespace NzbDrone.Core.Jobs
             var downloadedEpisodes = _scheduledTaskRepository.GetDefinition(typeof(DownloadedEpisodesScanCommand));
             downloadedEpisodes.Interval = _configService.DownloadedEpisodesScanInterval;
 
-            _scheduledTaskRepository.UpdateMany(new List<ScheduledTask> { rss, downloadedEpisodes });
+            var netImport = _scheduledTaskRepository.GetDefinition(typeof(NetImportSyncCommand));
+            netImport.Interval = _configService.NetImportSyncInterval;
+
+            _scheduledTaskRepository.UpdateMany(new List<ScheduledTask> { rss, downloadedEpisodes, netImport });
         }
     }
 }

src/NzbDrone.Core/MediaCover/CoverAlreadyExistsSpecification.cs

@@ -1,5 +1,8 @@
-using NzbDrone.Common.Disk;
+using System;
+using NzbDrone.Common.Disk;
 using NzbDrone.Common.Http;
+using System.Drawing;
+using NLog;
 
 namespace NzbDrone.Core.MediaCover
 {
@@ -12,11 +15,13 @@ namespace NzbDrone.Core.MediaCover
     {
         private readonly IDiskProvider _diskProvider;
         private readonly IHttpClient _httpClient;
+        private readonly Logger _logger;
 
-        public CoverAlreadyExistsSpecification(IDiskProvider diskProvider, IHttpClient httpClient)
+        public CoverAlreadyExistsSpecification(IDiskProvider diskProvider, IHttpClient httpClient, Logger logger)
         {
             _diskProvider = diskProvider;
             _httpClient = httpClient;
+            _logger = logger;
         }
 
         public bool AlreadyExists(string url, string path)
@@ -26,9 +31,38 @@ namespace NzbDrone.Core.MediaCover
                 return false;
             }
 
+            if (!IsValidGDIPlusImage(path))
+            {
+                _diskProvider.DeleteFile(path);
+                return false;
+            }
+
             var headers = _httpClient.Head(new HttpRequest(url)).Headers;
             var fileSize = _diskProvider.GetFileSize(path);
             return fileSize == headers.ContentLength;
         }
+
+        private bool IsValidGDIPlusImage(string filename)
+        {
+            try
+            {
+                GdiPlusInterop.CheckGdiPlus();
+
+                using (var bmp = new Bitmap(filename))
+                {
+                }
+                return true;
+            }
+            catch (DllNotFoundException ex)
+            {
+                _logger.Error(ex, "Could not find libgdiplus. Cannot test if image is corrupt.");
+                return true;
+            }
+            catch (Exception ex)
+            {
+                _logger.Debug(ex, "Corrupted image found at: {0}. Redownloading...", filename);
+                return false;
+            }
+        }
     }
 }

src/NzbDrone.Core/MediaCover/MediaCoverService.cs

@@ -114,7 +114,7 @@ namespace NzbDrone.Core.MediaCover
             }
         }
 
-        private void EnsureCovers(Movie movie)
+        private void EnsureCovers(Movie movie, int retried = 0)
         {
             foreach (var cover in movie.Images)
             {
@@ -130,7 +130,25 @@ namespace NzbDrone.Core.MediaCover
                 }
                 catch (WebException e)
                 {
-                    _logger.Warn(string.Format("Couldn't download media cover for {0}. {1}", movie, e.Message));
+                    if (e.Status == WebExceptionStatus.ProtocolError)
+                    {
+                        _logger.Warn(e, "Server returned different code than 200. The poster is probably not available yet.");
+                        return;
+                    }
+
+                    _logger.Warn(e, string.Format("Couldn't download media cover for {0}. {1}", movie, e.Message));
+                    if (retried < 3)
+                    {
+                        retried = +1;
+                        _logger.Warn("Retrying for the {0}. time in ten seconds.", retried);
+                        System.Threading.Thread.Sleep(10*1000);
+                        EnsureCovers(movie, retried);
+                    }
+                    else
+                    {
+                        _logger.Warn(e, "Couldn't download media cover even after retrying five times :(.");
+                    }
+
                 }
                 catch (Exception e)
                 {

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

@@ -153,7 +153,12 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport
 
         private int GetMinimumAllowedRuntime(Movie movie)
         {
-            return 360; //6 minutes
+            if (movie.Runtime < 1)
+            {
+                return 5 * 60;
+            }
+
+            return movie.Runtime / 5 * 60;
         }
 
         private int GetMinimumAllowedRuntime(Series series)

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

@@ -68,22 +68,22 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport
                 {
                     //check if already imported
                     if (importResults.Select(r => r.ImportDecision.LocalMovie.Movie)
-                                         .Select(e => e.Id).Contains(localMovie.Movie.Id))
+                                         .Select(m => m.Id).Contains(localMovie.Movie.Id))
                     {
                         importResults.Add(new ImportResult(importDecision, "Movie has already been imported"));
                         continue;
                     }
 
-                    var episodeFile = new MovieFile();
-                    episodeFile.DateAdded = DateTime.UtcNow;
-                    episodeFile.MovieId = localMovie.Movie.Id;
-                    episodeFile.Path = localMovie.Path.CleanFilePath();
-                    episodeFile.Size = _diskProvider.GetFileSize(localMovie.Path);
-                    episodeFile.Quality = localMovie.Quality;
-                    episodeFile.MediaInfo = localMovie.MediaInfo;
-                    episodeFile.Movie = localMovie.Movie;
-                    episodeFile.ReleaseGroup = localMovie.ParsedMovieInfo.ReleaseGroup;
-                    episodeFile.Edition = localMovie.ParsedMovieInfo.Edition;
+                    var movieFile = new MovieFile();
+                    movieFile.DateAdded = DateTime.UtcNow;
+                    movieFile.MovieId = localMovie.Movie.Id;
+                    movieFile.Path = localMovie.Path.CleanFilePath();
+                    movieFile.Size = _diskProvider.GetFileSize(localMovie.Path);
+                    movieFile.Quality = localMovie.Quality;
+                    movieFile.MediaInfo = localMovie.MediaInfo;
+                    movieFile.Movie = localMovie.Movie;
+                    movieFile.ReleaseGroup = localMovie.ParsedMovieInfo.ReleaseGroup;
+                    movieFile.Edition = localMovie.ParsedMovieInfo.Edition;
 
                     bool copyOnly;
                     switch (importMode)
@@ -102,17 +102,17 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport
 
                     if (newDownload)
                     {
-                        episodeFile.SceneName = GetSceneName(downloadClientItem, localMovie);
+                        movieFile.SceneName = GetSceneName(downloadClientItem, localMovie);
 
-                        var moveResult = _episodeFileUpgrader.UpgradeMovieFile(episodeFile, localMovie, copyOnly);
+                        var moveResult = _episodeFileUpgrader.UpgradeMovieFile(movieFile, localMovie, copyOnly); //TODO: Check if this works
                         oldFiles = moveResult.OldFiles;
                     }
                     else
                     {
-                        episodeFile.RelativePath = localMovie.Movie.Path.GetRelativePath(episodeFile.Path);
+                        movieFile.RelativePath = localMovie.Movie.Path.GetRelativePath(movieFile.Path);
                     }
 
-                    _mediaFileService.Add(episodeFile);
+                    _mediaFileService.Add(movieFile);
                     importResults.Add(new ImportResult(importDecision));
 
                     if (newDownload)
@@ -122,22 +122,22 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport
 
                     if (downloadClientItem != null)
                     {
-                        _eventAggregator.PublishEvent(new MovieImportedEvent(localMovie, episodeFile, newDownload, downloadClientItem.DownloadClient, downloadClientItem.DownloadId, downloadClientItem.IsReadOnly));
+                        _eventAggregator.PublishEvent(new MovieImportedEvent(localMovie, movieFile, newDownload, downloadClientItem.DownloadClient, downloadClientItem.DownloadId, downloadClientItem.IsReadOnly));
                     }
                     else
                     {
-                        _eventAggregator.PublishEvent(new MovieImportedEvent(localMovie, episodeFile, newDownload));
+                        _eventAggregator.PublishEvent(new MovieImportedEvent(localMovie, movieFile, newDownload));
                     }
 
                     if (newDownload)
                     {
-                        _eventAggregator.PublishEvent(new MovieDownloadedEvent(localMovie, episodeFile, oldFiles));
+                        _eventAggregator.PublishEvent(new MovieDownloadedEvent(localMovie, movieFile, oldFiles));
                     }
                 }
                 catch (Exception e)
                 {
-                    _logger.Warn(e, "Couldn't import episode " + localMovie);
-                    importResults.Add(new ImportResult(importDecision, "Failed to import episode"));
+                    _logger.Warn(e, "Couldn't import movie " + localMovie);
+                    importResults.Add(new ImportResult(importDecision, "Failed to import movie"));
                 }
             }
 

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

@@ -128,7 +128,48 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport
                             var current = localMovie.Quality;
                             var qualityName = current.Quality.Name.ToLower();
                             QualityModel updated = null;
-                            if (width > 1400)
+                            if (width > 2000)
+                            {
+                                if (qualityName.Contains("bluray"))
+                                {
+                                    updated = new QualityModel(Quality.Bluray2160p);
+                                }
+
+                                else if (qualityName.Contains("webdl"))
+                                {
+                                    updated = new QualityModel(Quality.WEBDL2160p);
+                                }
+
+                                else if (qualityName.Contains("hdtv"))
+                                {
+                                    updated = new QualityModel(Quality.HDTV2160p);
+                                }
+
+                                else
+                                {
+                                    var def = _qualitiesService.Get(Quality.HDTV2160p);
+                                    if (localMovie.Size > def.MinSize && def.MaxSize > localMovie.Size)
+                                    {
+                                        updated = new QualityModel(Quality.HDTV2160p);
+                                    }
+                                    def = _qualitiesService.Get(Quality.WEBDL2160p);
+                                    if (localMovie.Size > def.MinSize && def.MaxSize > localMovie.Size)
+                                    {
+                                        updated = new QualityModel(Quality.WEBDL2160p);
+                                    }
+                                    def = _qualitiesService.Get(Quality.Bluray2160p);
+                                    if (localMovie.Size > def.MinSize && def.MaxSize > localMovie.Size)
+                                    {
+                                        updated = new QualityModel(Quality.Bluray2160p);
+                                    }
+                                    if (updated == null)
+                                    {
+                                        updated = new QualityModel(Quality.Bluray2160p);
+                                    }
+                                }
+
+                            }
+                            else if (width > 1400)
                             {
                                 if (qualityName.Contains("bluray"))
                                 {
@@ -147,7 +188,6 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport
 
                                 else
                                 {
-
                                     var def = _qualitiesService.Get(Quality.HDTV1080p);
                                     if (localMovie.Size > def.MinSize && def.MaxSize > localMovie.Size)
                                     {