Try to add year to release titles that have no year (foriegn release groups) (#1028)

It won't work. You have to do it like in FindByTitle. This reverts commit 0d85c7435c.

.github/ISSUE_TEMPLATE.md

@@ -1,9 +1,12 @@
+**Description:**
 
+Provide a description of the feature request or bug here, the more details the better. 
+Please also try to include the following if you are reporting a bug
+
+**Radarr Version:**
+
+**Logs:**
 
 
 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!
-
-Please use our [Discord server](https://discord.gg/NWYch8M) for support or longer discussions.
+Visit our [Discord server](https://discord.gg/NWYch8M) for support or longer discussions.

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,13 +2,11 @@
 YES | NO
 
 #### Description
-A few sentences describing the overall goals of the pull request's commits.
+
 
 #### Todos
 - [ ] Tests
-- [ ] Documentation
-
 
 #### Issues Fixed or Closed by this PR
 
-* 
+* #

.travis.yml

@@ -4,7 +4,7 @@ addons:
   apt:
     packages:
       - nodejs
-      - npm
+#      - npm apparently not needed anymore.
 script:
   - ./build.sh
   - chmod +x test.sh

package.json

@@ -40,6 +40,7 @@
     "run-sequence": "1.1.1",
     "streamqueue": "1.1.0",
     "tar.gz": "0.1.1",
+    "url-search-params": "^0.6.1",
     "webpack": "1.12.0",
     "webpack-stream": "2.1.0"
   }

src/NzbDrone.Api/Calendar/CalendarFeedModule.cs

@@ -16,13 +16,13 @@ namespace NzbDrone.Api.Calendar
 {
     public class CalendarFeedModule : NzbDroneFeedModule
     {
-        private readonly IEpisodeService _episodeService;
+        private readonly IMovieService _movieService;
         private readonly ITagService _tagService;
 
-        public CalendarFeedModule(IEpisodeService episodeService, ITagService tagService)
+        public CalendarFeedModule(IMovieService movieService, ITagService tagService)
             : base("calendar")
         {
-            _episodeService = episodeService;
+            _movieService = movieService;
             _tagService = tagService;
 
             Get["/NzbDrone.ics"] = options => GetCalendarFeed();
@@ -37,7 +37,7 @@ namespace NzbDrone.Api.Calendar
             var start = DateTime.Today.AddDays(-pastDays);
             var end = DateTime.Today.AddDays(futureDays);
             var unmonitored = false;
-            var premiersOnly = false;
+            //var premiersOnly = false;
             var tags = new List<int>();
 
             // TODO: Remove start/end parameters in v3, they don't work well for iCal
@@ -46,7 +46,7 @@ namespace NzbDrone.Api.Calendar
             var queryPastDays = Request.Query.PastDays;
             var queryFutureDays = Request.Query.FutureDays;
             var queryUnmonitored = Request.Query.Unmonitored;
-            var queryPremiersOnly = Request.Query.PremiersOnly;
+            // var queryPremiersOnly = Request.Query.PremiersOnly;
             var queryTags = Request.Query.Tags;
 
             if (queryStart.HasValue) start = DateTime.Parse(queryStart.Value);
@@ -69,10 +69,10 @@ namespace NzbDrone.Api.Calendar
                 unmonitored = bool.Parse(queryUnmonitored.Value);
             }
 
-            if (queryPremiersOnly.HasValue)
-            {
-                premiersOnly = bool.Parse(queryPremiersOnly.Value);
-            }
+            //if (queryPremiersOnly.HasValue)
+            //{
+            //    premiersOnly = bool.Parse(queryPremiersOnly.Value);
+            //}
 
             if (queryTags.HasValue)
             {
@@ -80,43 +80,56 @@ namespace NzbDrone.Api.Calendar
                 tags.AddRange(tagInput.Split(',').Select(_tagService.GetTag).Select(t => t.Id));
             }
 
-            var episodes = _episodeService.EpisodesBetweenDates(start, end, unmonitored);
+            var movies = _movieService.GetMoviesBetweenDates(start, end, unmonitored);
             var calendar = new Ical.Net.Calendar
             {
-                ProductId = "-//sonarr.tv//Sonarr//EN"
+                ProductId = "-//radarr.video//Radarr//EN"
             };
 
-
-
-            foreach (var episode in episodes.OrderBy(v => v.AirDateUtc.Value))
+            foreach (var movie in movies.OrderBy(v => v.Added))
             {
-                if (premiersOnly && (episode.SeasonNumber == 0 || episode.EpisodeNumber != 1))
-                {
-                    continue;
-                }
-
-                if (tags.Any() && tags.None(episode.Series.Tags.Contains))
+                if (tags.Any() && tags.None(movie.Tags.Contains))
                 {
                     continue;
                 }
 
                 var occurrence = calendar.Create<Event>();
-                occurrence.Uid = "NzbDrone_episode_" + episode.Id;
-                occurrence.Status = episode.HasFile ? EventStatus.Confirmed : EventStatus.Tentative;
-                occurrence.Start = new CalDateTime(episode.AirDateUtc.Value) { HasTime = true };
-                occurrence.End = new CalDateTime(episode.AirDateUtc.Value.AddMinutes(episode.Series.Runtime)) { HasTime = true };
-                occurrence.Description = episode.Overview;
-                occurrence.Categories = new List<string>() { episode.Series.Network };
+                occurrence.Uid = "NzbDrone_movie_" + movie.Id;
+                occurrence.Status = movie.HasFile ? EventStatus.Confirmed : EventStatus.Tentative;
 
-                switch (episode.Series.SeriesType)
+                switch (movie.Status)
                 {
-                    case SeriesTypes.Daily:
-                        occurrence.Summary = $"{episode.Series.Title} - {episode.Title}";
+                    case MovieStatusType.PreDB:
+                        if (movie.PhysicalRelease != null)
+                        {
+                            occurrence.Start = new CalDateTime(movie.PhysicalRelease.Value) { HasTime = true };
+                            occurrence.End = new CalDateTime(movie.PhysicalRelease.Value.AddMinutes(movie.Runtime)) { HasTime = true };
+                        }
                         break;
+
+                    case MovieStatusType.InCinemas:
+                        if (movie.InCinemas != null)
+                        {
+                            occurrence.Start = new CalDateTime(movie.InCinemas.Value) { HasTime = true };
+                            occurrence.End = new CalDateTime(movie.InCinemas.Value.AddMinutes(movie.Runtime)) { HasTime = true };
+                        }
+                        break;
+                    case MovieStatusType.Announced:
+                        continue; // no date
                     default:
-                        occurrence.Summary =$"{episode.Series.Title} - {episode.SeasonNumber}x{episode.EpisodeNumber:00} - {episode.Title}";
+                        if (movie.PhysicalRelease != null)
+                        {
+                            occurrence.Start = new CalDateTime(movie.PhysicalRelease.Value) { HasTime = true };
+                            occurrence.End = new CalDateTime(movie.PhysicalRelease.Value.AddMinutes(movie.Runtime)) { HasTime = true };
+                        }
                         break;
                 }
+
+                occurrence.Description = movie.Overview;
+                occurrence.Categories = new List<string>() { movie.Studio };
+
+                occurrence.Summary = $"{movie.Title}";
+
             }
 
             var serializer = (IStringSerializer) new SerializerFactory().Build(calendar.GetType(), new SerializationContext());

src/NzbDrone.Api/Calendar/CalendarModule.cs

@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Nancy;
 using NzbDrone.Api.Episodes;
 using NzbDrone.Api.Movie;
+using NzbDrone.Api.Series;
 using NzbDrone.Core.Datastore.Events;
 using NzbDrone.Core.MediaCover;
 using NzbDrone.Core.MediaFiles;

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

@@ -8,6 +8,7 @@ namespace NzbDrone.Api.Config
         public int MinimumAge { get; set; }
         public int Retention { get; set; }
         public int RssSyncInterval { get; set; }
+	public int AvailabilityDelay { get; set; }
     }
 
     public static class IndexerConfigResourceMapper
@@ -19,6 +20,7 @@ namespace NzbDrone.Api.Config
                 MinimumAge = model.MinimumAge,
                 Retention = model.Retention,
                 RssSyncInterval = model.RssSyncInterval,
+		AvailabilityDelay = model.AvailabilityDelay,
             };
         }
     }

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,31 @@
+using NzbDrone.Api.REST;
+using NzbDrone.Core.Configuration;
+
+namespace NzbDrone.Api.Config
+{
+    public class NetImportConfigResource : RestResource
+    {
+        public int NetImportSyncInterval { get; set; }
+	public string ListSyncLevel { get; set; }
+	public string ImportExclusions { get; set; }
+	public string TraktAuthToken { get; set; }
+	public string TraktRefreshToken { get; set; }
+	public int TraktTokenExpiry { get; set; }
+    }
+
+    public static class NetImportConfigResourceMapper
+    {
+        public static NetImportConfigResource ToResource(IConfigService model)
+        {
+            return new NetImportConfigResource
+            {
+                NetImportSyncInterval = model.NetImportSyncInterval,
+		ListSyncLevel = model.ListSyncLevel,
+		ImportExclusions = model.ImportExclusions,
+	        TraktAuthToken = model.TraktAuthToken,
+	        TraktRefreshToken = model.TraktRefreshToken,
+	        TraktTokenExpiry = model.TraktTokenExpiry,
+            };
+        }
+    }
+}

src/NzbDrone.Api/EpisodeFiles/EpisodeFileModule.cs

@@ -71,7 +71,7 @@ namespace NzbDrone.Api.EpisodeFiles
 
         private void DeleteEpisodeFile(int id)
         {
-            var episodeFile = _mediaFileService.Get(id);
+			var episodeFile = _mediaFileService.Get(id);
             var series = _seriesService.GetSeries(episodeFile.SeriesId);
             var fullPath = Path.Combine(series.Path, episodeFile.RelativePath);
 

src/NzbDrone.Api/Extensions/Pipelines/RequestLoggingPipeline.cs

@@ -66,13 +66,9 @@ namespace NzbDrone.Api.Extensions.Pipelines
         private Response LogError(NancyContext context, Exception exception)
         {
             var response = _errorPipeline.HandleException(context, exception);
-
             context.Response = response;
-
             LogEnd(context);
-
             context.Response = null;
-
             return response;
         }
 
@@ -80,12 +76,9 @@ namespace NzbDrone.Api.Extensions.Pipelines
         {
             if (request.Url.Query.IsNotNullOrWhiteSpace())
             {
-                return string.Concat(request.Url.Path, "?", request.Url.Query);
-            }
-            else
-            {
-                return request.Url.Path;
+                return string.Concat(request.Url.Path, request.Url.Query);
             }
+            return request.Url.Path;
         }
     }
 }

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

@@ -0,0 +1,175 @@
+using System.Collections;
+using System.Collections.Generic;
+using Nancy;
+using NzbDrone.Api.Extensions;
+using NzbDrone.Core.MediaCover;
+using NzbDrone.Core.MetadataSource;
+using NzbDrone.Core.Parser;
+using System.Linq;
+using System;
+using Marr.Data;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Datastore;
+using NzbDrone.Core.MediaFiles;
+using NzbDrone.Core.MediaFiles.EpisodeImport;
+using NzbDrone.Core.RootFolders;
+using NzbDrone.Common.Cache;
+using NzbDrone.Core.Tv;
+
+namespace NzbDrone.Api.Movie
+{
+
+    public class UnmappedComparer : IComparer<UnmappedFolder>
+    {
+        public int Compare(UnmappedFolder a, UnmappedFolder b)
+        {
+            return a.Name.CompareTo(b.Name);
+        }
+    }
+
+    public class MovieBulkImportModule : NzbDroneRestModule<MovieResource>
+    {
+        private readonly ISearchForNewMovie _searchProxy;
+        private readonly IRootFolderService _rootFolderService;
+        private readonly IMakeImportDecision _importDecisionMaker;
+        private readonly IDiskScanService _diskScanService;
+		private readonly ICached<Core.Tv.Movie> _mappedMovies;
+        private readonly IMovieService _movieService;
+
+        public MovieBulkImportModule(ISearchForNewMovie searchProxy, IRootFolderService rootFolderService, IMakeImportDecision importDecisionMaker,
+		                             IDiskScanService diskScanService, ICacheManager cacheManager, IMovieService movieService)
+            : base("/movies/bulkimport")
+        {
+            _searchProxy = searchProxy;
+            _rootFolderService = rootFolderService;
+            _importDecisionMaker = importDecisionMaker;
+            _diskScanService = diskScanService;
+			_mappedMovies = cacheManager.GetCache<Core.Tv.Movie>(GetType(), "mappedMoviesCache");
+            _movieService = movieService;
+            Get["/"] = x => Search();
+        }
+
+
+        private Response Search()
+        {
+            if (Request.Query.Id == 0)
+            {
+                //Todo error handling
+            }
+
+            RootFolder rootFolder = _rootFolderService.Get(Request.Query.Id);
+
+            int page = Request.Query.page;
+            int per_page = Request.Query.per_page;
+
+            int min = (page - 1) * per_page;
+
+            int max = page * per_page;
+
+            var unmapped = rootFolder.UnmappedFolders.OrderBy(f => f.Name).ToList();
+
+            int total_count = unmapped.Count;
+
+            if (Request.Query.total_entries.HasValue)
+            {
+                total_count = Request.Query.total_entries;
+            }
+
+            max = total_count >= max ? max : total_count;
+
+            var paged = unmapped.GetRange(min, max-min);
+
+            var mapped = paged.Select(f =>
+			{
+				Core.Tv.Movie m = null;
+
+				var mappedMovie = _mappedMovies.Find(f.Name);
+
+				if (mappedMovie != null)
+				{
+					return mappedMovie;
+				}
+
+				var parsedTitle = Parser.ParseMoviePath(f.Name);
+				if (parsedTitle == null)
+				{
+					m = new Core.Tv.Movie
+					{
+						Title = f.Name.Replace(".", " ").Replace("-", " "),
+						Path = f.Path,
+					};
+				}
+				else
+				{
+					m = new Core.Tv.Movie
+					{
+						Title = parsedTitle.MovieTitle,
+						Year = parsedTitle.Year,
+						ImdbId = parsedTitle.ImdbId,
+						Path = f.Path
+					};
+				}
+
+				var files = _diskScanService.GetVideoFiles(f.Path);
+
+				var decisions = _importDecisionMaker.GetImportDecisions(files.ToList(), m, true);
+
+				var decision = decisions.Where(d => d.Approved && !d.Rejections.Any()).FirstOrDefault();
+
+				if (decision != null)
+				{
+					var local = decision.LocalMovie;
+
+					m.MovieFile = new LazyLoaded<MovieFile>(new MovieFile
+					{
+						Path = local.Path,
+						Edition = local.ParsedMovieInfo.Edition,
+						Quality = local.Quality,
+						MediaInfo = local.MediaInfo,
+						ReleaseGroup = local.ParsedMovieInfo.ReleaseGroup,
+						RelativePath = f.Path.GetRelativePath(local.Path)
+					});
+				}
+
+				mappedMovie = _searchProxy.MapMovieToTmdbMovie(m);
+
+				if (mappedMovie != null)
+				{
+					mappedMovie.Monitored = true;
+
+					_mappedMovies.Set(f.Name, mappedMovie, TimeSpan.FromDays(2));
+
+					return mappedMovie;
+				}
+
+				return null;
+            });
+            
+            return new PagingResource<MovieResource>
+            {
+                Page = page,
+                PageSize = per_page,
+                SortDirection = SortDirection.Ascending,
+                SortKey = Request.Query.sort_by,
+                TotalRecords = total_count - mapped.Where(m => m == null).Count(),
+                Records = MapToResource(mapped.Where(m => m != null)).ToList()
+            }.AsResponse();
+        }
+
+
+        private static IEnumerable<MovieResource> MapToResource(IEnumerable<Core.Tv.Movie> movies)
+        {
+            foreach (var currentMovie in movies)
+            {
+                var resource = currentMovie.ToResource();
+                var poster = currentMovie.Images.FirstOrDefault(c => c.CoverType == MediaCoverTypes.Poster);
+                if (poster != null)
+                {
+                    resource.RemotePoster = poster.Url;
+                }
+
+                yield return resource;
+            }
+        }
+    }
+}

src/NzbDrone.Api/Movies/MovieFileModule.cs

@@ -13,77 +13,60 @@ using NzbDrone.SignalR;
 
 namespace NzbDrone.Api.EpisodeFiles
 {
-    public class MovieFileModule : NzbDroneRestModuleWithSignalR<MovieFileResource, MovieFile>
-                                 //IHandle<EpisodeFileAddedEvent>
+    public class MovieFileModule : NzbDroneRestModuleWithSignalR<MovieFileResource, MovieFile>, IHandle<MovieFileAddedEvent>
     {
         private readonly IMediaFileService _mediaFileService;
         private readonly IRecycleBinProvider _recycleBinProvider;
-        private readonly IMovieService _seriesService;
+        private readonly IMovieService _movieService;
         private readonly IQualityUpgradableSpecification _qualityUpgradableSpecification;
         private readonly Logger _logger;
 
         public MovieFileModule(IBroadcastSignalRMessage signalRBroadcaster,
                              IMediaFileService mediaFileService,
                              IRecycleBinProvider recycleBinProvider,
-                             IMovieService seriesService,
+                             IMovieService movieService,
                              IQualityUpgradableSpecification qualityUpgradableSpecification,
                              Logger logger)
             : base(signalRBroadcaster)
         {
             _mediaFileService = mediaFileService;
             _recycleBinProvider = recycleBinProvider;
-            _seriesService = seriesService;
+            _movieService = movieService;
             _qualityUpgradableSpecification = qualityUpgradableSpecification;
             _logger = logger;
-            /*GetResourceById = GetEpisodeFile;
-            GetResourceAll = GetEpisodeFiles;
-            UpdateResource = SetQuality;*/
-            DeleteResource = DeleteEpisodeFile;
+            GetResourceById = GetMovieFile;
+            UpdateResource = SetQuality;
+            DeleteResource = DeleteMovieFile;
         }
 
-        /*private EpisodeFileResource GetEpisodeFile(int id)
+        private MovieFileResource GetMovieFile(int id)
         {
-            var episodeFile = _mediaFileService.Get(id);
-            var series = _seriesService.GetSeries(episodeFile.SeriesId);
+            var movie = _mediaFileService.GetMovie(id);
 
-            return episodeFile.ToResource(series, _qualityUpgradableSpecification);
+            return movie.ToResource();
         }
 
-        private List<EpisodeFileResource> GetEpisodeFiles()
+        private void SetQuality(MovieFileResource movieFileResource)
         {
-            if (!Request.Query.SeriesId.HasValue)
-            {
-                throw new BadRequestException("seriesId is missing");
-            }
-
-            var seriesId = (int)Request.Query.SeriesId;
-
-            var series = _seriesService.GetSeries(seriesId);
-
-            return _mediaFileService.GetFilesBySeries(seriesId).ConvertAll(f => f.ToResource(series, _qualityUpgradableSpecification));
+            var movieFile = _mediaFileService.GetMovie(movieFileResource.Id);
+            movieFile.Quality = movieFileResource.Quality;
+            _mediaFileService.Update(movieFile);
         }
 
-        private void SetQuality(EpisodeFileResource episodeFileResource)
+        private void DeleteMovieFile(int id)
         {
-            var episodeFile = _mediaFileService.Get(episodeFileResource.Id);
-            episodeFile.Quality = episodeFileResource.Quality;
-            _mediaFileService.Update(episodeFile);
-        }*/
+            var movieFile = _mediaFileService.GetMovie(id);
+            var movie = _movieService.GetMovie(movieFile.MovieId);
+            var fullPath = Path.Combine(movie.Path, movieFile.RelativePath);
 
-        private void DeleteEpisodeFile(int id)
-        {
-            var episodeFile = _mediaFileService.GetMovie(id);
-            var series = _seriesService.GetMovie(episodeFile.MovieId);
-            var fullPath = Path.Combine(series.Path, episodeFile.RelativePath);
-
-            _logger.Info("Deleting episode file: {0}", fullPath);
+            _logger.Info("Deleting movie file: {0}", fullPath);
             _recycleBinProvider.DeleteFile(fullPath);
-            _mediaFileService.Delete(episodeFile, DeleteMediaFileReason.Manual);
+            _mediaFileService.Delete(movieFile, DeleteMediaFileReason.Manual);
         }
 
-        public void Handle(EpisodeFileAddedEvent message)
+        public void Handle(MovieFileAddedEvent message)
         {
-            BroadcastResourceChange(ModelAction.Updated, message.EpisodeFile.Id);
+            BroadcastResourceChange(ModelAction.Updated, message.MovieFile.Id);
         }
     }
 }

src/NzbDrone.Api/Movies/MovieModuleWithSignalR.cs

@@ -0,0 +1,78 @@
+using NzbDrone.Api.Movie;
+using NzbDrone.Core.Datastore.Events;
+using NzbDrone.Core.DecisionEngine;
+using NzbDrone.Core.Download;
+using NzbDrone.Core.MediaFiles.Events;
+using NzbDrone.Core.Messaging.Events;
+using NzbDrone.Core.Tv;
+using NzbDrone.SignalR;
+
+namespace NzbDrone.Api.Movies
+{
+    public abstract class MovieModuleWithSignalR : NzbDroneRestModuleWithSignalR<MovieResource, Core.Tv.Movie>,
+        IHandle<MovieGrabbedEvent>,
+        IHandle<MovieDownloadedEvent>
+    {
+        protected readonly IMovieService _movieService;
+        protected readonly IQualityUpgradableSpecification _qualityUpgradableSpecification;
+
+        protected MovieModuleWithSignalR(IMovieService movieService,
+                                           IQualityUpgradableSpecification qualityUpgradableSpecification,
+                                           IBroadcastSignalRMessage signalRBroadcaster)
+            : base(signalRBroadcaster)
+        {
+            _movieService = movieService;
+            _qualityUpgradableSpecification = qualityUpgradableSpecification;
+
+            GetResourceById = GetMovie;
+        }
+
+        protected MovieModuleWithSignalR(IMovieService movieService,
+                                           IQualityUpgradableSpecification qualityUpgradableSpecification,
+                                           IBroadcastSignalRMessage signalRBroadcaster,
+                                           string resource)
+            : base(signalRBroadcaster, resource)
+        {
+            _movieService = movieService;
+            _qualityUpgradableSpecification = qualityUpgradableSpecification;
+
+            GetResourceById = GetMovie;
+        }
+
+        protected MovieResource GetMovie(int id)
+        {
+            var movie = _movieService.GetMovie(id);
+            var resource = MapToResource(movie, true);
+            return resource;
+        }
+
+        protected MovieResource MapToResource(Core.Tv.Movie episode, bool includeSeries)
+        {
+            var resource = episode.ToResource();
+
+            if (includeSeries)
+            {
+                var series = episode ?? _movieService.GetMovie(episode.Id);
+                resource = series.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)
+        {
+            var resource = message.Movie.Movie.ToResource();
+            BroadcastResourceChange(ModelAction.Updated, resource);
+        }
+    }
+}

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,47 @@
+using FluentValidation;
+using NzbDrone.Api.ClientSchema;
+using NzbDrone.Core.NetImport;
+using NzbDrone.Core.Validation.Paths;
+
+namespace NzbDrone.Api.NetImport
+{
+    public class NetImportModule : ProviderModuleBase<NetImportResource, INetImport, NetImportDefinition>
+    {
+        public NetImportModule(NetImportFactory netImportFactory) : base(netImportFactory, "netimport")
+        {
+            PostValidator.RuleFor(c => c.RootFolderPath).NotNull();
+            PostValidator.RuleFor(c => c.MinimumAvailability).NotNull();
+            PostValidator.RuleFor(c => c.ProfileId).NotNull();
+        }
+
+        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;
+            resource.MinimumAvailability = definition.MinimumAvailability;
+        }
+
+        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;
+            definition.MinimumAvailability = resource.MinimumAvailability;
+        }
+
+        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,15 @@
+using NzbDrone.Core.NetImport;
+using NzbDrone.Core.Tv;
+
+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; }
+        public MovieStatusType MinimumAvailability { 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" />
@@ -116,11 +118,16 @@
     <Compile Include="Frontend\Mappers\RobotsTxtMapper.cs" />
     <Compile Include="Indexers\ReleaseModuleBase.cs" />
     <Compile Include="Indexers\ReleasePushModule.cs" />
+    <Compile Include="Movies\MovieModuleWithSignalR.cs" />
+    <Compile Include="Movies\MovieBulkImportModule.cs" />
     <Compile Include="Movies\MovieFileModule.cs" />
-    <Compile Include="Movies\MovieModule.cs" />
+    <Compile Include="Series\MovieModule.cs" />
     <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,12 +241,12 @@
     <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" />
     <Compile Include="Series\MovieLookupModule.cs" />
     <Compile Include="Series\SeriesLookupModule.cs" />
-    <Compile Include="Series\MovieModule.cs" />
     <Compile Include="Series\SeriesModule.cs" />
     <Compile Include="Series\MovieResource.cs" />
     <Compile Include="Series\SeriesResource.cs" />
@@ -254,12 +261,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\MovieCutoffModule.cs" />
     <Compile Include="Wanted\MovieMissingModule.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -288,11 +297,11 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+			 Other similar extension points exist, see Microsoft.Common.targets.
+	<Target Name="BeforeBuild">
+	</Target>
+	<Target Name="AfterBuild">
+	</Target>
+	-->
+</Project>

src/NzbDrone.Api/PagingResource.cs

@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
 using NzbDrone.Core.Datastore;
 
 namespace NzbDrone.Api
@@ -11,6 +13,7 @@ namespace NzbDrone.Api
         public SortDirection SortDirection { get; set; }
         public string FilterKey { get; set; }
         public string FilterValue { get; set; }
+        public string FilterType { get; set;  }
         public int TotalRecords { get; set; }
         public List<TResource> Records { get; set; }
     }
@@ -38,5 +41,14 @@ namespace NzbDrone.Api
 
             return pagingSpec;
         }
+
+		/*public static Expression<Func<TModel, object>> CreateFilterExpression<TModel>(string filterKey, string filterValue)
+		{
+			Type type = typeof(TModel);
+			ParameterExpression parameterExpression = Expression.Parameter(type, "x");
+			Expression expressionBody = parameterExpression;
+
+			return expressionBody;
+		}*/
     }
 }

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

@@ -119,7 +119,7 @@ namespace NzbDrone.Api
 
             resource.Fields = SchemaBuilder.ToSchema(definition.Settings);
 
-            resource.InfoLink = string.Format("https://github.com/Sonarr/Sonarr/wiki/Supported-{0}#{1}",
+            resource.InfoLink = string.Format("https://github.com/Radarr/Radarr/wiki/Supported-{0}#{1}",
                 typeof(TProviderResource).Name.Replace("Resource", "s"),
                 definition.Implementation.ToLower());
         }

src/NzbDrone.Api/REST/RestModule.cs

@@ -214,7 +214,10 @@ namespace NzbDrone.Api.REST
         private PagingResource<TResource> ReadPagingResourceFromRequest()
         {
             int pageSize;
-            int.TryParse(Request.Query.PageSize.ToString(), out pageSize);
+            if (!int.TryParse(Request.Query.PageSize.ToString(), out pageSize))
+            {
+                pageSize = 100000;
+            }
             if (pageSize == 0) pageSize = 10;
 
             int page;
@@ -249,8 +252,15 @@ namespace NzbDrone.Api.REST
                 {
                     pagingResource.FilterValue = Request.Query.FilterValue.ToString();
                 }
+
+                if (Request.Query.FilterType != null)
+                {
+                    pagingResource.FilterType = Request.Query.FilterType.ToString();
+                }
             }
 
+
+
             return pagingResource;
         }
     }

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

@@ -4,20 +4,44 @@ using NzbDrone.Api.Extensions;
 using NzbDrone.Core.MediaCover;
 using NzbDrone.Core.MetadataSource;
 using System.Linq;
+using System;
+using NzbDrone.Api.REST;
 
 namespace NzbDrone.Api.Movie
 {
     public class MovieLookupModule : NzbDroneRestModule<MovieResource>
     {
         private readonly ISearchForNewMovie _searchProxy;
+        private readonly IProvideMovieInfo _movieInfo;
 
-        public MovieLookupModule(ISearchForNewMovie searchProxy)
+        public MovieLookupModule(ISearchForNewMovie searchProxy, IProvideMovieInfo movieInfo)
             : base("/movies/lookup")
         {
+            _movieInfo = movieInfo;
             _searchProxy = searchProxy;
             Get["/"] = x => Search();
+            Get["/tmdb"] = x => SearchByTmdbId();
+            Get["/imdb"] = x => SearchByImdbId();
         }
 
+        private Response SearchByTmdbId()
+        {
+            int tmdbId = -1;
+            if(Int32.TryParse(Request.Query.tmdbId, out tmdbId))
+            {
+                var result = _movieInfo.GetMovieInfo(tmdbId, null);
+                return result.ToResource().AsResponse();
+            }
+
+            throw new BadRequestException("Tmdb Id was not valid");
+        }
+
+        private Response SearchByImdbId()
+        {
+            string imdbId = Request.Query.imdbId;
+            var result = _movieInfo.GetMovieInfo(imdbId);
+            return result.ToResource().AsResponse();
+        }
 
         private Response Search()
         {
@@ -25,7 +49,6 @@ namespace NzbDrone.Api.Movie
             return MapToResource(imdbResults).AsResponse();
         }
 
-
         private static IEnumerable<MovieResource> MapToResource(IEnumerable<Core.Tv.Movie> movies)
         {
             foreach (var currentSeries in movies)

src/NzbDrone.Api/Series/MovieModule.cs

@@ -15,6 +15,7 @@ using NzbDrone.Core.Validation.Paths;
 using NzbDrone.Core.DataAugmentation.Scene;
 using NzbDrone.Core.Validation;
 using NzbDrone.SignalR;
+using NzbDrone.Core.Datastore;
 
 namespace NzbDrone.Api.Movie
 {
@@ -52,6 +53,7 @@ namespace NzbDrone.Api.Movie
             _coverMapper = coverMapper;
 
             GetResourceAll = AllMovie;
+			GetResourcePaged = GetMoviePaged;
             GetResourceById = GetMovie;
             CreateResource = AddMovie;
             UpdateResource = UpdateMovie;
@@ -104,6 +106,62 @@ namespace NzbDrone.Api.Movie
             return MapToResource(movies);
         }
 
+		private PagingResource<MovieResource> GetMoviePaged(PagingResource<MovieResource> pagingResource)
+		{
+			var pagingSpec = pagingResource.MapToPagingSpec<MovieResource, Core.Tv.Movie>();
+
+			if (pagingResource.FilterKey == "monitored" && pagingResource.FilterValue == "false")
+			{
+				pagingSpec.FilterExpression = v => v.Monitored == false;
+			}
+			else if (pagingResource.FilterKey == "monitored")
+			{
+				pagingSpec.FilterExpression = v => v.Monitored == true;
+			}
+
+			if (pagingResource.FilterKey == "status")
+			{
+				switch (pagingResource.FilterValue)
+				{
+					case "released":
+						pagingSpec.FilterExpression = v => v.Status == MovieStatusType.Released;
+						break;
+					case "inCinemas":
+						pagingSpec.FilterExpression = v => v.Status == MovieStatusType.InCinemas;
+						break;
+					case "announced":
+						pagingSpec.FilterExpression = v => v.Status == MovieStatusType.Announced;
+						break;
+				}
+			}
+
+			if (pagingResource.FilterKey == "downloaded")
+			{
+				pagingSpec.FilterExpression = v => v.MovieFileId == 0;
+			}
+
+           if (pagingResource.FilterKey == "title")
+            {
+                if (pagingResource.FilterValue == string.Empty || pagingResource.FilterValue == null)
+                {
+                    pagingSpec.FilterExpression = v => true;
+                }
+                else
+                {
+                    if (pagingResource.FilterType == "contains")
+                    {
+                        pagingSpec.FilterExpression = v => v.CleanTitle.Contains(pagingResource.FilterValue);
+                    }
+                    else
+                    {
+                        pagingSpec.FilterExpression = v => v.CleanTitle == pagingResource.FilterValue;
+                    }
+                }
+            }
+
+			return ApplyToPage(_moviesService.Paged, pagingSpec, MovieResourceMapper.ToResource);
+		}
+
         protected MovieResource MapToResource(Core.Tv.Movie movies)
         {
             if (movies == null) return null;
@@ -147,14 +205,20 @@ namespace NzbDrone.Api.Movie
         private void DeleteMovie(int id)
         {
             var deleteFiles = false;
+            var addExclusion = false;
             var deleteFilesQuery = Request.Query.deleteFiles;
+            var addExclusionQuery = Request.Query.addExclusion;
 
             if (deleteFilesQuery.HasValue)
             {
                 deleteFiles = Convert.ToBoolean(deleteFilesQuery.Value);
             }
+            if (addExclusionQuery.HasValue)
+            {
+                addExclusion = Convert.ToBoolean(addExclusionQuery.Value);
+            }
 
-            _moviesService.DeleteMovie(id, deleteFiles);
+            _moviesService.DeleteMovie(id, deleteFiles, addExclusion);
         }
 
         private void MapCoversToLocal(params MovieResource[] movies)

src/NzbDrone.Api/Series/MovieResource.cs

@@ -43,6 +43,9 @@ namespace NzbDrone.Api.Movie
 
         //Editing Only
         public bool Monitored { get; set; }
+	    public MovieStatusType MinimumAvailability { get; set; }
+        public bool IsAvailable { get; set; }
+
         public int Runtime { get; set; }
         public DateTime? LastInfoSync { get; set; }
         public string CleanTitle { get; set; }
@@ -129,6 +132,9 @@ namespace NzbDrone.Api.Movie
                 ProfileId = model.ProfileId,
                 
                 Monitored = model.Monitored,
+                MinimumAvailability = model.MinimumAvailability,
+		
+                IsAvailable = model.IsAvailable(),
 
                 SizeOnDisk = size,
 
@@ -181,7 +187,8 @@ namespace NzbDrone.Api.Movie
                 ProfileId = resource.ProfileId,
 
                 Monitored = resource.Monitored,
-
+                MinimumAvailability = resource.MinimumAvailability,
+		
                 Runtime = resource.Runtime,
                 LastInfoSync = resource.LastInfoSync,
                 CleanTitle = resource.CleanTitle,
@@ -210,7 +217,8 @@ namespace NzbDrone.Api.Movie
             movie.ProfileId = resource.ProfileId;
 
             movie.Monitored = resource.Monitored;
-
+	        movie.MinimumAvailability = resource.MinimumAvailability;
+	   
             movie.RootFolderPath = resource.RootFolderPath;
             movie.Tags = resource.Tags;
             movie.AddOptions = resource.AddOptions;

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

@@ -15,7 +15,7 @@ namespace NzbDrone.Api.Wanted
                             ISeriesService seriesService,
                             IQualityUpgradableSpecification qualityUpgradableSpecification,
                             IBroadcastSignalRMessage signalRBroadcaster)
-            : base(episodeService, seriesService, qualityUpgradableSpecification, signalRBroadcaster, "wanted/cutoff")
+            : base(episodeService, seriesService, qualityUpgradableSpecification, signalRBroadcaster, "wanted/cutoff-old")
         {
             _episodeCutoffService = episodeCutoffService;
             GetResourcePaged = GetCutoffUnmetEpisodes;

src/NzbDrone.Api/Wanted/MovieCutoffModule.cs

@@ -0,0 +1,42 @@
+using NzbDrone.Api.Movie;
+using NzbDrone.Api.Movies;
+using NzbDrone.Core.DecisionEngine;
+using NzbDrone.Core.Tv;
+using NzbDrone.Core.Datastore;
+using NzbDrone.SignalR;
+
+namespace NzbDrone.Api.Wanted
+{
+    public class MovieCutoffModule : MovieModuleWithSignalR
+    {
+        private readonly IMovieCutoffService _movieCutoffService;
+
+        public MovieCutoffModule(IMovieCutoffService movieCutoffService,
+                                 IMovieService movieService,
+                                 IQualityUpgradableSpecification qualityUpgradableSpecification,
+                                 IBroadcastSignalRMessage signalRBroadcaster)
+            : base(movieService, qualityUpgradableSpecification, signalRBroadcaster, "wanted/cutoff")
+        {
+            _movieCutoffService = movieCutoffService;
+            GetResourcePaged = GetCutoffUnmetMovies;
+        }
+
+        private PagingResource<MovieResource> GetCutoffUnmetMovies(PagingResource<MovieResource> pagingResource)
+        {
+            var pagingSpec = pagingResource.MapToPagingSpec<MovieResource, Core.Tv.Movie>("title", SortDirection.Ascending);
+
+            if (pagingResource.FilterKey == "monitored" && pagingResource.FilterValue == "false")
+            {
+                pagingSpec.FilterExpression = v => v.Monitored == false;
+            }
+            else
+            {
+                pagingSpec.FilterExpression = v => v.Monitored == true;
+            }
+
+            var resource = ApplyToPage(_movieCutoffService.MoviesWhereCutoffUnmet, pagingSpec, v => MapToResource(v, true));
+
+            return resource;
+        }
+    }
+}

src/NzbDrone.Api/Wanted/MovieMissingModule.cs

@@ -12,16 +12,14 @@ using NzbDrone.Core.Datastore.Events;
 
 namespace NzbDrone.Api.Wanted
 {
-    class MovieMissingModule : NzbDroneRestModuleWithSignalR<MovieResource, Core.Tv.Movie>,
-        IHandle<MovieGrabbedEvent>,
-        IHandle<MovieDownloadedEvent>
+    class MovieMissingModule : MovieModuleWithSignalR
     {
         protected readonly IMovieService _movieService;
 
         public MovieMissingModule(IMovieService movieService, 
                                   IQualityUpgradableSpecification qualityUpgradableSpecification, 
                                   IBroadcastSignalRMessage signalRBroadcaster) 
-            : base(signalRBroadcaster, "wanted/missing")
+            : base(movieService, qualityUpgradableSpecification, signalRBroadcaster, "wanted/missing")
         {
 
             _movieService = movieService;
@@ -30,48 +28,13 @@ namespace NzbDrone.Api.Wanted
 
         private PagingResource<MovieResource> GetMissingMovies(PagingResource<MovieResource> pagingResource)
         {
-            var pagingSpec = pagingResource.MapToPagingSpec<MovieResource, Core.Tv.Movie>("physicalRelease", SortDirection.Descending);
+            var pagingSpec = pagingResource.MapToPagingSpec<MovieResource, Core.Tv.Movie>("title", SortDirection.Descending);
 
-            if (pagingResource.FilterKey == "monitored" && pagingResource.FilterValue == "false")
-            {
-                pagingSpec.FilterExpression = v => v.Monitored == false;
-            }
-            else
-            {
-                pagingSpec.FilterExpression = v => v.Monitored == true;
-            }
+            pagingSpec.FilterExpression = _movieService.ConstructFilterExpression(pagingResource.FilterKey, pagingResource.FilterValue);
 
-            var resource = ApplyToPage(_movieService.MoviesWithoutFiles, pagingSpec, v => MapToResource(v, false));
+            var resource = ApplyToPage(_movieService.MoviesWithoutFiles, pagingSpec, v => MapToResource(v, true));
 
             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.Common/Extensions/Base64Extensions.cs

@@ -2,7 +2,7 @@ using System;
 
 namespace NzbDrone.Common.Extensions
 {
-    public static class Base64Extentions
+    public static class Base64Extensions
     {
         public static string ToBase64(this byte[] bytes)
         {
@@ -14,4 +14,4 @@ namespace NzbDrone.Common.Extensions
             return BitConverter.GetBytes(input).ToBase64();
         }
     }
-}
+}

src/NzbDrone.Common/Extensions/XmlExtensions.cs

@@ -5,11 +5,11 @@ using System.Xml.Linq;
 
 namespace NzbDrone.Common.Extensions
 {
-    public static class XmlExtentions
+    public static class XmlExtensions
     {
         public static IEnumerable<XElement> FindDecendants(this XContainer container, string localName)
         {
             return container.Descendants().Where(c => c.Name.LocalName.Equals(localName, StringComparison.InvariantCultureIgnoreCase));
         }
     }
-}
+}

src/NzbDrone.Common/NzbDrone.Common.csproj

@@ -145,14 +145,14 @@
     <Compile Include="Expansive\Tree.cs" />
     <Compile Include="Expansive\TreeNode.cs" />
     <Compile Include="Expansive\TreeNodeList.cs" />
-    <Compile Include="Extensions\Base64Extentions.cs" />
+    <Compile Include="Extensions\Base64Extensions.cs" />
     <Compile Include="Extensions\DateTimeExtensions.cs" />
     <Compile Include="Crypto\HashConverter.cs" />
     <Compile Include="Extensions\Int64Extensions.cs" />
     <Compile Include="Extensions\ObjectExtensions.cs" />
     <Compile Include="Extensions\StreamExtensions.cs" />
     <Compile Include="Extensions\UrlExtensions.cs" />
-    <Compile Include="Extensions\XmlExtentions.cs" />
+    <Compile Include="Extensions\XmlExtensions.cs" />
     <Compile Include="HashUtil.cs" />
     <Compile Include="Http\Dispatchers\CurlHttpDispatcher.cs" />
     <Compile Include="Http\Dispatchers\FallbackHttpDispatcher.cs" />

src/NzbDrone.Core.Test/BulkImport/AddMultiMoviesFixture.cs

@@ -0,0 +1,75 @@
+using FizzWare.NBuilder;
+using FluentAssertions;
+using NUnit.Framework;
+using Moq;
+using NzbDrone.Core.Organizer;
+using NzbDrone.Core.Tv;
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Core.Tv.Events;
+using System.Collections.Generic;
+
+namespace NzbDrone.Core.Test.BulkImport
+{
+	[TestFixture]
+	public class AddMultiMoviesFixture : CoreTest<MovieService>
+	{
+		private List<Movie> fakeMovies;
+
+		[SetUp]
+		public void Setup()
+		{
+			fakeMovies = Builder<Movie>.CreateListOfSize(3).BuildList();
+			fakeMovies.ForEach(m =>
+			{
+				m.Path = null;
+				m.RootFolderPath = @"C:\Test\TV";
+			});
+		}
+
+		[Test]
+		public void movies_added_event_should_have_proper_path()
+		{
+			Mocker.GetMock<IBuildFileNames>()
+			      .Setup(s => s.GetMovieFolder(It.IsAny<Movie>(), null))
+			      .Returns((Movie m, NamingConfig n) => m.Title);
+
+			var movies = Subject.AddMovies(fakeMovies);
+
+			foreach (Movie movie in movies)
+			{
+				movie.Path.Should().NotBeNullOrEmpty();
+			}
+
+			//Subject.GetAllMovies().Should().HaveCount(3);
+		}
+
+		[Test]
+		public void movies_added_should_ignore_already_added()
+		{
+			Mocker.GetMock<IBuildFileNames>()
+				  .Setup(s => s.GetMovieFolder(It.IsAny<Movie>(), null))
+				  .Returns((Movie m, NamingConfig n) => m.Title);
+
+			Mocker.GetMock<IMovieRepository>().Setup(s => s.All()).Returns(new List<Movie> { fakeMovies[0] });
+
+			var movies = Subject.AddMovies(fakeMovies);
+
+			Mocker.GetMock<IMovieRepository>().Verify(v => v.InsertMany(It.Is<List<Movie>>(l => l.Count == 2)));
+		}
+
+		[Test]
+		public void movies_added_should_ignore_duplicates()
+		{
+			Mocker.GetMock<IBuildFileNames>()
+				  .Setup(s => s.GetMovieFolder(It.IsAny<Movie>(), null))
+				  .Returns((Movie m, NamingConfig n) => m.Title);
+
+			fakeMovies[2].TmdbId = fakeMovies[0].TmdbId;
+
+			var movies = Subject.AddMovies(fakeMovies);
+
+			Mocker.GetMock<IMovieRepository>().Verify(v => v.InsertMany(It.Is<List<Movie>>(l => l.Count == 2)));
+		}
+
+	}
+}

src/NzbDrone.Core.Test/DataAugmentation/SceneNumbering/XemServiceFixture.cs

@@ -1,312 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using FizzWare.NBuilder;
-using FluentAssertions;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Core.DataAugmentation.Xem;
-using NzbDrone.Core.DataAugmentation.Xem.Model;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv;
-using NzbDrone.Core.Tv.Events;
-using NzbDrone.Test.Common;
-
-namespace NzbDrone.Core.Test.DataAugmentation.SceneNumbering
-{
-    [TestFixture]
-    public class XemServiceFixture : CoreTest<XemService>
-    {
-        private Series _series;
-        private List<int> _theXemSeriesIds;
-        private List<XemSceneTvdbMapping> _theXemTvdbMappings;
-        private List<Episode> _episodes;
-
-        [SetUp]
-        public void SetUp()
-        {
-            _series = Builder<Series>.CreateNew()
-                .With(v => v.TvdbId = 10)
-                .With(v => v.UseSceneNumbering = false)
-                .BuildNew();
-
-            _theXemSeriesIds = new List<int> { 120 };
-            Mocker.GetMock<IXemProxy>()
-                  .Setup(v => v.GetXemSeriesIds())
-                  .Returns(_theXemSeriesIds);
-
-            _theXemTvdbMappings = new List<XemSceneTvdbMapping>();
-            Mocker.GetMock<IXemProxy>()
-                  .Setup(v => v.GetSceneTvdbMappings(10))
-                  .Returns(_theXemTvdbMappings);
-
-            _episodes = new List<Episode>();
-            _episodes.Add(new Episode { SeasonNumber = 1, EpisodeNumber = 1 });
-            _episodes.Add(new Episode { SeasonNumber = 1, EpisodeNumber = 2 });
-            _episodes.Add(new Episode { SeasonNumber = 2, EpisodeNumber = 1 });
-            _episodes.Add(new Episode { SeasonNumber = 2, EpisodeNumber = 2 });
-            _episodes.Add(new Episode { SeasonNumber = 2, EpisodeNumber = 3 });
-            _episodes.Add(new Episode { SeasonNumber = 2, EpisodeNumber = 4 });
-            _episodes.Add(new Episode { SeasonNumber = 2, EpisodeNumber = 5 });
-            _episodes.Add(new Episode { SeasonNumber = 3, EpisodeNumber = 1 });
-            _episodes.Add(new Episode { SeasonNumber = 3, EpisodeNumber = 2 });
-
-            Mocker.GetMock<IEpisodeService>()
-                  .Setup(v => v.GetEpisodeBySeries(It.IsAny<int>()))
-                  .Returns(_episodes);
-        }
-
-        private void GivenTvdbMappings()
-        {
-            _theXemSeriesIds.Add(10);
-
-            AddTvdbMapping(1, 1, 1, 1, 1, 1); // 1x01 -> 1x01
-            AddTvdbMapping(2, 1, 2, 2, 1, 2); // 1x02 -> 1x02
-            AddTvdbMapping(3, 2, 1, 3, 2, 1); // 2x01 -> 2x01
-            AddTvdbMapping(4, 2, 2, 4, 2, 2); // 2x02 -> 2x02
-            AddTvdbMapping(5, 2, 3, 5, 2, 3); // 2x03 -> 2x03
-            AddTvdbMapping(6, 3, 1, 6, 2, 4); // 3x01 -> 2x04
-            AddTvdbMapping(7, 3, 2, 7, 2, 5); // 3x02 -> 2x05
-        }
-
-        private void GivenExistingMapping()
-        {
-            _series.UseSceneNumbering = true;
-
-            _episodes[0].SceneSeasonNumber = 1;
-            _episodes[0].SceneEpisodeNumber = 1;
-            _episodes[1].SceneSeasonNumber = 1;
-            _episodes[1].SceneEpisodeNumber = 2;
-            _episodes[2].SceneSeasonNumber = 2;
-            _episodes[2].SceneEpisodeNumber = 1;
-            _episodes[3].SceneSeasonNumber = 2;
-            _episodes[3].SceneEpisodeNumber = 2;
-            _episodes[4].SceneSeasonNumber = 2;
-            _episodes[4].SceneEpisodeNumber = 3;
-            _episodes[5].SceneSeasonNumber = 3;
-            _episodes[5].SceneEpisodeNumber = 1;
-            _episodes[6].SceneSeasonNumber = 3;
-            _episodes[6].SceneEpisodeNumber = 1;
-        }
-
-        private void AddTvdbMapping(int sceneAbsolute, int sceneSeason, int sceneEpisode, int tvdbAbsolute, int tvdbSeason, int tvdbEpisode)
-        {
-            _theXemTvdbMappings.Add(new XemSceneTvdbMapping
-            {
-                Scene = new XemValues { Absolute = sceneAbsolute, Season = sceneSeason, Episode = sceneEpisode },
-                Tvdb  = new XemValues { Absolute = tvdbAbsolute, Season = tvdbSeason, Episode = tvdbEpisode },
-            });
-        }
-
-
-        [Test]
-        public void should_not_fetch_scenenumbering_if_not_listed()
-        {
-            Subject.Handle(new SeriesUpdatedEvent(_series));
-
-            Mocker.GetMock<IXemProxy>()
-                  .Verify(v => v.GetSceneTvdbMappings(10), Times.Never());
-
-            Mocker.GetMock<ISeriesService>()
-                  .Verify(v => v.UpdateSeries(It.IsAny<Series>()), Times.Never());
-        }
-
-        [Test]
-        public void should_fetch_scenenumbering()
-        {
-            GivenTvdbMappings();
-
-            Subject.Handle(new SeriesUpdatedEvent(_series));
-
-            Mocker.GetMock<ISeriesService>()
-                  .Verify(v => v.UpdateSeries(It.Is<Series>(s => s.UseSceneNumbering == true)), Times.Once());
-        }
-
-        [Test]
-        public void should_clear_scenenumbering_if_removed_from_thexem()
-        {
-            GivenExistingMapping();
-
-            Subject.Handle(new SeriesUpdatedEvent(_series));
-
-            Mocker.GetMock<ISeriesService>()
-                  .Verify(v => v.UpdateSeries(It.IsAny<Series>()), Times.Once());
-        }
-
-        [Test]
-        public void should_not_clear_scenenumbering_if_no_results_at_all_from_thexem()
-        {
-            GivenExistingMapping();
-
-            _theXemSeriesIds.Clear();
-
-            Subject.Handle(new SeriesUpdatedEvent(_series));
-
-            Mocker.GetMock<ISeriesService>()
-                  .Verify(v => v.UpdateSeries(It.IsAny<Series>()), Times.Never());
-
-            ExceptionVerification.ExpectedWarns(1);
-        }
-
-        [Test]
-        public void should_not_clear_scenenumbering_if_thexem_throws()
-        {
-            GivenExistingMapping();
-
-            Mocker.GetMock<IXemProxy>()
-                  .Setup(v => v.GetXemSeriesIds())
-                  .Throws(new InvalidOperationException());
-
-            Subject.Handle(new SeriesUpdatedEvent(_series));
-
-            Mocker.GetMock<ISeriesService>()
-                  .Verify(v => v.UpdateSeries(It.IsAny<Series>()), Times.Never());
-
-            ExceptionVerification.ExpectedWarns(1);
-        }
-
-        [Test]
-        public void should_flag_unknown_future_episodes_if_existing_season_is_mapped()
-        {
-            GivenTvdbMappings();
-            _theXemTvdbMappings.RemoveAll(v => v.Tvdb.Season == 2 && v.Tvdb.Episode == 5);
-
-            Subject.Handle(new SeriesUpdatedEvent(_series));
-
-            var episode = _episodes.First(v => v.SeasonNumber == 2 && v.EpisodeNumber == 5);
-
-            episode.UnverifiedSceneNumbering.Should().BeTrue();
-        }
-
-        [Test]
-        public void should_flag_unknown_future_season_if_future_season_is_shifted()
-        {
-            GivenTvdbMappings();
-
-            Subject.Handle(new SeriesUpdatedEvent(_series));
-
-            var episode = _episodes.First(v => v.SeasonNumber == 3 && v.EpisodeNumber == 1);
-
-            episode.UnverifiedSceneNumbering.Should().BeTrue();
-        }
-
-        [Test]
-        public void should_not_flag_unknown_future_season_if_future_season_is_not_shifted()
-        {
-            GivenTvdbMappings();
-            _theXemTvdbMappings.RemoveAll(v => v.Scene.Season == 3);
-
-            Subject.Handle(new SeriesUpdatedEvent(_series));
-
-            var episode = _episodes.First(v => v.SeasonNumber == 3 && v.EpisodeNumber == 1);
-
-            episode.UnverifiedSceneNumbering.Should().BeFalse();
-        }
-
-        [Test]
-        public void should_not_flag_past_episodes_if_not_causing_overlaps()
-        {
-            GivenTvdbMappings();
-            _theXemTvdbMappings.RemoveAll(v => v.Scene.Season == 2);
-
-            Subject.Handle(new SeriesUpdatedEvent(_series));
-
-            var episode = _episodes.First(v => v.SeasonNumber == 2 && v.EpisodeNumber == 1);
-
-            episode.UnverifiedSceneNumbering.Should().BeFalse();
-        }
-
-        [Test]
-        public void should_flag_past_episodes_if_causing_overlap()
-        {
-            GivenTvdbMappings();
-            _theXemTvdbMappings.RemoveAll(v => v.Scene.Season == 2 && v.Tvdb.Episode <= 1);
-            _theXemTvdbMappings.First(v => v.Scene.Season == 2 && v.Scene.Episode == 2).Scene.Episode = 1;
-
-            Subject.Handle(new SeriesUpdatedEvent(_series));
-
-            var episode = _episodes.First(v => v.SeasonNumber == 2 && v.EpisodeNumber == 1);
-
-            episode.UnverifiedSceneNumbering.Should().BeTrue();
-        }
-
-        [Test]
-        public void should_not_extrapolate_season_with_specials()
-        {
-            GivenTvdbMappings();
-            var specialMapping = _theXemTvdbMappings.First(v => v.Tvdb.Season == 2 && v.Tvdb.Episode == 5);
-            specialMapping.Tvdb.Season = 0;
-            specialMapping.Tvdb.Episode = 1;
-
-            Subject.Handle(new SeriesUpdatedEvent(_series));
-
-            var episode = _episodes.First(v => v.SeasonNumber == 2 && v.EpisodeNumber == 5);
-
-            episode.UnverifiedSceneNumbering.Should().BeTrue();
-            episode.SceneSeasonNumber.Should().NotHaveValue();
-            episode.SceneEpisodeNumber.Should().NotHaveValue();
-        }
-
-        [Test]
-        public void should_extrapolate_season_with_future_episodes()
-        {
-            GivenTvdbMappings();
-            _theXemTvdbMappings.RemoveAll(v => v.Tvdb.Season == 2 && v.Tvdb.Episode == 5);
-
-            Subject.Handle(new SeriesUpdatedEvent(_series));
-
-            var episode = _episodes.First(v => v.SeasonNumber == 2 && v.EpisodeNumber == 5);
-
-            episode.UnverifiedSceneNumbering.Should().BeTrue();
-            episode.SceneSeasonNumber.Should().Be(3);
-            episode.SceneEpisodeNumber.Should().Be(2);
-        }
-
-        [Test]
-        public void should_extrapolate_season_with_shifted_episodes()
-        {
-            GivenTvdbMappings();
-            _theXemTvdbMappings.RemoveAll(v => v.Tvdb.Season == 2 && v.Tvdb.Episode == 5);
-            var dualMapping = _theXemTvdbMappings.First(v => v.Tvdb.Season == 2 && v.Tvdb.Episode == 4);
-            dualMapping.Scene.Season = 2;
-            dualMapping.Scene.Episode = 3;
-
-            Subject.Handle(new SeriesUpdatedEvent(_series));
-
-            var episode = _episodes.First(v => v.SeasonNumber == 2 && v.EpisodeNumber == 5);
-
-            episode.UnverifiedSceneNumbering.Should().BeTrue();
-            episode.SceneSeasonNumber.Should().Be(2);
-            episode.SceneEpisodeNumber.Should().Be(4);
-        }
-
-        [Test]
-        public void should_extrapolate_shifted_future_seasons()
-        {
-            GivenTvdbMappings();
-
-            Subject.Handle(new SeriesUpdatedEvent(_series));
-
-            var episode = _episodes.First(v => v.SeasonNumber == 3 && v.EpisodeNumber == 2);
-
-            episode.UnverifiedSceneNumbering.Should().BeTrue();
-            episode.SceneSeasonNumber.Should().Be(4);
-            episode.SceneEpisodeNumber.Should().Be(2);
-        }
-
-        [Test]
-        public void should_not_extrapolate_matching_future_seasons()
-        {
-            GivenTvdbMappings();
-            _theXemTvdbMappings.RemoveAll(v => v.Scene.Season != 1);
-
-            Subject.Handle(new SeriesUpdatedEvent(_series));
-
-            var episode = _episodes.First(v => v.SeasonNumber == 3 && v.EpisodeNumber == 2);
-
-            episode.UnverifiedSceneNumbering.Should().BeFalse();
-            episode.SceneSeasonNumber.Should().NotHaveValue();
-            episode.SceneEpisodeNumber.Should().NotHaveValue();
-        }
-    }
-}

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/DecisionEngineTests/RssSync/DelaySpecificationFixture.cs

@@ -26,7 +26,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
     {
         private Profile _profile;
         private DelayProfile _delayProfile;
-        private RemoteEpisode _remoteEpisode;
+        private RemoteMovie _remoteEpisode;
 
         [SetUp]
         public void Setup()
@@ -38,12 +38,12 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
                                                  .With(d => d.PreferredProtocol = DownloadProtocol.Usenet)
                                                  .Build();
 
-            var series = Builder<Series>.CreateNew()
+            var series = Builder<Movie>.CreateNew()
                                         .With(s => s.Profile = _profile)
                                         .Build();
 
-            _remoteEpisode = Builder<RemoteEpisode>.CreateNew()
-                                                   .With(r => r.Series = series)
+            _remoteEpisode = Builder<RemoteMovie>.CreateNew()
+                                                   .With(r => r.Movie = series)
                                                    .Build();
 
             _profile.Items = new List<ProfileQualityItem>();
@@ -53,30 +53,30 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
 
             _profile.Cutoff = Quality.WEBDL720p;
 
-            _remoteEpisode.ParsedEpisodeInfo = new ParsedEpisodeInfo();
+            _remoteEpisode.ParsedMovieInfo = new ParsedMovieInfo();
             _remoteEpisode.Release = new ReleaseInfo();
             _remoteEpisode.Release.DownloadProtocol = DownloadProtocol.Usenet;
 
-            _remoteEpisode.Episodes = Builder<Episode>.CreateListOfSize(1).Build().ToList();
-            _remoteEpisode.Episodes.First().EpisodeFileId = 0;
+            //_remoteEpisode.Episodes = Builder<Episode>.CreateListOfSize(1).Build().ToList();
+            //_remoteEpisode.Episodes.First().EpisodeFileId = 0;
 
-            Mocker.GetMock<IDelayProfileService>()
-                  .Setup(s => s.BestForTags(It.IsAny<HashSet<int>>()))
-                  .Returns(_delayProfile);
+            //Mocker.GetMock<IDelayProfileService>()
+            //      .Setup(s => s.BestForTags(It.IsAny<HashSet<int>>()))
+            //      .Returns(_delayProfile);
 
-            Mocker.GetMock<IPendingReleaseService>()
-                  .Setup(s => s.GetPendingRemoteEpisodes(It.IsAny<int>()))
-                  .Returns(new List<RemoteEpisode>());
+            //Mocker.GetMock<IPendingReleaseService>()
+            //      .Setup(s => s.GetPendingRemoteEpisodes(It.IsAny<int>()))
+            //      .Returns(new List<RemoteEpisode>());
         }
 
         private void GivenExistingFile(QualityModel quality)
         {
-            _remoteEpisode.Episodes.First().EpisodeFileId = 1;
+            //_remoteEpisode.Episodes.First().EpisodeFileId = 1;
 
-            _remoteEpisode.Episodes.First().EpisodeFile = new LazyLoaded<EpisodeFile>(new EpisodeFile
-                                                                                 {
-                                                                                     Quality = quality
-                                                                                 });
+            //_remoteEpisode.Episodes.First().EpisodeFile = new LazyLoaded<EpisodeFile>(new EpisodeFile
+            //                                                                     {
+            //                                                                         Quality = quality
+            //                                                                     });
         }
 
         private void GivenUpgradeForExistingFile()

src/NzbDrone.Core.Test/Download/DownloadClientTests/Blackhole/TorrentBlackholeFixture.cs

@@ -74,9 +74,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
                 .Returns(1000000);
         }
 
-        protected override RemoteEpisode CreateRemoteEpisode()
+        protected override RemoteMovie CreateRemoteMovie()
         {
-            var remoteEpisode = base.CreateRemoteEpisode();
+            var remoteEpisode = base.CreateRemoteMovie();
             var torrentInfo = new TorrentInfo();
 
             torrentInfo.Title = remoteEpisode.Release.Title;
@@ -125,7 +125,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
         [Test]
         public void Download_should_download_file_if_it_doesnt_exist()
         {
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             Subject.Download(remoteEpisode);
 
@@ -139,7 +139,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
         {
             Subject.Definition.Settings.As<TorrentBlackholeSettings>().SaveMagnetFiles = true;
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
             remoteEpisode.Release.DownloadUrl = null;
 
             Subject.Download(remoteEpisode);
@@ -153,7 +153,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
         [Test]
         public void Download_should_not_save_magnet_if_disabled()
         {
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
             remoteEpisode.Release.DownloadUrl = null;
 
             Assert.Throws<ReleaseDownloadException>(() => Subject.Download(remoteEpisode));
@@ -169,7 +169,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
         {
             Subject.Definition.Settings.As<TorrentBlackholeSettings>().SaveMagnetFiles = true;
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             Subject.Download(remoteEpisode);
 
@@ -185,7 +185,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
             var illegalTitle = "Saturday Night Live - S38E08 - Jeremy Renner/Maroon 5 [SDTV]";
             var expectedFilename = Path.Combine(_blackholeFolder, "Saturday Night Live - S38E08 - Jeremy Renner+Maroon 5 [SDTV]" + Path.GetExtension(_filePath));
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
             remoteEpisode.Release.Title = illegalTitle;
 
             Subject.Download(remoteEpisode);
@@ -198,7 +198,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
         [Test]
         public void Download_should_throw_if_magnet_and_torrent_url_does_not_exist()
         {
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
             remoteEpisode.Release.DownloadUrl = null;
 
             Assert.Throws<ReleaseDownloadException>(() => Subject.Download(remoteEpisode));
@@ -273,7 +273,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
         [Test]
         public void should_return_null_hash()
         {
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             Subject.Download(remoteEpisode).Should().BeNull();
         }

src/NzbDrone.Core.Test/Download/DownloadClientTests/Blackhole/UsenetBlackholeFixture.cs

@@ -104,7 +104,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
         [Test]
         public void Download_should_download_file_if_it_doesnt_exist()
         {
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             Subject.Download(remoteEpisode);
 
@@ -119,7 +119,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
             var illegalTitle = "Saturday Night Live - S38E08 - Jeremy Renner/Maroon 5 [SDTV]";
             var expectedFilename = Path.Combine(_blackholeFolder, "Saturday Night Live - S38E08 - Jeremy Renner+Maroon 5 [SDTV]" + Path.GetExtension(_filePath));
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
             remoteEpisode.Release.Title = illegalTitle;
 
             Subject.Download(remoteEpisode);

src/NzbDrone.Core.Test/Download/DownloadClientTests/DelugeTests/DelugeFixture.cs

@@ -196,7 +196,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DelugeTests
         {
             GivenSuccessfulDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             var id = Subject.Download(remoteEpisode);
 
@@ -208,7 +208,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DelugeTests
         {
             GivenSuccessfulDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
             remoteEpisode.Release.DownloadUrl = magnetUrl;
 
             var id = Subject.Download(remoteEpisode);

src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadClientFixtureBase.cs

@@ -30,8 +30,8 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests
                 .Returns(30);
 
             Mocker.GetMock<IParsingService>()
-                .Setup(s => s.Map(It.IsAny<ParsedEpisodeInfo>(), It.IsAny<int>(), It.IsAny<int>(), (SearchCriteriaBase)null))
-                .Returns(() => CreateRemoteEpisode());
+                .Setup(s => s.Map(It.IsAny<ParsedMovieInfo>(), It.IsAny<string>(), (SearchCriteriaBase)null))
+                .Returns(() => CreateRemoteMovie());
 
             Mocker.GetMock<IHttpClient>()
                   .Setup(s => s.Get(It.IsAny<HttpRequest>()))
@@ -42,20 +42,20 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests
                 .Returns<string, OsPath>((h, r) => r);
         }
 
-        protected virtual RemoteEpisode CreateRemoteEpisode()
+        protected virtual RemoteMovie CreateRemoteMovie()
         {
-            var remoteEpisode = new RemoteEpisode();
+            var remoteEpisode = new RemoteMovie();
             remoteEpisode.Release = new ReleaseInfo();
             remoteEpisode.Release.Title = _title;
             remoteEpisode.Release.DownloadUrl = _downloadUrl;
             remoteEpisode.Release.DownloadProtocol = Subject.Protocol;
 
-            remoteEpisode.ParsedEpisodeInfo = new ParsedEpisodeInfo();
-            remoteEpisode.ParsedEpisodeInfo.FullSeason = false;
+            remoteEpisode.ParsedMovieInfo = new ParsedMovieInfo();
+            //remoteEpisode.ParsedEpisodeInfo.FullSeason = false;
 
-            remoteEpisode.Episodes = new List<Episode>();
+            //remoteEpisode.Episodes = new List<Episode>();
 
-            remoteEpisode.Series = new Series();
+            remoteEpisode.Movie = new Movie();
 
             return remoteEpisode;
         }

src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/SerialNumberProviderFixture.cs

@@ -0,0 +1,74 @@
+using System;
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using NzbDrone.Core.Download.Clients;
+using NzbDrone.Core.Download.Clients.DownloadStation;
+using NzbDrone.Core.Download.Clients.DownloadStation.Proxies;
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Test.Common;
+
+namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
+{
+    [TestFixture]
+    public class SerialNumberProviderFixture : CoreTest<SerialNumberProvider>
+    {
+        protected DownloadStationSettings _settings;
+
+        [SetUp]
+        protected void Setup()
+        {
+            _settings = new DownloadStationSettings();
+        }
+
+        private void GivenValidResponse()
+        {
+            Mocker.GetMock<IDSMInfoProxy>()
+                  .Setup(d => d.GetSerialNumber(It.IsAny<DownloadStationSettings>()))
+                  .Returns("serial");
+        }
+
+        private void GivenInvalidResponse()
+        {
+            Mocker.GetMock<IDSMInfoProxy>()
+                  .Setup(d => d.GetSerialNumber(It.IsAny<DownloadStationSettings>()))
+                  .Throws(new DownloadClientException("Serial response invalid"));
+        }
+
+        [Test]
+        public void should_return_hashedserialnumber()
+        {
+            GivenValidResponse();
+
+            var serial = Subject.GetSerialNumber(_settings);
+
+            // This hash should remain the same for 'serial', so don't update the test if you change HashConverter, fix the code instead.
+            serial.Should().Be("50DE66B735D30738618568294742FCF1DFA52A47");
+
+            Mocker.GetMock<IDSMInfoProxy>()
+                  .Verify(d => d.GetSerialNumber(It.IsAny<DownloadStationSettings>()), Times.Once());
+        }
+
+        [Test]
+        public void should_cache_serialnumber()
+        {
+            GivenValidResponse();
+
+            var serial1 = Subject.GetSerialNumber(_settings);
+            var serial2 = Subject.GetSerialNumber(_settings);
+
+            serial2.Should().Be(serial1);
+
+            Mocker.GetMock<IDSMInfoProxy>()
+                  .Verify(d => d.GetSerialNumber(It.IsAny<DownloadStationSettings>()), Times.Once());
+        }
+
+        [Test]
+        public void should_throw_if_serial_number_unavailable()
+        {
+            Assert.Throws(Is.InstanceOf<Exception>(), () => Subject.GetSerialNumber(_settings));
+
+            ExceptionVerification.ExpectedWarns(1);
+        }
+    }
+}

src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/SharedFolderResolverFixture.cs

@@ -0,0 +1,75 @@
+using System;
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using NzbDrone.Common.Disk;
+using NzbDrone.Core.Download.Clients;
+using NzbDrone.Core.Download.Clients.DownloadStation;
+using NzbDrone.Core.Download.Clients.DownloadStation.Proxies;
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Test.Common;
+
+namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
+{
+    [TestFixture]
+    public class SharedFolderResolverFixture : CoreTest<SharedFolderResolver>
+    {
+        protected string _serialNumber = "SERIALNUMBER";
+        protected OsPath _sharedFolder;
+        protected OsPath _physicalPath;
+        protected DownloadStationSettings _settings;
+
+        [SetUp]
+        protected void Setup()
+        {
+            _sharedFolder = new OsPath("/myFolder");
+            _physicalPath = new OsPath("/mnt/sda1/folder");
+            _settings = new DownloadStationSettings();
+
+            Mocker.GetMock<IFileStationProxy>()
+                  .Setup(f => f.GetSharedFolderMapping(It.IsAny<string>(), It.IsAny<DownloadStationSettings>()))
+                  .Throws(new DownloadClientException("There is no shared folder"));
+
+            Mocker.GetMock<IFileStationProxy>()
+                  .Setup(f => f.GetSharedFolderMapping(_sharedFolder.FullPath, It.IsAny<DownloadStationSettings>()))
+                  .Returns(new SharedFolderMapping(_sharedFolder.FullPath, _physicalPath.FullPath));
+        }
+
+        [Test]
+        public void should_throw_when_cannot_resolve_shared_folder()
+        {
+            Assert.Throws(Is.InstanceOf<Exception>(), () => Subject.RemapToFullPath(new OsPath("/unknownFolder"), _settings, _serialNumber));
+
+            ExceptionVerification.ExpectedWarns(1);
+        }
+
+        [Test]
+        public void should_return_valid_sharedfolder()
+        {
+            var mapping = Subject.RemapToFullPath(_sharedFolder, _settings, "abc");
+
+            mapping.Should().Be(_physicalPath);
+
+            Mocker.GetMock<IFileStationProxy>()
+                  .Verify(f => f.GetSharedFolderMapping(It.IsAny<string>(), It.IsAny<DownloadStationSettings>()), Times.Once());
+        }
+
+        [Test]
+        public void should_cache_mapping()
+        {
+            Subject.RemapToFullPath(_sharedFolder, _settings, "abc");
+            Subject.RemapToFullPath(_sharedFolder, _settings, "abc");
+
+            Mocker.GetMock<IFileStationProxy>()
+                  .Verify(f => f.GetSharedFolderMapping(It.IsAny<string>(), It.IsAny<DownloadStationSettings>()), Times.Once());
+        }
+
+        [Test]
+        public void should_remap_subfolder()
+        {
+            var mapping = Subject.RemapToFullPath(_sharedFolder + "sub", _settings, "abc");
+
+            mapping.Should().Be(_physicalPath + "sub");
+        }
+    }
+}

src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/TorrentDownloadStationFixture.cs

@@ -0,0 +1,622 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using NzbDrone.Common.Disk;
+using NzbDrone.Common.Http;
+using NzbDrone.Core.Download;
+using NzbDrone.Core.Download.Clients.DownloadStation;
+using NzbDrone.Core.Download.Clients.DownloadStation.Proxies;
+using NzbDrone.Core.MediaFiles.TorrentInfo;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Test.Common;
+
+namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
+{
+    [TestFixture]
+    public class TorrentDownloadStationFixture : DownloadClientFixtureBase<TorrentDownloadStation>
+    {
+        protected DownloadStationSettings _settings;
+
+        protected DownloadStationTask _queued;
+        protected DownloadStationTask _downloading;
+        protected DownloadStationTask _failed;
+        protected DownloadStationTask _completed;
+        protected DownloadStationTask _seeding;
+        protected DownloadStationTask _magnet;
+        protected DownloadStationTask _singleFile;
+        protected DownloadStationTask _multipleFiles;
+        protected DownloadStationTask _singleFileCompleted;
+        protected DownloadStationTask _multipleFilesCompleted;
+
+        protected string _serialNumber = "SERIALNUMBER";
+        protected string _category = "sonarr";
+        protected string _tvDirectory = @"video/Series";
+        protected string _defaultDestination = "somepath";
+        protected OsPath _physicalPath = new OsPath("/mnt/sdb1/mydata");
+
+        protected Dictionary<string, object> _downloadStationConfigItems;
+
+        protected string DownloadURL => "magnet:?xt=urn:btih:5dee65101db281ac9c46344cd6b175cdcad53426&dn=download";
+
+        [SetUp]
+        public void Setup()
+        {
+            _settings = new DownloadStationSettings()
+            {
+                Host = "127.0.0.1",
+                Port = 5000,
+                Username = "admin",
+                Password = "pass"
+            };
+
+            Subject.Definition = new DownloadClientDefinition();
+            Subject.Definition.Settings = _settings;
+
+            _queued = new DownloadStationTask()
+            {
+                Id = "id1",
+                Size = 1000,
+                Status = DownloadStationTaskStatus.Waiting,
+                Type = DownloadStationTaskType.BT.ToString(),
+                Username = "admin",
+                Title = "title",
+                Additional = new DownloadStationTaskAdditional
+                {
+                    Detail = new Dictionary<string, string>
+                    {
+                        { "destination","shared/folder" },
+                        { "uri", DownloadURL }
+                    },
+                    Transfer = new Dictionary<string, string>
+                    {
+                        { "size_downloaded", "0"},
+                        { "speed_download", "0" }
+                    }
+                }
+            };
+
+            _completed = new DownloadStationTask()
+            {
+                Id = "id2",
+                Size = 1000,
+                Status = DownloadStationTaskStatus.Finished,
+                Type = DownloadStationTaskType.BT.ToString(),
+                Username = "admin",
+                Title = "title",
+                Additional = new DownloadStationTaskAdditional
+                {
+                    Detail = new Dictionary<string, string>
+                    {
+                        { "destination","shared/folder" },
+                        { "uri", DownloadURL }
+                    },
+                    Transfer = new Dictionary<string, string>
+                    {
+                        { "size_downloaded", "1000"},
+                        { "speed_download", "0" }
+                    },
+                }
+            };
+
+            _seeding = new DownloadStationTask()
+            {
+                Id = "id2",
+                Size = 1000,
+                Status = DownloadStationTaskStatus.Seeding,
+                Type = DownloadStationTaskType.BT.ToString(),
+                Username = "admin",
+                Title = "title",
+                Additional = new DownloadStationTaskAdditional
+                {
+                    Detail = new Dictionary<string, string>
+                    {
+                        { "destination","shared/folder" },
+                        { "uri", DownloadURL }
+                    },
+                    Transfer = new Dictionary<string, string>
+                    {
+                        { "size_downloaded", "1000"},
+                        { "speed_download", "0" }
+                    }
+                }
+            };
+
+            _downloading = new DownloadStationTask()
+            {
+                Id = "id3",
+                Size = 1000,
+                Status = DownloadStationTaskStatus.Downloading,
+                Type = DownloadStationTaskType.BT.ToString(),
+                Username = "admin",
+                Title = "title",
+                Additional = new DownloadStationTaskAdditional
+                {
+                    Detail = new Dictionary<string, string>
+                    {
+                        { "destination","shared/folder" },
+                        { "uri", DownloadURL }
+                    },
+                    Transfer = new Dictionary<string, string>
+                    {
+                        { "size_downloaded", "100"},
+                        { "speed_download", "50" }
+                    }
+                }
+            };
+
+            _failed = new DownloadStationTask()
+            {
+                Id = "id4",
+                Size = 1000,
+                Status = DownloadStationTaskStatus.Error,
+                Type = DownloadStationTaskType.BT.ToString(),
+                Username = "admin",
+                Title = "title",
+                Additional = new DownloadStationTaskAdditional
+                {
+                    Detail = new Dictionary<string, string>
+                    {
+                        { "destination","shared/folder" },
+                        { "uri", DownloadURL }
+                    },
+                    Transfer = new Dictionary<string, string>
+                    {
+                        { "size_downloaded", "10"},
+                        { "speed_download", "0" }
+                    }
+                }
+            };
+
+            _singleFile = new DownloadStationTask()
+            {
+                Id = "id5",
+                Size = 1000,
+                Status = DownloadStationTaskStatus.Seeding,
+                Type = DownloadStationTaskType.BT.ToString(),
+                Username = "admin",
+                Title = "a.mkv",
+                Additional = new DownloadStationTaskAdditional
+                {
+                    Detail = new Dictionary<string, string>
+                    {
+                        { "destination","shared/folder" },
+                        { "uri", DownloadURL }
+                    },
+                    Transfer = new Dictionary<string, string>
+                    {
+                        { "size_downloaded", "1000"},
+                        { "speed_download", "0" }
+                    }
+                }
+            };
+
+            _multipleFiles = new DownloadStationTask()
+            {
+                Id = "id6",
+                Size = 1000,
+                Status = DownloadStationTaskStatus.Seeding,
+                Type = DownloadStationTaskType.BT.ToString(),
+                Username = "admin",
+                Title = "title",
+                Additional = new DownloadStationTaskAdditional
+                {
+                    Detail = new Dictionary<string, string>
+                    {
+                        { "destination","shared/folder" },
+                        { "uri", DownloadURL }
+                    },
+                    Transfer = new Dictionary<string, string>
+                    {
+                        { "size_downloaded", "1000"},
+                        { "speed_download", "0" }
+                    }
+                }
+            };
+
+            _singleFileCompleted = new DownloadStationTask()
+            {
+                Id = "id6",
+                Size = 1000,
+                Status = DownloadStationTaskStatus.Finished,
+                Type = DownloadStationTaskType.BT.ToString(),
+                Username = "admin",
+                Title = "a.mkv",
+                Additional = new DownloadStationTaskAdditional
+                {
+                    Detail = new Dictionary<string, string>
+                    {
+                        { "destination","shared/folder" },
+                        { "uri", DownloadURL }
+                    },
+                    Transfer = new Dictionary<string, string>
+                    {
+                        { "size_downloaded", "1000"},
+                        { "speed_download", "0" }
+                    }
+                }
+            };
+
+            _multipleFilesCompleted = new DownloadStationTask()
+            {
+                Id = "id6",
+                Size = 1000,
+                Status = DownloadStationTaskStatus.Finished,
+                Type = DownloadStationTaskType.BT.ToString(),
+                Username = "admin",
+                Title = "title",
+                Additional = new DownloadStationTaskAdditional
+                {
+                    Detail = new Dictionary<string, string>
+                    {
+                        { "destination","shared/folder" },
+                        { "uri", DownloadURL }
+                    },
+                    Transfer = new Dictionary<string, string>
+                    {
+                        { "size_downloaded", "1000"},
+                        { "speed_download", "0" }
+                    }
+                }
+            };
+
+            Mocker.GetMock<ITorrentFileInfoReader>()
+                  .Setup(s => s.GetHashFromTorrentFile(It.IsAny<byte[]>()))
+                  .Returns("CBC2F069FE8BB2F544EAE707D75BCD3DE9DCF951");
+
+            Mocker.GetMock<IHttpClient>()
+                  .Setup(s => s.Get(It.IsAny<HttpRequest>()))
+                  .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), new byte[0]));
+
+            _downloadStationConfigItems = new Dictionary<string, object>
+            {
+                { "default_destination", _defaultDestination },
+            };
+
+            Mocker.GetMock<IDownloadStationProxy>()
+              .Setup(v => v.GetConfig(It.IsAny<DownloadStationSettings>()))
+              .Returns(_downloadStationConfigItems);
+        }
+
+        protected void GivenSharedFolder()
+        {
+            Mocker.GetMock<ISharedFolderResolver>()
+                  .Setup(s => s.RemapToFullPath(It.IsAny<OsPath>(), It.IsAny<DownloadStationSettings>(), It.IsAny<string>()))
+                  .Returns<OsPath, DownloadStationSettings, string>((path, setttings, serial) => _physicalPath);
+        }
+
+        protected void GivenSerialNumber()
+        {
+            Mocker.GetMock<ISerialNumberProvider>()
+                .Setup(s => s.GetSerialNumber(It.IsAny<DownloadStationSettings>()))
+                .Returns(_serialNumber);
+        }
+
+        protected void GivenTvCategory()
+        {
+            _settings.TvCategory = _category;
+        }
+
+        protected void GivenTvDirectory()
+        {
+            _settings.TvDirectory = _tvDirectory;
+        }
+
+        protected virtual void GivenTasks(List<DownloadStationTask> torrents)
+        {
+            if (torrents == null)
+            {
+                torrents = new List<DownloadStationTask>();
+            }
+
+            Mocker.GetMock<IDownloadStationProxy>()
+                  .Setup(s => s.GetTasks(It.IsAny<DownloadStationSettings>()))
+                  .Returns(torrents);
+        }
+
+        protected void PrepareClientToReturnQueuedItem()
+        {
+            GivenTasks(new List<DownloadStationTask>
+            {
+                _queued
+            });
+        }
+
+        protected void GivenSuccessfulDownload()
+        {
+            Mocker.GetMock<IHttpClient>()
+                  .Setup(s => s.Get(It.IsAny<HttpRequest>()))
+                  .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), new byte[1000]));
+
+            Mocker.GetMock<IDownloadStationProxy>()
+                  .Setup(s => s.AddTaskFromUrl(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<DownloadStationSettings>()))
+                  .Callback(PrepareClientToReturnQueuedItem);
+
+            Mocker.GetMock<IDownloadStationProxy>()
+                  .Setup(s => s.AddTaskFromData(It.IsAny<byte[]>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<DownloadStationSettings>()))
+                  .Callback(PrepareClientToReturnQueuedItem);
+        }
+
+        protected override RemoteMovie CreateRemoteMovie()
+        {
+            var episode = base.CreateRemoteMovie();
+
+            episode.Release.DownloadUrl = DownloadURL;
+
+            return episode;
+        }
+
+        protected int GivenAllKindOfTasks()
+        {
+            var tasks = new List<DownloadStationTask>() { _queued, _completed, _failed, _downloading, _seeding };
+
+            Mocker.GetMock<IDownloadStationProxy>()
+                  .Setup(d => d.GetTasks(_settings))
+                  .Returns(tasks);
+
+            return tasks.Count;
+        }
+
+        [Test]
+        public void Download_with_TvDirectory_should_force_directory()
+        {
+            GivenSerialNumber();
+            GivenTvDirectory();
+            GivenSuccessfulDownload();
+
+            var remoteEpisode = CreateRemoteMovie();
+
+            var id = Subject.Download(remoteEpisode);
+
+            id.Should().NotBeNullOrEmpty();
+
+            Mocker.GetMock<IDownloadStationProxy>()
+                  .Verify(v => v.AddTaskFromUrl(It.IsAny<string>(), _tvDirectory, It.IsAny<DownloadStationSettings>()), Times.Once());
+        }
+
+        [Test]
+        public void Download_with_category_should_force_directory()
+        {
+            GivenSerialNumber();
+            GivenTvCategory();
+            GivenSuccessfulDownload();
+
+            var remoteEpisode = CreateRemoteMovie();
+
+            var id = Subject.Download(remoteEpisode);
+
+            id.Should().NotBeNullOrEmpty();
+
+            Mocker.GetMock<IDownloadStationProxy>()
+                  .Verify(v => v.AddTaskFromUrl(It.IsAny<string>(), $"{_defaultDestination}/{_category}", It.IsAny<DownloadStationSettings>()), Times.Once());
+        }
+
+        [Test]
+        public void Download_without_TvDirectory_and_Category_should_use_default()
+        {
+            GivenSerialNumber();
+            GivenSuccessfulDownload();
+
+            var remoteEpisode = CreateRemoteMovie();
+
+            var id = Subject.Download(remoteEpisode);
+
+            id.Should().NotBeNullOrEmpty();
+
+            Mocker.GetMock<IDownloadStationProxy>()
+                  .Verify(v => v.AddTaskFromUrl(It.IsAny<string>(), null, It.IsAny<DownloadStationSettings>()), Times.Once());
+        }
+
+        [Test]
+        public void GetItems_should_return_empty_list_if_no_tasks_available()
+        {
+            GivenSerialNumber();
+            GivenSharedFolder();
+            GivenTasks(new List<DownloadStationTask>());
+
+            Subject.GetItems().Should().BeEmpty();
+        }
+
+        [Test]
+        public void GetItems_should_return_ignore_tasks_of_unknown_type()
+        {
+            GivenSerialNumber();
+            GivenSharedFolder();
+            GivenTasks(new List<DownloadStationTask> { _completed });
+
+            _completed.Type = "ipfs";
+
+            Subject.GetItems().Should().BeEmpty();
+        }
+
+        [Test]
+        public void GetItems_should_ignore_downloads_in_wrong_folder()
+        {
+            _settings.TvDirectory = @"/shared/folder/sub";
+
+            GivenSerialNumber();
+            GivenSharedFolder();
+            GivenTasks(new List<DownloadStationTask> { _completed });
+
+            Subject.GetItems().Should().BeEmpty();
+        }
+
+        [Test]
+        public void GetItems_should_throw_if_shared_folder_resolve_fails()
+        {
+            Mocker.GetMock<ISharedFolderResolver>()
+                  .Setup(s => s.RemapToFullPath(It.IsAny<OsPath>(), It.IsAny<DownloadStationSettings>(), It.IsAny<string>()))
+                  .Throws(new ApplicationException("Some unknown exception, HttpException or DownloadClientException"));
+
+            GivenSerialNumber();
+            GivenAllKindOfTasks();
+
+            Assert.Throws(Is.InstanceOf<Exception>(), () => Subject.GetItems());
+            ExceptionVerification.ExpectedErrors(0);
+        }
+
+        [Test]
+        public void GetItems_should_throw_if_serial_number_unavailable()
+        {
+            Mocker.GetMock<ISerialNumberProvider>()
+                  .Setup(s => s.GetSerialNumber(_settings))
+                  .Throws(new ApplicationException("Some unknown exception, HttpException or DownloadClientException"));
+
+            GivenSharedFolder();
+            GivenAllKindOfTasks();
+
+            Assert.Throws(Is.InstanceOf<Exception>(), () => Subject.GetItems());
+            ExceptionVerification.ExpectedErrors(0);
+        }
+
+        [Test]
+        public void Download_should_throw_and_not_add_task_if_cannot_get_serial_number()
+        {
+            var remoteEpisode = CreateRemoteMovie();
+
+            Mocker.GetMock<ISerialNumberProvider>()
+                  .Setup(s => s.GetSerialNumber(_settings))
+                  .Throws(new ApplicationException("Some unknown exception, HttpException or DownloadClientException"));
+
+            Assert.Throws(Is.InstanceOf<Exception>(), () => Subject.Download(remoteEpisode));
+
+            Mocker.GetMock<IDownloadStationProxy>()
+                  .Verify(v => v.AddTaskFromUrl(It.IsAny<string>(), null, _settings), Times.Never());
+        }
+
+        [Test]
+        public void GetItems_should_set_outputPath_to_base_folder_when_single_file_non_finished_tasks()
+        {
+            GivenSerialNumber();
+            GivenSharedFolder();
+
+            GivenTasks(new List<DownloadStationTask>() { _singleFile });
+
+            var items = Subject.GetItems();
+
+            items.Should().HaveCount(1);
+            items.First().OutputPath.Should().Be(_physicalPath + _singleFile.Title);
+        }
+
+        [Test]
+        public void GetItems_should_set_outputPath_to_torrent_folder_when_multiple_files_non_finished_tasks()
+        {
+            GivenSerialNumber();
+            GivenSharedFolder();
+
+            GivenTasks(new List<DownloadStationTask>() { _multipleFiles });
+
+            var items = Subject.GetItems();
+
+            items.Should().HaveCount(1);
+            items.First().OutputPath.Should().Be(_physicalPath + _multipleFiles.Title);
+        }
+
+        [Test]
+        public void GetItems_should_set_outputPath_to_base_folder_when_single_file_finished_tasks()
+        {
+            GivenSerialNumber();
+            GivenSharedFolder();
+
+            GivenTasks(new List<DownloadStationTask>() { _singleFileCompleted });
+
+            var items = Subject.GetItems();
+
+            items.Should().HaveCount(1);
+            items.First().OutputPath.Should().Be(_physicalPath + _singleFileCompleted.Title);
+        }
+
+        [Test]
+        public void GetItems_should_set_outputPath_to_torrent_folder_when_multiple_files_finished_tasks()
+        {
+            GivenSerialNumber();
+            GivenSharedFolder();
+
+            GivenTasks(new List<DownloadStationTask>() { _multipleFilesCompleted });
+
+            var items = Subject.GetItems();
+
+            items.Should().HaveCount(1);
+            items.First().OutputPath.Should().Be($"{_physicalPath}/{_multipleFiles.Title}");
+        }
+
+        [Test]
+        public void GetItems_should_not_map_outputpath_for_queued_or_downloading_tasks()
+        {
+            GivenSerialNumber();
+            GivenSharedFolder();
+
+            GivenTasks(new List<DownloadStationTask>
+            {
+                _queued, _downloading
+            });
+
+            var items = Subject.GetItems();
+
+            items.Should().HaveCount(2);
+            items.Should().OnlyContain(v => v.OutputPath.IsEmpty);
+        }
+
+        [Test]
+        public void GetItems_should_map_outputpath_for_completed_or_failed_tasks()
+        {
+            GivenSerialNumber();
+            GivenSharedFolder();
+
+            GivenTasks(new List<DownloadStationTask>
+            {
+                _completed, _failed, _seeding
+            });
+
+            var items = Subject.GetItems();
+
+            items.Should().HaveCount(3);
+            items.Should().OnlyContain(v => !v.OutputPath.IsEmpty);
+        }
+
+        [TestCase(DownloadStationTaskStatus.Downloading, DownloadItemStatus.Downloading, true)]
+        [TestCase(DownloadStationTaskStatus.Finished, DownloadItemStatus.Completed, false)]
+        [TestCase(DownloadStationTaskStatus.Seeding, DownloadItemStatus.Completed, true)]
+        [TestCase(DownloadStationTaskStatus.Waiting, DownloadItemStatus.Queued, true)]
+        public void GetItems_should_return_readonly_expected(DownloadStationTaskStatus apiStatus, DownloadItemStatus expectedItemStatus, bool readOnlyExpected)
+        {
+            GivenSerialNumber();
+            GivenSharedFolder();
+
+            _queued.Status = apiStatus;
+
+            GivenTasks(new List<DownloadStationTask>() { _queued });
+
+            var items = Subject.GetItems();
+
+            items.Should().HaveCount(1);
+            items.First().IsReadOnly.Should().Be(readOnlyExpected);
+        }
+
+        [TestCase(DownloadStationTaskStatus.Downloading, DownloadItemStatus.Downloading)]
+        [TestCase(DownloadStationTaskStatus.Error, DownloadItemStatus.Failed)]
+        [TestCase(DownloadStationTaskStatus.Extracting, DownloadItemStatus.Downloading)]
+        [TestCase(DownloadStationTaskStatus.Finished, DownloadItemStatus.Completed)]
+        [TestCase(DownloadStationTaskStatus.Finishing, DownloadItemStatus.Downloading)]
+        [TestCase(DownloadStationTaskStatus.HashChecking, DownloadItemStatus.Downloading)]
+        [TestCase(DownloadStationTaskStatus.Paused, DownloadItemStatus.Paused)]
+        [TestCase(DownloadStationTaskStatus.Seeding, DownloadItemStatus.Completed)]
+        [TestCase(DownloadStationTaskStatus.Waiting, DownloadItemStatus.Queued)]
+        public void GetItems_should_return_item_as_downloadItemStatus(DownloadStationTaskStatus apiStatus, DownloadItemStatus expectedItemStatus)
+        {
+            GivenSerialNumber();
+            GivenSharedFolder();
+
+            _queued.Status = apiStatus;
+
+            GivenTasks(new List<DownloadStationTask>() { _queued });
+
+            var items = Subject.GetItems();
+            items.Should().HaveCount(1);
+
+            items.First().Status.Should().Be(expectedItemStatus);
+        }
+    }
+}

src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/UsenetDownloadStationFixture.cs

@@ -0,0 +1,452 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using NzbDrone.Common.Disk;
+using NzbDrone.Common.Http;
+using NzbDrone.Core.Download;
+using NzbDrone.Core.Download.Clients.DownloadStation;
+using NzbDrone.Core.Download.Clients.DownloadStation.Proxies;
+using NzbDrone.Core.MediaFiles.TorrentInfo;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Test.Common;
+using NzbDrone.Core.Organizer;
+
+namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
+{
+    [TestFixture]
+    public class UsenetDownloadStationFixture : DownloadClientFixtureBase<UsenetDownloadStation>
+    {
+        protected DownloadStationSettings _settings;
+
+        protected DownloadStationTask _queued;
+        protected DownloadStationTask _downloading;
+        protected DownloadStationTask _failed;
+        protected DownloadStationTask _completed;
+        protected DownloadStationTask _seeding;
+
+        protected string _serialNumber = "SERIALNUMBER";
+        protected string _category = "sonarr";
+        protected string _tvDirectory = @"video/Series";
+        protected string _defaultDestination = "somepath";
+        protected OsPath _physicalPath = new OsPath("/mnt/sdb1/mydata");
+
+        protected RemoteMovie _remoteEpisode;
+
+        protected Dictionary<string, object> _downloadStationConfigItems;
+
+        [SetUp]
+        public void Setup()
+        {
+            _remoteEpisode = CreateRemoteMovie();
+
+            _settings = new DownloadStationSettings()
+            {
+                Host = "127.0.0.1",
+                Port = 5000,
+                Username = "admin",
+                Password = "pass"
+            };
+
+            Subject.Definition = new DownloadClientDefinition();
+            Subject.Definition.Settings = _settings;
+
+            _queued = new DownloadStationTask()
+            {
+                Id = "id1",
+                Size = 1000,
+                Status = DownloadStationTaskStatus.Waiting,
+                Type = DownloadStationTaskType.NZB.ToString(),
+                Username = "admin",
+                Title = "title",
+                Additional = new DownloadStationTaskAdditional
+                {
+                    Detail = new Dictionary<string, string>
+                    {
+                        { "destination","shared/folder" },
+                        { "uri", FileNameBuilder.CleanFileName(_remoteEpisode.Release.Title) + ".nzb" }
+                    },
+                    Transfer = new Dictionary<string, string>
+                    {
+                        { "size_downloaded", "0"},
+                        { "speed_download", "0" }
+                    }
+                }
+            };
+
+            _completed = new DownloadStationTask()
+            {
+                Id = "id2",
+                Size = 1000,
+                Status = DownloadStationTaskStatus.Finished,
+                Type = DownloadStationTaskType.NZB.ToString(),
+                Username = "admin",
+                Title = "title",
+                Additional = new DownloadStationTaskAdditional
+                {
+                    Detail = new Dictionary<string, string>
+                    {
+                        { "destination","shared/folder" },
+                        { "uri", FileNameBuilder.CleanFileName(_remoteEpisode.Release.Title) + ".nzb" }
+                    },
+                    Transfer = new Dictionary<string, string>
+                    {
+                        { "size_downloaded", "1000"},
+                        { "speed_download", "0" }
+                    },
+                }
+            };
+
+            _seeding = new DownloadStationTask()
+            {
+                Id = "id2",
+                Size = 1000,
+                Status = DownloadStationTaskStatus.Seeding,
+                Type = DownloadStationTaskType.NZB.ToString(),
+                Username = "admin",
+                Title = "title",
+                Additional = new DownloadStationTaskAdditional
+                {
+                    Detail = new Dictionary<string, string>
+                    {
+                        { "destination","shared/folder" },
+                        { "uri", FileNameBuilder.CleanFileName(_remoteEpisode.Release.Title) + ".nzb" }
+                    },
+                    Transfer = new Dictionary<string, string>
+                    {
+                        { "size_downloaded", "1000"},
+                        { "speed_download", "0" }
+                    }
+                }
+            };
+
+            _downloading = new DownloadStationTask()
+            {
+                Id = "id3",
+                Size = 1000,
+                Status = DownloadStationTaskStatus.Downloading,
+                Type = DownloadStationTaskType.NZB.ToString(),
+                Username = "admin",
+                Title = "title",
+                Additional = new DownloadStationTaskAdditional
+                {
+                    Detail = new Dictionary<string, string>
+                    {
+                        { "destination","shared/folder" },
+                        { "uri", FileNameBuilder.CleanFileName(_remoteEpisode.Release.Title) + ".nzb" }
+                    },
+                    Transfer = new Dictionary<string, string>
+                    {
+                        { "size_downloaded", "100"},
+                        { "speed_download", "50" }
+                    }
+                }
+            };
+
+            _failed = new DownloadStationTask()
+            {
+                Id = "id4",
+                Size = 1000,
+                Status = DownloadStationTaskStatus.Error,
+                Type = DownloadStationTaskType.NZB.ToString(),
+                Username = "admin",
+                Title = "title",
+                Additional = new DownloadStationTaskAdditional
+                {
+                    Detail = new Dictionary<string, string>
+                    {
+                        { "destination","shared/folder" },
+                        { "uri", FileNameBuilder.CleanFileName(_remoteEpisode.Release.Title) + ".nzb" }
+                    },
+                    Transfer = new Dictionary<string, string>
+                    {
+                        { "size_downloaded", "10"},
+                        { "speed_download", "0" }
+                    }
+                }
+            };
+
+            Mocker.GetMock<IHttpClient>()
+                  .Setup(s => s.Get(It.IsAny<HttpRequest>()))
+                  .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), new byte[0]));
+
+            _downloadStationConfigItems = new Dictionary<string, object>
+            {
+                { "default_destination", _defaultDestination },
+            };
+
+            Mocker.GetMock<IDownloadStationProxy>()
+              .Setup(v => v.GetConfig(It.IsAny<DownloadStationSettings>()))
+              .Returns(_downloadStationConfigItems);
+        }
+
+        protected void GivenSharedFolder()
+        {
+            Mocker.GetMock<ISharedFolderResolver>()
+                  .Setup(s => s.RemapToFullPath(It.IsAny<OsPath>(), It.IsAny<DownloadStationSettings>(), It.IsAny<string>()))
+                  .Returns<OsPath, DownloadStationSettings, string>((path, setttings, serial) => _physicalPath);
+        }
+
+        protected void GivenSerialNumber()
+        {
+            Mocker.GetMock<ISerialNumberProvider>()
+                .Setup(s => s.GetSerialNumber(It.IsAny<DownloadStationSettings>()))
+                .Returns(_serialNumber);
+        }
+
+        protected void GivenTvCategory()
+        {
+            _settings.TvCategory = _category;
+        }
+
+        protected void GivenTvDirectory()
+        {
+            _settings.TvDirectory = _tvDirectory;
+        }
+
+        protected virtual void GivenTasks(List<DownloadStationTask> nzbs)
+        {
+            if (nzbs == null)
+            {
+                nzbs = new List<DownloadStationTask>();
+            }
+
+            Mocker.GetMock<IDownloadStationProxy>()
+                  .Setup(s => s.GetTasks(It.IsAny<DownloadStationSettings>()))
+                  .Returns(nzbs);
+        }
+
+        protected void PrepareClientToReturnQueuedItem()
+        {
+            GivenTasks(new List<DownloadStationTask>
+            {
+                _queued
+            });
+        }
+
+        protected void GivenSuccessfulDownload()
+        {/*
+            Mocker.GetMock<IHttpClient>()
+                  .Setup(s => s.Get(It.IsAny<HttpRequest>()))
+                  .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), new byte[1000]));
+            */
+
+            Mocker.GetMock<IDownloadStationProxy>()
+                  .Setup(s => s.AddTaskFromData(It.IsAny<byte[]>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<DownloadStationSettings>()))
+                  .Callback(PrepareClientToReturnQueuedItem);
+        }
+
+        protected void GivenAllKindOfTasks()
+        {
+            var tasks = new List<DownloadStationTask>() { _queued, _completed, _failed, _downloading, _seeding };
+
+            Mocker.GetMock<IDownloadStationProxy>()
+                  .Setup(d => d.GetTasks(_settings))
+                  .Returns(tasks);
+        }
+
+        [Test]
+        public void Download_with_TvDirectory_should_force_directory()
+        {
+            GivenSerialNumber();
+            GivenTvDirectory();
+            GivenSuccessfulDownload();
+
+            var remoteEpisode = CreateRemoteMovie();
+
+            var id = Subject.Download(remoteEpisode);
+
+            id.Should().NotBeNullOrEmpty();
+
+            Mocker.GetMock<IDownloadStationProxy>()
+                  .Verify(v => v.AddTaskFromData(It.IsAny<byte[]>(), It.IsAny<string>(), _tvDirectory, It.IsAny<DownloadStationSettings>()), Times.Once());
+        }
+
+        [Test]
+        public void Download_with_category_should_force_directory()
+        {
+            GivenSerialNumber();
+            GivenTvCategory();
+            GivenSuccessfulDownload();
+
+            var remoteEpisode = CreateRemoteMovie();
+
+            var id = Subject.Download(remoteEpisode);
+
+            id.Should().NotBeNullOrEmpty();
+
+            Mocker.GetMock<IDownloadStationProxy>()
+                  .Verify(v => v.AddTaskFromData(It.IsAny<byte[]>(), It.IsAny<string>(), $"{_defaultDestination}/{_category}", It.IsAny<DownloadStationSettings>()), Times.Once());
+        }
+
+        [Test]
+        public void Download_without_TvDirectory_and_Category_should_use_default()
+        {
+            GivenSerialNumber();
+            GivenSuccessfulDownload();
+
+            var remoteEpisode = CreateRemoteMovie();
+
+            var id = Subject.Download(remoteEpisode);
+
+            id.Should().NotBeNullOrEmpty();
+
+            Mocker.GetMock<IDownloadStationProxy>()
+                  .Verify(v => v.AddTaskFromData(It.IsAny<byte[]>(), It.IsAny<string>(), null, It.IsAny<DownloadStationSettings>()), Times.Once());
+        }
+
+        [Test]
+        public void GetItems_should_return_empty_list_if_no_tasks_available()
+        {
+            GivenSerialNumber();
+            GivenSharedFolder();
+            GivenTasks(new List<DownloadStationTask>());
+
+            Subject.GetItems().Should().BeEmpty();
+        }
+
+        [Test]
+        public void GetItems_should_return_ignore_tasks_of_unknown_type()
+        {
+            GivenSerialNumber();
+            GivenSharedFolder();
+            GivenTasks(new List<DownloadStationTask> { _completed });
+
+            _completed.Type = "ipfs";
+
+            Subject.GetItems().Should().BeEmpty();
+        }
+
+        [Test]
+        public void GetItems_should_ignore_downloads_in_wrong_folder()
+        {
+            _settings.TvDirectory = @"/shared/folder/sub";
+
+            GivenSerialNumber();
+            GivenSharedFolder();
+            GivenTasks(new List<DownloadStationTask> { _completed });
+
+            Subject.GetItems().Should().BeEmpty();
+        }
+
+        [Test]
+        public void GetItems_should_throw_if_shared_folder_resolve_fails()
+        {
+            Mocker.GetMock<ISharedFolderResolver>()
+                  .Setup(s => s.RemapToFullPath(It.IsAny<OsPath>(), It.IsAny<DownloadStationSettings>(), It.IsAny<string>()))
+                  .Throws(new ApplicationException("Some unknown exception, HttpException or DownloadClientException"));
+
+            GivenSerialNumber();
+            GivenAllKindOfTasks();
+
+            Assert.Throws(Is.InstanceOf<Exception>(), () => Subject.GetItems());
+            ExceptionVerification.ExpectedErrors(0);
+        }
+
+        [Test]
+        public void GetItems_should_throw_if_serial_number_unavailable()
+        {
+            Mocker.GetMock<ISerialNumberProvider>()
+                  .Setup(s => s.GetSerialNumber(_settings))
+                  .Throws(new ApplicationException("Some unknown exception, HttpException or DownloadClientException"));
+
+            GivenSharedFolder();
+            GivenAllKindOfTasks();
+
+            Assert.Throws(Is.InstanceOf<Exception>(), () => Subject.GetItems());
+            ExceptionVerification.ExpectedErrors(0);
+        }
+
+        [Test]
+        public void Download_should_throw_and_not_add_task_if_cannot_get_serial_number()
+        {
+            var remoteEpisode = CreateRemoteMovie();
+
+            Mocker.GetMock<ISerialNumberProvider>()
+                  .Setup(s => s.GetSerialNumber(_settings))
+                  .Throws(new ApplicationException("Some unknown exception, HttpException or DownloadClientException"));
+
+            Assert.Throws(Is.InstanceOf<Exception>(), () => Subject.Download(remoteEpisode));
+
+            Mocker.GetMock<IDownloadStationProxy>()
+                  .Verify(v => v.AddTaskFromUrl(It.IsAny<string>(), null, _settings), Times.Never());
+        }
+
+        [Test]
+        public void GetItems_should_not_map_outputpath_for_queued_or_downloading_tasks()
+        {
+            GivenSerialNumber();
+            GivenSharedFolder();
+
+            GivenTasks(new List<DownloadStationTask>
+            {
+                _queued, _downloading
+            });
+
+            var items = Subject.GetItems();
+
+            items.Should().HaveCount(2);
+            items.Should().OnlyContain(v => v.OutputPath.IsEmpty);
+        }
+
+        [Test]
+        public void GetItems_should_map_outputpath_for_completed_or_failed_tasks()
+        {
+            GivenSerialNumber();
+            GivenSharedFolder();
+
+            GivenTasks(new List<DownloadStationTask>
+            {
+                _completed, _failed, _seeding
+            });
+
+            var items = Subject.GetItems();
+
+            items.Should().HaveCount(3);
+            items.Should().OnlyContain(v => !v.OutputPath.IsEmpty);
+        }
+
+        [TestCase(DownloadStationTaskStatus.Downloading, DownloadItemStatus.Downloading, true)]
+        [TestCase(DownloadStationTaskStatus.Finished, DownloadItemStatus.Completed, false)]
+        [TestCase(DownloadStationTaskStatus.Waiting, DownloadItemStatus.Queued, true)]
+        public void GetItems_should_return_readonly_expected(DownloadStationTaskStatus apiStatus, DownloadItemStatus expectedItemStatus, bool readOnlyExpected)
+        {
+            GivenSerialNumber();
+            GivenSharedFolder();
+
+            _queued.Status = apiStatus;
+
+            GivenTasks(new List<DownloadStationTask>() { _queued });
+
+            var items = Subject.GetItems();
+
+            items.Should().HaveCount(1);
+            items.First().IsReadOnly.Should().Be(readOnlyExpected);
+        }
+
+        [TestCase(DownloadStationTaskStatus.Downloading, DownloadItemStatus.Downloading)]
+        [TestCase(DownloadStationTaskStatus.Error, DownloadItemStatus.Failed)]
+        [TestCase(DownloadStationTaskStatus.Extracting, DownloadItemStatus.Downloading)]
+        [TestCase(DownloadStationTaskStatus.Finished, DownloadItemStatus.Completed)]
+        [TestCase(DownloadStationTaskStatus.Finishing, DownloadItemStatus.Downloading)]
+        [TestCase(DownloadStationTaskStatus.HashChecking, DownloadItemStatus.Downloading)]
+        [TestCase(DownloadStationTaskStatus.Paused, DownloadItemStatus.Paused)]
+        [TestCase(DownloadStationTaskStatus.Waiting, DownloadItemStatus.Queued)]
+        public void GetItems_should_return_item_as_downloadItemStatus(DownloadStationTaskStatus apiStatus, DownloadItemStatus expectedItemStatus)
+        {
+            GivenSerialNumber();
+            GivenSharedFolder();
+
+            _queued.Status = apiStatus;
+
+            GivenTasks(new List<DownloadStationTask>() { _queued });
+
+            var items = Subject.GetItems();
+            items.Should().HaveCount(1);
+
+            items.First().Status.Should().Be(expectedItemStatus);
+        }
+    }
+}

src/NzbDrone.Core.Test/Download/DownloadClientTests/HadoukenTests/HadoukenFixture.cs

@@ -197,7 +197,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.HadoukenTests
         {
             GivenSuccessfulDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             var id = Subject.Download(remoteEpisode);
 
@@ -276,7 +276,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.HadoukenTests
         [Test]
         public void Download_from_magnet_link_should_return_hash_uppercase()
         {
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             remoteEpisode.Release.DownloadUrl = "magnet:?xt=urn:btih:a45129e59d8750f9da982f53552b1e4f0457ee9f";
 
@@ -291,7 +291,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.HadoukenTests
         [Test]
         public void Download_from_torrent_file_should_return_hash_uppercase()
         {
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             Mocker.GetMock<IHadoukenProxy>()
                .Setup(v => v.AddTorrentFile(It.IsAny<HadoukenSettings>(), It.IsAny<byte[]>()))

src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbVortexTests/NzbVortexFixture.cs

@@ -189,7 +189,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbVortexTests
         {
             GivenSuccessfulDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             var id = Subject.Download(remoteEpisode);
 
@@ -201,7 +201,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbVortexTests
         {
             GivenFailedDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             Assert.Throws<DownloadClientException>(() => Subject.Download(remoteEpisode));
         }

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

@@ -303,7 +303,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetTests
         {
             GivenSuccessfulDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             var id = Subject.Download(remoteEpisode);
 
@@ -315,7 +315,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetTests
         {
             GivenFailedDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             Assert.Throws<DownloadClientException>(() => Subject.Download(remoteEpisode));
         }

src/NzbDrone.Core.Test/Download/DownloadClientTests/QBittorrentTests/QBittorrentFixture.cs

@@ -245,7 +245,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
         {
             GivenSuccessfulDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             var id = Subject.Download(remoteEpisode);
 
@@ -257,7 +257,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
         {
             GivenSuccessfulDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
             remoteEpisode.Release.DownloadUrl = magnetUrl;
 
             var id = Subject.Download(remoteEpisode);
@@ -290,7 +290,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
             GivenRedirectToMagnet();
             GivenSuccessfulDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             var id = Subject.Download(remoteEpisode);
 
@@ -303,7 +303,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
             GivenRedirectToTorrent();
             GivenSuccessfulDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             var id = Subject.Download(remoteEpisode);
 

src/NzbDrone.Core.Test/Download/DownloadClientTests/RTorrentTests/RTorrentFixture.cs

@@ -116,7 +116,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.RTorrentTests
         {
             GivenSuccessfulDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             var id = Subject.Download(remoteEpisode);
 

src/NzbDrone.Core.Test/Download/DownloadClientTests/SabnzbdTests/SabnzbdFixture.cs

@@ -260,7 +260,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
         {
             GivenSuccessfulDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
             remoteEpisode.Release.Title = title;
 
             var id = Subject.Download(remoteEpisode);
@@ -274,7 +274,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
         {
             GivenSuccessfulDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             var id = Subject.Download(remoteEpisode);
 
@@ -315,12 +315,12 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
                     .Setup(s => s.DownloadNzb(It.IsAny<byte[]>(), It.IsAny<string>(), It.IsAny<string>(), (int)SabnzbdPriority.High, It.IsAny<SabnzbdSettings>()))
                     .Returns(new SabnzbdAddResponse());
 
-            var remoteEpisode = CreateRemoteEpisode();
-            remoteEpisode.Episodes = Builder<Episode>.CreateListOfSize(1)
-                                                      .All()
-                                                      .With(e => e.AirDate = DateTime.Today.ToString(Episode.AIR_DATE_FORMAT))
-                                                      .Build()
-                                                      .ToList();
+            var remoteEpisode = CreateRemoteMovie();
+            //remoteEpisode.Episodes = Builder<Episode>.CreateListOfSize(1)
+            //                                          .All()
+            //                                          .With(e => e.AirDate = DateTime.Today.ToString(Episode.AIR_DATE_FORMAT))
+            //                                          .Build()
+            //                                          .ToList();
 
             Subject.Download(remoteEpisode);
 

src/NzbDrone.Core.Test/Download/DownloadClientTests/TransmissionTests/TransmissionFixture.cs

@@ -55,7 +55,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
         {
             GivenSuccessfulDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             var id = Subject.Download(remoteEpisode);
 
@@ -68,7 +68,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
             GivenTvDirectory();
             GivenSuccessfulDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             var id = Subject.Download(remoteEpisode);
 
@@ -84,7 +84,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
             GivenTvCategory();
             GivenSuccessfulDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             var id = Subject.Download(remoteEpisode);
 
@@ -102,7 +102,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
 
             _transmissionConfigItems["download-dir"] += "/";
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             var id = Subject.Download(remoteEpisode);
 
@@ -117,7 +117,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
         {
             GivenSuccessfulDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             var id = Subject.Download(remoteEpisode);
 
@@ -132,7 +132,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
         {
             GivenSuccessfulDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
             remoteEpisode.Release.DownloadUrl = magnetUrl;
 
             var id = Subject.Download(remoteEpisode);

src/NzbDrone.Core.Test/Download/DownloadClientTests/UTorrentTests/UTorrentFixture.cs

@@ -229,7 +229,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.UTorrentTests
         {
             GivenSuccessfulDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             var id = Subject.Download(remoteEpisode);
 
@@ -253,7 +253,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.UTorrentTests
         {
             GivenSuccessfulDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
             remoteEpisode.Release.DownloadUrl = magnetUrl;
 
             var id = Subject.Download(remoteEpisode);
@@ -351,7 +351,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.UTorrentTests
             GivenRedirectToMagnet();
             GivenSuccessfulDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             var id = Subject.Download(remoteEpisode);
 
@@ -364,7 +364,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.UTorrentTests
             GivenRedirectToTorrent();
             GivenSuccessfulDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             var id = Subject.Download(remoteEpisode);
 

src/NzbDrone.Core.Test/Download/DownloadClientTests/VuzeTests/VuzeFixture.cs

@@ -57,7 +57,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.VuzeTests
         {
             GivenSuccessfulDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             var id = Subject.Download(remoteEpisode);
 
@@ -70,7 +70,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.VuzeTests
             GivenTvDirectory();
             GivenSuccessfulDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             var id = Subject.Download(remoteEpisode);
 
@@ -86,7 +86,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.VuzeTests
             GivenTvCategory();
             GivenSuccessfulDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             var id = Subject.Download(remoteEpisode);
 
@@ -104,7 +104,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.VuzeTests
 
             _transmissionConfigItems["download-dir"] += "/";
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             var id = Subject.Download(remoteEpisode);
 
@@ -119,7 +119,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.VuzeTests
         {
             GivenSuccessfulDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             var id = Subject.Download(remoteEpisode);
 
@@ -134,7 +134,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.VuzeTests
         {
             GivenSuccessfulDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
             remoteEpisode.Release.DownloadUrl = magnetUrl;
 
             var id = Subject.Download(remoteEpisode);

src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemoveGrabbedFixture.cs

@@ -20,22 +20,19 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
     public class RemoveGrabbedFixture : CoreTest<PendingReleaseService>
     {
         private DownloadDecision _temporarilyRejected;
-        private Series _series;
+        private Movie _series;
         private Episode _episode;
         private Profile _profile;
         private ReleaseInfo _release;
-        private ParsedEpisodeInfo _parsedEpisodeInfo;
-        private RemoteEpisode _remoteEpisode;
+        private ParsedMovieInfo _parsedEpisodeInfo;
+        private RemoteMovie _remoteEpisode;
 
         [SetUp]
         public void Setup()
         {
-            _series = Builder<Series>.CreateNew()
+            _series = Builder<Movie>.CreateNew()
                                      .Build();
 
-            _episode = Builder<Episode>.CreateNew()
-                                       .Build();
-
             _profile = new Profile
                        {
                            Name = "Test",
@@ -52,13 +49,13 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
 
             _release = Builder<ReleaseInfo>.CreateNew().Build();
 
-            _parsedEpisodeInfo = Builder<ParsedEpisodeInfo>.CreateNew().Build();
+            _parsedEpisodeInfo = Builder<ParsedMovieInfo>.CreateNew().Build();
             _parsedEpisodeInfo.Quality = new QualityModel(Quality.HDTV720p);
 
-            _remoteEpisode = new RemoteEpisode();
-            _remoteEpisode.Episodes = new List<Episode>{ _episode };
-            _remoteEpisode.Series = _series;
-            _remoteEpisode.ParsedEpisodeInfo = _parsedEpisodeInfo;
+            _remoteEpisode = new RemoteMovie();
+            //_remoteEpisode.Episodes = new List<Episode>{ _episode };
+            _remoteEpisode.Movie = _series;
+            _remoteEpisode.ParsedMovieInfo = _parsedEpisodeInfo;
             _remoteEpisode.Release = _release;
             
             _temporarilyRejected = new DownloadDecision(_remoteEpisode, new Rejection("Temp Rejected", RejectionType.Temporary));
@@ -67,13 +64,13 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
                   .Setup(s => s.All())
                   .Returns(new List<PendingRelease>());
 
-            Mocker.GetMock<ISeriesService>()
-                  .Setup(s => s.GetSeries(It.IsAny<int>()))
+            Mocker.GetMock<IMovieService>()
+                  .Setup(s => s.GetMovie(It.IsAny<int>()))
                   .Returns(_series);
 
-            Mocker.GetMock<IParsingService>()
-                  .Setup(s => s.GetEpisodes(It.IsAny<ParsedEpisodeInfo>(), _series, true, null))
-                  .Returns(new List<Episode> {_episode});
+            //Mocker.GetMock<IParsingService>()
+            //      .Setup(s => s.GetMovie(It.IsAny<ParsedMovieInfo>(), _series.Title))
+            //      .Returns(_episode);
 
             Mocker.GetMock<IPrioritizeDownloadDecision>()
                   .Setup(s => s.PrioritizeDecisions(It.IsAny<List<DownloadDecision>>()))
@@ -89,7 +86,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
                                                    .All()
                                                    .With(h => h.SeriesId = _series.Id)
                                                    .With(h => h.Release = _release.JsonClone())
-                                                   .With(h => h.ParsedEpisodeInfo = parsedEpisodeInfo)
+                                                   .With(h => h.ParsedMovieInfo = _parsedEpisodeInfo)
                                                    .Build();
 
             Mocker.GetMock<IPendingReleaseRepository>()
@@ -102,7 +99,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
         {
             GivenHeldRelease(_parsedEpisodeInfo.Quality);
 
-            Subject.Handle(new EpisodeGrabbedEvent(_remoteEpisode));
+            Subject.Handle(new MovieGrabbedEvent(_remoteEpisode));
 
             VerifyDelete();
         }
@@ -112,7 +109,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
         {
             GivenHeldRelease(new QualityModel(Quality.SDTV));
 
-            Subject.Handle(new EpisodeGrabbedEvent(_remoteEpisode));
+            Subject.Handle(new MovieGrabbedEvent(_remoteEpisode));
 
             VerifyDelete();
         }
@@ -122,7 +119,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
         {
             GivenHeldRelease(new QualityModel(Quality.Bluray720p));
 
-            Subject.Handle(new EpisodeGrabbedEvent(_remoteEpisode));
+            Subject.Handle(new MovieGrabbedEvent(_remoteEpisode));
 
             VerifyNoDelete();
         }

src/NzbDrone.Core.Test/Files/Indexers/TorrentRss/AlphaRatio.xml

@@ -0,0 +1,281 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <channel>
+    <xhtml:meta xmlns:xhtml="http://www.w3.org/1999/xhtml" name="robots" content="noindex" />
+    <meta xmlns="http://pipes.yahoo.com" name="pipes" content="noprocess" />
+    <title>TV :: AlphaRatio</title>
+    <link>https://alpharatio.cc/</link>
+    <description>Personal RSS feed: TV</description>
+    <language>en-us</language>
+    <lastBuildDate>Tue, 29 Nov 2016 11:01:28 +0000</lastBuildDate>
+    <docs>http://blogs.law.harvard.edu/tech/rss</docs>
+    <generator>Gazelle Feed Class</generator>
+
+    <item>
+      <title><![CDATA[TvHD 465989 465960 Good.Behavior.S01E03.PROPER.720p.HDTV.x264-KILLERS]]></title>
+      <description>
+        <![CDATA[MB                                                                <br />
+                                                      @@@@:      :                                                      <br />
+                                             :7 :::.7:@.:u7:.X5LF                                                       <br />
+                                          .LFq2    .B@B@B@B@B@B@B@                                                      <br />
+                                .. i@r            rB@B@B@B@B@B@B@@@:                                                    <br />
+                        :  :B@B@B@B@:             X@@@@@B@B@B@B@B@B@B@J                    .u@B.                        <br />
+                    :.YkuB@B@B@BM.                  @B@B@B@B@B@@@B@B@B@r                2B@B@B@B@i                      <br />
+                 @@@B@r@@@B@B:                      B@B@B@B@B@@@B@B@B@B@              i@B@B@B@BrO@@@@@                  <br />
+               @@@@B@B@BB,                          r:@B@B@@@B@@@B@q@@@BM @L:B.B,    @@B@B@B@BO@@@@B@B@B                <br />
+           jB@B@B@B@N.                              7   B@@@@@B@B@O  8B@.    @F     B@B@B@@@O@B@B@B@@@@@B.              <br />
+         i@B@B@B@:                                  7   @B@B@B@B@      B:    B:    i@B@B@B@BNB8B7     .B@@              <br />
+         @B@B@.                                     1G   @B@B@B@         @   ,     @B@:i @u  @:       0EB@              <br />
+         ;ir                                        ,      U@B@B         .@        B@B        L        B@B              <br />
+                                                    7       B@B@              q@Bv:@BP                 @B@              <br />
+         i@Bu                                       @     ,S@ @@             B@@@B@B@. BkU@B@    5Ui  @Y@B              <br />
+        @@B@v                                       B    :@iB B@@@B@B@M@     @B@@@B@BB @@7i iU  5i2vB@k B@              <br />
+      @B@B@B7                                       i       @ @B@B@B@B@B@B5  i@B@@@B@           r       @               <br />
+     @B@B@B@.                                               @ B@B@B@B@B@B@B@.  MB  @Bu      .   U      @Bi              <br />
+   k@P   @@@OBi                                            .@ @B@B@B@B@B@B@B.   @MBB@@      @F  @     7B@B              <br />
+   @B  @B@@@B@                                             0B@B@B@B@B@B@B@B@  B@B@B@B@F     B@B@B.    B@B               <br />
+   B  @B@B@B B:                                            B@B@B@B@@@B@@@BM  B@B@B@B@B@:  @B@;:B@@@: F@B                <br />
+   @. B@@@B@ @Bu i.       MX                       J          B@B@B@   @B.   @B@B@B@@ B@B@F Si k@@  B@BN                <br />
+  @@  @B@B@B@B@B B        @B@BOr:                  .i0F7@B:  B@B@      E@     @B@B@r@  B@B@B.   @B@B@B5                 <br />
+  B@B@B@@@B@B@B:           @B@B@B@Z:              B@B@B@B@B@B@@@B,     L@      @B@      B@B@B@B@B@B@B,                  <br />
+ :@B@B@B@B@B@B@:       Y@B@@@@@B@B@B@:                      7B@@@0     :@      L@        ,@B@B@B@B@B@B@B@.              <br />
+ JB@B@B@B@B@B@B@    U@B@@J,  @U.@@B@B@B                         B@F    i@      PB          @B@B@B@B@BG.@B@B@B,          <br />
+ r@B@B@B@B@B@B@B    ;             @B@B@                  :.     @  @J  r@      G@        @@:  .Z@@7    B@@@@@B@B@B@F    <br />
+ ,B@B@B@B@B@B@B@B5                 @B@@@            j@B5E@BXB@BvO      rB      OB       B@    B@@@r   B@B@B@B@B@B@B@B.  <br />
+  @B@B@B@B@B@@@B@i @@  .uO0 :v. @   @B@B            @@@   L:   ,@      .@      Z@ iB   B@B  @B@B@@@BNB@ :2@B@B@B@@@B@B  <br />
+ :@@B@B@B@B@@@B@B..@@@B@B@@.  :YY   B@@@:                       B,      B      .: u@  .@B@B     r@ OB       i@B@B@@@B@B <br />
+UB@B@B@B@B@@@B@B@B@B@B LJ,          @B@B.                       @.      @          Y  @BP   .rUB@B@B@B@Z7,   B@B@B@B@B@ <br />
+,@B@@@B@B@B@B@B@@@  i17.           @B@B@v                       O,      B            1B@B@B@B@@@B@@@B@B@B@B@B@B@B@BiB@Bv<br />
+:B@B@B@B@B@B@B@2@B                 B@B@B@                       k.     .@           M@@BOB@B@B@B@B@B@B@B@B@B@B@B@B@P @@B<br />
+i@B@B@@@B@B@B@B M@B           .7   @B@B@r                       B.     7B      @   YB@B@B@B@B@B@B@B@B@B@B@B@B@B@B@B@B@@@<br />
+u@@B@B@B@@@B@B@  B@B@       2U8.  5B@@E                         @,     r@      M   B@B@B@B@B@B@B@B@B@@@B@B@B@B@@@B@@@@@B<br />
+q@B@B@B@@@B@B@B.   @@@i2 @JX      :@B@                          BY     rB      @   G@@B@B@B@B@B@B@B@B@B@B@B@B@B@B@B@B@B@<br />
+BB@B@B@B@B@B@Bi      .             B@@:                         @B      @             @B@B@B@B@B@B@B@B@B@B@B@@@@@B@B@B@j<br />
+O@B@B@B@B@B@B@@@                  u@B@@                         Bu      B             @@B@B@B@BB8                0B@B@B <br />
+SB@B@B@B@B@B@B@B@B               @@B@@@B                                @             .BS                      r  @@@B@ <br />
+.@B@B@B@B@B@B@B@B@              B@B@@@B@Br     XB@Br                   7B          u        .vB       B:        B@B@B@B <br />
+ @@@@B@B@B@B@B@B@B@B@B         .@B@B@B@B@@M    i..@.                    i           i  i              P   @,jB   @@B    <br />
+ @B@B@B@B@B@B@B@B@B@B@B@i      @N@@@B@@@B@B@B                                          @                          B@E   <br />
+  @B@B@B@@@B@B@B@B@B@B@B@B    @ :  @@B@B@@@Mi                                          B              .           @@    <br />
+  F@B@@@B@B@B@B@B@@@B@B@B@,@  M    @.:v  X                                             i              B          :BM    <br />
+   i@B@B@B@B@@@B@B@B@@@@@B@B  L                                                      ,r  ,      ;    B@.        @B@,    <br />
+     ,M@B@B  @B@B@B@B@@@B@B@B@              rL                                        B   j     :jr@B@@r       @B@B@B   <br />
+              @B@B@B@B@B@B@B@B              .:                                         . .@ :       ,        @@@@B@@    <br />
+              ,@B@B@B@B@B@B@B   .@X r5BMB:     r ,,                                    7  B B@B            @B@B@B@@     <br />
+              L@@B@B@B@ 8B@B@    BM:@B@B@B@B@B@@8X80Mu:           FB@B@B@B@B@@@B@B@@@B@B  q uO@GMFLv@B@B@B@B@  B@Bu     <br />
+               @B@B@B@B k@  MYM@@@B@B@F ,.           :5@B@B7  Y@B@@@@@B@@@B@@@@@B@@@@@B@  B      :    B@B@B@  @@B@BL    <br />
+               B@@@@@@@ @@7   @EvB@BF                      B@B@B@@@@@B@BMB@B@B@B@@@B@B@B@ 7  .   .@u,    i@  B@B@77B@   <br />
+                B@B@B@@@O@     : 7.,                      :@B@@@B@B@B@,   .LB@@@B@B@B@B@B@B@ @    r@:  @::M @@B@B@M@B@  <br />
+            :i  @B@B@@@Bi5      ::                       v@B@@@B@B@B           B@@@B@@@B@@@B@@         B@@@B@B@B@B@B@B@i<br />
+           :    B@B@B@B@B@                               @B@B@B@@@B            LB@B@@@B@B@B@B@B@@5     @B@B@B@B@B@@@B@  <br />
+            .k@B@B@B@B@B@u.                              B@B@B@B@B2             @B@B@B@B@B@@@B@B@@@B@@@B@B@B@B@B@B@     <br />
+       :Lur:F@@@B@B@B@B@@@B                             B@B@B@B@B@               @@@B@B@B@B@B@@@B@B@B@B@B@B@B@B@B@J     <br />
+   .vBMi     :,,rB@B@B@B@BO                             @@@B@B@@@5              :i@@@B@B@B@@@B@B@B@B@@@B@@@B@B@B@@:     <br />
+  1r             @B@B@B@B@B@                           LB@B@B@B@Bq          N@Bi rB@B@B@B@B@B@B@@@B@B@B@B@B@B@@@B@      <br />
+               ,L. @@B@B@B@G Li                        .@B@B@B@B@B@@@B@.   B@B@viv@B@B@B@B@B@B@B@B@B@B@B@@@B@B@B@       <br />
+              r,   @@@@@B@@@B@: :                       B@B@B@B@B@B@@@B@     :B@ @S@B@B@B@B@B@B@@@B@B@B@@@B@B@B@        <br />
+                 .j iB@B@B@B@B@B@Bi:;  G @@BrLk .  i   M@B@B@@@B@@@                 GB@B@B@B@B@B@B@B@B@@@B@B@B@:        <br />
+               ,:   :   BUB@B@B@B@@@@@N0r@B@B B@B@  : :@B@B@B@@@B                    @B@B@B@B@B@B@B@B@B@B@B@. B         <br />
+              @i  ui   M .. @B@: B.@@B@BB:O @. B  @    i B@@@@@B@                   @@@B@B@B@@@B @@B@B@B@@@B  @ @       <br />
+            E@   @7     ;   .U  i   N@B@  B .@     @     @B@B@B@B@     v  .GB      @B@B@B@B@@@M: @B@B@B@B@BZ @  Y       <br />
+                       Bu  .@   M    7v7            @   :B@B@@@B@BU   @B@B@B@B@   BB@B@B@B@B@Bi  B@@@B@B@B@v            <br />
+                      5@   @7        L S            .q   .N@B@@@B@BBB@B@B@B@B@B@kqqSB@B@B@B@B@   @B@B@B@B@@r            <br />
+                      q    :         B Z             .:      2@B@B@B@..L. .    M@B@B@:@BiP  @B   B@@@B@B@B@             <br />
+                                     ;                        B@@@B@B. @@@B@: 2@B@B@          i  @B@@@B@B@B             <br />
+                                                               7@B@k@B@B@B@B@B@B@B@              B@B@@@@@Bi             <br />
+                                                                     jB@B@B@@@B@@O               @B@B@B@B@              <br />
+                                                                       B@B@B@B@k                 B@@@B@@@B              <br />
+                                                                         rPS:                    @B@ @B@B@              <br />
+                            .     ::   ,ui:,:   vL:,::                                           B@B B@B@B              <br />
+         .B@B@B@B@i  @B@@@B@5    @B@B   :@@@@@   OB@@@                                           @B@ @B@@@              <br />
+            @B@B@   FB@B@      7@B@B@    .@@@B    @B@B     iMB@B@S   .GB@B@.,B@@L   vG0Sqv;:@    L@@ ..E@B              <br />
+            B@@@B@@@B@B@B       .@B@@    :B@B@    B@B@   @B@B@..B@B@   @B@@@2.B@B@ @B@BBM        S@1   S@.              <br />
+            @B@B@B.  ,@B@B8      B@B@    .@B@@    @B@@   B@B@8:iii;Mv  i@B@M  .rr      B@B@B@B   k@r   EJ               <br />
+          S@B@B@B@   EB@B@B@B.  B@B@B@, r@B@B@1  @B@B@B: YB@@@r.      7@B@B@2      @@@@@@MB@B@   ,Bi                    <br />
+         :r,     .i ,:     .i: :i    ,:.i.    i,::    ::    :J@B@X7   i.    i:     r    :,:.     ,@ a                   <br />
+                                                                                                 .B n                   <br />
+                                       [ P R E S E N T S ]                                        @ t                   <br />
+                                                                                                  @ i                   <br />
+                                                                                                  0 /                   <br />
+                                                                                                  B 4                   <br />
+                                                                                                  @ 0                   <br />
+                                                                                                  . 4                   <br />
+                                                                                                                        <br />
+                    Good.Behavior.S01E03.PROPER.720p.HDTV.x264-KILLERS<br />
+<br />
+<br />
+                    Day: 2016-11-29<br />
+                    Resolution: 1280x720<br />
+                    Size: 1.02 GiB<br />
+                    FrameRate: 23.976<br />
+                    Length: 00:49:02.144<br />
+                    Bitrate: 2 535 Kbps<br />
+                    Note: FLEET is missing the last seg<br />
+<br />
+<br />
+          n***** We all miss you. Come back soon.]]>
+      </description>
+      <pubDate>Tue, 29 Nov 2016 10:55:58 +0000</pubDate>
+      <link>https://alpharatio.cc/torrents.php?action=download&amp;authkey=private_auth_key&amp;torrent_pass=private_torrent_pass&amp;id=465960</link>
+      <guid>https://alpharatio.cc/torrents.php?action=download&amp;authkey=private_auth_key&amp;torrent_pass=private_torrent_pass&amp;id=465960</guid>
+      <comments>https://alpharatio.cc/torrents.php?id=465989</comments>
+      <dc:creator>Anonymous</dc:creator>
+    </item>
+    <item>
+      <title><![CDATA[TvHD 465860 465831 WWE.RAW.2016.11.28.720p.HDTV.x264-KYR]]></title>
+      <description>
+        <![CDATA[&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;<br />
+&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&szlig;&deg;&deg; &Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;  &Uuml;&deg; &szlig;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;<br />
+&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&szlig;&szlig;&deg;&deg;&Uuml;&deg;&Ucirc;&Ucirc;&sup2;&szlig;&Uuml;&Ucirc;&Ucirc;&Uuml;&Uuml;&sup2; &Uuml;&szlig;&sup2; &THORN;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;<br />
+&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&szlig; &Uuml;&szlig;&deg;&sup2;&deg;&sup2;&Ucirc;&Ucirc;&Yacute;&Ucirc;&Ucirc;&Ucirc;&plusmn;&sup2;&sup2; &Uuml;&Yacute; &THORN; &THORN;&THORN;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;<br />
+&Ucirc;&Ucirc;&Ucirc;&Ucirc;&deg; &Ucirc;&Ucirc;&Yacute;&sup2;&THORN;&sup2;&Ucirc;&Ucirc;&Ucirc;&THORN;&Ucirc;&Ucirc;&plusmn;&sup2;&Yacute;&Yacute;&THORN;&Ucirc;   &szlig;  &Uuml;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;<br />
+&sup2;&Ucirc;&Ucirc;&deg;&Ucirc;&Yacute;&Ucirc;&Ucirc;&Ucirc;&Yacute;&plusmn;&Ucirc;&Ucirc;&Ucirc;&sup2;&Ucirc;&Ucirc;&deg;&Ucirc;&Ucirc;&THORN;&sup2;&THORN; &Yacute;      &THORN;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&szlig;&szlig;            &szlig;&szlig;&szlig;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;<br />
+&Ucirc;&Ucirc;&deg;&Ucirc;&Ucirc;&THORN;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&sup2;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&deg;&Ucirc;&sup2;&Ucirc;&THORN;&sup2; &Yacute;&sup2;       &Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&szlig;                    &szlig;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;<br />
+&Ucirc;&deg;&deg;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Yacute;&Yacute;&Ucirc;&Ucirc;&szlig;&Yacute;&sup2;&deg;&THORN;&THORN;       &Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&sup2;                        &sup2;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;<br />
+&deg;&Ucirc;&Yacute;&Ucirc;&Ucirc;&THORN;&Ucirc;&Ucirc;&Ucirc;&sup2;&Ucirc;&Ucirc;&Ucirc;&THORN;&Ucirc;&THORN;&THORN;&THORN;&Uuml;&Ucirc;&Ucirc;&deg;&sup2;&Yacute;&THORN;       &THORN;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&sup2;                          &sup2;&Ucirc;&Ucirc;&Ucirc;&Ucirc;<br />
+&Ucirc;&sup2;&Yacute;&Ucirc;&Ucirc;&Yacute;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&THORN;&deg;&Ucirc;&sup2;&THORN;&Ucirc;&Ucirc;&Ucirc; &THORN; &sup2;        &Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;                            &sup2;&Ucirc;&Ucirc;&Ucirc;<br />
+&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Yacute;&Yacute;&Ucirc;&Ucirc;&Yacute;&Ucirc;&Yacute;&Ucirc; &sup2;  &Yacute;       &Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Yacute;                             &Ucirc;&Ucirc;&Ucirc;<br />
+&Ucirc;&sup2;&Ucirc;&Ucirc;&Ucirc;&Yacute;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Yacute;&Ucirc;&Yacute;&Ucirc;&THORN;&Ucirc;&Ucirc;&THORN;&sup2;&THORN; &Yacute;&Yacute;  &Uuml;&Uuml;&Uuml;&Uuml;    &Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;   &Uuml;&Uuml; &Uuml;                       &THORN;&Ucirc;&Ucirc;<br />
+&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Yacute;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&THORN;&Ucirc;&THORN;&Ucirc;&Ucirc;&sup2;&THORN;&deg;&THORN; &sup2;&Yacute; &szlig;&szlig;&szlig;&Ucirc;&Ucirc;&Ucirc;&sup2;  &THORN;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&sup2;  &Ucirc;&Ucirc;&sup2;&sup2;&Ucirc;&Ucirc;&sup2;                     &THORN;&Ucirc;&Ucirc;<br />
+&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&THORN;&Ucirc;&Ucirc;&Ucirc;&Yacute;&Ucirc;&THORN;&Ucirc;&Yacute;&Ucirc;&Ucirc;&plusmn;&THORN; &sup2; &Yacute;&THORN; &szlig;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&sup2;&THORN; &Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;  &Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&sup2;&plusmn;             &Uuml;&Uuml;    &szlig;&sup2;&Ucirc;&Ucirc;<br />
+&sup2;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&sup2;&THORN;&Yacute;&Ucirc;&Yacute;&Ucirc;&Ucirc;&deg;&Ucirc; &sup2; &THORN; &sup2; &Uuml;&szlig;&Ucirc;&Ucirc;&Ucirc;&szlig; &THORN;&THORN;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Yacute;&Yacute;  &Ucirc;&Ucirc;&szlig;                 &Uuml;&Uuml;&Uuml;&szlig;&sup2;    &Ucirc;&Ucirc;<br />
+&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Yacute;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Yacute;&Ucirc;&THORN;&THORN;&Ucirc;&Uuml;&sup2; &THORN;  &Yacute; &Yacute; &szlig;&szlig;&szlig;    &szlig;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Yacute;&szlig;                     &sup2;&szlig;  &sup2;&THORN;&Yacute;   &THORN;&Ucirc;<br />
+&sup2;&Ucirc;&Ucirc;&Ucirc;&Yacute;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&THORN;&Yacute;&Ucirc;&sup2;&THORN;&Ucirc;&Yacute;&Ucirc;&Yacute;  &Yacute; &Yacute; &THORN;         &szlig;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&szlig;                      &THORN;     &THORN;&Yacute;   &THORN;&Ucirc;<br />
+&plusmn;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&THORN;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&THORN;&THORN;&Ucirc;&Yacute;&Ucirc;&Ucirc;&Yacute;&THORN;&Ucirc;  &Yacute;&THORN;             &szlig;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;                        &Yacute;     &sup2;&Ucirc;&Uuml;  &Ucirc;&Ucirc;<br />
+&sup2;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&deg;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Yacute;&Ucirc;&Ucirc;&Ucirc;&THORN;&Ucirc;&Ucirc;&deg;&Ucirc; &szlig; &THORN;   &Yacute;   &Yacute;      &Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc; &Uuml;&Ucirc;&Ucirc;&Uuml; &Yacute;                    &Uuml;&szlig;     &szlig;&Ucirc;&Ucirc;<br />
+&Ucirc;&sup2;&Ucirc;&Ucirc;&Yacute;&Yacute;&Yacute;&Ucirc;&Ucirc;&Ucirc;&THORN;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&THORN;&sup2;&THORN;   &Yacute;       &sup2;&Uuml;&sup2;&Ucirc;&Ucirc; &Uuml;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&szlig;&Ucirc;&szlig;&szlig;&szlig;                 &Uuml;&Uuml;&Uuml;&sup2;&szlig;       &Ucirc;&Ucirc;<br />
+&Ucirc;&Yacute;&Ucirc;&Ucirc;&THORN;&Yacute;&deg;&Ucirc;&Ucirc;&Ucirc;&Yacute;&Ucirc;&Ucirc;&Yacute;&Ucirc;&Ucirc;&Yacute;&Ucirc;&sup2;&Yacute;      &Yacute;     &szlig;&szlig;&Uuml;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;                  &deg;  &szlig;&sup2;&szlig; &sup2;       &THORN;&Ucirc;<br />
+&Ucirc;&Ucirc;&deg;&Ucirc;&THORN;&Ucirc;&THORN;&THORN;&Ucirc;&Ucirc;&Ucirc;&THORN;&Ucirc;&Ucirc;&deg;&Ucirc;&Ucirc;&sup2;&THORN;&Ucirc;  &Yacute;   &Yacute;  &Uuml;&Uuml;  &THORN;&THORN;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Uuml;&Ucirc;&Uuml;&Uuml;              &plusmn;&deg;&deg;    &szlig;         &Ucirc;<br />
+&Ucirc;&Ucirc;&Ucirc;&THORN;&Yacute;&Ucirc;&THORN;&Yacute;&Ucirc;&Ucirc;&Ucirc;&Yacute;&Ucirc;&Ucirc;&Ucirc;&THORN;&Ucirc;&Ucirc; &sup2;&Yacute; &THORN;   &THORN;&deg;&sup2;&Ucirc;&Ucirc;&Ucirc;&Ucirc; &THORN;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&szlig;                &plusmn;&sup2;&plusmn;&plusmn;              &THORN;<br />
+&Ucirc;&Ucirc;&Ucirc;&THORN;&Ucirc;&Ucirc;&Yacute;&Ucirc;&THORN;&Ucirc;&Ucirc;&Yacute;&sup2;&THORN;&Ucirc;&Yacute;&Ucirc;&Ucirc;&Yacute;&THORN;&Yacute;  &Yacute;   &sup2;&szlig;  &Uuml;&szlig;&Yacute;&sup2;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Yacute;&Uuml;            &Uuml;&Uuml;&sup2;&Ucirc;&Ucirc;&Ucirc;&sup2;&sup2;              &THORN;<br />
+&Ucirc;&Ucirc;&Yacute;&THORN;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Yacute;&Ucirc;&deg;&Ucirc;&sup2;&THORN;&Yacute;&Ucirc;&deg;&Ucirc;&THORN; &Yacute;&Yacute;     &Uuml;&Uuml;&sup2;&THORN;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Yacute;&Ucirc;&sup2;&Uuml;        &Uuml;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&plusmn;<br />
+&Ucirc;&szlig;&Uuml;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Yacute;&Ucirc;&Ucirc;&THORN;&Ucirc;&Ucirc;&THORN;&Ucirc;&sup2;&THORN;&Yacute;&Yacute;&Ucirc; &Yacute;&Yacute;&Yacute; &deg; &Yacute;&szlig;&Ucirc;&sup2;&Yacute;&THORN;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&szlig;         &sup2;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;<br />
+&Ucirc;&szlig;&szlig;&szlig; &szlig;&Uuml;&sup2;&THORN;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&THORN;&Ucirc;&THORN;&Ucirc;&Ucirc;&deg;&Ucirc;&Ucirc;&Ucirc; &sup2;&sup2;&plusmn;&plusmn;&THORN;  &szlig;&Uuml;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;         &sup2;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;<br />
+        &Ucirc;&Ucirc;&THORN;&Ucirc;&Ucirc;&Ucirc;&Yacute;&Ucirc;&Ucirc;&Yacute;&Ucirc;&Ucirc;&Uuml;&szlig;&Ucirc;&THORN;&Ucirc;&Ucirc;&Ucirc;&sup2;&Yacute;&sup2;&Uuml;  &Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Yacute;&THORN;&Uuml;   &Uuml;&Uuml;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Yacute; &Uuml;             &THORN;<br />
+       &szlig;&sup2;&Ucirc;&THORN;&sup2;&Ucirc;&Ucirc;&Ucirc; &Ucirc;&Ucirc;&THORN;&Ucirc;&Ucirc;&Ucirc;&THORN;&THORN;&Ucirc;&Ucirc;&sup2;&Ucirc;&sup2;&THORN;&sup2;&Yacute; &THORN;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Yacute;&THORN;&Ucirc;&Ucirc;&sup2;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&szlig;             &THORN;&Ucirc;<br />
+         &Uuml;&sup2;&szlig;&Uuml;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Yacute;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&THORN;&sup2;&Ucirc;&Uuml;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Uuml;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&sup2;              &Yacute;&Ucirc;<br />
+        &szlig;  &Uuml;&Uuml;&szlig;&szlig;&Uuml;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&THORN;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&THORN;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Uuml;&Ucirc;&szlig;&szlig;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&sup2;              &THORN; &Ucirc;<br />
+          &szlig; &szlig;&Ucirc;&Ucirc;&Uuml;&Uuml;&Yacute;&Ucirc;&Ucirc;&Ucirc;&sup2;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Yacute;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Uuml;&Uuml;&szlig;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&sup2;&Uuml;&Uuml;&szlig;             &Yacute;&THORN;&sup2;<br />
+              &szlig;&Yacute;&Ucirc;&Ucirc;&THORN;&Ucirc;&Ucirc;&Ucirc;&THORN;&Ucirc;&Yacute;&Ucirc;&Ucirc;&Ucirc;&THORN;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&sup2;&Uuml;             &sup2; &Ucirc;&sup2;<br />
+                &Ucirc;&Ucirc;&THORN;&Ucirc;&Ucirc;&Ucirc;&Yacute;&Ucirc;&Ucirc;&THORN;&Ucirc;&Yacute;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&THORN;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&szlig;             &sup2; &THORN;&sup2;&deg;<br />
+               &szlig; &sup2;&THORN;&Ucirc;&Ucirc;&Ucirc;&THORN;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Yacute;&Ucirc;&Ucirc;&Ucirc;&sup2;              &sup2; &Uuml;&Ucirc;&sup2;<br />
+                  &THORN;&Ucirc;&Ucirc;&Yacute;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&THORN;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Yacute;&Ucirc;&Ucirc;               &sup2; &Uuml;&Ucirc;&sup2;&deg;<br />
+                 &Uuml;&szlig; &Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&szlig;&Yacute;&szlig;              &Uuml;&szlig; &Uuml;&Ucirc;&sup2;&deg;<br />
+                     &sup2;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&szlig;&Uuml;&sup2;              &Uuml;&szlig; &Uuml;&Ucirc;&Ucirc;&sup2;&deg;<br />
+                      &Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc; &Ucirc;&sup2;            &Uuml;&sup2;&szlig; &Uuml;&Ucirc;&Ucirc;&sup2;&plusmn;&deg;<br />
+                       &sup2;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc; &Ucirc;&sup2;         &Uuml;&Uuml;&szlig;&szlig;  &Uuml;&Ucirc;&Ucirc;&sup2;&plusmn;&deg;<br />
+                        &szlig;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc; &Ucirc;&sup2;      &Uuml;&Uuml;&szlig;&szlig;  &Uuml;&Uuml;&Ucirc;&Ucirc;&Ucirc;&sup2;&plusmn;&deg;<br />
+                          &sup2;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc; &Ucirc;&sup2;   &Uuml;&Uuml;&szlig;&szlig;  &Uuml;&Uuml;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&sup2;&sup2;&plusmn;&deg;<br />
+                           &szlig;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Yacute;&Ucirc;&sup2;&Uuml;&Uuml;&szlig;&szlig;  &Uuml;&Uuml;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&sup2;&sup2;&sup2;&plusmn;&deg;<br />
+                             &sup2;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&sup2;&szlig;&szlig;&szlig;&Uuml;&Uuml;&Uuml;&Uuml;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&sup2;&sup2;&sup2;&plusmn;&plusmn;&deg;<br />
+                              &sup2;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&szlig;&sup2;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&sup2;&sup2;&sup2;&plusmn;&plusmn;&deg;<br />
+                               &szlig;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;  &deg;&sup2;&szlig;&sup2;&sup2;&sup2;&sup2;&plusmn;&plusmn;&deg;<br />
+                                &szlig;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;   &deg;&sup2;<br />
+                                 &sup2;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Yacute;  &deg;&plusmn;&Yacute;<br />
+                                  &szlig;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Uuml;&deg;&deg;&plusmn;&sup2;<br />
+                                   &sup2;&Ucirc;&Ucirc;&Ucirc;&sup2;&szlig;&sup2;&sup2;&szlig;<br />
+                                    &Ucirc;&sup2;&Ucirc;<br />
+                                    &THORN;&sup2;&Yacute;<br />
+                                     &plusmn;<br />
+                                     &deg;<br />
+<br />
+                &Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;            &Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;           &Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;<br />
+              &Uuml;&szlig;&szlig;&Ucirc;&Ucirc;&szlig; &szlig;&Ucirc;&sup2;        &Uuml;&szlig;&szlig;&Ucirc;&Ucirc;&szlig; &szlig;&Ucirc;&sup2;     &Uuml;&Uuml;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&szlig; &szlig;&Ucirc;&sup2;<br />
+                  &Ucirc;&Ucirc;&Ucirc;&deg;&plusmn;&Ucirc;&Yacute;  &sup2;&Ucirc;&Uuml;      &Ucirc;&Ucirc;&Ucirc;&deg;&plusmn;&Ucirc;&Yacute; &Uuml;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&szlig;&szlig;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&deg;&plusmn;&Ucirc;&Yacute;<br />
+                  &THORN;&Ucirc;&Ucirc;&Ucirc;&sup2;&Ucirc;&Ucirc;   &Ucirc;&Ucirc;&Yacute;     &THORN;&Ucirc;&Ucirc;&Ucirc;&sup2;&Ucirc;&Yacute;&Ucirc;&Ucirc;&Ucirc;&szlig;     &THORN;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&sup2;&Ucirc;&Ucirc;<br />
+         &Uuml;&Uuml;       &Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&sup2;  &THORN;&Ucirc;&Ucirc;&Yacute;     &THORN;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc; &sup2;&Ucirc;&Yacute;       &Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&sup2;<br />
+        &THORN;&Ucirc;&Ucirc;      &sup2;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;   &Ucirc;&Ucirc;&Ucirc;      &THORN;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&sup2; &THORN;&Ucirc;&Ucirc;      &sup2;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;<br />
+         &Ucirc;&Ucirc;&Yacute;    &sup2;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&sup2;    &Ucirc;&Ucirc;&Ucirc;      &Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Yacute;  &Ucirc;&Ucirc;&Yacute;    &sup2;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&sup2;<br />
+         &THORN;&Ucirc;&sup2; &Uuml;&Uuml;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Uuml;&Uuml;&Uuml;   &THORN;&Ucirc;&Ucirc;&Yacute;    &sup2;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;   &THORN;&Ucirc;&sup2; &Uuml;&Uuml;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Uuml;&Uuml;&Uuml;   &szlig;<br />
+          &Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&szlig;&szlig;&Ucirc;&Uuml; &sup2;&Ucirc;&Ucirc;&Uuml;&Uuml;&Uuml;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Yacute;    &Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&szlig;&szlig;&Ucirc;&Uuml;<br />
+          &THORN;&Ucirc;&Ucirc;&Ucirc;&szlig;&szlig;    &szlig;&Ucirc;&Ucirc;&Ucirc;&deg;&THORN;&Ucirc;  &szlig;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&sup2;     &THORN;&Ucirc;&Ucirc;&Ucirc;&szlig;&szlig;    &szlig;&Ucirc;&Ucirc;&Ucirc;&deg;&THORN;&Ucirc;<br />
+           &sup2;&Ucirc;&sup2;       &Ucirc;&Ucirc;&Ucirc;&Uuml;&Ucirc;&Yacute;       &Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Yacute;      &sup2;&Ucirc;&Ucirc;       &Ucirc;&Ucirc;&Ucirc;&Uuml;&Ucirc;&Yacute;<br />
+           &THORN;&Ucirc;&Ucirc;&Yacute;     &Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&sup2;       &THORN;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;       &THORN;&Ucirc;&Ucirc;&Yacute;     &Ucirc;&Ucirc;&Ucirc;&Ucirc;&Ucirc;&sup2;<br />
+            &Ucirc;&Ucirc;&Ucirc;    &Ucirc;&szlig;&Ucirc;&Ucirc;&Ucirc;&Ucirc;        &Ucirc;&szlig;&Ucirc;&Ucirc;&Ucirc;&Yacute;        &Ucirc;&Ucirc;&Ucirc;    &Ucirc;&szlig;&Ucirc;&Ucirc;&Ucirc;&Ucirc;<br />
+             &szlig;    &Ucirc;&deg;&THORN;&Ucirc;&Ucirc;&Ucirc;&Yacute;       &Ucirc;&deg;&THORN;&Ucirc;&Ucirc;&Ucirc;          &szlig;    &Ucirc;&deg;&THORN;&Ucirc;&Ucirc;&Ucirc;&Yacute;<br />
+                 &Ucirc;&plusmn;&deg;&Ucirc;&Ucirc;&Ucirc;&sup2;       &Ucirc;&plusmn;&deg;&Ucirc;&Ucirc;&Ucirc;&sup2;              &Ucirc;&plusmn;&deg;&Ucirc;&Ucirc;&Ucirc;&sup2;<br />
+                &THORN;&plusmn;&plusmn;&plusmn;&deg;&Ucirc;&Ucirc;       &THORN;&plusmn;&plusmn;&plusmn;&deg;&Ucirc;&Ucirc;              &THORN;&plusmn;&plusmn;&plusmn;&deg;&Ucirc;&Ucirc;    presents..<br />
+                &THORN;&sup2;&plusmn;&plusmn;&plusmn;&plusmn;&Yacute;       &THORN;&sup2;&plusmn;&plusmn;&plusmn;&plusmn;&Yacute;              &THORN;&sup2;&plusmn;&plusmn;&plusmn;&plusmn;&Yacute;<br />
+                 &Ucirc;&sup2;&sup2;&sup2;&Ucirc;&Uuml;     &Uuml;&sup2; &Ucirc;&sup2;&sup2;&sup2;&Ucirc;&Uuml;            &Uuml;&sup2; &Ucirc;&sup2;&sup2;&sup2;&Ucirc;&Uuml;    &Uuml;&sup2;<br />
+                  &szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;   &szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;   &szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;<br />
+                   k  n  o  w       y  o  u  r       r  o  l  e<br />
+<br />
+   &uacute; &uacute;&uacute;--&Auml;-&Auml;-&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;-&Auml;-&Auml;--&uacute;&uacute; &uacute;<br />
+                WWE.RAW.2016.11.28.720p.HDTV.h264-KYR<br />
+   &uacute; &uacute;&uacute;--&Auml;-&Auml;-&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;-&Auml;-&Auml;--&uacute;&uacute; &uacute;<br />
+       &Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;  &Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;  &Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;<br />
+      &Ucirc;&szlig;&Uuml;&deg;&Ucirc;&szlig;&Uuml;&deg;&Ucirc; &Ucirc;&sup2;&Ucirc;&szlig;&Uuml;&deg;&Ucirc;&deg;&Uuml;&szlig;&Ucirc; &Uuml;&Uuml;&Ucirc;&szlig;&Uuml;&deg;&Ucirc;  &Ucirc;&Uuml;&Ucirc;&szlig;&Uuml;&deg;&Ucirc;&szlig;&Uuml;&Uuml;&Ucirc;&deg;&Uuml;&szlig;&Ucirc;<br />
+   &Uacute;&Auml;&Auml;&Ucirc; &szlig;&Uuml;&Ucirc; &Uuml;&Ucirc;&Ucirc; &Ucirc;&sup2;&Ucirc; &Uuml;&Ucirc;&Ucirc; &Uuml; &Ucirc;&Uuml;&Uuml;&deg;&Ucirc; &Uuml;&Ucirc;&szlig;&Auml;&Auml;&Ucirc; &Ucirc; &Ucirc; &Ucirc; &Uuml;&Ucirc;&Ucirc; &Ucirc; &Ucirc;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&uacute;&uacute; &uacute;<br />
+   &sup3;  &Ucirc; &Ucirc; &Ucirc;&Uuml;&szlig;&szlig;&Ucirc;&Uuml;&szlig;&szlig;&Ucirc;&Uuml;&szlig;&szlig;&Ucirc;&Uuml;&Ucirc; &Ucirc;&Uuml;&szlig; &Ucirc;&Uuml;&szlig;&szlig;&Ucirc;  &Ucirc; &Ucirc;&Uuml;&Ucirc; &Ucirc;&deg;&Ucirc;&sup2;&Ucirc; &szlig; &Ucirc;<br />
+   &sup3;  &szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig; &szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;  &szlig;&szlig;&szlig; &szlig;&szlig;&szlig;&szlig;&szlig; &szlig;&szlig;&szlig;&szlig;&szlig;<br />
+   &sup3;<br />
+   &sup3;     title&uacute;[ WWE RAW                                               ]&uacute;<br />
+   &sup3;     genre&uacute;[ Wrestling   ]&uacute;                crf&uacute;[ 23                ]&uacute;<br />
+   &sup3; rel. date&uacute;[ 11.28.16    ]&uacute;             format&uacute;[ x264              ]&uacute;<br />
+   &sup3;  air date&uacute;[ 11.28.16    ]&uacute;             source&uacute;[ HDTV              ]&uacute;<br />
+   &sup3;   runtime&uacute;[ 2h 13m 48s  ]&uacute;            bitrate&uacute;[ 4111kbps          ]&uacute;<br />
+   &sup3;  filesize&uacute;[ 4.28 GB     ]&uacute;            resolu.&uacute;[ 1280x720          ]&uacute;<br />
+   &sup3; rar count&uacute;[ 93x50mb     ]&uacute;             frames&uacute;[ 59.940            ]&uacute;<br />
+   &sup3;          &uacute;[                             audio&uacute;[ 384 kbps AC3 5.1  ]&uacute;<br />
+   &sup3;          &uacute;[                          location&uacute;[ USA               ]&uacute;<br />
+   &sup3;          &uacute;[                                                       ]&uacute;<br />
+   &sup3;      url &uacute;[ http://www.wwe.com                                    ]&uacute;     <br />
+   &sup3;<br />
+   &sup3;<br />
+   &sup3;                   &Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;  &Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;   &Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;<br />
+   &sup3;                  &Ucirc;&szlig;&Uuml;&deg;&Ucirc;&szlig;&Uuml;&deg;&Ucirc; &Ucirc;&sup2;&Ucirc;&szlig;&Uuml;&deg;&Ucirc;&deg;&Uuml;&szlig;&Ucirc; &Uuml;&Uuml;&Ucirc;&szlig;&Uuml;&deg;&Ucirc;  &Ucirc;&szlig;&Uuml;&deg;&Ucirc;&deg;&Uuml;&szlig;&Ucirc;&Uuml; &Uuml;&Ucirc;&szlig;&Uuml;&deg;&Ucirc; &Uuml;&Uuml;&Ucirc;<br />
+   &sup3;        &uacute; &uacute;&uacute;&Auml;&Auml;&Auml;&Auml;&Auml;-&Ucirc; &szlig;&Uuml;&Ucirc; &Uuml;&Ucirc;&Ucirc; &Ucirc;&sup2;&Ucirc; &Uuml;&Ucirc;&Ucirc; &Uuml; &Ucirc;&Uuml;&Uuml;&deg;&Ucirc; &Uuml;&Ucirc;&szlig;&Auml;&Auml;&Ucirc; &Ucirc; &Ucirc; &Ucirc; &Ucirc;&Ucirc; &Ucirc;&Ucirc; &Uuml;&Ucirc;&Ucirc;&Uuml;&Uuml;&deg;&Ucirc;&Auml;&Auml;&acute;<br />
+   &sup3;                  &Ucirc; &Ucirc; &Ucirc;&Uuml;&szlig;&szlig;&Ucirc;&Uuml;&szlig;&szlig;&Ucirc;&Uuml;&szlig;&szlig;&Ucirc;&Uuml;&Ucirc; &Ucirc;&Uuml;&szlig; &Ucirc;&Uuml;&szlig;&szlig;&Ucirc;  &Ucirc; &Ucirc; &Ucirc; &szlig; &Ucirc;&Ucirc;&deg;&Ucirc;&Ucirc;&Uuml;&szlig;&szlig;&Ucirc;&Uuml;&szlig; &Ucirc;  &sup3;<br />
+   &sup3;                  &szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig; &szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;  &szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig; &szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;  &sup3;<br />
+   &sup3;                                                                        &sup3;<br />
+   &sup3;                                                                        &sup3;<br />
+   &sup3;                                                  Enjoy!                &sup3;<br />
+   &sup3;                                                                        &sup3;<br />
+   &sup3;                                                                        &sup3;<br />
+   &sup3;   &Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;  &Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;  &Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;                                 &sup3;<br />
+   &sup3;  &Ucirc;&szlig;&Uuml;&deg;&Ucirc;&szlig;&Uuml;&deg;&Ucirc;&deg;&Uuml;&szlig;&Ucirc;&szlig;&Ucirc;&deg;&Ucirc;&szlig;&Uuml;&deg;&Ucirc;  &Ucirc;&Uuml;&Ucirc;&szlig;&Uuml;&deg;&Ucirc;&szlig;&Uuml;&Uuml;&Ucirc;&deg;&Uuml;&szlig;&Ucirc;                                &sup3;<br />
+   &Atilde;&Auml;&Auml;&Ucirc; &Yacute;&szlig;&Ucirc; &szlig;&Uuml;&Ucirc; &Ucirc; &Ucirc; &Ucirc; &Ucirc; &szlig; &Ucirc;&Auml;&Auml;&Ucirc;&deg;&Ucirc; &Ucirc; &Ucirc; &Uuml;&Ucirc;&Ucirc; &Ucirc; &Ucirc;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;-&Auml;&Auml;&Auml;&Auml;&Auml;&uacute;&uacute; &uacute;        &sup3;<br />
+      &Ucirc; &szlig; &Ucirc; &Ucirc; &Ucirc; &szlig; &Ucirc; &szlig; &Ucirc; &Ucirc;&szlig;&szlig;  &Ucirc; &Ucirc; &Ucirc; &Ucirc;&deg;&Ucirc;&sup2;&Ucirc; &szlig; &Ucirc;                                &sup3;<br />
+      &szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;    &szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig; &szlig;&szlig;&szlig;&szlig;&szlig;                                &sup3;<br />
+                                                                            &sup3;<br />
+       group info                                                          &sup3;<br />
+                                                                            &sup3;<br />
+                Know Your Role and Shut Your Mouth!                         &sup3;<br />
+                                                                            &sup3;<br />
+       we are now looking for...                                           &sup3;<br />
+                                                                            &sup3;<br />
+         (a) capper(s) of cable, PPV, good upspeed advantageous             &sup3;<br />
+                              .. contact in the usual way.                  &sup3;<br />
+                                                                            &sup3;<br />
+       KYR respects...                                                     &sup3;<br />
+                                                                            &sup3;<br />
+                everyone keeping it real and oldschool. we love ya!         &sup3;<br />
+                                                                            &sup3;<br />
+                          &Uuml; &Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml; &Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;                        &sup3;<br />
+                         &Uuml;&Uuml;&Uuml;&Uuml;&sup2; &Uuml;&Uuml;&Uuml; &Ucirc;&Uuml;&sup2; &Uuml;&Uuml;&Uuml; &Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml; &sup2;&Yacute;                       &sup3;<br />
+  &uacute; &uacute;&uacute;&Auml;&Auml;&Auml;&Auml;&Auml;--&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Ucirc; &Uuml;&Uuml; &Yacute;&THORN;&Ucirc;&Ucirc;&Yacute;&Uuml;&Uuml; &Yacute;&THORN;&Ucirc;&Ucirc;&Yacute;&szlig;&szlig;  &THORN;&Ucirc;&Ucirc;&Yacute;&THORN;&Ucirc; &Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&acute;<br />
+                         &Ucirc; &Ucirc;&Ucirc; &Uuml;&Ucirc;&Ucirc;&szlig; &Ucirc;&Ucirc; &Uuml;&Ucirc;&Ucirc;&sup2; &Ucirc;&Ucirc; &Uuml;&Ucirc;&Ucirc;&szlig; &Ucirc;&Yacute;    K N O W            &sup3;<br />
+   ascii crafted by      &Ucirc; &Ucirc;&Ucirc;&Ucirc;&Ucirc;&sup2;&Uuml;  &THORN;&Ucirc;&Ucirc;&sup2;&szlig; &Uuml; &Ucirc;&Ucirc;&Ucirc;&Ucirc;&sup2;&Uuml; &szlig;&Ucirc;                        &sup3;<br />
+                         &Ucirc; &Ucirc;&Ucirc; &szlig;&Ucirc;&Ucirc;&sup2;  &Ucirc;&Ucirc; &Uuml;&sup2;&Ucirc; &Ucirc;&Ucirc; &szlig;&Ucirc;&Ucirc;&sup2; &sup2;&Yacute;       Y O U R         &sup3;<br />
+        h8`!HiGHONASCii  &Ucirc; &Ucirc;&Ucirc; &Yacute;&THORN;&Ucirc;&Ucirc;&Yacute; &Ucirc;&Ucirc; &Ucirc; &Ucirc; &Ucirc;&Ucirc; &Yacute;&THORN;&Ucirc;&Ucirc;&Yacute;&THORN;&Ucirc;                       &sup3;<br />
+                         &Ucirc; &Ucirc;&sup2; &Ucirc; &Ucirc;&Ucirc;&sup2; &Ucirc;&sup2; &Ucirc; &Ucirc; &Ucirc;&sup2; &Ucirc; &Ucirc;&Ucirc;&sup2; &Ucirc;           R O L E     &sup3;<br />
+  &uacute; &uacute;&uacute;&Auml;-&Auml;----&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Ucirc;&Uuml;&Uuml;&Uuml;&Uuml;&sup2;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&sup2; &Ucirc;&Uuml;&Uuml;&Uuml;&Uuml;&sup2;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&sup2; &Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Auml;&Ugrave;<br />
+     &Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;    &Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;  &Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;   &Uuml;&Uuml;&Uuml; &Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;<br />
+  &deg;&plusmn;&sup2;&Ucirc; &Uuml;&szlig;&Ucirc; &Uuml;&szlig;&Ucirc; &Uuml;&szlig;&Ucirc; &Uuml;&szlig;&Ucirc;&sup2;&sup2;&Ucirc;&szlig;&Uuml;&deg;&Ucirc;&szlig;&Uuml;&deg;&Ucirc; &Ucirc;&sup2;&Ucirc;&szlig;&Uuml;&deg;&Ucirc;&deg;&Uuml;&szlig;&Ucirc; &Uuml;&Uuml;&Ucirc;&szlig;&Uuml;&deg;&Ucirc; &Uuml;&Uuml;&Ucirc;&sup2;&sup2;&Ucirc;&deg;&Uuml;&szlig;&Ucirc;&szlig;&Uuml;&deg;&Ucirc;&deg;&Uuml;&szlig;&Ucirc;&sup2;&plusmn;&deg;<br />
+ &deg; &deg;&plusmn;&Ucirc; &Ucirc; &Ucirc; &Ucirc; &Ucirc; &Ucirc; &Ucirc; &Ucirc; &Ucirc;+&plusmn;&Ucirc; &szlig;&Uuml;&Ucirc; &Uuml;&Ucirc;&Ucirc; &Ucirc;&plusmn;&Ucirc; &Uuml;&Ucirc;&Ucirc; &Uuml; &Ucirc;&Uuml;&Uuml;&deg;&Ucirc; &Uuml;&Ucirc;&Ucirc;&Uuml;&Uuml;&deg;&Ucirc;&plusmn;&plusmn;&Ucirc; &Uuml; &Ucirc; &Ucirc; &Ucirc; &Ucirc; &Ucirc;&plusmn;&deg; &deg;<br />
+  &deg;&plusmn;&sup2;&Ucirc;&Uuml;&szlig;&deg;&Ucirc;&Uuml;&szlig;&deg;&Ucirc;&Uuml;&szlig;&deg;&Ucirc;&Uuml;&szlig;&deg;&Ucirc;&sup2;&sup2;&Ucirc; &Ucirc; &Ucirc;&Uuml;&szlig;&szlig;&Ucirc;&Uuml;&szlig;&szlig;&Ucirc;&Uuml;&szlig;&szlig;&Ucirc;&Uuml;&Ucirc; &Ucirc;&Uuml;&szlig; &Ucirc;&Uuml;&szlig;&szlig;&Ucirc;&Uuml;&szlig; &Ucirc;&sup2;&sup2;&Ucirc;&Uuml;&Ucirc; &Ucirc;&Uuml;&Ucirc; &Ucirc; &szlig;&Uuml;&Ucirc;&sup2;&plusmn;&deg;<br />
+     &szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;  &szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig; &szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;    &szlig;&szlig;&szlig; &szlig;&szlig;&szlig;&szlig;&szlig;&szlig;<br />
+                    &Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;  &Uuml;&Uuml; &Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;&Uuml;<br />
+               &deg;&plusmn;&sup2;&sup2;&Ucirc;&szlig;&Uuml; &Ucirc;&deg;&Uuml;&szlig;&Ucirc;&szlig;&Ucirc;&deg;&Ucirc;&szlig;&Uuml;&deg;&Ucirc;&Uuml; &Uuml;&Ucirc;&Uuml;&Ucirc;&szlig;&Uuml;&deg;&Ucirc;&szlig;&Uuml;&deg;&Ucirc;&deg;&Ucirc;&deg;&Ucirc;&deg;&Ucirc;&sup2;&sup2;&plusmn;&deg;<br />
+              &deg; &deg;&plusmn;&plusmn;&Ucirc; &Ucirc;&Ucirc;&Ucirc; &Ucirc; &Ucirc; &Ucirc; &Ucirc; &Ucirc; &Ucirc;&Ucirc; &Ucirc;&Ucirc;&deg;&Ucirc; &Ucirc; &Ucirc; &Yacute;&szlig;&Ucirc; &Ucirc; &Ucirc; &Ucirc;&plusmn;&plusmn;&deg; &deg;<br />
+               &deg;&plusmn;&sup2;&sup2;&Ucirc;&Uuml;&szlig;&deg;&Ucirc; &szlig; &Ucirc; &szlig; &Ucirc;&Uuml;&Ucirc; &Ucirc;&Ucirc;&deg;&Ucirc;&Ucirc; &Ucirc; &Ucirc; &Ucirc;&deg;&szlig; &Ucirc;&szlig;&Ucirc;&szlig;&Ucirc;&szlig;&Ucirc;&sup2;&sup2;&plusmn;&deg;<br />
+                    &szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig; &szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;&szlig;]]>
+      </description>
+      <pubDate>Tue, 29 Nov 2016 05:08:18 +0000</pubDate>
+      <link>https://alpharatio.cc/torrents.php?action=download&amp;authkey=private_auth_key&amp;torrent_pass=private_torrent_pass&amp;id=465831</link>
+      <guid>https://alpharatio.cc/torrents.php?action=download&amp;authkey=private_auth_key&amp;torrent_pass=private_torrent_pass&amp;id=465831</guid>
+      <comments>https://alpharatio.cc/torrents.php?id=465860</comments>
+      <dc:creator>Anonymous</dc:creator>
+    </item>
+  </channel>
+</rss>

src/NzbDrone.Core.Test/Files/Xem/Failure.txt

@@ -1,7 +0,0 @@
-{
-
-    "result": "failure",
-    "data": [ ],
-    "message": "no show with the tvdb_id 79488 found"
-
-}

src/NzbDrone.Core.Test/Files/Xem/Ids.txt

@@ -1,10 +0,0 @@
-{
-
-    "result": "success",
-    "data": [
-        "73141",
-        "79886",
-    ],
-    "message": ""
-
-}

src/NzbDrone.Core.Test/Files/Xem/Mappings.txt

@@ -1,32 +0,0 @@
-{
-
-    "result": "success",
-    "data": [
-        {
-            "scene": {
-                "season": 1,
-                "episode": 1,
-                "absolute": 1
-            },
-            "tvdb": {
-                "season": 1,
-                "episode": 1,
-                "absolute": 1
-            }
-        },
-        {
-            "scene": {
-                "season": 1,
-                "episode": 2,
-                "absolute": 2
-            },
-            "tvdb": {
-                "season": 1,
-                "episode": 2,
-                "absolute": 2
-            }
-        }
-    ],
-    "message": "full mapping for 73388 on tvdb. this was a cached version"
-
-}

src/NzbDrone.Core.Test/Files/Xem/Names.txt

@@ -1,24 +0,0 @@
-{
-
-    "result": "success",
-    "data": {
-        "220571": [
-            "Is This a Zombie? Of the Dead",
-            "Kore wa Zombie Desuka?",
-            "Kore wa Zombie Desuka? Of the Dead",
-            "Kore wa Zombie Desuka Of the Dead",
-            "Kore wa Zombie Desu ka - Of the Dead",
-            "Kore wa Zombie Desu ka of the Dead"
-        ],
-        "79151": [
-            "Fate Stay Night",
-            "Fate/Zero",
-            "Fate Zero",
-            "Fate/Zero (2012)",
-            "Fate Zero S2",
-            "Fate Zero"
-        ]
-    },
-    "message": ""
-
-}

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/HealthCheck/Checks/HealthCheckFixtureExtensions.cs

@@ -1,4 +1,5 @@
 using FluentAssertions;
+using NzbDrone.Common.Extensions;
 using NzbDrone.Core.HealthCheck;
 
 namespace NzbDrone.Core.Test.HealthCheck.Checks
@@ -10,14 +11,24 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
             result.Type.Should().Be(HealthCheckResult.Ok);
         }
 
-        public static void ShouldBeWarning(this Core.HealthCheck.HealthCheck result)
+        public static void ShouldBeWarning(this Core.HealthCheck.HealthCheck result, string message = null)
         {
             result.Type.Should().Be(HealthCheckResult.Warning);
+
+            if (message.IsNotNullOrWhiteSpace())
+            {
+                result.Message.Should().Contain(message);
+            }
         }
 
-        public static void ShouldBeError(this Core.HealthCheck.HealthCheck result)
+        public static void ShouldBeError(this Core.HealthCheck.HealthCheck result, string message = null)
         {
             result.Type.Should().Be(HealthCheckResult.Error);
+
+            if (message.IsNotNullOrWhiteSpace())
+            {
+                result.Message.Should().Contain(message);
+            }
         }
     }
 }

src/NzbDrone.Core.Test/HealthCheck/Checks/IndexerRssCheckFixture.cs

@@ -0,0 +1,92 @@
+using System.Collections.Generic;
+using Moq;
+using NUnit.Framework;
+using NzbDrone.Core.HealthCheck.Checks;
+using NzbDrone.Core.Indexers;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.HealthCheck.Checks
+{
+    [TestFixture]
+    public class IndexerRssCheckFixture : CoreTest<IndexerRssCheck>
+    {
+        private Mock<IIndexer> _indexerMock;
+
+        [SetUp]
+        public void SetUp()
+        {
+            Mocker.GetMock<IIndexerFactory>()
+                  .Setup(s => s.GetAvailableProviders())
+                  .Returns(new List<IIndexer>());
+
+            Mocker.GetMock<IIndexerFactory>()
+                  .Setup(s => s.RssEnabled(It.IsAny<bool>()))
+                  .Returns(new List<IIndexer>());
+        }
+
+        private void GivenIndexer(bool supportsRss, bool supportsSearch)
+        {
+            _indexerMock = Mocker.GetMock<IIndexer>();
+            _indexerMock.SetupGet(s => s.SupportsRss).Returns(supportsRss);
+            _indexerMock.SetupGet(s => s.SupportsSearch).Returns(supportsSearch);
+
+            Mocker.GetMock<IIndexerFactory>()
+                  .Setup(s => s.GetAvailableProviders())
+                  .Returns(new List<IIndexer> { _indexerMock.Object });
+        }
+
+        private void GivenRssEnabled()
+        {
+            Mocker.GetMock<IIndexerFactory>()
+                  .Setup(s => s.RssEnabled(It.IsAny<bool>()))
+                  .Returns(new List<IIndexer> { _indexerMock.Object });
+        }
+
+        private void GivenRssFiltered()
+        {
+            Mocker.GetMock<IIndexerFactory>()
+                  .Setup(s => s.RssEnabled(false))
+                  .Returns(new List<IIndexer> { _indexerMock.Object });
+        }
+
+        [Test]
+        public void should_return_error_when_no_indexer_present()
+        {
+            Subject.Check().ShouldBeError();
+        }
+
+        [Test]
+        public void should_return_error_when_no_rss_supported_indexer_present()
+        {
+            GivenIndexer(false, true);
+
+            Subject.Check().ShouldBeError();
+        }
+
+        [Test]
+        public void should_return_ok_when_rss_is_enabled()
+        {
+            GivenIndexer(true, false);
+            GivenRssEnabled();
+
+            Subject.Check().ShouldBeOk();
+        }
+
+        [Test]
+        public void should_return_error_if_rss_is_supported_but_disabled()
+        {
+            GivenIndexer(true, false);
+
+            Subject.Check().ShouldBeError();
+        }
+
+        [Test]
+        public void should_return_filter_warning_if_rss_is_enabled_but_filtered()
+        {
+            GivenIndexer(true, false);
+            GivenRssFiltered();
+
+            Subject.Check().ShouldBeWarning("recent indexer errors");
+        }
+    }
+}

src/NzbDrone.Core.Test/HealthCheck/Checks/IndexerSearchCheckFixture.cs

@@ -8,10 +8,22 @@ using NzbDrone.Core.Test.Framework;
 namespace NzbDrone.Core.Test.HealthCheck.Checks
 {
     [TestFixture]
-    public class IndexerCheckFixture : CoreTest<IndexerCheck>
+    public class IndexerSearchCheckFixture : CoreTest<IndexerSearchCheck>
     {
         private Mock<IIndexer> _indexerMock;
 
+        [SetUp]
+        public void SetUp()
+        {
+            Mocker.GetMock<IIndexerFactory>()
+                  .Setup(s => s.GetAvailableProviders())
+                  .Returns(new List<IIndexer>());
+
+            Mocker.GetMock<IIndexerFactory>()
+                  .Setup(s => s.SearchEnabled(It.IsAny<bool>()))
+                  .Returns(new List<IIndexer>());
+        }
+
         private void GivenIndexer(bool supportsRss, bool supportsSearch)
         {
             _indexerMock = Mocker.GetMock<IIndexer>();
@@ -21,42 +33,30 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
             Mocker.GetMock<IIndexerFactory>()
                   .Setup(s => s.GetAvailableProviders())
                   .Returns(new List<IIndexer> { _indexerMock.Object });
-
-            Mocker.GetMock<IIndexerFactory>()
-                  .Setup(s => s.RssEnabled())
-                  .Returns(new List<IIndexer>());
-
-            Mocker.GetMock<IIndexerFactory>()
-                  .Setup(s => s.SearchEnabled())
-                  .Returns(new List<IIndexer>());
-        }
-
-        private void GivenRssEnabled()
-        {
-            Mocker.GetMock<IIndexerFactory>()
-                  .Setup(s => s.RssEnabled())
-                  .Returns(new List<IIndexer> { _indexerMock.Object });
         }
 
         private void GivenSearchEnabled()
         {
             Mocker.GetMock<IIndexerFactory>()
-                  .Setup(s => s.SearchEnabled())
+                  .Setup(s => s.SearchEnabled(It.IsAny<bool>()))
+                  .Returns(new List<IIndexer> { _indexerMock.Object });
+        }
+
+        private void GivenSearchFiltered()
+        {
+            Mocker.GetMock<IIndexerFactory>()
+                  .Setup(s => s.SearchEnabled(false))
                   .Returns(new List<IIndexer> { _indexerMock.Object });
         }
 
         [Test]
-        public void should_return_error_when_not_indexers_are_enabled()
+        public void should_return_warning_when_no_indexer_present()
         {
-            Mocker.GetMock<IIndexerFactory>()
-                  .Setup(s => s.GetAvailableProviders())
-                  .Returns(new List<IIndexer>());
-
-            Subject.Check().ShouldBeError();
+            Subject.Check().ShouldBeWarning();
         }
 
         [Test]
-        public void should_return_warning_when_only_enabled_indexer_doesnt_support_search()
+        public void should_return_warning_when_no_search_supported_indexer_present()
         {
             GivenIndexer(true, false);
 
@@ -64,7 +64,16 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
         }
 
         [Test]
-        public void should_return_warning_when_only_enabled_indexer_doesnt_support_rss()
+        public void should_return_ok_when_search_is_enabled()
+        {
+            GivenIndexer(false, true);
+            GivenSearchEnabled();
+
+            Subject.Check().ShouldBeOk();
+        }
+
+        [Test]
+        public void should_return_warning_if_search_is_supported_but_disabled()
         {
             GivenIndexer(false, true);
 
@@ -72,52 +81,12 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
         }
 
         [Test]
-        public void should_return_ok_when_multiple_indexers_are_enabled()
+        public void should_return_filter_warning_if_search_is_enabled_but_filtered()
         {
-            GivenRssEnabled();
-            GivenSearchEnabled();
+            GivenIndexer(false, true);
+            GivenSearchFiltered();
 
-            var indexer1 = Mocker.GetMock<IIndexer>();
-            indexer1.SetupGet(s => s.SupportsRss).Returns(true);
-            indexer1.SetupGet(s => s.SupportsSearch).Returns(true);
-
-            var indexer2 = new Moq.Mock<IIndexer>();
-            indexer2.SetupGet(s => s.SupportsRss).Returns(true);
-            indexer2.SetupGet(s => s.SupportsSearch).Returns(false);
-
-            Mocker.GetMock<IIndexerFactory>()
-                  .Setup(s => s.GetAvailableProviders())
-                  .Returns(new List<IIndexer> { indexer1.Object, indexer2.Object });
-
-            Subject.Check().ShouldBeOk();
-        }
-
-        [Test]
-        public void should_return_ok_when_indexer_supports_rss_and_search()
-        {
-            GivenIndexer(true, true);
-            GivenRssEnabled();
-            GivenSearchEnabled();
-
-            Subject.Check().ShouldBeOk();
-        }
-
-        [Test]
-        public void should_return_warning_if_rss_is_supported_but_disabled()
-        {
-            GivenIndexer(true, true);
-            GivenSearchEnabled();
-
-            Subject.Check().ShouldBeWarning();
-        }
-
-        [Test]
-        public void should_return_warning_if_search_is_supported_but_disabled()
-        {
-            GivenIndexer(true, true);
-            GivenRssEnabled();
-
-            Subject.Check().ShouldBeWarning();
+            Subject.Check().ShouldBeWarning("recent indexer errors");
         }
     }
 }

src/NzbDrone.Core.Test/IndexerSearchTests/NzbSearchServiceFixture.cs

@@ -28,7 +28,7 @@ namespace NzbDrone.Core.Test.IndexerSearchTests
             _mockIndexer.SetupGet(s => s.SupportsSearch).Returns(true);
 
             Mocker.GetMock<IIndexerFactory>()
-                  .Setup(s => s.SearchEnabled())
+                  .Setup(s => s.SearchEnabled(true))
                   .Returns(new List<IIndexer> { _mockIndexer.Object });
 
             Mocker.GetMock<IMakeDownloadDecision>()

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

@@ -5,7 +5,6 @@ using NUnit.Framework;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Indexers.Newznab;
 using NzbDrone.Core.Indexers.Omgwtfnzbs;
-using NzbDrone.Core.Indexers.Wombles;
 using NzbDrone.Core.Lifecycle;
 using NzbDrone.Core.Test.Framework;
 
@@ -22,7 +21,6 @@ namespace NzbDrone.Core.Test.IndexerTests
 
             _indexers.Add(Mocker.Resolve<Newznab>());
             _indexers.Add(Mocker.Resolve<Omgwtfnzbs>());
-            _indexers.Add(Mocker.Resolve<Wombles>());
 
             Mocker.SetConstant<IEnumerable<IIndexer>>(_indexers);
         }

src/NzbDrone.Core.Test/IndexerTests/IntegrationTests/IndexerIntegrationTests.cs

@@ -4,9 +4,7 @@ using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Indexers.KickassTorrents;
 using NzbDrone.Core.Indexers.Nyaa;
-using NzbDrone.Core.Indexers.Wombles;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Test.Framework;
@@ -40,58 +38,6 @@ namespace NzbDrone.Core.Test.IndexerTests.IntegrationTests
             };
         }
 
-        [Test]
-        public void wombles_fetch_recent()
-        {
-            var indexer = Mocker.Resolve<Wombles>();
-
-            indexer.Definition = new IndexerDefinition
-            {
-                Name = "MyIndexer",
-                Settings = NullConfig.Instance
-            };
-
-            var result = indexer.FetchRecent();
-
-            ValidateResult(result);
-        }
-
-        [Test]
-        [ManualTest]
-        [Explicit]
-        public void kickass_fetch_recent()
-        {
-            var indexer = Mocker.Resolve<KickassTorrents>();
-
-            indexer.Definition = new IndexerDefinition
-            {
-                Name = "MyIndexer",
-                Settings = new KickassTorrentsSettings()
-            };
-
-            var result = indexer.FetchRecent();
-
-            ValidateTorrentResult(result, hasSize: true);
-        }
-
-        [Test]
-        [ManualTest]
-        [Explicit]
-        public void kickass_search_single()
-        {
-            var indexer = Mocker.Resolve<KickassTorrents>();
-
-            indexer.Definition = new IndexerDefinition
-            {
-                Name = "MyIndexer",
-                Settings = new KickassTorrentsSettings()
-            };
-
-            var result = indexer.Fetch(_singleSearchCriteria);
-
-            ValidateTorrentResult(result, hasSize: true, hasMagnet: true);
-        }
-
         [Test]
         public void nyaa_fetch_recent()
         {

src/NzbDrone.Core.Test/IndexerTests/KickassTorrentsTests/KickassTorrentsFixture.cs

@@ -1,173 +0,0 @@
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Indexers.KickassTorrents;
-using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Test.Common;
-using System;
-using System.Linq;
-using FluentAssertions;
-using System.Text.RegularExpressions;
-
-namespace NzbDrone.Core.Test.IndexerTests.KickassTorrentsTests
-{
-    [TestFixture]
-    public class KickassTorrentsFixture : CoreTest<KickassTorrents>
-    {
-        [SetUp]
-        public void Setup()
-        {
-            Subject.Definition = new IndexerDefinition()
-                {
-                    Name = "Kickass Torrents",
-                    Settings = new KickassTorrentsSettings() { VerifiedOnly = false }
-                };
-        }
-
-        [Test]
-        public void should_parse_recent_feed_from_KickassTorrents()
-        {
-            var recentFeed = ReadAllText(@"Files/Indexers/KickassTorrents/KickassTorrents.xml");
-
-            Mocker.GetMock<IHttpClient>()
-                .Setup(o => o.Execute(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET)))
-                .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), recentFeed));
-
-            var releases = Subject.FetchRecent();
-
-            releases.Should().HaveCount(5);
-            releases.First().Should().BeOfType<TorrentInfo>();
-
-            var torrentInfo = (TorrentInfo) releases.First();
-
-            torrentInfo.Title.Should().Be("Doctor Stranger.E03.140512.HDTV.H264.720p-iPOP.avi [CTRG]");
-            torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
-            torrentInfo.DownloadUrl.Should().Be("http://torcache.net/torrent/208C4F7866612CC88BFEBC7C496FA72C2368D1C0.torrent?title=%5Bkickass.to%5Ddoctor.stranger.e03.140512.hdtv.h264.720p.ipop.avi.ctrg");
-            torrentInfo.InfoUrl.Should().Be("http://kickass.to/doctor-stranger-e03-140512-hdtv-h264-720p-ipop-avi-ctrg-t9100648.html");
-            torrentInfo.CommentUrl.Should().BeNullOrEmpty();
-            torrentInfo.Indexer.Should().Be(Subject.Definition.Name);
-            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2014/05/12 16:16:49"));
-            torrentInfo.Size.Should().Be(1205364736);
-            torrentInfo.InfoHash.Should().Be("208C4F7866612CC88BFEBC7C496FA72C2368D1C0");
-            torrentInfo.MagnetUrl.Should().Be("magnet:?xt=urn:btih:208C4F7866612CC88BFEBC7C496FA72C2368D1C0&dn=doctor+stranger+e03+140512+hdtv+h264+720p+ipop+avi+ctrg&tr=udp%3A%2F%2Fopen.demonii.com%3A1337%2Fannounce");
-        }
-
-        [Test]
-        public void should_return_empty_list_on_404()
-        {
-            Mocker.GetMock<IHttpClient>()
-                .Setup(o => o.Execute(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET)))
-                .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), new byte[0], System.Net.HttpStatusCode.NotFound));
-
-            var releases = Subject.FetchRecent();
-
-            releases.Should().HaveCount(0);
-
-            ExceptionVerification.IgnoreWarns();
-        }
-
-        [Test]
-        public void should_not_return_unverified_releases_if_not_configured()
-        {
-            ((KickassTorrentsSettings) Subject.Definition.Settings).VerifiedOnly = true;
-
-            var recentFeed = ReadAllText(@"Files/Indexers/KickassTorrents/KickassTorrents.xml");
-
-            Mocker.GetMock<IHttpClient>()
-                .Setup(o => o.Execute(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET)))
-                .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), recentFeed));
-
-            var releases = Subject.FetchRecent();
-
-            releases.Should().HaveCount(4);
-        }
-
-        [Test]
-        public void should_set_seeders_to_null()
-        {
-            // Atm, Kickass supplies 0 as seeders and leechers on the rss feed (but not the site), so set it to null if there aren't any peers.
-            var recentFeed = ReadAllText(@"Files/Indexers/KickassTorrents/KickassTorrents.xml");
-
-            recentFeed = recentFeed.Replace("<pubDate>Mon, 12 May 2014 16:16:49 +0000</pubDate>", string.Format("<pubDate>{0:R}</pubDate>", DateTime.UtcNow));
-            recentFeed = Regex.Replace(recentFeed, @"(seeds|peers)\>\d*", "$1>0");
-
-            Mocker.GetMock<IHttpClient>()
-                .Setup(o => o.Execute(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET)))
-                .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), recentFeed));
-
-            var releases = Subject.FetchRecent();
-
-            releases.Should().HaveCount(5);
-            releases.First().Should().BeOfType<TorrentInfo>();
-
-            var torrentInfo = (TorrentInfo)releases.First();
-
-            torrentInfo.Peers.Should().NotHaveValue();
-            torrentInfo.Seeders.Should().NotHaveValue();
-        }
-
-        [Test]
-        public void should_not_set_seeders_to_null_if_has_peers()
-        {
-            // Atm, Kickass supplies 0 as seeders and leechers on the rss feed (but not the site), so set it to null if there aren't any peers.
-            var recentFeed = ReadAllText(@"Files/Indexers/KickassTorrents/KickassTorrents.xml");
-
-            recentFeed = recentFeed.Replace("<pubDate>Mon, 12 May 2014 16:16:49 +0000</pubDate>", string.Format("<pubDate>{0:R}</pubDate>", DateTime.UtcNow));
-            recentFeed = Regex.Replace(recentFeed, @"(seeds)\>\d*", "$1>0");
-
-            Mocker.GetMock<IHttpClient>()
-                .Setup(o => o.Execute(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET)))
-                .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), recentFeed));
-
-            var releases = Subject.FetchRecent();
-
-            releases.Should().HaveCount(5);
-            releases.First().Should().BeOfType<TorrentInfo>();
-
-            var torrentInfo = (TorrentInfo)releases.First();
-
-            torrentInfo.Peers.Should().Be(311);
-            torrentInfo.Seeders.Should().Be(0);
-        }
-
-        [Test]
-        public void should_not_set_seeders_to_null_if_older_than_12_hours()
-        {
-            // Atm, Kickass supplies 0 as seeders and leechers on the rss feed (but not the site), so set it to null if there aren't any peers.
-            var recentFeed = ReadAllText(@"Files/Indexers/KickassTorrents/KickassTorrents.xml");
-
-            recentFeed = Regex.Replace(recentFeed, @"(seeds|peers)\>\d*", "$1>0");
-
-            Mocker.GetMock<IHttpClient>()
-                .Setup(o => o.Execute(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET)))
-                .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), recentFeed));
-
-            var releases = Subject.FetchRecent();
-
-            releases.Should().HaveCount(5);
-            releases.First().Should().BeOfType<TorrentInfo>();
-
-            var torrentInfo = (TorrentInfo)releases.First();
-
-            torrentInfo.Peers.Should().Be(0);
-            torrentInfo.Seeders.Should().Be(0);
-        }
-
-        
-        [Test]
-        public void should_handle_xml_with_html_accents()
-        {
-            var recentFeed = ReadAllText(@"Files/Indexers/KickassTorrents/KickassTorrents_accents.xml");
-
-            Mocker.GetMock<IHttpClient>()
-                .Setup(o => o.Execute(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET)))
-                .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), recentFeed));
-
-            var releases = Subject.FetchRecent();
-
-            releases.Should().HaveCount(5);
-        }
-    }
-}

src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TorrentRssIndexerFixture.cs

@@ -215,5 +215,22 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
             torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
             torrentInfo.DownloadUrl.Should().Be("http://storage.animetosho.org/torrents/4b58360143d59a55cbd922397a3eaa378165f3ff/DAYS%20-%2005%20%281280x720%20HEVC2%20AAC%29.torrent");            
         }
+
+        [Test]
+        public void should_parse_recent_feed_from_AlphaRatio()
+        {
+            GivenRecentFeedResponse("TorrentRss/AlphaRatio.xml");
+
+            var releases = Subject.FetchRecent();
+
+            releases.Should().HaveCount(2);
+            releases.Last().Should().BeOfType<TorrentInfo>();
+
+            var torrentInfo = releases.Last() as TorrentInfo;
+
+            torrentInfo.Title.Should().Be("TvHD 465860 465831 WWE.RAW.2016.11.28.720p.HDTV.x264-KYR");
+            torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
+            torrentInfo.DownloadUrl.Should().Be("https://alpharatio.cc/torrents.php?action=download&authkey=private_auth_key&torrent_pass=private_torrent_pass&id=465831");
+        }
     }
 }

src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TorrentRssSettingsDetectorFixture.cs

@@ -180,6 +180,26 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
             });
         }
 
+        [Test]
+        public void should_detect_rss_settings_for_AlphaRatio()
+        {
+            _indexerSettings.AllowZeroSize = true;
+
+            GivenRecentFeedResponse("TorrentRss/AlphaRatio.xml");
+
+            var settings = Subject.Detect(_indexerSettings);
+
+            settings.ShouldBeEquivalentTo(new TorrentRssIndexerParserSettings
+            {
+                UseEZTVFormat = false,
+                UseEnclosureUrl = false,
+                UseEnclosureLength = false,
+                ParseSizeInDescription = true,
+                ParseSeedersInDescription = false,
+                SizeElementName = null
+            });
+        }
+
         [Test]
         [Ignore("Cannot reliably reject unparseable titles")]
         public void should_reject_rss_settings_for_AwesomeHD()

src/NzbDrone.Core.Test/IndexerTests/WomblesTests/WomblesFixture.cs

@@ -1,59 +0,0 @@
-using System;
-using System.Linq;
-using FluentAssertions;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Indexers.Wombles;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.ThingiProvider;
-
-namespace NzbDrone.Core.Test.IndexerTests.WomblesTests
-{
-
-    [TestFixture]
-    public class TorrentRssIndexerFixture : CoreTest<Wombles>
-    {
-        [SetUp]
-        public void Setup()
-        {
-
-            Subject.Definition = new IndexerDefinition()
-            {
-                Name = "Wombles",
-                Settings = new NullConfig(),
-            };
-        }
-
-        private void GivenRecentFeedResponse(string rssXmlFile)
-        {
-            var recentFeed = ReadAllText(@"Files/Indexers/" + rssXmlFile);
-
-            Mocker.GetMock<IHttpClient>()
-                .Setup(o => o.Execute(It.IsAny<HttpRequest>()))
-                .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), recentFeed));
-        }
-
-        [Test]
-        public void should_parse_recent_feed_from_wombles()
-        {
-            GivenRecentFeedResponse("Wombles/wombles.xml");
-
-            var releases = Subject.FetchRecent();
-
-            releases.Should().HaveCount(5);
-            
-            var releaseInfo = releases.First();
-
-            releaseInfo.Title.Should().Be("One.Child.S01E01.720p.HDTV.x264-TLA");
-            releaseInfo.DownloadProtocol.Should().Be(DownloadProtocol.Usenet);
-            releaseInfo.DownloadUrl.Should().Be("http://indexer.local/nzb/bb4/One.Child.S01E01.720p.HDTV.x264-TLA.nzb");
-            releaseInfo.InfoUrl.Should().BeNullOrEmpty();
-            releaseInfo.CommentUrl.Should().BeNullOrEmpty();
-            releaseInfo.Indexer.Should().Be(Subject.Definition.Name);
-            releaseInfo.PublishDate.Should().Be(DateTime.Parse("2016-02-17 23:03:52 +0000").ToUniversalTime());
-            releaseInfo.Size.Should().Be(956*1024*1024);
-        }
-    }
-}

src/NzbDrone.Core.Test/MediaFiles/MediaInfo/UpdateMediaInfoServiceFixture.cs

@@ -16,12 +16,12 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
     [TestFixture]
     public class UpdateMediaInfoServiceFixture : CoreTest<UpdateMediaInfoService>
     {
-        private Series _series;
+        private Movie _series;
 
         [SetUp]
         public void Setup()
         {
-            _series = new Series
+            _series = new Movie
                       {
                           Id = 1,
                           Path = @"C:\series".AsOsAgnostic()
@@ -56,7 +56,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
         [Test]
         public void should_skip_up_to_date_media_info()
         {
-            var episodeFiles = Builder<EpisodeFile>.CreateListOfSize(3)
+            var episodeFiles = Builder<MovieFile>.CreateListOfSize(3)
                 .All()
                 .With(v => v.RelativePath = "media.mkv")
                 .TheFirst(1)
@@ -64,25 +64,25 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
                 .BuildList();
 
             Mocker.GetMock<IMediaFileService>()
-                  .Setup(v => v.GetFilesBySeries(1))
+                  .Setup(v => v.GetFilesByMovie(1))
                   .Returns(episodeFiles);
 
             GivenFileExists();
             GivenSuccessfulScan();
 
-            Subject.Handle(new SeriesScannedEvent(_series));
+            Subject.Handle(new MovieScannedEvent(_series));
 
             Mocker.GetMock<IVideoFileInfoReader>()
                   .Verify(v => v.GetMediaInfo(Path.Combine(_series.Path, "media.mkv")), Times.Exactly(2));
 
             Mocker.GetMock<IMediaFileService>()
-                  .Verify(v => v.Update(It.IsAny<EpisodeFile>()), Times.Exactly(2));
+                  .Verify(v => v.Update(It.IsAny<MovieFile>()), Times.Exactly(2));
         }
 
         [Test]
         public void should_update_outdated_media_info()
         {
-            var episodeFiles = Builder<EpisodeFile>.CreateListOfSize(3)
+            var episodeFiles = Builder<MovieFile>.CreateListOfSize(3)
                 .All()
                 .With(v => v.RelativePath = "media.mkv")
                 .TheFirst(1)
@@ -90,48 +90,48 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
                 .BuildList();
 
             Mocker.GetMock<IMediaFileService>()
-                  .Setup(v => v.GetFilesBySeries(1))
+                  .Setup(v => v.GetFilesByMovie(1))
                   .Returns(episodeFiles);
 
             GivenFileExists();
             GivenSuccessfulScan();
 
-            Subject.Handle(new SeriesScannedEvent(_series));
+            Subject.Handle(new MovieScannedEvent(_series));
 
             Mocker.GetMock<IVideoFileInfoReader>()
                   .Verify(v => v.GetMediaInfo(Path.Combine(_series.Path, "media.mkv")), Times.Exactly(3));
 
             Mocker.GetMock<IMediaFileService>()
-                  .Verify(v => v.Update(It.IsAny<EpisodeFile>()), Times.Exactly(3));
+                  .Verify(v => v.Update(It.IsAny<MovieFile>()), Times.Exactly(3));
         }
 
         [Test]
         public void should_ignore_missing_files()
         {
-            var episodeFiles = Builder<EpisodeFile>.CreateListOfSize(2)
+            var episodeFiles = Builder<MovieFile>.CreateListOfSize(2)
                    .All()
                    .With(v => v.RelativePath = "media.mkv")
                    .BuildList();
 
             Mocker.GetMock<IMediaFileService>()
-                  .Setup(v => v.GetFilesBySeries(1))
+                  .Setup(v => v.GetFilesByMovie(1))
                   .Returns(episodeFiles);
 
             GivenSuccessfulScan();
 
-            Subject.Handle(new SeriesScannedEvent(_series));
+            Subject.Handle(new MovieScannedEvent(_series));
 
             Mocker.GetMock<IVideoFileInfoReader>()
                   .Verify(v => v.GetMediaInfo("media.mkv"), Times.Never());
 
             Mocker.GetMock<IMediaFileService>()
-                  .Verify(v => v.Update(It.IsAny<EpisodeFile>()), Times.Never());
+                  .Verify(v => v.Update(It.IsAny<MovieFile>()), Times.Never());
         }
 
         [Test]
         public void should_continue_after_failure()
         {
-            var episodeFiles = Builder<EpisodeFile>.CreateListOfSize(2)
+            var episodeFiles = Builder<MovieFile>.CreateListOfSize(2)
                    .All()
                    .With(v => v.RelativePath = "media.mkv")
                    .TheFirst(1)
@@ -139,20 +139,20 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
                    .BuildList();
 
             Mocker.GetMock<IMediaFileService>()
-                  .Setup(v => v.GetFilesBySeries(1))
+                  .Setup(v => v.GetFilesByMovie(1))
                   .Returns(episodeFiles);
 
             GivenFileExists();
             GivenSuccessfulScan();
             GivenFailedScan(Path.Combine(_series.Path, "media2.mkv"));
 
-            Subject.Handle(new SeriesScannedEvent(_series));
+            Subject.Handle(new MovieScannedEvent(_series));
 
             Mocker.GetMock<IVideoFileInfoReader>()
                   .Verify(v => v.GetMediaInfo(Path.Combine(_series.Path, "media.mkv")), Times.Exactly(1));
 
             Mocker.GetMock<IMediaFileService>()
-                  .Verify(v => v.Update(It.IsAny<EpisodeFile>()), Times.Exactly(1));
+                  .Verify(v => v.Update(It.IsAny<MovieFile>()), Times.Exactly(1));
         }
     }
 }

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

@@ -113,7 +113,6 @@
     <Compile Include="Blacklisting\BlacklistServiceFixture.cs" />
     <Compile Include="Configuration\ConfigCachingFixture.cs" />
     <Compile Include="Configuration\ConfigServiceFixture.cs" />
-    <Compile Include="DataAugmentation\SceneNumbering\XemServiceFixture.cs" />
     <Compile Include="DataAugmentation\Scene\SceneMappingProxyFixture.cs" />
     <Compile Include="DataAugmentation\Scene\SceneMappingServiceFixture.cs" />
     <Compile Include="DataAugmentation\DailySeries\DailySeriesDataProxyFixture.cs" />
@@ -183,6 +182,10 @@
     <Compile Include="Download\DownloadClientTests\TransmissionTests\TransmissionFixtureBase.cs" />
     <Compile Include="Download\DownloadClientTests\UTorrentTests\UTorrentFixture.cs" />
     <Compile Include="Download\DownloadClientTests\VuzeTests\VuzeFixture.cs" />
+    <Compile Include="Download\DownloadClientTests\DownloadStationTests\TorrentDownloadStationFixture.cs" />
+    <Compile Include="Download\DownloadClientTests\DownloadStationTests\SerialNumberProviderFixture.cs" />
+    <Compile Include="Download\DownloadClientTests\DownloadStationTests\SharedFolderResolverFixture.cs" />
+    <Compile Include="Download\DownloadClientTests\DownloadStationTests\UsenetDownloadStationFixture.cs" />
     <Compile Include="Download\DownloadServiceFixture.cs" />
     <Compile Include="Download\FailedDownloadServiceFixture.cs" />
     <Compile Include="Download\Pending\PendingReleaseServiceTests\PendingReleaseServiceFixture.cs" />
@@ -190,6 +193,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>
@@ -208,9 +214,10 @@
     <Compile Include="HealthCheck\Checks\AppDataLocationFixture.cs" />
     <Compile Include="HealthCheck\Checks\DownloadClientCheckFixture.cs" />
     <Compile Include="HealthCheck\Checks\DroneFactoryCheckFixture.cs" />
-    <Compile Include="HealthCheck\Checks\HealthCheckFixtureExtentions.cs" />
+    <Compile Include="HealthCheck\Checks\HealthCheckFixtureExtensions.cs" />
     <Compile Include="HealthCheck\Checks\ImportMechanismCheckFixture.cs" />
-    <Compile Include="HealthCheck\Checks\IndexerCheckFixture.cs" />
+    <Compile Include="HealthCheck\Checks\IndexerSearchCheckFixture.cs" />
+    <Compile Include="HealthCheck\Checks\IndexerRssCheckFixture.cs" />
     <Compile Include="HealthCheck\Checks\MonoVersionCheckFixture.cs" />
     <Compile Include="HealthCheck\Checks\IndexerStatusCheckFixture.cs" />
     <Compile Include="HealthCheck\Checks\RootFolderCheckFixture.cs" />
@@ -254,11 +261,9 @@
     <Compile Include="IndexerTests\TestIndexer.cs" />
     <Compile Include="IndexerTests\TestIndexerSettings.cs" />
     <Compile Include="IndexerTests\IPTorrentsTests\IPTorrentsFixture.cs" />
-    <Compile Include="IndexerTests\KickassTorrentsTests\KickassTorrentsFixture.cs" />
     <Compile Include="IndexerTests\NyaaTests\NyaaFixture.cs" />
     <Compile Include="IndexerTests\TorrentRssIndexerTests\TorrentRssIndexerFixture.cs" />
     <Compile Include="IndexerTests\TorrentRssIndexerTests\TestTorrentRssIndexer.cs" />
-    <Compile Include="IndexerTests\WomblesTests\WomblesFixture.cs" />
     <Compile Include="IndexerTests\XElementExtensionsFixture.cs" />
     <Compile Include="InstrumentationTests\DatabaseTargetFixture.cs" />
     <Compile Include="JobTests\JobRepositoryFixture.cs" />
@@ -284,6 +289,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" />
@@ -341,7 +349,6 @@
     <Compile Include="Profiles\ProfileRepositoryFixture.cs" />
     <Compile Include="Profiles\ProfileServiceFixture.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Providers\XemProxyFixture.cs" />
     <Compile Include="ProviderTests\DiskProviderTests\ArchiveProviderFixture.cs" />
     <Compile Include="ProviderTests\DiskScanProviderTests\GetVideoFilesFixture.cs" />
     <Compile Include="ProviderTests\RecycleBinProviderTests\CleanupFixture.cs" />
@@ -377,6 +384,7 @@
     <Compile Include="UpdateTests\UpdatePackageProviderFixture.cs" />
     <Compile Include="UpdateTests\UpdateServiceFixture.cs" />
     <Compile Include="XbmcVersionTests.cs" />
+    <Compile Include="BulkImport\AddMultiMoviesFixture.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Marr.Data\Marr.Data.csproj">
@@ -409,6 +417,13 @@
       <Link>sqlite3.dll</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Files\imdb_watchlist.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Files\Indexers\TorrentRss\AlphaRatio.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="License.txt" />
     <None Include="Files\Indexers\BroadcastheNet\RecentFeed.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -549,21 +564,11 @@
     <None Include="Files\TestArchive.zip">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <Content Include="Files\Xem\Failure.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Files\Xem\Ids.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Files\Xem\Mappings.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Files\Xem\Names.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="DataAugmentation\SceneNumbering\" />
+    <Folder Include="Providers\" />
     <Folder Include="ProviderTests\UpdateProviderTests\" />
   </ItemGroup>
   <ItemGroup>
@@ -578,11 +583,11 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

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

@@ -7,6 +7,7 @@ namespace NzbDrone.Core.Test.ParserTests
 {
 
     [TestFixture]
+	[Ignore("Series")]
     public class AbsoluteEpisodeNumberParserFixture : CoreTest
     {
         [TestCase("[SubDESU]_High_School_DxD_07_(1280x720_x264-AAC)_[6B7FD717]", "High School DxD", 7, 0, 0)]

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

@@ -9,6 +9,7 @@ namespace NzbDrone.Core.Test.ParserTests
 {
 
     [TestFixture]
+	[Ignore("Series")]
     public class DailyEpisodeParserFixture : CoreTest
     {
         [TestCase("Conan 2011 04 18 Emma Roberts HDTV XviD BFF", "Conan", 2011, 04, 18)]

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

@@ -1,4 +1,4 @@
-using FluentAssertions;
+using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.Parser;
 using NzbDrone.Core.Test.Framework;
@@ -11,6 +11,9 @@ namespace NzbDrone.Core.Test.ParserTests
     {
         [TestCase("Castle.2009.S01E14.English.HDTV.XviD-LOL", Language.English)]
         [TestCase("Castle.2009.S01E14.French.HDTV.XviD-LOL", Language.French)]
+        [TestCase("Ouija.Origin.of.Evil.2016.MULTi.TRUEFRENCH.1080p.BluRay.x264-MELBA", Language.French)]
+        [TestCase("Everest.2015.FRENCH.VFQ.BDRiP.x264-CNF30", Language.French)]
+        [TestCase("Showdown.In.Little.Tokyo.1991.MULTI.VFQ.VFF.DTSHD-MASTER.1080p.BluRay.x264-ZombiE", Language.French)]
         [TestCase("Castle.2009.S01E14.Spanish.HDTV.XviD-LOL", Language.Spanish)]
         [TestCase("Castle.2009.S01E14.German.HDTV.XviD-LOL", Language.German)]
         [TestCase("Castle.2009.S01E14.Germany.HDTV.XviD-LOL", Language.English)]
@@ -46,10 +49,17 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Castle.2009.S01E14.HDTV.XviD.HUNDUB-LOL", Language.Hungarian)]
         [TestCase("Castle.2009.S01E14.HDTV.XviD.ENG.HUN-LOL", Language.Hungarian)]
         [TestCase("Castle.2009.S01E14.HDTV.XviD.HUN-LOL", Language.Hungarian)]
+		[TestCase("The Danish Girl 2015", Language.English)]
+        [TestCase("Passengers.2016.German.DL.AC3.Dubbed.1080p.WebHD.h264.iNTERNAL-PsO", Language.German)]
         public void should_parse_language(string postTitle, Language language)
         {
-            var result = LanguageParser.ParseLanguage(postTitle);
-            result.Should().Be(language);
+            var result = Parser.Parser.ParseMovieTitle(postTitle);
+			if (result == null)
+			{
+				Parser.Parser.ParseTitle(postTitle).Language.Should().Be(language);
+				return;
+			}
+            result.Language.Should().Be(language);
         }
 
         [TestCase("2 Broke Girls - S01E01 - Pilot.en.sub", Language.English)]

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

@@ -7,6 +7,7 @@ namespace NzbDrone.Core.Test.ParserTests
 {
 
     [TestFixture]
+	[Ignore("Series")]
     public class MiniSeriesEpisodeParserFixture : CoreTest
     {
         [TestCase("The.Kennedys.Part.2.DSR.XviD-SYS", "The Kennedys", 2)]

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

@@ -6,6 +6,7 @@ namespace NzbDrone.Core.Test.ParserTests
 {
 
     [TestFixture]
+	[Ignore("Series")]
     public class MultiEpisodeParserFixture : CoreTest
     {
         [TestCase("WEEDS.S03E01-06.DUAL.BDRip.XviD.AC3.-HELLYWOOD", "WEEDS", 3, new[] { 1, 2, 3, 4, 5, 6 })]

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

@@ -62,5 +62,30 @@ namespace NzbDrone.Core.Test.ParserTests
         {
             Parser.Parser.ParseTitle(postTitle).SeriesTitle.Should().Be(title);
         }
+
+		[TestCase("The.Man.from.U.N.C.L.E.2015.1080p.BluRay.x264-SPARKS", "The Man from U.N.C.L.E.")]
+		[TestCase("1941.1979.EXTENDED.720p.BluRay.X264-AMIABLE", "1941")]
+		[TestCase("MY MOVIE (2016) [R][Action, Horror][720p.WEB-DL.AVC.8Bit.6ch.AC3].mkv", "MY MOVIE")]
+		[TestCase("R.I.P.D.2013.720p.BluRay.x264-SPARKS", "R.I.P.D.")]
+		[TestCase("V.H.S.2.2013.LIMITED.720p.BluRay.x264-GECKOS", "V.H.S. 2")]
+		[TestCase("This Is A Movie (1999) [IMDB #] <Genre, Genre, Genre> {ACTORS} !DIRECTOR +MORE_SILLY_STUFF_NO_ONE_NEEDS ?", "This Is A Movie")]
+		[TestCase("We Are the Best!.2013.720p.H264.mkv", "We Are the Best!")]
+		[TestCase("(500).Days.Of.Summer.(2009).DTS.1080p.BluRay.x264.NLsubs", "(500) Days Of Summer")]
+		public void should_parse_movie_title(string postTitle, string title)
+		{
+			Parser.Parser.ParseMovieTitle(postTitle).MovieTitle.Should().Be(title);
+		}
+
+		[TestCase("1941.1979.EXTENDED.720p.BluRay.X264-AMIABLE", 1979)]
+		public void should_parse_movie_year(string postTitle, int year)
+		{
+			Parser.Parser.ParseMovieTitle(postTitle).Year.Should().Be(year);
+		}
+
+		[TestCase("The Danish Girl 2015")]
+		public void should_not_parse_language_in_movie_title(string postTitle)
+		{
+			Parser.Parser.ParseMovieTitle(postTitle).Language.Should().Be(Language.English);
+		}
     }
 }

src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/GetEpisodesFixture.cs

@@ -14,6 +14,7 @@ using NzbDrone.Test.Common;
 namespace NzbDrone.Core.Test.ParserTests.ParsingServiceTests
 {
     [TestFixture]
+	[Ignore("Series")]
     public class GetEpisodesFixture : TestBase<ParsingService>
     {
         private Series _series;

src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/MapFixture.cs

@@ -18,6 +18,12 @@ namespace NzbDrone.Core.Test.ParserTests.ParsingServiceTests
     public class MapFixture : TestBase<ParsingService>
     {
         private Series _series;
+		private Movie _movie;
+		private ParsedMovieInfo _parsedMovieInfo;
+		private ParsedMovieInfo _wrongYearInfo;
+		private ParsedMovieInfo _romanTitleInfo;
+		private ParsedMovieInfo _alternativeTitleInfo;
+		private MovieSearchCriteria _movieSearchCriteria;
         private List<Episode> _episodes;
         private ParsedEpisodeInfo _parsedEpisodeInfo;
         private SingleEpisodeSearchCriteria _singleEpisodeSearchCriteria;
@@ -30,6 +36,13 @@ namespace NzbDrone.Core.Test.ParserTests.ParsingServiceTests
                 .With(s => s.CleanTitle = "rock")
                 .Build();
 
+			_movie = Builder<Movie>.CreateNew()
+								   .With(m => m.Title = "Mission Impossible 3")
+								   .With(m => m.CleanTitle = "missionimpossible3")
+			                       .With(m => m.Year = 2006)
+			                       .With(m => m.AlternativeTitles = new List<string> { "Mission Impossible 3: Same same" })
+								   .Build();
+
             _episodes = Builder<Episode>.CreateListOfSize(1)
                                         .All()
                                         .With(e => e.AirDate = DateTime.Today.ToString(Episode.AIR_DATE_FORMAT))
@@ -43,6 +56,31 @@ namespace NzbDrone.Core.Test.ParserTests.ParsingServiceTests
                 EpisodeNumbers = new[] { 1 }
             };
 
+			_parsedMovieInfo = new ParsedMovieInfo
+			{
+				MovieTitle = _movie.Title,
+				Year = _movie.Year,
+
+			};
+
+			_wrongYearInfo = new ParsedMovieInfo
+			{
+				MovieTitle = _movie.Title,
+				Year = 1900,
+			};
+
+			_alternativeTitleInfo = new ParsedMovieInfo
+			{
+				MovieTitle = _movie.AlternativeTitles.First(),
+				Year = _movie.Year,
+			};
+
+			_romanTitleInfo = new ParsedMovieInfo
+			{
+				MovieTitle = "Mission Impossible III",
+				Year = _movie.Year,
+			};
+
             _singleEpisodeSearchCriteria = new SingleEpisodeSearchCriteria
             {
                 Series = _series,
@@ -50,27 +88,18 @@ namespace NzbDrone.Core.Test.ParserTests.ParsingServiceTests
                 SeasonNumber = _episodes.First().SeasonNumber,
                 Episodes = _episodes
             };
+
+			_movieSearchCriteria = new MovieSearchCriteria
+			{
+				Movie = _movie
+			};
         }
 
-        private void GivenMatchBySeriesTitle()
+        private void GivenMatchByMovieTitle()
         {
-            Mocker.GetMock<ISeriesService>()
+            Mocker.GetMock<IMovieService>()
                   .Setup(s => s.FindByTitle(It.IsAny<string>()))
-                  .Returns(_series);
-        }
-
-        private void GivenMatchByTvdbId()
-        {
-            Mocker.GetMock<ISeriesService>()
-                  .Setup(s => s.FindByTvdbId(It.IsAny<Int32>()))
-                  .Returns(_series);
-        }
-
-        private void GivenMatchByTvRageId()
-        {
-            Mocker.GetMock<ISeriesService>()
-                  .Setup(s => s.FindByTvRageId(It.IsAny<int>()))
-                  .Returns(_series);
+                  .Returns(_movie);
         }
 
         private void GivenParseResultSeriesDoesntMatchSearchCriteria()
@@ -79,121 +108,45 @@ namespace NzbDrone.Core.Test.ParserTests.ParsingServiceTests
         }
 
         [Test]
-        public void should_lookup_series_by_name()
+        public void should_lookup_Movie_by_name()
         {
-            GivenMatchBySeriesTitle();
+            GivenMatchByMovieTitle();
 
-            Subject.Map(_parsedEpisodeInfo, _series.TvdbId, _series.TvRageId);
+            Subject.Map(_parsedMovieInfo, "", null);
 
-            Mocker.GetMock<ISeriesService>()
+            Mocker.GetMock<IMovieService>()
                   .Verify(v => v.FindByTitle(It.IsAny<string>()), Times.Once());
         }
 
         [Test]
-        public void should_use_tvdbid_when_series_title_lookup_fails()
+        public void should_use_search_criteria_movie_title()
         {
-            GivenMatchByTvdbId();
+            GivenMatchByMovieTitle();
 
-            Subject.Map(_parsedEpisodeInfo, _series.TvdbId, _series.TvRageId);
-
-            Mocker.GetMock<ISeriesService>()
-                  .Verify(v => v.FindByTvdbId(It.IsAny<Int32>()), Times.Once());
-        }
-
-        [Test]
-        public void should_use_tvrageid_when_series_title_lookup_fails()
-        {
-            GivenMatchByTvRageId();
-
-            Subject.Map(_parsedEpisodeInfo, 0, _series.TvRageId);
-
-            Mocker.GetMock<ISeriesService>()
-                  .Verify(v => v.FindByTvRageId(It.IsAny<int>()), Times.Once());
-        }
-
-        [Test]
-        public void should_not_use_tvrageid_when_scene_naming_exception_exists()
-        {
-            GivenMatchByTvRageId();
-
-            Mocker.GetMock<ISceneMappingService>()
-                  .Setup(v => v.FindTvdbId(It.IsAny<string>()))
-                  .Returns(10);
-
-            var result = Subject.Map(_parsedEpisodeInfo, _series.TvdbId, _series.TvRageId);
-
-            Mocker.GetMock<ISeriesService>()
-                  .Verify(v => v.FindByTvRageId(It.IsAny<int>()), Times.Never());
-
-            result.Series.Should().BeNull();
-        }
-
-        [Test]
-        public void should_use_search_criteria_series_title()
-        {
-            GivenMatchBySeriesTitle();
-
-            Subject.Map(_parsedEpisodeInfo, _series.TvdbId, _series.TvRageId, _singleEpisodeSearchCriteria);
+            Subject.Map(_parsedMovieInfo, "", _movieSearchCriteria);
 
             Mocker.GetMock<ISeriesService>()
                   .Verify(v => v.FindByTitle(It.IsAny<string>()), Times.Never());
         }
 
         [Test]
-        public void should_FindByTitle_when_search_criteria_matching_fails()
-        {
-            GivenParseResultSeriesDoesntMatchSearchCriteria();
-
-            Subject.Map(_parsedEpisodeInfo, 10, 10, _singleEpisodeSearchCriteria);
-
-            Mocker.GetMock<ISeriesService>()
-                  .Verify(v => v.FindByTitle(It.IsAny<string>()), Times.Once());
+        public void should_not_match_with_wrong_year()
+		{
+			GivenMatchByMovieTitle();
+			Subject.Map(_wrongYearInfo, "", _movieSearchCriteria).Movie.Should().BeNull();
         }
 
-        [Test]
-        public void should_FindByTvdbId_when_search_criteria_and_FindByTitle_matching_fails()
-        {
-            GivenParseResultSeriesDoesntMatchSearchCriteria();
+		[Test]
+		public void should_match_alternative_title()
+		{
+			Subject.Map(_alternativeTitleInfo, "", _movieSearchCriteria).Movie.Should().Be(_movieSearchCriteria.Movie);
+		}
 
-            Subject.Map(_parsedEpisodeInfo, 10, 10, _singleEpisodeSearchCriteria);
+		[Test]
+		public void should_match_roman_title()
+		{
+			Subject.Map(_romanTitleInfo, "", _movieSearchCriteria).Movie.Should().Be(_movieSearchCriteria.Movie);
+		}
 
-            Mocker.GetMock<ISeriesService>()
-                  .Verify(v => v.FindByTvdbId(It.IsAny<Int32>()), Times.Once());
-        }
-
-        [Test]
-        public void should_FindByTvRageId_when_search_criteria_and_FindByTitle_matching_fails()
-        {
-            GivenParseResultSeriesDoesntMatchSearchCriteria();
-
-            Subject.Map(_parsedEpisodeInfo, 10, 10, _singleEpisodeSearchCriteria);
-
-            Mocker.GetMock<ISeriesService>()
-                  .Verify(v => v.FindByTvRageId(It.IsAny<int>()), Times.Once());
-        }
-
-        [Test]
-        public void should_use_tvdbid_matching_when_alias_is_found()
-        {
-            Mocker.GetMock<ISceneMappingService>()
-                  .Setup(s => s.FindTvdbId(It.IsAny<string>()))
-                  .Returns(_series.TvdbId);
-
-            Subject.Map(_parsedEpisodeInfo, _series.TvdbId, _series.TvRageId, _singleEpisodeSearchCriteria);
-
-            Mocker.GetMock<ISeriesService>()
-                  .Verify(v => v.FindByTitle(It.IsAny<string>()), Times.Never());
-        }
-
-        [Test]
-        public void should_use_tvrageid_match_from_search_criteria_when_title_match_fails()
-        {
-            GivenParseResultSeriesDoesntMatchSearchCriteria();
-
-            Subject.Map(_parsedEpisodeInfo, _series.TvdbId, _series.TvRageId, _singleEpisodeSearchCriteria);
-
-            Mocker.GetMock<ISeriesService>()
-                  .Verify(v => v.FindByTitle(It.IsAny<string>()), Times.Never());
-        }
     }
 }

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

@@ -7,6 +7,7 @@ namespace NzbDrone.Core.Test.ParserTests
 {
 
     [TestFixture]
+	[Ignore("Series")]//Is this really necessary with movies? I dont think so
     public class PathParserFixture : CoreTest
     {
         [TestCase(@"z:\tv shows\battlestar galactica (2003)\Season 3\S03E05 - Collaborators.mkv", 3, 5)]

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

@@ -24,6 +24,8 @@ namespace NzbDrone.Core.Test.ParserTests
             new object[] { Quality.Bluray720p },
             new object[] { Quality.Bluray1080p },
             new object[] { Quality.Bluray2160p },
+            new object[] { Quality.Remux1080p },
+            new object[] { Quality.Remux2160p },
         };
 
         public static object[] OtherSourceQualityParserCases =
@@ -40,6 +42,8 @@ namespace NzbDrone.Core.Test.ParserTests
             new object[] { "720p BluRay", Quality.Bluray720p },
             new object[] { "1080p BluRay", Quality.Bluray1080p },
             new object[] { "2160p BluRay", Quality.Bluray2160p },
+            new object[] { "1080p Remux", Quality.Remux1080p },
+            new object[] { "2160p Remux", Quality.Remux2160p },
         };
 
         [TestCase("S07E23 .avi ", false)]
@@ -79,7 +83,6 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("the.shield.1x13.circles.ws.xvidvd-tns", false)]
         [TestCase("the_x-files.9x18.sunshine_days.ac3.ws_dvdrip_xvid-fov.avi", false)]
         [TestCase("[FroZen] Miyuki - 23 [DVD][7F6170E6]", false)]
-        [TestCase("Hannibal.S01E05.576p.BluRay.DD5.1.x264-HiSD", false)]
         [TestCase("Hannibal.S01E05.480p.BluRay.DD5.1.x264-HiSD", false)]
         [TestCase("Heidi Girl of the Alps (BD)(640x480(RAW) (BATCH 1) (1-13)", false)]
         [TestCase("[Doki] Clannad - 02 (848x480 XviD BD MP3) [95360783]", false)]
@@ -215,20 +218,41 @@ 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)
+		[TestCase("Movie.Name.2004.576p.BDRip.x264-HANDJOB")]
+		[TestCase("Hannibal.S01E05.576p.BluRay.DD5.1.x264-HiSD")]
+		public void should_parse_bluray576p_quality(string title)
+		{
+			ParseAndVerifyQuality(title, Quality.Bluray576p, false);
+		}
+
+        [TestCase("Contract.to.Kill.2016.REMUX.1080p.BluRay.AVC.DTS-HD.MA.5.1-iFT")]
+        [TestCase("27.Dresses.2008.REMUX.1080p.Bluray.AVC.DTS-HR.MA.5.1-LEGi0N")]
+        public void should_parse_remux1080p_quality(string title)
         {
-            ParseAndVerifyQuality(title, Quality.RAWHD, proper);
+            ParseAndVerifyQuality(title, Quality.Remux1080p, false);
         }
 
+        [TestCase("Contract.to.Kill.2016.REMUX.2160p.BluRay.AVC.DTS-HD.MA.5.1-iFT")]
+        [TestCase("27.Dresses.2008.REMUX.2160p.Bluray.AVC.DTS-HR.MA.5.1-LEGi0N")]
+        public void should_parse_remux2160p_quality(string title)
+        {
+            ParseAndVerifyQuality(title, Quality.Remux2160p, false);
+        }
+
+        //[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)]
         [TestCase("Series.Title.S01E01.webm", false)]
@@ -275,6 +299,13 @@ namespace NzbDrone.Core.Test.ParserTests
             QualityParser.ParseQuality(title).QualitySource.Should().Be(QualitySource.Extension);
         }
 
+        [TestCase("Movie.Title.2016.1080p.KORSUB.WEBRip.x264.AAC2.0-RADARR", "korsub")]
+        [TestCase("Movie.Title.2016.1080p.KORSUBS.WEBRip.x264.AAC2.0-RADARR", "korsubs")]
+        public void should_parse_hardcoded_subs(string postTitle, string sub)
+        {
+            QualityParser.ParseQuality(postTitle).HardcodedSubs.Should().Be(sub);
+        }
+
         private void ParseAndVerifyQuality(string title, Quality quality, bool proper)
         {
             var result = QualityParser.ParseQuality(title);

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

@@ -6,6 +6,7 @@ namespace NzbDrone.Core.Test.ParserTests
 {
 
     [TestFixture]
+	[Ignore("Series")]
     public class SeasonParserFixture : CoreTest
     {
         [TestCase("30.Rock.Season.04.HDTV.XviD-DIMENSION", "30 Rock", 4)]

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

@@ -5,6 +5,7 @@ using NzbDrone.Core.Test.Framework;
 namespace NzbDrone.Core.Test.ParserTests
 {
     [TestFixture]
+	[Ignore("Series")]
     public class SeriesTitleInfoFixture : CoreTest
     {
         [Test]

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

@@ -7,6 +7,7 @@ namespace NzbDrone.Core.Test.ParserTests
 {
 
     [TestFixture]
+	[Ignore("Series")]
     public class SingleEpisodeParserFixture : CoreTest
     {
         [TestCase("Sonny.With.a.Chance.S02E15", "Sonny With a Chance", 2, 15)]

src/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/GetVideoFilesFixture.cs

@@ -1,39 +1,47 @@
-using System.IO;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using FizzWare.NBuilder;
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common.Disk;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Test.Framework;
+using NzbDrone.Core.Tv;
 
 namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
 {
 
     public class GetVideoFilesFixture : CoreTest<DiskScanService>
     {
-        private string[] _files;
+        private string[] _fileNames;
 
         [SetUp]
         public void Setup()
         {
-            _files = new[]
+            _fileNames = new[]
                         {
-                            @"C:\Test\30 Rock1.mkv",
-                            @"C:\Test\30 Rock2.avi",
-                            @"C:\Test\30 Rock3.MP4",
-                            @"C:\Test\30 Rock4.wMv",
-                            @"C:\Test\movie.exe",
-                            @"C:\Test\movie"
+                            @"30 Rock1.mkv",
+                            @"30 Rock2.avi",
+                            @"30 Rock3.MP4",
+                            @"30 Rock4.wMv",
+                            @"movie.exe",
+                            @"movie"
                         };
-
-            GivenFiles();
         }
 
-        private void GivenFiles()
+        private IEnumerable<string> GetFiles(string folder, string subFolder = "")
         {
+            return _fileNames.Select(f => Path.Combine(folder, subFolder, f));
+        }
+
+        private void GivenFiles(IEnumerable<string> files)
+        {
+            var filesToReturn = files.ToArray();
             Mocker.GetMock<IDiskProvider>()
-                .Setup(s => s.GetFiles(It.IsAny<string>(), SearchOption.AllDirectories))
-                .Returns(_files);
+                  .Setup(s => s.GetFiles(It.IsAny<string>(), SearchOption.AllDirectories))
+                  .Returns(filesToReturn);
         }
 
         [Test]
@@ -73,8 +81,31 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
         public void should_return_video_files_only()
         {
             var path = @"C:\Test\";
+            GivenFiles(GetFiles(path));
 
             Subject.GetVideoFiles(path).Should().HaveCount(4);
         }
+
+        [TestCase("Extras")]
+        [TestCase("@eadir")]
+        [TestCase("extrafanart")]
+        [TestCase("Plex Versions")]
+        [TestCase(".secret")]
+        [TestCase(".hidden")]
+        public void should_filter_certain_sub_folders(string subFolder)
+        {
+            var path = @"C:\Test\";
+            var files = GetFiles(path).ToList();
+            var specialFiles = GetFiles(path, subFolder).ToList();
+            var allFiles = files.Concat(specialFiles);
+
+            var series = Builder<Series>.CreateNew()
+                                        .With(s => s.Path = path)
+                                        .Build();
+
+            var filteredFiles = Subject.FilterFiles(series, allFiles);
+            filteredFiles.Should().NotContain(specialFiles);
+            filteredFiles.Count.Should().BeGreaterThan(0);
+        }
     }
-}
+}

src/NzbDrone.Core.Test/Providers/XemProxyFixture.cs

@@ -1,54 +0,0 @@
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Core.DataAugmentation.Xem;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Test.Common.Categories;
-
-namespace NzbDrone.Core.Test.Providers
-{
-    [TestFixture]
-    [IntegrationTest]
-    public class XemProxyFixture : CoreTest<XemProxy>
-    {
-        [SetUp]
-        public void Setup()
-        {
-            UseRealHttp();
-        }
-
-        [Test]
-        public void get_series_ids()
-        {
-            var ids = Subject.GetXemSeriesIds();
-
-            ids.Should().NotBeEmpty();
-            ids.Should().Contain(i => i == 73141);
-        }
-
-        [TestCase(12345, Description = "invalid id")]
-        [TestCase(279042, Description = "no single connection")]
-        public void should_return_empty_when_known_error(int id)
-        {
-            Subject.GetSceneTvdbMappings(id).Should().BeEmpty();
-        }
-
-        [TestCase(82807)]
-        [TestCase(73141, Description = "American Dad!")]
-        public void should_get_mapping(int seriesId)
-        {
-            var result = Subject.GetSceneTvdbMappings(seriesId);
-
-            result.Should().NotBeEmpty();
-            result.Should().OnlyContain(c => c.Scene != null);
-            result.Should().OnlyContain(c => c.Tvdb != null);
-        }
-
-        [TestCase(78916)]
-        public void should_filter_out_episodes_without_scene_mapping(int seriesId)
-        {
-            var result = Subject.GetSceneTvdbMappings(seriesId);
-
-            result.Should().NotContain(c => c.Tvdb == null);
-        }
-    }
-}

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)