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.

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

@@ -6,6 +6,11 @@ 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
@@ -14,7 +19,12 @@ namespace NzbDrone.Api.Config
         {
             return new NetImportConfigResource
             {
-                NetImportSyncInterval = model.NetImportSyncInterval
+                NetImportSyncInterval = model.NetImportSyncInterval,
+		ListSyncLevel = model.ListSyncLevel,
+		ImportExclusions = model.ImportExclusions,
+	        TraktAuthToken = model.TraktAuthToken,
+	        TraktRefreshToken = model.TraktRefreshToken,
+	        TraktTokenExpiry = model.TraktTokenExpiry,
             };
         }
     }

src/NzbDrone.Api/Movies/MovieBulkImportModule.cs

@@ -112,7 +112,7 @@ namespace NzbDrone.Api.Movie
 
 				var files = _diskScanService.GetVideoFiles(f.Path);
 
-				var decisions = _importDecisionMaker.GetImportDecisions(files.ToList(), m);
+				var decisions = _importDecisionMaker.GetImportDecisions(files.ToList(), m, true);
 
 				var decision = decisions.Where(d => d.Approved && !d.Rejections.Any()).FirstOrDefault();
 
@@ -172,4 +172,4 @@ namespace NzbDrone.Api.Movie
             }
         }
     }
-}
+}

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 = GetMovieFile;
-            /*GetResourceAll = GetEpisodeFiles;
-            UpdateResource = SetQuality;*/
             UpdateResource = SetQuality;
-            DeleteResource = DeleteEpisodeFile;
+            DeleteResource = DeleteMovieFile;
         }
 
         private MovieFileResource GetMovieFile(int id)
         {
-            var episodeFile = _mediaFileService.GetMovie(id);
+            var movie = _mediaFileService.GetMovie(id);
 
-            return episodeFile.ToResource();
+            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));
-        }
-        */
-        private void SetQuality(MovieFileResource episodeFileResource)
-        {
-            var episodeFile = _mediaFileService.GetMovie(episodeFileResource.Id);
-            episodeFile.Quality = episodeFileResource.Quality;
-            _mediaFileService.Update(episodeFile);
+            var movieFile = _mediaFileService.GetMovie(movieFileResource.Id);
+            movieFile.Quality = movieFileResource.Quality;
+            _mediaFileService.Update(movieFile);
         }
 
-        private void DeleteEpisodeFile(int id)
+        private void DeleteMovieFile(int id)
         {
-            var episodeFile = _mediaFileService.GetMovie(id);
-            var series = _seriesService.GetMovie(episodeFile.MovieId);
-            var fullPath = Path.Combine(series.Path, episodeFile.RelativePath);
+            var movieFile = _mediaFileService.GetMovie(id);
+            var movie = _movieService.GetMovie(movieFile.MovieId);
+            var fullPath = Path.Combine(movie.Path, movieFile.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

@@ -13,27 +13,27 @@ namespace NzbDrone.Api.Movies
         IHandle<MovieGrabbedEvent>,
         IHandle<MovieDownloadedEvent>
     {
-        protected readonly IMovieService _episodeService;
+        protected readonly IMovieService _movieService;
         protected readonly IQualityUpgradableSpecification _qualityUpgradableSpecification;
 
-        protected MovieModuleWithSignalR(IMovieService episodeService,
+        protected MovieModuleWithSignalR(IMovieService movieService,
                                            IQualityUpgradableSpecification qualityUpgradableSpecification,
                                            IBroadcastSignalRMessage signalRBroadcaster)
             : base(signalRBroadcaster)
         {
-            _episodeService = episodeService;
+            _movieService = movieService;
             _qualityUpgradableSpecification = qualityUpgradableSpecification;
 
             GetResourceById = GetMovie;
         }
 
-        protected MovieModuleWithSignalR(IMovieService episodeService,
+        protected MovieModuleWithSignalR(IMovieService movieService,
                                            IQualityUpgradableSpecification qualityUpgradableSpecification,
                                            IBroadcastSignalRMessage signalRBroadcaster,
                                            string resource)
             : base(signalRBroadcaster, resource)
         {
-            _episodeService = episodeService;
+            _movieService = movieService;
             _qualityUpgradableSpecification = qualityUpgradableSpecification;
 
             GetResourceById = GetMovie;
@@ -41,8 +41,8 @@ namespace NzbDrone.Api.Movies
 
         protected MovieResource GetMovie(int id)
         {
-            var episode = _episodeService.GetMovie(id);
-            var resource = MapToResource(episode, true);
+            var movie = _movieService.GetMovie(id);
+            var resource = MapToResource(movie, true);
             return resource;
         }
 
@@ -52,7 +52,7 @@ namespace NzbDrone.Api.Movies
 
             if (includeSeries)
             {
-                var series = episode ?? _episodeService.GetMovie(episode.Id);
+                var series = episode ?? _movieService.GetMovie(episode.Id);
                 resource = series.ToResource();
             }
 

src/NzbDrone.Api/NetImport/NetImportModule.cs

@@ -1,16 +1,17 @@
-using NzbDrone.Api.ClientSchema;
+using FluentValidation;
+using NzbDrone.Api.ClientSchema;
 using NzbDrone.Core.NetImport;
-using NzbDrone.Core.Profiles;
+using NzbDrone.Core.Validation.Paths;
 
 namespace NzbDrone.Api.NetImport
 {
     public class NetImportModule : ProviderModuleBase<NetImportResource, INetImport, NetImportDefinition>
     {
-        private readonly IProfileService _profileService;
-        public NetImportModule(NetImportFactory indexerFactory, IProfileService profileService)
-            : base(indexerFactory, "netimport")
+        public NetImportModule(NetImportFactory netImportFactory) : base(netImportFactory, "netimport")
         {
-            _profileService = profileService;
+            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)
@@ -22,6 +23,7 @@ namespace NzbDrone.Api.NetImport
             resource.ProfileId = definition.ProfileId;
             resource.RootFolderPath = definition.RootFolderPath;
             resource.ShouldMonitor = definition.ShouldMonitor;
+            resource.MinimumAvailability = definition.MinimumAvailability;
         }
 
         protected override void MapToModel(NetImportDefinition definition, NetImportResource resource)
@@ -33,6 +35,7 @@ namespace NzbDrone.Api.NetImport
             definition.ProfileId = resource.ProfileId;
             definition.RootFolderPath = resource.RootFolderPath;
             definition.ShouldMonitor = resource.ShouldMonitor;
+            definition.MinimumAvailability = resource.MinimumAvailability;
         }
 
         protected override void Validate(NetImportDefinition definition, bool includeWarnings)
@@ -41,4 +44,4 @@ namespace NzbDrone.Api.NetImport
             base.Validate(definition, includeWarnings);
         }
     }
-}
+}

src/NzbDrone.Api/NetImport/NetImportResource.cs

@@ -1,4 +1,5 @@
 using NzbDrone.Core.NetImport;
+using NzbDrone.Core.Tv;
 
 namespace NzbDrone.Api.NetImport
 {
@@ -9,5 +10,6 @@ namespace NzbDrone.Api.NetImport
         public bool ShouldMonitor { get; set; }
         public string RootFolderPath { get; set; }
         public int ProfileId { get; set; }
+        public MovieStatusType MinimumAvailability { get; set; }
     }
-}
+}

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

@@ -21,6 +21,7 @@ namespace NzbDrone.Api.Movie
             _searchProxy = searchProxy;
             Get["/"] = x => Search();
             Get["/tmdb"] = x => SearchByTmdbId();
+            Get["/imdb"] = x => SearchByImdbId();
         }
 
         private Response SearchByTmdbId()
@@ -35,6 +36,12 @@ namespace NzbDrone.Api.Movie
             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()
         {

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/Wanted/MovieMissingModule.cs

@@ -30,14 +30,7 @@ namespace NzbDrone.Api.Wanted
         {
             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, true));
 

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

@@ -20,16 +20,16 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
     {
         protected DownloadStationSettings _settings;
 
-        protected DownloadStationTorrent _queued;
-        protected DownloadStationTorrent _downloading;
-        protected DownloadStationTorrent _failed;
-        protected DownloadStationTorrent _completed;
-        protected DownloadStationTorrent _seeding;
-        protected DownloadStationTorrent _magnet;
-        protected DownloadStationTorrent _singleFile;
-        protected DownloadStationTorrent _multipleFiles;
-        protected DownloadStationTorrent _singleFileCompleted;
-        protected DownloadStationTorrent _multipleFilesCompleted;
+        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";
@@ -55,15 +55,15 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
             Subject.Definition = new DownloadClientDefinition();
             Subject.Definition.Settings = _settings;
 
-            _queued = new DownloadStationTorrent()
+            _queued = new DownloadStationTask()
             {
                 Id = "id1",
                 Size = 1000,
                 Status = DownloadStationTaskStatus.Waiting,
-                Type = DownloadStationTaskType.BT,
+                Type = DownloadStationTaskType.BT.ToString(),
                 Username = "admin",
                 Title = "title",
-                Additional = new DownloadStationTorrentAdditional
+                Additional = new DownloadStationTaskAdditional
                 {
                     Detail = new Dictionary<string, string>
                     {
@@ -78,15 +78,15 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
                 }
             };
 
-            _completed = new DownloadStationTorrent()
+            _completed = new DownloadStationTask()
             {
                 Id = "id2",
                 Size = 1000,
                 Status = DownloadStationTaskStatus.Finished,
-                Type = DownloadStationTaskType.BT,
+                Type = DownloadStationTaskType.BT.ToString(),
                 Username = "admin",
                 Title = "title",
-                Additional = new DownloadStationTorrentAdditional
+                Additional = new DownloadStationTaskAdditional
                 {
                     Detail = new Dictionary<string, string>
                     {
@@ -101,15 +101,15 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
                 }
             };
 
-            _seeding = new DownloadStationTorrent()
+            _seeding = new DownloadStationTask()
             {
                 Id = "id2",
                 Size = 1000,
                 Status = DownloadStationTaskStatus.Seeding,
-                Type = DownloadStationTaskType.BT,
+                Type = DownloadStationTaskType.BT.ToString(),
                 Username = "admin",
                 Title = "title",
-                Additional = new DownloadStationTorrentAdditional
+                Additional = new DownloadStationTaskAdditional
                 {
                     Detail = new Dictionary<string, string>
                     {
@@ -124,15 +124,15 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
                 }
             };
 
-            _downloading = new DownloadStationTorrent()
+            _downloading = new DownloadStationTask()
             {
                 Id = "id3",
                 Size = 1000,
                 Status = DownloadStationTaskStatus.Downloading,
-                Type = DownloadStationTaskType.BT,
+                Type = DownloadStationTaskType.BT.ToString(),
                 Username = "admin",
                 Title = "title",
-                Additional = new DownloadStationTorrentAdditional
+                Additional = new DownloadStationTaskAdditional
                 {
                     Detail = new Dictionary<string, string>
                     {
@@ -147,15 +147,15 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
                 }
             };
 
-            _failed = new DownloadStationTorrent()
+            _failed = new DownloadStationTask()
             {
                 Id = "id4",
                 Size = 1000,
                 Status = DownloadStationTaskStatus.Error,
-                Type = DownloadStationTaskType.BT,
+                Type = DownloadStationTaskType.BT.ToString(),
                 Username = "admin",
                 Title = "title",
-                Additional = new DownloadStationTorrentAdditional
+                Additional = new DownloadStationTaskAdditional
                 {
                     Detail = new Dictionary<string, string>
                     {
@@ -170,15 +170,15 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
                 }
             };
 
-            _singleFile = new DownloadStationTorrent()
+            _singleFile = new DownloadStationTask()
             {
                 Id = "id5",
                 Size = 1000,
                 Status = DownloadStationTaskStatus.Seeding,
-                Type = DownloadStationTaskType.BT,
+                Type = DownloadStationTaskType.BT.ToString(),
                 Username = "admin",
                 Title = "a.mkv",
-                Additional = new DownloadStationTorrentAdditional
+                Additional = new DownloadStationTaskAdditional
                 {
                     Detail = new Dictionary<string, string>
                     {
@@ -193,15 +193,15 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
                 }
             };
 
-            _multipleFiles = new DownloadStationTorrent()
+            _multipleFiles = new DownloadStationTask()
             {
                 Id = "id6",
                 Size = 1000,
                 Status = DownloadStationTaskStatus.Seeding,
-                Type = DownloadStationTaskType.BT,
+                Type = DownloadStationTaskType.BT.ToString(),
                 Username = "admin",
                 Title = "title",
-                Additional = new DownloadStationTorrentAdditional
+                Additional = new DownloadStationTaskAdditional
                 {
                     Detail = new Dictionary<string, string>
                     {
@@ -216,15 +216,15 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
                 }
             };
 
-            _singleFileCompleted = new DownloadStationTorrent()
+            _singleFileCompleted = new DownloadStationTask()
             {
                 Id = "id6",
                 Size = 1000,
                 Status = DownloadStationTaskStatus.Finished,
-                Type = DownloadStationTaskType.BT,
+                Type = DownloadStationTaskType.BT.ToString(),
                 Username = "admin",
                 Title = "a.mkv",
-                Additional = new DownloadStationTorrentAdditional
+                Additional = new DownloadStationTaskAdditional
                 {
                     Detail = new Dictionary<string, string>
                     {
@@ -239,15 +239,15 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
                 }
             };
 
-            _multipleFilesCompleted = new DownloadStationTorrent()
+            _multipleFilesCompleted = new DownloadStationTask()
             {
                 Id = "id6",
                 Size = 1000,
                 Status = DownloadStationTaskStatus.Finished,
-                Type = DownloadStationTaskType.BT,
+                Type = DownloadStationTaskType.BT.ToString(),
                 Username = "admin",
                 Title = "title",
-                Additional = new DownloadStationTorrentAdditional
+                Additional = new DownloadStationTaskAdditional
                 {
                     Detail = new Dictionary<string, string>
                     {
@@ -304,21 +304,21 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
             _settings.TvDirectory = _tvDirectory;
         }
 
-        protected virtual void GivenTorrents(List<DownloadStationTorrent> torrents)
+        protected virtual void GivenTasks(List<DownloadStationTask> torrents)
         {
             if (torrents == null)
             {
-                torrents = new List<DownloadStationTorrent>();
+                torrents = new List<DownloadStationTask>();
             }
 
             Mocker.GetMock<IDownloadStationProxy>()
-                  .Setup(s => s.GetTorrents(It.IsAny<DownloadStationSettings>()))
+                  .Setup(s => s.GetTasks(It.IsAny<DownloadStationSettings>()))
                   .Returns(torrents);
         }
 
         protected void PrepareClientToReturnQueuedItem()
         {
-            GivenTorrents(new List<DownloadStationTorrent>
+            GivenTasks(new List<DownloadStationTask>
             {
                 _queued
             });
@@ -331,17 +331,17 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
                   .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), new byte[1000]));
 
             Mocker.GetMock<IDownloadStationProxy>()
-                  .Setup(s => s.AddTorrentFromUrl(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<DownloadStationSettings>()))
+                  .Setup(s => s.AddTaskFromUrl(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<DownloadStationSettings>()))
                   .Callback(PrepareClientToReturnQueuedItem);
 
             Mocker.GetMock<IDownloadStationProxy>()
-                  .Setup(s => s.AddTorrentFromData(It.IsAny<byte[]>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<DownloadStationSettings>()))
+                  .Setup(s => s.AddTaskFromData(It.IsAny<byte[]>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<DownloadStationSettings>()))
                   .Callback(PrepareClientToReturnQueuedItem);
         }
 
-        protected override RemoteEpisode CreateRemoteEpisode()
+        protected override RemoteMovie CreateRemoteMovie()
         {
-            var episode = base.CreateRemoteEpisode();
+            var episode = base.CreateRemoteMovie();
 
             episode.Release.DownloadUrl = DownloadURL;
 
@@ -350,10 +350,10 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
 
         protected int GivenAllKindOfTasks()
         {
-            var tasks = new List<DownloadStationTorrent>() { _queued, _completed, _failed, _downloading, _seeding };
+            var tasks = new List<DownloadStationTask>() { _queued, _completed, _failed, _downloading, _seeding };
 
             Mocker.GetMock<IDownloadStationProxy>()
-                  .Setup(d => d.GetTorrents(_settings))
+                  .Setup(d => d.GetTasks(_settings))
                   .Returns(tasks);
 
             return tasks.Count;
@@ -366,14 +366,14 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
             GivenTvDirectory();
             GivenSuccessfulDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             var id = Subject.Download(remoteEpisode);
 
             id.Should().NotBeNullOrEmpty();
 
             Mocker.GetMock<IDownloadStationProxy>()
-                  .Verify(v => v.AddTorrentFromUrl(It.IsAny<string>(), _tvDirectory, It.IsAny<DownloadStationSettings>()), Times.Once());
+                  .Verify(v => v.AddTaskFromUrl(It.IsAny<string>(), _tvDirectory, It.IsAny<DownloadStationSettings>()), Times.Once());
         }
 
         [Test]
@@ -383,14 +383,14 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
             GivenTvCategory();
             GivenSuccessfulDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             var id = Subject.Download(remoteEpisode);
 
             id.Should().NotBeNullOrEmpty();
 
             Mocker.GetMock<IDownloadStationProxy>()
-                  .Verify(v => v.AddTorrentFromUrl(It.IsAny<string>(), $"{_defaultDestination}/{_category}", It.IsAny<DownloadStationSettings>()), Times.Once());
+                  .Verify(v => v.AddTaskFromUrl(It.IsAny<string>(), $"{_defaultDestination}/{_category}", It.IsAny<DownloadStationSettings>()), Times.Once());
         }
 
         [Test]
@@ -399,14 +399,36 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
             GivenSerialNumber();
             GivenSuccessfulDownload();
 
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             var id = Subject.Download(remoteEpisode);
 
             id.Should().NotBeNullOrEmpty();
 
             Mocker.GetMock<IDownloadStationProxy>()
-                  .Verify(v => v.AddTorrentFromUrl(It.IsAny<string>(), null, It.IsAny<DownloadStationSettings>()), Times.Once());
+                  .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]
@@ -416,7 +438,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
 
             GivenSerialNumber();
             GivenSharedFolder();
-            GivenTorrents(new List<DownloadStationTorrent> { _completed });
+            GivenTasks(new List<DownloadStationTask> { _completed });
 
             Subject.GetItems().Should().BeEmpty();
         }
@@ -450,9 +472,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
         }
 
         [Test]
-        public void Download_should_throw_and_not_add_torrent_if_cannot_get_serial_number()
+        public void Download_should_throw_and_not_add_task_if_cannot_get_serial_number()
         {
-            var remoteEpisode = CreateRemoteEpisode();
+            var remoteEpisode = CreateRemoteMovie();
 
             Mocker.GetMock<ISerialNumberProvider>()
                   .Setup(s => s.GetSerialNumber(_settings))
@@ -461,16 +483,16 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
             Assert.Throws(Is.InstanceOf<Exception>(), () => Subject.Download(remoteEpisode));
 
             Mocker.GetMock<IDownloadStationProxy>()
-                  .Verify(v => v.AddTorrentFromUrl(It.IsAny<string>(), null, _settings), Times.Never());
+                  .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_torrent()
+        public void GetItems_should_set_outputPath_to_base_folder_when_single_file_non_finished_tasks()
         {
             GivenSerialNumber();
             GivenSharedFolder();
 
-            GivenTorrents(new List<DownloadStationTorrent>() { _singleFile });
+            GivenTasks(new List<DownloadStationTask>() { _singleFile });
 
             var items = Subject.GetItems();
 
@@ -479,12 +501,12 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
         }
 
         [Test]
-        public void GetItems_should_set_outputPath_to_torrent_folder_when_multiple_files_non_finished_torrent()
+        public void GetItems_should_set_outputPath_to_torrent_folder_when_multiple_files_non_finished_tasks()
         {
             GivenSerialNumber();
             GivenSharedFolder();
 
-            GivenTorrents(new List<DownloadStationTorrent>() { _multipleFiles });
+            GivenTasks(new List<DownloadStationTask>() { _multipleFiles });
 
             var items = Subject.GetItems();
 
@@ -493,12 +515,12 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
         }
 
         [Test]
-        public void GetItems_should_set_outputPath_to_base_folder_when_single_file_finished_torrent()
+        public void GetItems_should_set_outputPath_to_base_folder_when_single_file_finished_tasks()
         {
             GivenSerialNumber();
             GivenSharedFolder();
 
-            GivenTorrents(new List<DownloadStationTorrent>() { _singleFileCompleted });
+            GivenTasks(new List<DownloadStationTask>() { _singleFileCompleted });
 
             var items = Subject.GetItems();
 
@@ -507,12 +529,12 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
         }
 
         [Test]
-        public void GetItems_should_set_outputPath_to_torrent_folder_when_multiple_files_finished_torrent()
+        public void GetItems_should_set_outputPath_to_torrent_folder_when_multiple_files_finished_tasks()
         {
             GivenSerialNumber();
             GivenSharedFolder();
 
-            GivenTorrents(new List<DownloadStationTorrent>() { _multipleFilesCompleted });
+            GivenTasks(new List<DownloadStationTask>() { _multipleFilesCompleted });
 
             var items = Subject.GetItems();
 
@@ -521,12 +543,12 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
         }
 
         [Test]
-        public void GetItems_should_not_map_outputpath_for_queued_or_downloading_torrents()
+        public void GetItems_should_not_map_outputpath_for_queued_or_downloading_tasks()
         {
             GivenSerialNumber();
             GivenSharedFolder();
 
-            GivenTorrents(new List<DownloadStationTorrent>
+            GivenTasks(new List<DownloadStationTask>
             {
                 _queued, _downloading
             });
@@ -538,12 +560,12 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
         }
 
         [Test]
-        public void GetItems_should_map_outputpath_for_completed_or_failed_torrents()
+        public void GetItems_should_map_outputpath_for_completed_or_failed_tasks()
         {
             GivenSerialNumber();
             GivenSharedFolder();
 
-            GivenTorrents(new List<DownloadStationTorrent>
+            GivenTasks(new List<DownloadStationTask>
             {
                 _completed, _failed, _seeding
             });
@@ -565,7 +587,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
 
             _queued.Status = apiStatus;
 
-            GivenTorrents(new List<DownloadStationTorrent>() { _queued });
+            GivenTasks(new List<DownloadStationTask>() { _queued });
 
             var items = Subject.GetItems();
 
@@ -589,7 +611,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
 
             _queued.Status = apiStatus;
 
-            GivenTorrents(new List<DownloadStationTorrent>() { _queued });
+            GivenTasks(new List<DownloadStationTask>() { _queued });
 
             var items = Subject.GetItems();
             items.Should().HaveCount(1);
@@ -597,4 +619,4 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
             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/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/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/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/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/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" />
@@ -186,6 +185,7 @@
     <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" />
@@ -214,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" />
@@ -348,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" />
@@ -420,6 +420,10 @@
     <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>
@@ -560,23 +564,12 @@
     <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\" />
-    <Folder Include="BulkImport\" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
@@ -590,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/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/ParserFixture.cs

@@ -81,5 +81,11 @@ namespace NzbDrone.Core.Test.ParserTests
 		{
 			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/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)]
@@ -221,6 +225,20 @@ namespace NzbDrone.Core.Test.ParserTests
 			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.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)]
@@ -283,8 +301,6 @@ namespace NzbDrone.Core.Test.ParserTests
 
         [TestCase("Movie.Title.2016.1080p.KORSUB.WEBRip.x264.AAC2.0-RADARR", "korsub")]
         [TestCase("Movie.Title.2016.1080p.KORSUBS.WEBRip.x264.AAC2.0-RADARR", "korsubs")]
-        [TestCase("Movie.Title.2016.1080p.DKSUB.WEBRip.x264.AAC2.0-RADARR", "dksub")]
-        [TestCase("Movie.Title.2016.1080p.DKSUBS.WEBRip.x264.AAC2.0-RADARR", "dksubs")]
         public void should_parse_hardcoded_subs(string postTitle, string sub)
         {
             QualityParser.ParseQuality(postTitle).HardcodedSubs.Should().Be(sub);

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/RootFolderTests/RootFolderServiceFixture.cs

@@ -1,12 +1,16 @@
 using System;
 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.Configuration;
 using NzbDrone.Core.RootFolders;
 using NzbDrone.Core.Test.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Test.Common;
 
 namespace NzbDrone.Core.Test.RootFolderTests
@@ -103,5 +107,48 @@ namespace NzbDrone.Core.Test.RootFolderTests
 
             Assert.Throws<InvalidOperationException>(() => Subject.Add(new RootFolder { Path = path }));
         }
+
+        [TestCase("$recycle.bin")]
+        [TestCase("system volume information")]
+        [TestCase("recycler")]
+        [TestCase("lost+found")]
+        [TestCase(".appledb")]
+        [TestCase(".appledesktop")]
+        [TestCase(".appledouble")]
+        [TestCase("@eadir")]
+        [TestCase(".grab")]
+        public void should_get_root_folder_with_subfolders_excluding_special_sub_folders(string subFolder)
+        {
+            var rootFolder = Builder<RootFolder>.CreateNew()
+                                                .With(r => r.Path = @"C:\Test\TV")
+                                                .Build();
+
+            var subFolders = new[]
+                        {
+                            "Series1",
+                            "Series2",
+                            "Series3",
+                            subFolder
+                        };
+
+            var folders = subFolders.Select(f => Path.Combine(@"C:\Test\TV", f)).ToArray();
+
+            Mocker.GetMock<IRootFolderRepository>()
+                  .Setup(s => s.Get(It.IsAny<int>()))
+                  .Returns(rootFolder);
+
+            Mocker.GetMock<ISeriesService>()
+                  .Setup(s => s.GetAllSeries())
+                  .Returns(new List<Series>());
+
+            Mocker.GetMock<IDiskProvider>()
+                  .Setup(s => s.GetDirectories(rootFolder.Path))
+                  .Returns(folders);
+
+            var unmappedFolders = Subject.Get(rootFolder.Id).UnmappedFolders;
+
+            unmappedFolders.Count.Should().BeGreaterThan(0);
+            unmappedFolders.Should().NotContain(u => u.Name == subFolder);
+        }
     }
 }

src/NzbDrone.Core/Configuration/ConfigService.cs

@@ -105,12 +105,69 @@ namespace NzbDrone.Core.Configuration
             set { SetValue("RssSyncInterval", value); }
         }
 
+	public int AvailabilityDelay
+	{
+	    get { return GetValueInt("AvailabilityDelay",0); }
+	    set { SetValue("AvailabilityDelay", value); }
+	}
+
         public int NetImportSyncInterval
         {
             get { return GetValueInt("NetImportSyncInterval", 60); }
 
             set { SetValue("NetImportSyncInterval", value); }
         }
+        
+        public string TraktAuthToken
+	      {
+            get { return GetValue("TraktAuthToken", string.Empty); }
+
+            set { SetValue("TraktAuthToken", value); }
+	      }
+
+	      public string TraktRefreshToken
+	      {
+	          get { return GetValue("TraktRefreshToken", string.Empty); }
+        
+	          set {SetValue("TraktRefreshToken", value); }
+	      }
+        
+	      public int TraktTokenExpiry
+	      {
+	      	  get { return GetValueInt("TraktTokenExpiry", 0); }
+        
+	          set { SetValue("TraktTokenExpiry", value); }
+	      }
+
+	public string NewTraktAuthToken
+	{
+		get {return GetValue("NewTraktAuthToken", string.Empty); }
+		set { SetValue("NewTraktAuthToken", value); }
+	}
+
+	public string NewTraktRefreshToken
+	{
+		get {return GetValue("NewTraktRefreshToken", string.Empty); }
+		set { SetValue("NewTraktRefreshToken", value); }
+	}
+
+	public int NewTraktTokenExpiry
+	{
+		get {return GetValueInt("NewTraktTokenExpiry", 0); }
+		set { SetValue("NewTraktTokenExpiry", value); }
+	}
+
+	public string ListSyncLevel
+	{
+	    get { return GetValue("ListSyncLevel", "disabled"); }
+	    set { SetValue("ListSyncLevel", value); }
+	}
+
+	public string ImportExclusions
+	{
+	    get { return GetValue("ImportExclusions", string.Empty); }
+	    set { SetValue("ImportExclusions", value); }
+	}
 
         public int MinimumAge
         {

src/NzbDrone.Core/Configuration/IConfigService.cs

@@ -46,7 +46,17 @@ namespace NzbDrone.Core.Configuration
         int RssSyncInterval { get; set; }
         int MinimumAge { get; set; }
 
+	int AvailabilityDelay { get; set; }
+
         int NetImportSyncInterval { get; set; }
+	string ListSyncLevel { get; set; }
+	string ImportExclusions { get; set; }
+        string TraktAuthToken { get; set; }
+        string TraktRefreshToken { get; set; }
+        int TraktTokenExpiry { get; set; }
+	string NewTraktAuthToken { get; set; }
+	string NewTraktRefreshToken {get; set; }
+	int NewTraktTokenExpiry { get; set; }
 
         //UI
         int FirstDayOfWeek { get; set; }
@@ -56,6 +66,7 @@ namespace NzbDrone.Core.Configuration
         string LongDateFormat { get; set; }
         string TimeFormat { get; set; }
         bool ShowRelativeDates { get; set; }
+
         bool EnableColorImpairedMode { get; set; }
 
         //Internal

src/NzbDrone.Core/DataAugmentation/Xem/Model/XemResult.cs

@@ -1,9 +0,0 @@
-namespace NzbDrone.Core.DataAugmentation.Xem.Model
-{
-    public class XemResult<T>
-    {
-        public string Result { get; set; }
-        public T Data { get; set; }
-        public string Message { get; set; }
-    }
-}

src/NzbDrone.Core/DataAugmentation/Xem/Model/XemSceneTvdbMapping.cs

@@ -1,8 +0,0 @@
-namespace NzbDrone.Core.DataAugmentation.Xem.Model
-{
-    public class XemSceneTvdbMapping
-    {
-        public XemValues Scene { get; set; }
-        public XemValues Tvdb { get; set; }
-    }
-}

src/NzbDrone.Core/DataAugmentation/Xem/Model/XemValues.cs

@@ -1,9 +0,0 @@
-namespace NzbDrone.Core.DataAugmentation.Xem.Model
-{
-    public class XemValues
-    {
-        public int Season { get; set; }
-        public int Episode { get; set; }
-        public int Absolute { get; set; }
-    }
-}

src/NzbDrone.Core/DataAugmentation/Xem/XemProxy.cs

@@ -1,127 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Newtonsoft.Json.Linq;
-using NLog;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.DataAugmentation.Scene;
-using NzbDrone.Core.DataAugmentation.Xem.Model;
-
-namespace NzbDrone.Core.DataAugmentation.Xem
-{
-    public interface IXemProxy
-    {
-        List<int> GetXemSeriesIds();
-        List<XemSceneTvdbMapping> GetSceneTvdbMappings(int id);
-        List<SceneMapping> GetSceneTvdbNames();
-    }
-
-    public class XemProxy : IXemProxy
-    {
-        private const string ROOT_URL = "http://thexem.de/map/";
-
-        private readonly Logger _logger;
-        private readonly IHttpClient _httpClient;
-        private readonly IHttpRequestBuilderFactory _xemRequestBuilder;
-
-        private static readonly string[] IgnoredErrors = { "no single connection", "no show with the tvdb_id" };
-
-        public XemProxy(IHttpClient httpClient, Logger logger)
-        {
-            _httpClient = httpClient;
-            _logger = logger;
-
-            _xemRequestBuilder = new HttpRequestBuilder(ROOT_URL)
-                .AddSuffixQueryParam("origin", "tvdb")
-                .CreateFactory();
-        }
-
-        public List<int> GetXemSeriesIds()
-        {
-            _logger.Debug("Fetching Series IDs from");
-
-            var request = _xemRequestBuilder.Create()
-                                            .Resource("/havemap")
-                                            .Build();
-
-            var response = _httpClient.Get<XemResult<List<string>>>(request).Resource;
-            CheckForFailureResult(response);
-
-            return response.Data.Select(d =>
-            {
-                int tvdbId = 0;
-                int.TryParse(d, out tvdbId);
-
-                return tvdbId;
-            }).Where(t => t > 0).ToList();
-        }
-
-        public List<XemSceneTvdbMapping> GetSceneTvdbMappings(int id)
-        {
-            _logger.Debug("Fetching Mappings for: {0}", id);
-
-            var request = _xemRequestBuilder.Create()
-                                            .Resource("/all")
-                                            .AddQueryParam("id", id)
-                                            .Build();
-
-            var response = _httpClient.Get<XemResult<List<XemSceneTvdbMapping>>>(request).Resource;
-
-            return response.Data.Where(c => c.Scene != null).ToList();
-        }
-
-        public List<SceneMapping> GetSceneTvdbNames()
-        {
-            _logger.Debug("Fetching alternate names");
-
-            var request = _xemRequestBuilder.Create()
-                                            .Resource("/allNames")
-                                            .AddQueryParam("seasonNumbers", true)
-                                            .Build();
-
-            var response = _httpClient.Get<XemResult<Dictionary<int, List<JObject>>>>(request).Resource;
-
-            var result = new List<SceneMapping>();
-
-            foreach (var series in response.Data)
-            {
-                foreach (var name in series.Value)
-                {
-                    foreach (var n in name)
-                    {
-                        int seasonNumber;
-                        if (!int.TryParse(n.Value.ToString(), out seasonNumber))
-                        {
-                            continue;
-                        }
-
-                        //hack to deal with Fate/Zero 
-                        if (series.Key == 79151 && seasonNumber > 1)
-                        {
-                            continue;
-                        }
-
-                        result.Add(new SceneMapping
-                                   {
-                                       Title = n.Key,
-                                       SearchTerm = n.Key,
-                                       SceneSeasonNumber = seasonNumber,
-                                       TvdbId = series.Key
-                                   });
-                    }
-                }
-            }
-
-            return result;
-        }
-
-        private static void CheckForFailureResult<T>(XemResult<T> response)
-        {
-            if (response.Result.Equals("failure", StringComparison.InvariantCultureIgnoreCase) &&
-                !IgnoredErrors.Any(knowError => response.Message.Contains(knowError)))
-            {
-                throw new Exception("Error response received from Xem: " + response.Message);
-            }
-        }
-    }
-}

src/NzbDrone.Core/DataAugmentation/Xem/XemService.cs

@@ -1,243 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using NLog;
-using NzbDrone.Common.Cache;
-using NzbDrone.Core.DataAugmentation.Scene;
-using NzbDrone.Core.Messaging.Events;
-using NzbDrone.Core.Tv;
-using NzbDrone.Core.Tv.Events;
-
-namespace NzbDrone.Core.DataAugmentation.Xem
-{
-    public class XemService : ISceneMappingProvider, IHandle<SeriesUpdatedEvent>, IHandle<SeriesRefreshStartingEvent>
-    {
-        private readonly IEpisodeService _episodeService;
-        private readonly IXemProxy _xemProxy;
-        private readonly ISeriesService _seriesService;
-        private readonly Logger _logger;
-        private readonly ICachedDictionary<bool> _cache;
-
-        public XemService(IEpisodeService episodeService,
-                           IXemProxy xemProxy,
-                           ISeriesService seriesService, ICacheManager cacheManager, Logger logger)
-        {
-            _episodeService = episodeService;
-            _xemProxy = xemProxy;
-            _seriesService = seriesService;
-            _logger = logger;
-            _cache = cacheManager.GetCacheDictionary<bool>(GetType(), "mappedTvdbid");
-        }
-
-        private void PerformUpdate(Series series)
-        {
-            _logger.Debug("Updating scene numbering mapping for: {0}", series);
-
-            try
-            {
-                var mappings = _xemProxy.GetSceneTvdbMappings(series.TvdbId);
-
-                if (!mappings.Any() && !series.UseSceneNumbering)
-                {
-                    _logger.Debug("Mappings for: {0} are empty, skipping", series);
-                    return;
-                }
-
-                var episodes = _episodeService.GetEpisodeBySeries(series.Id);
-
-                foreach (var episode in episodes)
-                {
-                    episode.SceneAbsoluteEpisodeNumber = null;
-                    episode.SceneSeasonNumber = null;
-                    episode.SceneEpisodeNumber = null;
-                    episode.UnverifiedSceneNumbering = false;
-                }
-
-                foreach (var mapping in mappings)
-                {
-                    _logger.Debug("Setting scene numbering mappings for {0} S{1:00}E{2:00}", series, mapping.Tvdb.Season, mapping.Tvdb.Episode);
-
-                    var episode = episodes.SingleOrDefault(e => e.SeasonNumber == mapping.Tvdb.Season && e.EpisodeNumber == mapping.Tvdb.Episode);
-
-                    if (episode == null)
-                    {
-                        _logger.Debug("Information hasn't been added to TheTVDB yet, skipping.");
-                        continue;
-                    }
-
-                    episode.SceneAbsoluteEpisodeNumber = mapping.Scene.Absolute;
-                    episode.SceneSeasonNumber = mapping.Scene.Season;
-                    episode.SceneEpisodeNumber = mapping.Scene.Episode;
-                }
-
-                if (episodes.Any(v => v.SceneEpisodeNumber.HasValue && v.SceneSeasonNumber != 0))
-                {
-                    ExtrapolateMappings(series, episodes, mappings);
-                }
-
-                _episodeService.UpdateEpisodes(episodes);
-                series.UseSceneNumbering = mappings.Any();
-                _seriesService.UpdateSeries(series);
-
-                _logger.Debug("XEM mapping updated for {0}", series);
-            }
-            catch (Exception ex)
-            {
-                _logger.Error(ex, "Error updating scene numbering mappings for: " + series);
-            }
-        }
-
-        private void ExtrapolateMappings(Series series, List<Episode> episodes, List<Model.XemSceneTvdbMapping> mappings)
-        {
-            var mappedEpisodes = episodes.Where(v => v.SeasonNumber != 0 && v.SceneEpisodeNumber.HasValue).ToList();
-            var mappedSeasons = new HashSet<int>(mappedEpisodes.Select(v => v.SeasonNumber).Distinct());
-
-            var sceneEpisodeMappings = mappings.ToLookup(v => v.Scene.Season)
-                                               .ToDictionary(v => v.Key, e => new HashSet<int>(e.Select(v => v.Scene.Episode)));
-
-            var firstTvdbEpisodeBySeason = mappings.ToLookup(v => v.Tvdb.Season)
-                                                   .ToDictionary(v => v.Key, e => e.Min(v => v.Tvdb.Episode));
-
-            var lastSceneSeason = mappings.Select(v => v.Scene.Season).Max();
-            var lastTvdbSeason = mappings.Select(v => v.Tvdb.Season).Max();
-
-            // Mark all episodes not on the xem as unverified.
-            foreach (var episode in episodes)
-            {
-                if (episode.SeasonNumber == 0) continue;
-                if (episode.SceneEpisodeNumber.HasValue) continue;
-
-                if (mappedSeasons.Contains(episode.SeasonNumber))
-                {
-                    // Mark if a mapping exists for an earlier episode in this season.
-                    if (firstTvdbEpisodeBySeason[episode.SeasonNumber] <= episode.EpisodeNumber)
-                    {
-                        episode.UnverifiedSceneNumbering = true;
-                        continue;
-                    }
-
-                    // Mark if a mapping exists with a scene number to this episode.
-                    if (sceneEpisodeMappings.ContainsKey(episode.SeasonNumber) &&
-                        sceneEpisodeMappings[episode.SeasonNumber].Contains(episode.EpisodeNumber))
-                    {
-                        episode.UnverifiedSceneNumbering = true;
-                        continue;
-                    }
-                }
-                else if (lastSceneSeason != lastTvdbSeason && episode.SeasonNumber > lastTvdbSeason)
-                {
-                    episode.UnverifiedSceneNumbering = true;
-                }
-            }
-
-            foreach (var episode in episodes)
-            {
-                if (episode.SeasonNumber == 0) continue;
-                if (episode.SceneEpisodeNumber.HasValue) continue;
-                if (episode.SeasonNumber < lastTvdbSeason) continue;
-                if (!episode.UnverifiedSceneNumbering) continue;
-
-                var seasonMappings = mappings.Where(v => v.Tvdb.Season == episode.SeasonNumber).ToList();
-                if (seasonMappings.Any(v => v.Tvdb.Episode >= episode.EpisodeNumber))
-                {
-                    continue;
-                }
-
-                if (seasonMappings.Any())
-                {
-                    var lastEpisodeMapping = seasonMappings.OrderBy(v => v.Tvdb.Episode).Last();
-                    var lastSceneSeasonMapping = mappings.Where(v => v.Scene.Season == lastEpisodeMapping.Scene.Season).OrderBy(v => v.Scene.Episode).Last();
-
-                    if (lastSceneSeasonMapping.Tvdb.Season == 0)
-                    {
-                        continue;
-                    }
-
-                    var offset = episode.EpisodeNumber - lastEpisodeMapping.Tvdb.Episode;
-
-                    episode.SceneSeasonNumber = lastEpisodeMapping.Scene.Season;
-                    episode.SceneEpisodeNumber = lastEpisodeMapping.Scene.Episode + offset;
-                    episode.SceneAbsoluteEpisodeNumber = lastEpisodeMapping.Scene.Absolute + offset;
-                }
-                else if (lastTvdbSeason != lastSceneSeason)
-                {
-                    var offset = episode.SeasonNumber - lastTvdbSeason;
-
-                    episode.SceneSeasonNumber = lastSceneSeason + offset;
-                    episode.SceneEpisodeNumber = episode.EpisodeNumber;
-                    // TODO: SceneAbsoluteEpisodeNumber.
-                }
-            }
-        }
-
-        private void UpdateXemSeriesIds()
-        {
-            try
-            {
-                var ids = _xemProxy.GetXemSeriesIds();
-
-                if (ids.Any())
-                {
-                    _cache.Update(ids.ToDictionary(v => v.ToString(), v => true));
-                    return;
-                }
-
-                _cache.ExtendTTL();
-                _logger.Warn("Failed to update Xem series list.");
-            }
-            catch (Exception ex)
-            {
-                _cache.ExtendTTL();
-                _logger.Warn(ex, "Failed to update Xem series list.");
-            }
-        }
-
-        public List<SceneMapping> GetSceneMappings()
-        {
-            var mappings = _xemProxy.GetSceneTvdbNames();
-
-            return mappings.Where(m =>
-            {
-                int id;
-
-                if (int.TryParse(m.Title, out id))
-                {
-                    _logger.Debug("Skipping all numeric name: {0} for {1}", m.Title, m.TvdbId);
-                    return false;
-                }
-
-                return true;
-            }).ToList();
-        }
-
-        public void Handle(SeriesUpdatedEvent message)
-        {
-            if (_cache.IsExpired(TimeSpan.FromHours(3)))
-            {
-                UpdateXemSeriesIds();
-            }
-
-            if (_cache.Count == 0)
-            {
-                _logger.Debug("Scene numbering is not available");
-                return;
-            }
-
-            if (!_cache.Find(message.Series.TvdbId.ToString()) && !message.Series.UseSceneNumbering)
-            {
-                _logger.Debug("Scene numbering is not available for {0} [{1}]", message.Series.Title, message.Series.TvdbId);
-                return;
-            }
-
-            PerformUpdate(message.Series);
-        }
-
-        public void Handle(SeriesRefreshStartingEvent message)
-        {
-            if (message.ManualTrigger && _cache.IsExpired(TimeSpan.FromMinutes(1)))
-            {
-                UpdateXemSeriesIds();
-            }
-        }
-    }
-}

src/NzbDrone.Core/Datastore/Migration/133_add_minimumavailability.cs

@@ -0,0 +1,23 @@
+using FluentMigrator;
+//using FluentMigrator.Expressions;
+using NzbDrone.Core.Datastore.Migration.Framework;
+using NzbDrone.Core.Tv;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(133)]
+    public class add_minimumavailability : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            if (!this.Schema.Schema("dbo").Table("NetImport").Column("MinimumAvailability").Exists())
+            {
+                Alter.Table("NetImport").AddColumn("MinimumAvailability").AsInt32().WithDefaultValue(MovieStatusType.PreDB);
+            }
+	        if (!this.Schema.Schema("dbo").Table("Movies").Column("MinimumAvailability").Exists())
+	        {
+		        Alter.Table("Movies").AddColumn("MinimumAvailability").AsInt32().WithDefaultValue(MovieStatusType.PreDB);
+	        }
+        }
+    }
+}

src/NzbDrone.Core/Datastore/Migration/134_add_remux_qualities_for_the_wankers.cs

@@ -0,0 +1,24 @@
+using System.Data;
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(134)]
+    public class add_remux_qualities_for_the_wankers : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Execute.WithConnection(ConvertProfile);
+        }
+
+        private void ConvertProfile(IDbConnection conn, IDbTransaction tran)
+        {
+            var updater = new ProfileUpdater70(conn, tran);
+            updater.SplitQualityAppend(19, 31); // Remux2160p    AFTER     Bluray2160p
+            updater.SplitQualityAppend(7, 30);  // Remux1080p    AFTER     Bluray1080p
+
+            updater.Commit();
+        }
+    }
+}

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

@@ -0,0 +1,69 @@
+using System;
+using System.Linq;
+using NLog;
+using NzbDrone.Core.IndexerSearch.Definitions;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Tv;
+using NzbDrone.Core.Configuration;
+
+namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
+{
+    public class AvailabilitySpecification : IDecisionEngineSpecification
+    {
+        private readonly IConfigService _settingsService;
+        private readonly Logger _logger;
+
+        public AvailabilitySpecification(IConfigService settingsService, Logger logger)
+        {
+            _settingsService = settingsService;
+            _logger = logger;
+        }
+
+        public RejectionType Type => RejectionType.Permanent;
+
+        public Decision IsSatisfiedBy(RemoteMovie subject, SearchCriteriaBase searchCriteria)
+        {
+            if (searchCriteria != null)
+            {
+                if (searchCriteria.UserInvokedSearch)
+                {
+                    _logger.Debug("Skipping availability check during search");
+                    return Decision.Accept();
+                }
+            }
+            if (!subject.Movie.IsAvailable(_settingsService.AvailabilityDelay))
+            {
+                return Decision.Reject("Movie {0} will only be considered available {1} days after {2}", subject.Movie, _settingsService.AvailabilityDelay, subject.Movie.MinimumAvailability.ToString());
+            }
+
+            return Decision.Accept();
+        }
+
+        public virtual Decision IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
+        {
+            if (searchCriteria != null)
+            {
+                if (!searchCriteria.MonitoredEpisodesOnly)
+                {
+                    _logger.Debug("Skipping availability check during search");
+                    return Decision.Accept();
+                }
+            }
+
+            /*if (subject.Series.Status != MovieStatusType.Released)
+            {
+                _logger.Debug("{0} is present in the DB but not yet available. skipping.", subject.Series);
+                return Decision.Reject("Series is not yet available");
+            }
+
+            /*var monitoredCount = subject.Episodes.Count(episode => episode.Monitored);
+            if (monitoredCount == subject.Episodes.Count)
+            {
+                return Decision.Accept();
+            }
+
+            _logger.Debug("Only {0}/{1} episodes are monitored. skipping.", monitoredCount, subject.Episodes.Count);*/
+            return Decision.Reject("Episode is not yet available");
+        }
+    }
+}

src/NzbDrone.Core/Download/Clients/DownloadStation/DownloadStationSettings.cs

@@ -42,7 +42,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
         [FieldDefinition(3, Label = "Password", Type = FieldType.Password)]
         public string Password { get; set; }
 
-        [FieldDefinition(4, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Radarr avoids conflicts with unrelated downloads, but it's optional. Creates a [category] subdirectory in the output directory.")]
+        [FieldDefinition(4, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Sonarr avoids conflicts with unrelated downloads, but it's optional. Creates a [category] subdirectory in the output directory.")]
         public string TvCategory { get; set; }
 
         [FieldDefinition(5, Label = "Directory", Type = FieldType.Textbox, HelpText = "Optional shared folder to put downloads into, leave blank to use the default Download Station location")]

src/NzbDrone.Core/Download/Clients/DownloadStation/DownloadStationTask.cs

@@ -5,7 +5,7 @@ using Newtonsoft.Json.Converters;
 
 namespace NzbDrone.Core.Download.Clients.DownloadStation
 {
-    public class DownloadStationTorrent
+    public class DownloadStationTask
     {
         public string Username { get; set; }
 
@@ -15,8 +15,10 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
 
         public long Size { get; set; }
 
-        [JsonConverter(typeof(StringEnumConverter))]
-        public DownloadStationTaskType Type { get; set; }
+        /// <summary>
+        /// /// Possible values are: BT, NZB, http, ftp, eMule and https
+        /// </summary>
+        public string Type { get; set; }
 
         [JsonProperty(PropertyName = "status_extra")]
         public Dictionary<string, string> StatusExtra { get; set; }
@@ -24,7 +26,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
         [JsonConverter(typeof(StringEnumConverter))]
         public DownloadStationTaskStatus Status { get; set; }
 
-        public DownloadStationTorrentAdditional Additional { get; set; }
+        public DownloadStationTaskAdditional Additional { get; set; }
 
         public override string ToString()
         {
@@ -34,7 +36,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
 
     public enum DownloadStationTaskType
     {
-        BT, NZB, http, ftp, eMule
+        BT, NZB, http, ftp, eMule, https
     }
 
     public enum DownloadStationTaskStatus

src/NzbDrone.Core/Download/Clients/DownloadStation/DownloadStationTaskAdditional.cs

@@ -3,13 +3,13 @@ using System.Collections.Generic;
 
 namespace NzbDrone.Core.Download.Clients.DownloadStation
 {
-    public class DownloadStationTorrentAdditional
+    public class DownloadStationTaskAdditional
     {
         public Dictionary<string, string> Detail { get; set; }
 
         public Dictionary<string, string> Transfer { get; set; }
 
         [JsonProperty("File")]
-        public List<DownloadStationTorrentFile> Files { get; set; }
+        public List<DownloadStationTaskFile> Files { get; set; }
     }
 }

src/NzbDrone.Core/Download/Clients/DownloadStation/DownloadStationTaskFile.cs

@@ -4,11 +4,11 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using static NzbDrone.Core.Download.Clients.DownloadStation.DownloadStationTorrent;
+using static NzbDrone.Core.Download.Clients.DownloadStation.DownloadStationTask;
 
 namespace NzbDrone.Core.Download.Clients.DownloadStation
 {
-    public class DownloadStationTorrentFile
+    public class DownloadStationTaskFile
     {
         public string FileName { get; set; }
 

src/NzbDrone.Core/Download/Clients/DownloadStation/Proxies/DSMInfoProxy.cs

@@ -30,4 +30,4 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation.Proxies
             return response.Data.SerialNumber;
         }
     }
-}
+}

src/NzbDrone.Core/Download/Clients/DownloadStation/Proxies/DiskStationProxyBase.cs

@@ -49,7 +49,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation.Proxies
         {
             if (retries == 5)
             {
-                throw new DownloadClientException("Try to process same request more than 5 times");
+                throw new DownloadClientException("Try to process request to {0} with {1} more than 5 times", api, arguments.ToJson().ToString());
             }
 
             if (!_authenticated && api != DiskStationApi.Info && api != DiskStationApi.DSMInfo)
@@ -72,15 +72,21 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation.Proxies
                 }
                 else
                 {
-                    if (responseContent.Error.SessionError)
-                    {
-                        _authenticated = false;
-                        return ProcessRequest<T>(api, arguments, settings, operation, method, retries++);
-                    }
-
                     var msg = $"Failed to {operation}. Reason: {responseContent.Error.GetMessage(api)}";
                     _logger.Error(msg);
 
+                    if (responseContent.Error.SessionError)
+                    {
+                        _authenticated = false;
+
+                        if (responseContent.Error.Code == 105)
+                        {
+                            throw new DownloadClientAuthenticationException(msg);
+                        }
+
+                        return ProcessRequest<T>(api, arguments, settings, operation, method, ++retries);
+                    }
+                                     
                     throw new DownloadClientException(msg);
                 }
             }
@@ -210,4 +216,4 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation.Proxies
             }
         }
     }
-}
+}

src/NzbDrone.Core/Download/Clients/DownloadStation/Proxies/DownloadStationProxy.cs

@@ -10,11 +10,11 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation.Proxies
 {
     public interface IDownloadStationProxy
     {
-        IEnumerable<DownloadStationTorrent> GetTorrents(DownloadStationSettings settings);
+        IEnumerable<DownloadStationTask> GetTasks(DownloadStationSettings settings);
         Dictionary<string, object> GetConfig(DownloadStationSettings settings);
-        void RemoveTorrent(string downloadId, DownloadStationSettings settings);
-        void AddTorrentFromUrl(string url, string downloadDirectory, DownloadStationSettings settings);
-        void AddTorrentFromData(byte[] torrentData, string filename, string downloadDirectory, DownloadStationSettings settings);
+        void RemoveTask(string downloadId, DownloadStationSettings settings);
+        void AddTaskFromUrl(string url, string downloadDirectory, DownloadStationSettings settings);
+        void AddTaskFromData(byte[] data, string filename, string downloadDirectory, DownloadStationSettings settings);
         IEnumerable<int> GetApiVersion(DownloadStationSettings settings);
     }
 
@@ -25,7 +25,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation.Proxies
         {
         }
 
-        public void AddTorrentFromData(byte[] torrentData, string filename, string downloadDirectory, DownloadStationSettings settings)
+        public void AddTaskFromData(byte[] data, string filename, string downloadDirectory, DownloadStationSettings settings)
         {
             var arguments = new Dictionary<string, object>
             {
@@ -39,19 +39,19 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation.Proxies
                 arguments.Add("destination", downloadDirectory);
             }
 
-            arguments.Add("file", new Dictionary<string, object>() { { "name", filename }, { "data", torrentData } });
+            arguments.Add("file", new Dictionary<string, object>() { { "name", filename }, { "data", data } });
 
-            var response = ProcessRequest(DiskStationApi.DownloadStationTask, arguments, settings, $"add torrent from data {filename}", HttpMethod.POST);
+            var response = ProcessRequest(DiskStationApi.DownloadStationTask, arguments, settings, $"add task from data {filename}", HttpMethod.POST);
         }
 
-        public void AddTorrentFromUrl(string torrentUrl, string downloadDirectory, DownloadStationSettings settings)
+        public void AddTaskFromUrl(string url, string downloadDirectory, DownloadStationSettings settings)
         {
             var arguments = new Dictionary<string, object>
             {
                 { "api", "SYNO.DownloadStation.Task" },
                 { "version", "3" },
                 { "method", "create" },
-                { "uri", torrentUrl }
+                { "uri", url }
             };
 
             if (downloadDirectory.IsNotNullOrWhiteSpace())
@@ -59,10 +59,10 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation.Proxies
                 arguments.Add("destination", downloadDirectory);
             }
 
-            var response = ProcessRequest(DiskStationApi.DownloadStationTask, arguments, settings, $"add torrent from url {torrentUrl}", HttpMethod.GET);
+            var response = ProcessRequest(DiskStationApi.DownloadStationTask, arguments, settings, $"add task from url {url}");
         }
 
-        public IEnumerable<DownloadStationTorrent> GetTorrents(DownloadStationSettings settings)
+        public IEnumerable<DownloadStationTask> GetTasks(DownloadStationSettings settings)
         {
             var arguments = new Dictionary<string, object>
             {
@@ -74,14 +74,14 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation.Proxies
 
             try
             {
-                var response = ProcessRequest<DownloadStationTaskInfoResponse>(DiskStationApi.DownloadStationTask, arguments, settings, "get torrents");
+                var response = ProcessRequest<DownloadStationTaskInfoResponse>(DiskStationApi.DownloadStationTask, arguments, settings, "get tasks");
 
-                return response.Data.Tasks.Where(t => t.Type == DownloadStationTaskType.BT);
+                return response.Data.Tasks;
             }
             catch (DownloadClientException e)
             {
                 _logger.Error(e);
-                return new List<DownloadStationTorrent>();
+                return new List<DownloadStationTask>();
             }
         }
 
@@ -99,7 +99,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation.Proxies
             return response.Data;
         }
 
-        public void RemoveTorrent(string downloadId, DownloadStationSettings settings)
+        public void RemoveTask(string downloadId, DownloadStationSettings settings)
         {
             var arguments = new Dictionary<string, object>
             {
@@ -111,7 +111,6 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation.Proxies
             };
 
             var response = ProcessRequest(DiskStationApi.DownloadStationTask, arguments, settings, $"remove item {downloadId}");
-            _logger.Trace("Item {0} removed from Download Station", downloadId);
         }
 
         public IEnumerable<int> GetApiVersion(DownloadStationSettings settings)
@@ -119,4 +118,4 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation.Proxies
             return base.GetApiVersion(settings, DiskStationApi.DownloadStationInfo);
         }
     }
-}
+}

src/NzbDrone.Core/Download/Clients/DownloadStation/Proxies/FileStationProxy.cs

@@ -52,4 +52,4 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation.Proxies
             return response.Data.Files.First();
         }
     }
-}
+}

src/NzbDrone.Core/Download/Clients/DownloadStation/Responses/DiskStationError.cs

@@ -83,16 +83,23 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation.Responses
             {
                 return AuthMessages[Code];
             }
+
             if (api == DiskStationApi.DownloadStationTask && DownloadStationTaskMessages.ContainsKey(Code))
             {
                 return DownloadStationTaskMessages[Code];
             }
+
             if (api == DiskStationApi.FileStationList && FileStationMessages.ContainsKey(Code))
             {
                 return FileStationMessages[Code];
             }
 
-            return CommonMessages[Code];
+            if (CommonMessages.ContainsKey(Code))
+            {
+                return CommonMessages[Code];
+            }
+
+            return $"{ Code } - Unknown error";
         }
     }
 }

src/NzbDrone.Core/Download/Clients/DownloadStation/Responses/DownloadStationTaskInfoResponse.cs

@@ -5,7 +5,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation.Responses
     public class DownloadStationTaskInfoResponse
     {
         public int Offset { get; set; }
-        public List<DownloadStationTorrent> Tasks {get;set;}
+        public List<DownloadStationTask> Tasks {get;set;}
         public int Total { get; set; }
     }
 }

src/NzbDrone.Core/Download/Clients/DownloadStation/TorrentDownloadStation.cs

@@ -25,30 +25,34 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
         protected readonly ISerialNumberProvider _serialNumberProvider;
         protected readonly IFileStationProxy _fileStationProxy;
 
-        public TorrentDownloadStation(IDownloadStationProxy proxy,
-                               ITorrentFileInfoReader torrentFileInfoReader,
-                               IHttpClient httpClient,
-                               IConfigService configService,
-                               IDiskProvider diskProvider,
-                               IRemotePathMappingService remotePathMappingService,
-                               Logger logger,
-                               ICacheManager cacheManager,
-                               ISharedFolderResolver sharedFolderResolver,
-                               ISerialNumberProvider serialNumberProvider,
-                               IFileStationProxy fileStationProxy)
+        public TorrentDownloadStation(ISharedFolderResolver sharedFolderResolver,
+                                      ISerialNumberProvider serialNumberProvider,
+                                      IFileStationProxy fileStationProxy,
+                                      IDownloadStationProxy proxy,
+                                      ITorrentFileInfoReader torrentFileInfoReader,
+                                      IHttpClient httpClient,
+                                      IConfigService configService,
+                                      IDiskProvider diskProvider,
+                                      IRemotePathMappingService remotePathMappingService,
+                                      Logger logger)
             : base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, logger)
         {
             _proxy = proxy;
+            _fileStationProxy = fileStationProxy;
             _sharedFolderResolver = sharedFolderResolver;
             _serialNumberProvider = serialNumberProvider;
-            _fileStationProxy = fileStationProxy;
         }
 
         public override string Name => "Download Station";
 
+        protected IEnumerable<DownloadStationTask> GetTasks()
+        {
+            return _proxy.GetTasks(Settings).Where(v => v.Type.ToLower() == DownloadStationTaskType.BT.ToString().ToLower());
+        }
+
         public override IEnumerable<DownloadClientItem> GetItems()
         {
-            var torrents = _proxy.GetTorrents(Settings);
+            var torrents = GetTasks();
             var serialNumber = _serialNumberProvider.GetSerialNumber(Settings);
 
             var items = new List<DownloadClientItem>();
@@ -125,11 +129,11 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
                 DeleteItemData(downloadId);
             }
 
-            _proxy.RemoveTorrent(ParseDownloadId(downloadId), Settings);
+            _proxy.RemoveTask(ParseDownloadId(downloadId), Settings);
             _logger.Debug("{0} removed correctly", downloadId);
         }
 
-        protected OsPath GetOutputPath(OsPath outputPath, DownloadStationTorrent torrent, string serialNumber)
+        protected OsPath GetOutputPath(OsPath outputPath, DownloadStationTask torrent, string serialNumber)
         {
             var fullPath = _sharedFolderResolver.RemapToFullPath(outputPath, Settings, serialNumber);
 
@@ -154,9 +158,9 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
         {
             var hashedSerialNumber = _serialNumberProvider.GetSerialNumber(Settings);
 
-            _proxy.AddTorrentFromUrl(magnetLink, GetDownloadDirectory(), Settings);
+            _proxy.AddTaskFromUrl(magnetLink, GetDownloadDirectory(), Settings);
 
-            var item = _proxy.GetTorrents(Settings).SingleOrDefault(t => t.Additional.Detail["uri"] == magnetLink);
+            var item = GetTasks().SingleOrDefault(t => t.Additional.Detail["uri"] == magnetLink);
 
             if (item != null)
             {
@@ -173,9 +177,9 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
         {
             var hashedSerialNumber = _serialNumberProvider.GetSerialNumber(Settings);
 
-            _proxy.AddTorrentFromData(fileContent, filename, GetDownloadDirectory(), Settings);
+            _proxy.AddTaskFromData(fileContent, filename, GetDownloadDirectory(), Settings);
 
-            var items = _proxy.GetTorrents(Settings).Where(t => t.Additional.Detail["uri"] == Path.GetFileNameWithoutExtension(filename));
+            var items = GetTasks().Where(t => t.Additional.Detail["uri"] == Path.GetFileNameWithoutExtension(filename));
 
             var item = items.SingleOrDefault();
 
@@ -195,16 +199,15 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
             failures.AddIfNotNull(TestConnection());
             if (failures.Any()) return;
             failures.AddIfNotNull(TestOutputPath());
-            if (failures.Any()) return;
             failures.AddIfNotNull(TestGetTorrents());
         }
 
-        protected bool IsFinished(DownloadStationTorrent torrent)
+        protected bool IsFinished(DownloadStationTask torrent)
         {
             return torrent.Status == DownloadStationTaskStatus.Finished;
         }
 
-        protected string GetMessage(DownloadStationTorrent torrent)
+        protected string GetMessage(DownloadStationTask torrent)
         {
             if (torrent.StatusExtra != null)
             {
@@ -222,7 +225,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
             return null;
         }
 
-        protected DownloadItemStatus GetStatus(DownloadStationTorrent torrent)
+        protected DownloadItemStatus GetStatus(DownloadStationTask torrent)
         {
             switch (torrent.Status)
             {
@@ -240,7 +243,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
             return DownloadItemStatus.Downloading;
         }
 
-        protected long GetRemainingSize(DownloadStationTorrent torrent)
+        protected long GetRemainingSize(DownloadStationTask torrent)
         {
             var downloadedString = torrent.Additional.Transfer["size_downloaded"];
             long downloadedSize;
@@ -254,7 +257,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
             return torrent.Size - Math.Max(0, downloadedSize);
         }
 
-        protected TimeSpan? GetRemainingTime(DownloadStationTorrent torrent)
+        protected TimeSpan? GetRemainingTime(DownloadStationTask torrent)
         {
             var speedString = torrent.Additional.Transfer["speed_download"];
             long downloadSpeed;
@@ -279,18 +282,53 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
         {
             try
             {
-                var folderInfo = _fileStationProxy.GetInfoFileOrDirectory($"/{GetDownloadDirectory()}", Settings);
+                var downloadDir = GetDefaultDir();
 
-                if (!folderInfo.IsDir || folderInfo.Additional == null)
+                if (downloadDir == null)
                 {
-                    throw new Exception($"{folderInfo.Path} is not a shared folder or it doesn't exist");
+                    return new NzbDroneValidationFailure(nameof(Settings.TvDirectory), "No default destination")
+                    {
+                        DetailedDescription = $"You must login into your Diskstation as {Settings.Username} and manually set it up into DownloadStation settings under BT/HTTP/FTP/NZB -> Location."
+                    };
+                }
+
+                downloadDir = GetDownloadDirectory();
+
+                if (downloadDir != null)
+                {
+                    var sharedFolder = downloadDir.Split('\\', '/')[0];
+                    var fieldName = Settings.TvDirectory.IsNotNullOrWhiteSpace() ? nameof(Settings.TvDirectory) : nameof(Settings.TvCategory);
+
+                    var folderInfo = _fileStationProxy.GetInfoFileOrDirectory($"/{downloadDir}", Settings);
+
+                    if (folderInfo.Additional == null)
+                    {
+                        return new NzbDroneValidationFailure(fieldName, $"Shared folder does not exist")
+                        {
+                            DetailedDescription = $"The Diskstation does not have a Shared Folder with the name '{sharedFolder}', are you sure you specified it correctly?"
+                        };
+                    }
+
+                    if (!folderInfo.IsDir)
+                    {
+                        return new NzbDroneValidationFailure(fieldName, $"Folder does not exist")
+                        {
+                            DetailedDescription = $"The folder '{downloadDir}' does not exist, it must be created manually inside the Shared Folder '{sharedFolder}'."
+                        };
+                    }
                 }
 
                 return null;
             }
+            catch (DownloadClientAuthenticationException ex) // User could not have permission to access to downloadstation
+            {
+                _logger.Error(ex);
+                return new NzbDroneValidationFailure(string.Empty, ex.Message);
+            }
             catch (Exception ex)
             {
-                return new NzbDroneValidationFailure(string.Empty, $"Failed to get output path: {ex.Message}");
+                _logger.Error(ex);
+                return new NzbDroneValidationFailure(string.Empty, $"Unknown exception: {ex.Message}");
             }
         }
 
@@ -305,7 +343,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
                 _logger.Error(ex, ex.Message);
                 return new NzbDroneValidationFailure("Username", "Authentication failure")
                 {
-                    DetailedDescription = $"Please verify your username and password. Also verify if the host running Radarr isn't blocked from accessing {Name} by WhiteList limitations in the {Name} configuration."
+                    DetailedDescription = $"Please verify your username and password. Also verify if the host running Sonarr isn't blocked from accessing {Name} by WhiteList limitations in the {Name} configuration."
                 };
             }
             catch (WebException ex)
@@ -346,7 +384,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
         {
             try
             {
-                _proxy.GetTorrents(Settings);
+                GetItems();
                 return null;
             }
             catch (Exception ex)

src/NzbDrone.Core/Download/Clients/DownloadStation/UsenetDownloadStation.cs

@@ -0,0 +1,425 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using FluentValidation.Results;
+using NLog;
+using NzbDrone.Common.Disk;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Common.Http;
+using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Download.Clients.DownloadStation.Proxies;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.RemotePathMappings;
+using NzbDrone.Core.Validation;
+
+namespace NzbDrone.Core.Download.Clients.DownloadStation
+{
+    public class UsenetDownloadStation : UsenetClientBase<DownloadStationSettings>
+    {
+        protected readonly IDownloadStationProxy _proxy;
+        protected readonly ISharedFolderResolver _sharedFolderResolver;
+        protected readonly ISerialNumberProvider _serialNumberProvider;
+        protected readonly IFileStationProxy _fileStationProxy;
+
+        public UsenetDownloadStation(ISharedFolderResolver sharedFolderResolver,
+                                     ISerialNumberProvider serialNumberProvider,
+                                     IFileStationProxy fileStationProxy,
+                                     IDownloadStationProxy proxy,
+                                     IHttpClient httpClient,
+                                     IConfigService configService,
+                                     IDiskProvider diskProvider,
+                                     IRemotePathMappingService remotePathMappingService,
+                                     Logger logger
+                                     )
+            : base(httpClient, configService, diskProvider, remotePathMappingService, logger)
+        {
+            _proxy = proxy;
+            _fileStationProxy = fileStationProxy;
+            _sharedFolderResolver = sharedFolderResolver;
+            _serialNumberProvider = serialNumberProvider;
+        }
+
+        public override string Name => "Download Station";
+
+        protected IEnumerable<DownloadStationTask> GetTasks()
+        {
+            return _proxy.GetTasks(Settings).Where(v => v.Type.ToLower() == DownloadStationTaskType.NZB.ToString().ToLower());
+        }
+
+        public override IEnumerable<DownloadClientItem> GetItems()
+        {
+            var nzbTasks = GetTasks();
+            var serialNumber = _serialNumberProvider.GetSerialNumber(Settings);
+
+            var items = new List<DownloadClientItem>();
+
+            long totalRemainingSize = 0;
+            long globalSpeed = nzbTasks.Where(t => t.Status == DownloadStationTaskStatus.Downloading)
+                                       .Select(GetDownloadSpeed)
+                                       .Sum();
+
+            foreach (var nzb in nzbTasks)
+            {
+                var outputPath = new OsPath($"/{nzb.Additional.Detail["destination"]}");
+
+                var taskRemainingSize = GetRemainingSize(nzb);
+
+                if (nzb.Status != DownloadStationTaskStatus.Paused)
+                {
+                    totalRemainingSize += taskRemainingSize;
+                }
+
+                if (Settings.TvDirectory.IsNotNullOrWhiteSpace())
+                {
+                    if (!new OsPath($"/{Settings.TvDirectory}").Contains(outputPath))
+                    {
+                        continue;
+                    }
+                }
+                else if (Settings.TvCategory.IsNotNullOrWhiteSpace())
+                {
+                    var directories = outputPath.FullPath.Split('\\', '/');
+                    if (!directories.Contains(Settings.TvCategory))
+                    {
+                        continue;
+                    }
+                }
+
+                var item = new DownloadClientItem()
+                {
+                    Category = Settings.TvCategory,
+                    DownloadClient = Definition.Name,
+                    DownloadId = CreateDownloadId(nzb.Id, serialNumber),
+                    Title = nzb.Title,
+                    TotalSize = nzb.Size,
+                    RemainingSize = taskRemainingSize,
+                    Status = GetStatus(nzb),
+                    Message = GetMessage(nzb),
+                    IsReadOnly = !IsFinished(nzb)
+                };
+
+                if (item.Status != DownloadItemStatus.Paused)
+                {
+                    item.RemainingTime = GetRemainingTime(totalRemainingSize, globalSpeed);
+                }
+
+                if (item.Status == DownloadItemStatus.Completed || item.Status == DownloadItemStatus.Failed)
+                {
+                    item.OutputPath = GetOutputPath(outputPath, nzb, serialNumber);
+                }
+
+                items.Add(item);
+            }
+
+            return items;
+        }
+
+        protected OsPath GetOutputPath(OsPath outputPath, DownloadStationTask task, string serialNumber)
+        {
+            var fullPath = _sharedFolderResolver.RemapToFullPath(outputPath, Settings, serialNumber);
+
+            var remotePath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, fullPath);
+
+            var finalPath = remotePath + task.Title;
+
+            return finalPath;
+        }
+
+        public override DownloadClientStatus GetStatus()
+        {
+            try
+            {
+                var path = GetDownloadDirectory();
+
+                return new DownloadClientStatus
+                {
+                    IsLocalhost = Settings.Host == "127.0.0.1" || Settings.Host == "localhost",
+                    OutputRootFolders = new List<OsPath> { _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(path)) }
+                };
+            }
+            catch (DownloadClientException e)
+            {
+                _logger.Debug(e, "Failed to get config from Download Station");
+
+                throw e;
+            }
+        }
+
+        public override void RemoveItem(string downloadId, bool deleteData)
+        {
+            if (deleteData)
+            {
+                DeleteItemData(downloadId);
+            }
+
+            _proxy.RemoveTask(ParseDownloadId(downloadId), Settings);
+            _logger.Debug("{0} removed correctly", downloadId);
+        }
+
+        protected override string AddFromNzbFile(RemoteEpisode remoteEpisode, string filename, byte[] fileContent)
+        {
+            throw new DownloadClientException("Episodes are not working with Radarr");
+        }
+
+        protected override string AddFromNzbFile(RemoteMovie remoteEpisode, string filename, byte[] fileContent)
+        {
+            var hashedSerialNumber = _serialNumberProvider.GetSerialNumber(Settings);
+
+            _proxy.AddTaskFromData(fileContent, filename, GetDownloadDirectory(), Settings);
+
+            var items = GetTasks().Where(t => t.Additional.Detail["uri"] == filename);
+
+            var item = items.SingleOrDefault();
+
+            if (item != null)
+            {
+                _logger.Debug("{0} added correctly", remoteEpisode);
+                return CreateDownloadId(item.Id, hashedSerialNumber);
+            }
+
+            _logger.Debug("No such task {0} in Download Station", filename);
+
+            throw new DownloadClientException("Failed to add NZB task to Download Station");
+        }
+
+        protected override void Test(List<ValidationFailure> failures)
+        {
+            failures.AddIfNotNull(TestConnection());
+            if (failures.Any()) return;
+            failures.AddIfNotNull(TestOutputPath());
+            failures.AddIfNotNull(TestGetNZB());
+        }
+
+        protected ValidationFailure TestOutputPath()
+        {
+            try
+            {
+                var downloadDir = GetDefaultDir();
+
+                if (downloadDir == null)
+                {
+                    return new NzbDroneValidationFailure(nameof(Settings.TvDirectory), "No default destination")
+                    {
+                        DetailedDescription = $"You must login into your Diskstation as {Settings.Username} and manually set it up into DownloadStation settings under BT/HTTP/FTP/NZB -> Location."
+                    };
+                }
+
+                downloadDir = GetDownloadDirectory();
+
+                if (downloadDir != null)
+                {
+                    var sharedFolder = downloadDir.Split('\\', '/')[0];
+                    var fieldName = Settings.TvDirectory.IsNotNullOrWhiteSpace() ? nameof(Settings.TvDirectory) : nameof(Settings.TvCategory);
+
+                    var folderInfo = _fileStationProxy.GetInfoFileOrDirectory($"/{downloadDir}", Settings);
+
+                    if (folderInfo.Additional == null)
+                    {
+                        return new NzbDroneValidationFailure(fieldName, $"Shared folder does not exist")
+                        {
+                            DetailedDescription = $"The Diskstation does not have a Shared Folder with the name '{sharedFolder}', are you sure you specified it correctly?"
+                        };
+                    }
+
+                    if (!folderInfo.IsDir)
+                    {
+                        return new NzbDroneValidationFailure(fieldName, $"Folder does not exist")
+                        {
+                            DetailedDescription = $"The folder '{downloadDir}' does not exist, it must be created manually inside the Shared Folder '{sharedFolder}'."
+                        };
+                    }
+                }
+
+                return null;
+            }
+            catch (DownloadClientAuthenticationException ex) // User could not have permission to access to downloadstation
+            {
+                _logger.Error(ex);
+                return new NzbDroneValidationFailure(string.Empty, ex.Message);
+            }
+            catch (Exception ex)
+            {
+                _logger.Error(ex);
+                return new NzbDroneValidationFailure(string.Empty, $"Unknown exception: {ex.Message}");
+            }
+        }
+
+        protected ValidationFailure TestConnection()
+        {
+            try
+            {
+                return ValidateVersion();
+            }
+            catch (DownloadClientAuthenticationException ex)
+            {
+                _logger.Error(ex, ex.Message);
+                return new NzbDroneValidationFailure("Username", "Authentication failure")
+                {
+                    DetailedDescription = $"Please verify your username and password. Also verify if the host running Sonarr isn't blocked from accessing {Name} by WhiteList limitations in the {Name} configuration."
+                };
+            }
+            catch (WebException ex)
+            {
+                _logger.Error(ex);
+
+                if (ex.Status == WebExceptionStatus.ConnectFailure)
+                {
+                    return new NzbDroneValidationFailure("Host", "Unable to connect")
+                    {
+                        DetailedDescription = "Please verify the hostname and port."
+                    };
+                }
+                return new NzbDroneValidationFailure(string.Empty, "Unknown exception: " + ex.Message);
+            }
+            catch (Exception ex)
+            {
+                _logger.Error(ex);
+                return new NzbDroneValidationFailure(string.Empty, "Unknown exception: " + ex.Message);
+            }
+        }
+
+        protected ValidationFailure ValidateVersion()
+        {
+            var versionRange = _proxy.GetApiVersion(Settings);
+
+            _logger.Debug("Download Station api version information: Min {0} - Max {1}", versionRange.Min(), versionRange.Max());
+
+            if (!versionRange.Contains(2))
+            {
+                return new ValidationFailure(string.Empty, $"Download Station API version not supported, should be at least 2. It supports from {versionRange.Min()} to {versionRange.Max()}");
+            }
+
+            return null;
+        }
+
+        protected bool IsFinished(DownloadStationTask task)
+        {
+            return task.Status == DownloadStationTaskStatus.Finished;
+        }
+
+        protected string GetMessage(DownloadStationTask task)
+        {
+            if (task.StatusExtra != null)
+            {
+                if (task.Status == DownloadStationTaskStatus.Extracting)
+                {
+                    return $"Extracting: {int.Parse(task.StatusExtra["unzip_progress"])}%";
+                }
+
+                if (task.Status == DownloadStationTaskStatus.Error)
+                {
+                    return task.StatusExtra["error_detail"];
+                }
+            }
+
+            return null;
+        }
+
+        protected DownloadItemStatus GetStatus(DownloadStationTask task)
+        {
+            switch (task.Status)
+            {
+                case DownloadStationTaskStatus.Waiting:
+                    return task.Size == 0 || GetRemainingSize(task) > 0 ? DownloadItemStatus.Queued : DownloadItemStatus.Completed;
+                case DownloadStationTaskStatus.Paused:
+                    return DownloadItemStatus.Paused;
+                case DownloadStationTaskStatus.Finished:
+                case DownloadStationTaskStatus.Seeding:
+                    return DownloadItemStatus.Completed;
+                case DownloadStationTaskStatus.Error:
+                    return DownloadItemStatus.Failed;
+            }
+
+            return DownloadItemStatus.Downloading;
+        }
+
+        protected long GetRemainingSize(DownloadStationTask task)
+        {
+            var downloadedString = task.Additional.Transfer["size_downloaded"];
+            long downloadedSize;
+
+            if (downloadedString.IsNullOrWhiteSpace() || !long.TryParse(downloadedString, out downloadedSize))
+            {
+                _logger.Debug("Task {0} has invalid size_downloaded: {1}", task.Title, downloadedString);
+                downloadedSize = 0;
+            }
+
+            return task.Size - Math.Max(0, downloadedSize);
+        }
+
+        protected long GetDownloadSpeed(DownloadStationTask task)
+        {
+            var speedString = task.Additional.Transfer["speed_download"];
+            long downloadSpeed;
+
+            if (speedString.IsNullOrWhiteSpace() || !long.TryParse(speedString, out downloadSpeed))
+            {
+                _logger.Debug("Task {0} has invalid speed_download: {1}", task.Title, speedString);
+                downloadSpeed = 0;
+            }
+
+            return Math.Max(downloadSpeed, 0);
+        }
+
+        protected TimeSpan? GetRemainingTime(long remainingSize, long downloadSpeed)
+        {
+            if (downloadSpeed > 0)
+            {
+                return TimeSpan.FromSeconds(remainingSize / downloadSpeed);
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        protected ValidationFailure TestGetNZB()
+        {
+            try
+            {
+                GetItems();
+                return null;
+            }
+            catch (Exception ex)
+            {
+                return new NzbDroneValidationFailure(string.Empty, "Failed to get the list of NZBs: " + ex.Message);
+            }
+        }
+
+        protected string ParseDownloadId(string id)
+        {
+            return id.Split(':')[1];
+        }
+
+        protected string CreateDownloadId(string id, string hashedSerialNumber)
+        {
+            return $"{hashedSerialNumber}:{id}";
+        }
+
+        protected string GetDefaultDir()
+        {
+            var config = _proxy.GetConfig(Settings);
+
+            var path = config["default_destination"] as string;
+
+            return path;
+        }
+
+        protected string GetDownloadDirectory()
+        {
+            if (Settings.TvDirectory.IsNotNullOrWhiteSpace())
+            {
+                return Settings.TvDirectory.TrimStart('/');
+            }
+            else if (Settings.TvCategory.IsNotNullOrWhiteSpace())
+            {
+                var destDir = GetDefaultDir();
+
+                return $"{destDir.TrimEnd('/')}/{Settings.TvCategory}";
+            }
+
+            return null;
+        }
+    }
+}

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

@@ -17,6 +17,8 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
     public class Nzbget : UsenetClientBase<NzbgetSettings>
     {
         private readonly INzbgetProxy _proxy;
+        private readonly string[] _successStatus = { "SUCCESS", "NONE" };
+        private readonly string[] _deleteFailedStatus =  { "HEALTH", "DUPE", "SCAN", "COPY" };
 
         public Nzbget(INzbgetProxy proxy,
                       IHttpClient httpClient,
@@ -134,7 +136,6 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
             }
 
             var historyItems = new List<DownloadClientItem>();
-            var successStatus = new[] { "SUCCESS", "NONE" };
 
             foreach (var item in history)
             {
@@ -148,7 +149,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
                     TotalSize = MakeInt64(item.FileSizeHi, item.FileSizeLo),
                     OutputPath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(item.DestDir)),
                     Category = item.Category,
-                    Message = string.Format("PAR Status: {0} - Unpack Status: {1} - Move Status: {2} - Script Status: {3} - Delete Status: {4} - Mark Status: {5}", item.ParStatus, item.UnpackStatus, item.MoveStatus, item.ScriptStatus, item.DeleteStatus, item.MarkStatus),
+                    Message = $"PAR Status: {item.ParStatus} - Unpack Status: {item.UnpackStatus} - Move Status: {item.MoveStatus} - Script Status: {item.ScriptStatus} - Delete Status: {item.DeleteStatus} - Mark Status: {item.MarkStatus}",
                     Status = DownloadItemStatus.Completed,
                     RemainingTime = TimeSpan.Zero
                 };
@@ -157,7 +158,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
                     continue;
                 }
 
-                if (!successStatus.Contains(item.ParStatus))
+                if (!_successStatus.Contains(item.ParStatus))
                 {
                     historyItem.Status = DownloadItemStatus.Failed;
                 }
@@ -166,24 +167,24 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
                 {
                     historyItem.Status = DownloadItemStatus.Warning;
                 }
-                else if (!successStatus.Contains(item.UnpackStatus))
+                else if (!_successStatus.Contains(item.UnpackStatus))
                 {
                     historyItem.Status = DownloadItemStatus.Failed;
                 }
 
-                if (!successStatus.Contains(item.MoveStatus))
+                if (!_successStatus.Contains(item.MoveStatus))
                 {
                     historyItem.Status = DownloadItemStatus.Warning;
                 }
 
-                if (!successStatus.Contains(item.ScriptStatus))
+                if (!_successStatus.Contains(item.ScriptStatus))
                 {
                     historyItem.Status = DownloadItemStatus.Failed;
                 }
 
-                if (!successStatus.Contains(item.DeleteStatus) && item.DeleteStatus.IsNotNullOrWhiteSpace())
+                if (!_successStatus.Contains(item.DeleteStatus) && item.DeleteStatus.IsNotNullOrWhiteSpace())
                 {
-                    if (item.DeleteStatus == "COPY" || item.DeleteStatus == "DUPE")
+                    if (_deleteFailedStatus.Contains(item.DeleteStatus))
                     {
                         historyItem.Status = DownloadItemStatus.Failed;
                     }
@@ -193,11 +194,6 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
                     }
                 }
 
-                if (item.DeleteStatus == "HEALTH")
-                {
-                    historyItem.Status = DownloadItemStatus.Failed;
-                }
-
                 historyItems.Add(historyItem);
             }
 

src/NzbDrone.Core/HealthCheck/Checks/ImportMechanismCheck.cs

@@ -1,7 +1,10 @@
-using System.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using NzbDrone.Common.Disk;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Download;
+using NzbDrone.Core.Download.Clients;
 using NzbDrone.Core.Download.Clients.Nzbget;
 using NzbDrone.Core.Download.Clients.Sabnzbd;
 
@@ -22,11 +25,26 @@ namespace NzbDrone.Core.HealthCheck.Checks
         public override HealthCheck Check()
         {
             var droneFactoryFolder = new OsPath(_configService.DownloadedEpisodesFolder);
-            var downloadClients = _provideDownloadClient.GetDownloadClients().Select(v => new { downloadClient = v, status = v.GetStatus() }).ToList();
+            List<ImportMechanismCheckStatus> downloadClients;
 
-            var downloadClientIsLocalHost = downloadClients.All(v => v.status.IsLocalhost);
-            var downloadClientOutputInDroneFactory = !droneFactoryFolder.IsEmpty
-                && downloadClients.Any(v => v.status.OutputRootFolders != null && v.status.OutputRootFolders.Any(droneFactoryFolder.Contains));
+            try
+            {
+                downloadClients = _provideDownloadClient.GetDownloadClients().Select(v => new ImportMechanismCheckStatus
+                {
+                    DownloadClient = v,
+                    Status = v.GetStatus()
+                }).ToList();
+            }
+            catch (DownloadClientException)
+            {
+                // One or more download clients failed, assume the health is okay and verify later
+                return new HealthCheck(GetType());
+            }
+
+            var downloadClientIsLocalHost = downloadClients.All(v => v.Status.IsLocalhost);
+            var downloadClientOutputInDroneFactory = !droneFactoryFolder.IsEmpty &&
+                                                     downloadClients.Any(v => v.Status.OutputRootFolders != null &&
+                                                     v.Status.OutputRootFolders.Any(droneFactoryFolder.Contains));
 
             if (!_configService.IsDefined("EnableCompletedDownloadHandling"))
             {
@@ -36,7 +54,7 @@ namespace NzbDrone.Core.HealthCheck.Checks
                     return new HealthCheck(GetType(), HealthCheckResult.Warning, "Enable Completed Download Handling if possible (Multi-Computer unsupported)", "Migrating-to-Completed-Download-Handling#Unsupported-download-client-on-different-computer");
                 }
 
-                if (downloadClients.All(v => v.downloadClient is Sabnzbd))
+                if (downloadClients.All(v => v.DownloadClient is Sabnzbd))
                 {
                     // With Sabnzbd we can check if the category should be changed.
                     if (downloadClientOutputInDroneFactory)
@@ -46,7 +64,8 @@ namespace NzbDrone.Core.HealthCheck.Checks
 
                     return new HealthCheck(GetType(), HealthCheckResult.Warning, "Enable Completed Download Handling if possible (Sabnzbd)", "Migrating-to-Completed-Download-Handling#sabnzbd-enable-completed-download-handling");
                 }
-                if (downloadClients.All(v => v.downloadClient is Nzbget))
+
+                if (downloadClients.All(v => v.DownloadClient is Nzbget))
                 {
                     // With Nzbget we can check if the category should be changed.
                     if (downloadClientOutputInDroneFactory)
@@ -56,6 +75,7 @@ namespace NzbDrone.Core.HealthCheck.Checks
 
                     return new HealthCheck(GetType(), HealthCheckResult.Warning, "Enable Completed Download Handling if possible (Nzbget)", "Migrating-to-Completed-Download-Handling#nzbget-enable-completed-download-handling");
                 }
+
                 return new HealthCheck(GetType(), HealthCheckResult.Warning, "Enable Completed Download Handling if possible", "Migrating-to-Completed-Download-Handling");
             }
 
@@ -64,8 +84,13 @@ namespace NzbDrone.Core.HealthCheck.Checks
                 return new HealthCheck(GetType(), HealthCheckResult.Warning, "Enable Completed Download Handling or configure Drone factory");
             }
 
-
             return new HealthCheck(GetType());
         }
     }
+
+    public class ImportMechanismCheckStatus
+    {
+        public IDownloadClient DownloadClient { get; set; }
+        public DownloadClientStatus Status { get; set; }
+    }
 }

src/NzbDrone.Core/HealthCheck/Checks/IndexerCheck.cs

@@ -1,50 +0,0 @@
-using System.Linq;
-using NzbDrone.Common.Extensions;
-using NzbDrone.Core.Indexers;
-
-namespace NzbDrone.Core.HealthCheck.Checks
-{
-    public class IndexerCheck : HealthCheckBase
-    {
-        private readonly IIndexerFactory _indexerFactory;
-
-        public IndexerCheck(IIndexerFactory indexerFactory)
-        {
-            _indexerFactory = indexerFactory;
-        }
-
-        public override HealthCheck Check()
-        {
-            var enabled = _indexerFactory.GetAvailableProviders();
-            var rssEnabled = _indexerFactory.RssEnabled();
-            var searchEnabled = _indexerFactory.SearchEnabled();
-
-            if (enabled.Empty())
-            {
-                return new HealthCheck(GetType(), HealthCheckResult.Error, "No indexers are enabled");
-            }
-
-            if (enabled.All(i => i.SupportsRss == false))
-            {
-                return new HealthCheck(GetType(), HealthCheckResult.Warning, "Enabled indexers do not support RSS sync");
-            }
-
-            if (enabled.All(i => i.SupportsSearch == false))
-            {
-                return new HealthCheck(GetType(), HealthCheckResult.Warning, "Enabled indexers do not support searching");
-            }
-
-            if (rssEnabled.Empty())
-            {
-                return new HealthCheck(GetType(), HealthCheckResult.Warning, "Enabled indexers do not have RSS sync enabled");
-            }
-
-            if (searchEnabled.Empty())
-            {
-                return new HealthCheck(GetType(), HealthCheckResult.Warning, "Enabled indexers do not have searching enabled");
-            }
-
-            return new HealthCheck(GetType());
-        }
-    }
-}

src/NzbDrone.Core/HealthCheck/Checks/IndexerRssCheck.cs

@@ -0,0 +1,35 @@
+using System.Linq;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Indexers;
+
+namespace NzbDrone.Core.HealthCheck.Checks
+{
+    public class IndexerRssCheck : HealthCheckBase
+    {
+        private readonly IIndexerFactory _indexerFactory;
+
+        public IndexerRssCheck(IIndexerFactory indexerFactory)
+        {
+            _indexerFactory = indexerFactory;
+        }
+
+        public override HealthCheck Check()
+        {
+            var enabled = _indexerFactory.RssEnabled(false);
+
+            if (enabled.Empty())
+            {
+                return new HealthCheck(GetType(), HealthCheckResult.Error, "No indexers available with RSS sync enabled, Sonarr will not grab new releases automatically");
+            }
+
+            var active = _indexerFactory.RssEnabled(true);
+
+            if (active.Empty())
+            {
+                 return new HealthCheck(GetType(), HealthCheckResult.Warning, "All rss-capable indexers are temporarily unavailable due to recent indexer errors");
+            }
+
+            return new HealthCheck(GetType());
+        }
+    }
+}

src/NzbDrone.Core/HealthCheck/Checks/IndexerSearchCheck.cs

@@ -0,0 +1,35 @@
+using System.Linq;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Indexers;
+
+namespace NzbDrone.Core.HealthCheck.Checks
+{
+    public class IndexerSearchCheck : HealthCheckBase
+    {
+        private readonly IIndexerFactory _indexerFactory;
+
+        public IndexerSearchCheck(IIndexerFactory indexerFactory)
+        {
+            _indexerFactory = indexerFactory;
+        }
+
+        public override HealthCheck Check()
+        {
+            var enabled = _indexerFactory.SearchEnabled(false);
+
+            if (enabled.Empty())
+            {
+                return new HealthCheck(GetType(), HealthCheckResult.Warning, "No indexers available with Search enabled, Sonarr will not provide any search results");
+            }
+
+            var active = _indexerFactory.SearchEnabled(true);
+
+            if (active.Empty())
+            {
+                return new HealthCheck(GetType(), HealthCheckResult.Warning, "All search-capable indexers are temporarily unavailable due to recent indexer errors");
+            }
+
+            return new HealthCheck(GetType());
+        }
+    }
+}

src/NzbDrone.Core/IndexerSearch/CutoffUnmetMoviesSearchCommand.cs

@@ -0,0 +1,11 @@
+using NzbDrone.Core.Messaging.Commands;
+
+namespace NzbDrone.Core.IndexerSearch
+{
+    public class CutoffUnmetMoviesSearchCommand : Command
+    {
+        public override bool SendUpdatesToClient => true;
+        public string FilterKey { get; set; }
+        public string FilterValue { get; set; }
+    }
+}

src/NzbDrone.Core/IndexerSearch/MissingMoviesSearchCommand.cs

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

src/NzbDrone.Core/IndexerSearch/MoviesSearchService.cs

@@ -1,41 +1,101 @@
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using NLog;
-using NzbDrone.Common.Instrumentation.Extensions;
-using NzbDrone.Core.Download;
-using NzbDrone.Core.Messaging.Commands;
-using NzbDrone.Core.Tv;
-using NzbDrone.Core.Datastore;
-using NzbDrone.Core.Queue;
-using NzbDrone.Core.DecisionEngine;
-
-namespace NzbDrone.Core.IndexerSearch
-{
-    public class MovieSearchService : IExecute<MoviesSearchCommand>, IExecute<MissingMoviesSearchCommand>
-    {
-        private readonly IMovieService _movieService;
-        private readonly ISearchForNzb _nzbSearchService;
-        private readonly IProcessDownloadDecisions _processDownloadDecisions;
-        private readonly IQueueService _queueService;
-        private readonly Logger _logger;
-
-        public MovieSearchService(IMovieService movieService,
-                                   ISearchForNzb nzbSearchService,
-                                   IProcessDownloadDecisions processDownloadDecisions,
-                                   IQueueService queueService,
-                                   Logger logger)
-        {
-            _movieService = movieService;
-            _nzbSearchService = nzbSearchService;
-            _processDownloadDecisions = processDownloadDecisions;
-            _queueService = queueService;
-            _logger = logger;
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using NLog;
+using NzbDrone.Common.Instrumentation.Extensions;
+using NzbDrone.Core.Download;
+using NzbDrone.Core.Messaging.Commands;
+using NzbDrone.Core.Tv;
+using NzbDrone.Core.Datastore;
+using NzbDrone.Core.Queue;
+using NzbDrone.Core.DecisionEngine;
+
+namespace NzbDrone.Core.IndexerSearch
+{
+    public class MovieSearchService : IExecute<MoviesSearchCommand>, IExecute<MissingMoviesSearchCommand>, IExecute<CutoffUnmetMoviesSearchCommand>
+    {
+        private readonly IMovieService _movieService;
+        private readonly IMovieCutoffService _movieCutoffService;
+        private readonly ISearchForNzb _nzbSearchService;
+        private readonly IProcessDownloadDecisions _processDownloadDecisions;
+        private readonly IQueueService _queueService;
+        private readonly Logger _logger;
+
+        public MovieSearchService(IMovieService movieService,
+                                   IMovieCutoffService movieCutoffService,
+                                   ISearchForNzb nzbSearchService,
+                                   IProcessDownloadDecisions processDownloadDecisions,
+                                   IQueueService queueService,
+                                   Logger logger)
+        {
+            _movieService = movieService;
+            _movieCutoffService = movieCutoffService;
+            _nzbSearchService = nzbSearchService;
+            _processDownloadDecisions = processDownloadDecisions;
+            _queueService = queueService;
+            _logger = logger;
         }
 
-        private void SearchForMissingMovies(List<Movie> movies, bool userInvokedSearch)
+        public void Execute(MoviesSearchCommand message)
         {
-            _logger.ProgressInfo("Performing missing search for {0} movies", movies.Count);
+            var downloadedCount = 0;
+            foreach (var movieId in message.MovieIds)
+            {
+                var movies = _movieService.GetMovie(movieId);
+
+                if (!movies.Monitored)
+                {
+                    _logger.Debug("Movie {0} is not monitored, skipping search", movies.Title);
+                }
+
+                var decisions = _nzbSearchService.MovieSearch(movieId, false);//_nzbSearchService.SeasonSearch(message.MovieId, season.SeasonNumber, false, message.Trigger == CommandTrigger.Manual);
+                downloadedCount += _processDownloadDecisions.ProcessDecisions(decisions).Grabbed.Count;
+
+            }
+            _logger.ProgressInfo("Movie search completed. {0} reports downloaded.", downloadedCount);
+        }
+
+        public void Execute(MissingMoviesSearchCommand message)
+        {
+            List<Movie> movies = _movieService.MoviesWithoutFiles(new PagingSpec<Movie>
+            {
+                Page = 1,
+                PageSize = 100000,
+                SortDirection = SortDirection.Ascending,
+                SortKey = "Id",
+                FilterExpression = _movieService.ConstructFilterExpression(message.FilterKey, message.FilterValue)
+            }).Records.ToList();
+
+
+            var queue = _queueService.GetQueue().Select(q => q.Movie.Id);
+            var missing = movies.Where(e => !queue.Contains(e.Id)).ToList();
+
+            SearchForMissingMovies(missing, message.Trigger == CommandTrigger.Manual);
+
+        }
+
+        public void Execute(CutoffUnmetMoviesSearchCommand message)
+        {
+            List<Movie> movies = _movieCutoffService.MoviesWhereCutoffUnmet(new PagingSpec<Movie>
+            {
+                Page = 1,
+                PageSize = 100000,
+                SortDirection = SortDirection.Ascending,
+                SortKey = "Id",
+                FilterExpression = _movieService.ConstructFilterExpression(message.FilterKey, message.FilterValue)
+            }).Records.ToList();
+
+
+            var queue = _queueService.GetQueue().Select(q => q.Movie.Id);
+            var missing = movies.Where(e => !queue.Contains(e.Id)).ToList();
+
+            SearchForMissingMovies(missing, message.Trigger == CommandTrigger.Manual);
+
+        }
+
+        private void SearchForMissingMovies(List<Movie> movies, bool userInvokedSearch)
+        {
+            _logger.ProgressInfo("Performing missing search for {0} movies", movies.Count);
             var downloadedCount = 0;
 
             foreach (var movieId in movies.GroupBy(e => e.Id))
@@ -59,49 +119,9 @@ namespace NzbDrone.Core.IndexerSearch
             }
 
             _logger.ProgressInfo("Completed missing search for {0} movies. {1} reports downloaded.", movies.Count, downloadedCount);
-        }
-
-        public void Execute(MoviesSearchCommand message)
-        {
-            var downloadedCount = 0;
-            foreach (var movieId in message.MovieIds)
-            {
-                var series = _movieService.GetMovie(movieId);
-                
-                if (!series.Monitored)
-                {
-                    _logger.Debug("Movie {0} is not monitored, skipping search", series.Title);
-                }
-
-                var decisions = _nzbSearchService.MovieSearch(movieId, false);//_nzbSearchService.SeasonSearch(message.MovieId, season.SeasonNumber, false, message.Trigger == CommandTrigger.Manual);
-                downloadedCount += _processDownloadDecisions.ProcessDecisions(decisions).Grabbed.Count;
-
-            }
-            _logger.ProgressInfo("Movie search completed. {0} reports downloaded.", downloadedCount);
-        }
-
-        public void Execute(MissingMoviesSearchCommand message)
-        {
-            List<Movie> movies;
-
-            movies = _movieService.MoviesWithoutFiles(new PagingSpec<Movie>
-                                                            {
-                                                                Page = 1,
-                                                                PageSize = 100000,
-                                                                SortDirection = SortDirection.Ascending,
-                                                                SortKey = "Id",
-                                                                FilterExpression =
-                                                                    v =>
-                                                                    v.Monitored == true
-                                                            }).Records.ToList();
-        
-
-        var queue = _queueService.GetQueue().Select(q => q.Movie.Id);
-        var missing = movies.Where(e => !queue.Contains(e.Id)).ToList();
-
-        SearchForMissingMovies(missing, message.Trigger == CommandTrigger.Manual);
-
-        }
-
-    }
-}
+        }
+
+
+
+    }
+}

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

@@ -20,7 +20,7 @@ namespace NzbDrone.Core.Indexers.HDBits
 
         public int[] Medium { get; set; }
 
-        public int[] Origin { get; set; }
+        public int? Origin { get; set; }
 
         [JsonProperty(PropertyName = "imdb")]
         public ImdbInfo ImdbInfo { get; set; }

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

@@ -0,0 +1,13 @@
+using NzbDrone.Core.Parser.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NzbDrone.Core.Indexers.HDBits
+{
+    public class HDBitsInfo : TorrentInfo
+    {
+        public bool? Internal { get; set; }
+    }
+}

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

@@ -5,6 +5,7 @@ using Newtonsoft.Json.Linq;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Indexers.Exceptions;
 using NzbDrone.Core.Parser.Model;
+using System.Linq;
 
 namespace NzbDrone.Core.Indexers.HDBits
 {
@@ -50,7 +51,9 @@ namespace NzbDrone.Core.Indexers.HDBits
             foreach (var result in queryResults)
             {
                 var id = result.Id;
-                torrentInfos.Add(new TorrentInfo()
+                var internalRelease = (result.TypeOrigin == 1 ? true : false);
+
+                torrentInfos.Add(new HDBitsInfo()
                 {
                     Guid = string.Format("HDBits-{0}", id),
                     Title = result.Name,
@@ -60,10 +63,20 @@ namespace NzbDrone.Core.Indexers.HDBits
                     InfoUrl = GetInfoUrl(id),
                     Seeders = result.Seeders,
                     Peers = result.Leechers + result.Seeders,
-                    PublishDate = result.Added.ToUniversalTime()
+                    PublishDate = result.Added.ToUniversalTime(),
+                    Internal = internalRelease
                 });
             }
 
+            // order by internal
+            if (_settings.PreferInternal)
+            {
+                return
+                    torrentInfos.OrderByDescending(o => o.PublishDate)
+                        .ThenBy(o => ((dynamic)o).Internal ? 0 : 1)
+                        .ToArray();
+            }
+
             return torrentInfos.ToArray();
         }
 

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

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Common.Http;
 using NzbDrone.Common.Serializer;
@@ -13,37 +13,10 @@ namespace NzbDrone.Core.Indexers.HDBits
         public virtual IndexerPageableRequestChain GetRecentRequests()
         {
             var pageableRequests = new IndexerPageableRequestChain();
-
             pageableRequests.Add(GetRequest(new TorrentQuery()));
-
             return pageableRequests;
         }
 
-        public virtual IndexerPageableRequestChain GetSearchRequests(AnimeEpisodeSearchCriteria searchCriteria)
-        {
-            return new IndexerPageableRequestChain();
-        }
-
-        public virtual IndexerPageableRequestChain GetSearchRequests(SpecialEpisodeSearchCriteria searchCriteria)
-        {
-            return new IndexerPageableRequestChain();
-        }
-
-        public virtual IndexerPageableRequestChain GetSearchRequests(DailyEpisodeSearchCriteria searchCriteria)
-        {
-            return new IndexerPageableRequestChain();
-        }
-
-        public virtual IndexerPageableRequestChain GetSearchRequests(SeasonSearchCriteria searchCriteria)
-        {
-            return new IndexerPageableRequestChain();
-        }
-
-        public virtual IndexerPageableRequestChain GetSearchRequests(SingleEpisodeSearchCriteria searchCriteria)
-        {
-            return new IndexerPageableRequestChain();
-        }
-
         public virtual IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
             var pageableRequests = new IndexerPageableRequestChain();
@@ -86,9 +59,40 @@ namespace NzbDrone.Core.Indexers.HDBits
             query.Username = Settings.Username;
             query.Passkey = Settings.ApiKey;
 
+            // Require Internal only if came from RSS sync
+            if (Settings.RequireInternal && query.ImdbInfo == null)
+            {
+                query.Origin = 1;
+            }
+
             request.SetContent(query.ToJson());
 
             yield return new IndexerRequest(request);
         }
+
+        public virtual IndexerPageableRequestChain GetSearchRequests(AnimeEpisodeSearchCriteria searchCriteria)
+        {
+            return new IndexerPageableRequestChain();
+        }
+
+        public virtual IndexerPageableRequestChain GetSearchRequests(SpecialEpisodeSearchCriteria searchCriteria)
+        {
+            return new IndexerPageableRequestChain();
+        }
+
+        public virtual IndexerPageableRequestChain GetSearchRequests(DailyEpisodeSearchCriteria searchCriteria)
+        {
+            return new IndexerPageableRequestChain();
+        }
+
+        public virtual IndexerPageableRequestChain GetSearchRequests(SeasonSearchCriteria searchCriteria)
+        {
+            return new IndexerPageableRequestChain();
+        }
+
+        public virtual IndexerPageableRequestChain GetSearchRequests(SingleEpisodeSearchCriteria searchCriteria)
+        {
+            return new IndexerPageableRequestChain();
+        }
     }
 }

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

@@ -32,6 +32,12 @@ namespace NzbDrone.Core.Indexers.HDBits
         [FieldDefinition(2, Label = "API URL", Advanced = true, HelpText = "Do not change this unless you know what you're doing. Since your API key will be sent to that host.")]
         public string BaseUrl { get; set; }
 
+        [FieldDefinition(3, Label = "Prefer Internal", Type = FieldType.Checkbox, HelpText = "Favors Internal releases over all other releases.")]
+        public bool PreferInternal { get; set; }
+
+        [FieldDefinition(4, Label = "Require Internal", Type = FieldType.Checkbox, HelpText = "Require Internal releases for release to be accepted.")]
+        public bool RequireInternal { get; set; }
+
         public NzbDroneValidationResult Validate()
         {
             return new NzbDroneValidationResult(Validator.Validate(this));

src/NzbDrone.Core/Indexers/IndexerFactory.cs

@@ -9,14 +9,13 @@ namespace NzbDrone.Core.Indexers
 {
     public interface IIndexerFactory : IProviderFactory<IIndexer, IndexerDefinition>
     {
-        List<IIndexer> RssEnabled();
-        List<IIndexer> SearchEnabled();
+        List<IIndexer> RssEnabled(bool filterBlockedIndexers = true);
+        List<IIndexer> SearchEnabled(bool filterBlockedIndexers = true);
     }
 
     public class IndexerFactory : ProviderFactory<IIndexer, IndexerDefinition>, IIndexerFactory
     {
         private readonly IIndexerStatusService _indexerStatusService;
-        private readonly IIndexerRepository _providerRepository;
         private readonly Logger _logger;
 
         public IndexerFactory(IIndexerStatusService indexerStatusService,
@@ -28,7 +27,6 @@ namespace NzbDrone.Core.Indexers
             : base(providerRepository, providers, container, eventAggregator, logger)
         {
             _indexerStatusService = indexerStatusService;
-            _providerRepository = providerRepository;
             _logger = logger;
         }
 
@@ -46,22 +44,28 @@ namespace NzbDrone.Core.Indexers
             definition.SupportsSearch = provider.SupportsSearch;
         }
 
-        public List<IIndexer> RssEnabled()
+        public List<IIndexer> RssEnabled(bool filterBlockedIndexers = true)
         {
             var enabledIndexers = GetAvailableProviders().Where(n => ((IndexerDefinition)n.Definition).EnableRss);
 
-            var indexers = FilterBlockedIndexers(enabledIndexers);
+            if (filterBlockedIndexers)
+            {
+                return FilterBlockedIndexers(enabledIndexers).ToList();
+            }
 
-            return indexers.ToList();
+            return enabledIndexers.ToList();
         }
 
-        public List<IIndexer> SearchEnabled()
+        public List<IIndexer> SearchEnabled(bool filterBlockedIndexers = true)
         {
             var enabledIndexers = GetAvailableProviders().Where(n => ((IndexerDefinition)n.Definition).EnableSearch);
 
-            var indexers = FilterBlockedIndexers(enabledIndexers);
+            if (filterBlockedIndexers)
+            {
+                return FilterBlockedIndexers(enabledIndexers).ToList();
+            }
 
-            return indexers.ToList();
+            return enabledIndexers.ToList();
         }
 
         private IEnumerable<IIndexer> FilterBlockedIndexers(IEnumerable<IIndexer> indexers)

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

@@ -32,7 +32,7 @@ namespace NzbDrone.Core.Indexers.Newznab
 
         public override IParseIndexerResponse GetParser()
         {
-            return new NewznabRssParser();
+            return new NewznabRssParser(Settings);
         }
 
         public override IEnumerable<ProviderDefinition> DefaultDefinitions

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

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.IndexerSearch.Definitions;
@@ -57,37 +58,12 @@ namespace NzbDrone.Core.Indexers.Newznab
             }
             else
             {
-                pageableRequests.Add(GetPagedRequests(MaxPages, Settings.Categories, "search", $"&q={System.Web.HttpUtility.UrlPathEncode(Parser.Parser.NormalizeTitle(searchCriteria.Movie.Title))}%20{searchCriteria.Movie.Year}"));
+                pageableRequests.Add(GetPagedRequests(MaxPages, Settings.Categories, "search", $"&q={Parser.Parser.NormalizeTitle(searchCriteria.Movie.Title)}%20{searchCriteria.Movie.Year}"));
             }
 
             return pageableRequests;
         }
 
-        public virtual IndexerPageableRequestChain GetSearchRequests(SingleEpisodeSearchCriteria searchCriteria)
-        {
-            return new IndexerPageableRequestChain();
-        }
-
-        public virtual IndexerPageableRequestChain GetSearchRequests(SeasonSearchCriteria searchCriteria)
-        {
-            return new IndexerPageableRequestChain();
-        }
-
-        public virtual IndexerPageableRequestChain GetSearchRequests(DailyEpisodeSearchCriteria searchCriteria)
-        {
-            return new IndexerPageableRequestChain();
-        }
-
-        public virtual IndexerPageableRequestChain GetSearchRequests(AnimeEpisodeSearchCriteria searchCriteria)
-        {
-            return new IndexerPageableRequestChain();
-        }
-
-        public virtual IndexerPageableRequestChain GetSearchRequests(SpecialEpisodeSearchCriteria searchCriteria)
-        {
-            return new IndexerPageableRequestChain();
-        }
-
         private IEnumerable<IndexerRequest> GetPagedRequests(int maxPages, IEnumerable<int> categories, string searchType, string parameters)
         {
             if (categories.Empty())
@@ -117,9 +93,30 @@ namespace NzbDrone.Core.Indexers.Newznab
             }
         }
 
-        private static string NewsnabifyTitle(string title)
+
+        public virtual IndexerPageableRequestChain GetSearchRequests(SingleEpisodeSearchCriteria searchCriteria)
         {
-            return title.Replace("+", "%20");
+            return new IndexerPageableRequestChain();
+        }
+
+        public virtual IndexerPageableRequestChain GetSearchRequests(SeasonSearchCriteria searchCriteria)
+        {
+            return new IndexerPageableRequestChain();
+        }
+
+        public virtual IndexerPageableRequestChain GetSearchRequests(DailyEpisodeSearchCriteria searchCriteria)
+        {
+            return new IndexerPageableRequestChain();
+        }
+
+        public virtual IndexerPageableRequestChain GetSearchRequests(AnimeEpisodeSearchCriteria searchCriteria)
+        {
+            return new IndexerPageableRequestChain();
+        }
+
+        public virtual IndexerPageableRequestChain GetSearchRequests(SpecialEpisodeSearchCriteria searchCriteria)
+        {
+            return new IndexerPageableRequestChain();
         }
     }
 }

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

@@ -4,6 +4,7 @@ using System.Xml.Linq;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Indexers.Exceptions;
 using NzbDrone.Core.Parser.Model;
+using RestSharp.Extensions;
 
 namespace NzbDrone.Core.Indexers.Newznab
 {
@@ -11,9 +12,12 @@ namespace NzbDrone.Core.Indexers.Newznab
     {
         public const string ns = "{http://www.newznab.com/DTD/2010/feeds/attributes/}";
 
-        public NewznabRssParser()
+        private readonly NewznabSettings _settings;
+
+        public NewznabRssParser(NewznabSettings settings)
         {
             PreferredEnclosureMimeType = "application/x-nzb";
+            _settings = settings;
         }
 
         protected override bool PreProcess(IndexerResponse indexerResponse)
@@ -50,6 +54,20 @@ namespace NzbDrone.Core.Indexers.Newznab
             releaseInfo = base.ProcessItem(item, releaseInfo);
             releaseInfo.ImdbId = GetImdbId(item);
 
+            // Fun, lets try to add year to the releaseTitle for our foriegn friends :)
+            if (!releaseInfo.Title.Contains(GetImdbTitle(item) + "." + GetImdbYear(item)))
+            {
+                if (GetImdbYear(item) != 1900)
+                {
+                    releaseInfo.Title = releaseInfo.Title.Replace(GetImdbTitle(item), GetImdbTitle(item) + "." + GetImdbYear(item));
+                }
+            }
+            
+            //if (_settings.Url == "https://newz-complex.org/www/")
+            //{
+            //    releaseInfo.Title = releaseInfo.Title.Replace(GetImdbTitle(item), GetImdbTitle(item) + "." + GetImdbYear(item));
+            //}
+
             return releaseInfo;
         }
 
@@ -125,6 +143,30 @@ namespace NzbDrone.Core.Indexers.Newznab
             return 0;
         }
 
+        protected virtual string GetImdbTitle(XElement item)
+        {
+            var imdbTitle = TryGetNewznabAttribute(item, "imdbtitle");
+            if (!imdbTitle.IsNullOrWhiteSpace())
+            {
+                return imdbTitle;
+            }
+
+            return string.Empty;
+        }
+
+        protected virtual int GetImdbYear(XElement item)
+        {
+            var imdbYearString = TryGetNewznabAttribute(item, "imdbyear");
+            int imdbYear;
+
+            if (!imdbYearString.IsNullOrWhiteSpace() && int.TryParse(imdbYearString, out imdbYear))
+            {
+                return imdbYear;
+            }
+
+            return 1900;
+        }
+
         protected string TryGetNewznabAttribute(XElement item, string key, string defaultValue = "")
         {
             var attr = item.Elements(ns + "attr").FirstOrDefault(e => e.Attribute("name").Value.Equals(key, StringComparison.CurrentCultureIgnoreCase));

src/NzbDrone.Core/Indexers/RssParser.cs

@@ -77,8 +77,8 @@ namespace NzbDrone.Core.Indexers
         {
             try
             {
-                var content = indexerResponse.Content;
-                content = ReplaceEntities.Replace(content, ReplaceEntity);
+                var content = XmlCleaner.ReplaceEntities(indexerResponse.Content);
+                content = XmlCleaner.ReplaceUnicode(content);
 
                 using (var xmlTextReader = XmlReader.Create(new StringReader(content), new XmlReaderSettings { DtdProcessing = DtdProcessing.Ignore, IgnoreComments = true }))
                 {
@@ -97,19 +97,6 @@ namespace NzbDrone.Core.Indexers
             }
         }
 
-        protected virtual string ReplaceEntity(Match match)
-        {
-            try
-            {
-                var character = WebUtility.HtmlDecode(match.Value);
-                return string.Concat("&#", (int)character[0], ";");
-            }
-            catch
-            {
-                return match.Value;
-            }
-        }
-
         protected virtual ReleaseInfo CreateNewReleaseInfo()
         {
             return new ReleaseInfo();

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

@@ -65,7 +65,7 @@ namespace NzbDrone.Core.Indexers.TorrentPotato
                 requestBuilder.AddQueryParam("user", "");
             }
 
-            requestBuilder.AddQueryParam("search", "the");
+            requestBuilder.AddQueryParam("search", "-");
 
             yield return new IndexerRequest(requestBuilder.Build());
         }

src/NzbDrone.Core/Indexers/TorrentRss/TorrentRssSettingsDetector.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using System.IO;
+using System.Text.RegularExpressions;
 using System.Xml;
 using System.Xml.Linq;
 using NLog;
@@ -191,7 +192,10 @@ namespace NzbDrone.Core.Indexers.TorrentRss
 
         private bool IsEZTVFeed(IndexerResponse response)
         {
-            using (var xmlTextReader = XmlReader.Create(new StringReader(response.Content), new XmlReaderSettings { DtdProcessing = DtdProcessing.Parse, ValidationType = ValidationType.None, IgnoreComments = true, XmlResolver = null }))
+            var content = XmlCleaner.ReplaceEntities(response.Content);
+            content = XmlCleaner.ReplaceUnicode(content);
+
+            using (var xmlTextReader = XmlReader.Create(new StringReader(content), new XmlReaderSettings { DtdProcessing = DtdProcessing.Parse, ValidationType = ValidationType.None, IgnoreComments = true, XmlResolver = null }))
             {
                 var document = XDocument.Load(xmlTextReader);
 

src/NzbDrone.Core/Indexers/XElementExtensions.cs

@@ -12,7 +12,7 @@ namespace NzbDrone.Core.Indexers
 {
     public static class XElementExtensions
     {
-        private static readonly Logger Logger = NzbDroneLogger.GetLogger(typeof(XmlExtentions));
+        private static readonly Logger Logger = NzbDroneLogger.GetLogger(typeof(XmlExtensions));
 
         public static readonly Regex RemoveTimeZoneRegex = new Regex(@"\s[A-Z]{2,4}$", RegexOptions.Compiled);
 

src/NzbDrone.Core/Indexers/XmlCleaner.cs

@@ -0,0 +1,36 @@
+using System.Globalization;
+using System.Net;
+using System.Text.RegularExpressions;
+
+namespace NzbDrone.Core.Indexers
+{
+    public static class XmlCleaner
+    {
+
+        private static readonly Regex ReplaceEntitiesRegex = new Regex("&[a-z]+;", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private static readonly Regex ReplaceUnicodeRegex = new Regex(@"[^\x09\x0A\x0D\x20-\xD7FF\xE000-\xFFFD\x10000-x10FFFF]", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+
+        public static string ReplaceEntities(string content)
+        {
+            return ReplaceEntitiesRegex.Replace(content, ReplaceEntity);
+        }
+
+        public static string ReplaceUnicode(string content)
+        {
+            return ReplaceUnicodeRegex.Replace(content, string.Empty);
+        }
+
+        private static string ReplaceEntity(Match match)
+        {
+            try
+            {
+                var character = WebUtility.HtmlDecode(match.Value);
+                return string.Concat("&#", (int)character[0], ";");
+            }
+            catch
+            {
+                return match.Value;
+            }
+        }
+    }
+}

src/NzbDrone.Core/MediaFiles/DiskScanService.cs

@@ -69,7 +69,7 @@ namespace NzbDrone.Core.MediaFiles
             _logger = logger;
         }
 
-        private static readonly Regex ExcludedSubFoldersRegex = new Regex(@"(?:\\|\/|^)(extras|@eadir|extrafanart|\..+)(?:\\|\/)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private static readonly Regex ExcludedSubFoldersRegex = new Regex(@"(?:\\|\/|^)(extras|@eadir|extrafanart|plex\sversions|\..+)(?:\\|\/)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
         private static readonly Regex ExcludedFilesRegex = new Regex(@"^\._|Thumbs\.db", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         public void Scan(Series series)
@@ -299,4 +299,4 @@ namespace NzbDrone.Core.MediaFiles
             }
         }
     }
-}
+}

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

@@ -154,9 +154,9 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport
             {
                 var title = Parser.Parser.RemoveFileExtension(downloadClientItem.Title);
 
-                var parsedTitle = Parser.Parser.ParseTitle(title);
+                var parsedTitle = Parser.Parser.ParseMovieTitle(title);
 
-                if (parsedTitle != null && !parsedTitle.FullSeason)
+                if (parsedTitle != null)
                 {
                     return title;
                 }