Log DownloadStation sid at Debug level to investigate possible cause reason 119.

.github/ISSUE_TEMPLATE.md

@@ -1,40 +1,5 @@
-<!--
-Before opening a new issue, please ensure:
-- You use the forums for support/questions
-- You search for existing bugs/feature requests
-- Remove extraneous template details
--->
 
-## Support / Questions
 
-Please use https://forums.sonarr.tv/ for support. Support requests or questions will be redirected to the forums and the issue will be closed.
 
-<!--
-Remove if not opening a bug report
--->
-
-## Bug Report
-
-### System Information/Logs
-
-**Sonarr Version:**
-
-**Operating System:**
-
-**.net Framework (Windows) or mono (macOS/Linux) Version:**
-
-**Link to Log Files (debug or trace):**
-
-**Browser (for UI bugs):**
-
-### Additional Information
-
-<!--
-Remove if not opening a feature request
--->
-
-## Feature Request
-
-### What problem are you looking to solve?
-
-### Other Information
+Provide a description of the feature request or bug, the more details the better.
+Please use https://forums.sonarr.tv/ for support or other questions. (When in doubt, use the forums)

.github/SUPPORT.md

@@ -1,7 +0,0 @@
-## Support
-
-There are a number of frequently asked questions that have been answered in our [FAQ](https://github.com/Sonarr/Sonarr/wiki/FAQ)
-
-The [wiki](https://github.com/Sonarr/Sonarr/wiki) contains other information and guides
-
-If you have a support question, please use the [support forums](https://forums.sonarr.tv/).

.gitignore

@@ -130,7 +130,6 @@ output/*
 
 #OS X metadata files
 ._*
-.DS_Store
 
 _start
 _temp_*/**/*

src/LogentriesNLog/LogentriesNLog.csproj

@@ -52,7 +52,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.3\lib\net40\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

src/LogentriesNLog/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
+  <package id="NLog" version="4.4.3" targetFramework="net40" />
 </packages>

src/Marr.Data/Reflection/SimpleReflectionStrategy.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
 using System.Reflection;

src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj

@@ -48,8 +48,8 @@
     <Reference Include="FluentAssertions.Core, Version=4.19.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
       <HintPath>..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Moq, Version=4.0.10827.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <Private>True</Private>
+    <Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll</HintPath>

src/NzbDrone.Api.Test/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="FluentAssertions" version="4.19.0" targetFramework="net40" />
-  <package id="Moq" version="4.0.10827" targetFramework="net40" />
+  <package id="Moq" version="4.0.10827" />
   <package id="NBuilder" version="4.0.0" targetFramework="net40" />
   <package id="NUnit" version="3.6.0" targetFramework="net40" />
 </packages>

src/NzbDrone.Api/Calendar/CalendarFeedModule.cs

@@ -1,10 +1,9 @@
-using Nancy;
+using Nancy;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using Ical.Net;
 using Ical.Net.DataTypes;
-using Ical.Net.General;
 using Ical.Net.Interfaces.Serialization;
 using Ical.Net.Serialization;
 using Ical.Net.Serialization.iCalendar.Factory;
@@ -93,9 +92,7 @@ namespace NzbDrone.Api.Calendar
                 ProductId = "-//sonarr.tv//Sonarr//EN"
             };
 
-            var calendarName = "Sonarr TV Schedule";
-            calendar.AddProperty(new CalendarProperty("NAME", calendarName));
-            calendar.AddProperty(new CalendarProperty("X-WR-CALNAME", calendarName));
+
 
             foreach (var episode in episodes.OrderBy(v => v.AirDateUtc.Value))
             {
@@ -117,7 +114,7 @@ namespace NzbDrone.Api.Calendar
 
                 if (asAllDay)
                 {
-                    occurrence.Start = new CalDateTime(episode.AirDateUtc.Value.ToLocalTime()) { HasTime = false };
+                    occurrence.Start = new CalDateTime(episode.AirDateUtc.Value) { HasTime = false };
                 }
                 else
                 {

src/NzbDrone.Api/Config/IndexerConfigModule.cs

@@ -13,9 +13,6 @@ namespace NzbDrone.Api.Config
             SharedValidator.RuleFor(c => c.MinimumAge)
                            .GreaterThanOrEqualTo(0);
 
-            SharedValidator.RuleFor(c => c.MaximumSize)
-                           .GreaterThanOrEqualTo(0);
-
             SharedValidator.RuleFor(c => c.Retention)
                            .GreaterThanOrEqualTo(0);
 
@@ -28,4 +25,4 @@ namespace NzbDrone.Api.Config
             return IndexerConfigResourceMapper.ToResource(model);
         }
     }
-}
+}

src/NzbDrone.Api/Config/IndexerConfigResource.cs

@@ -6,7 +6,6 @@ namespace NzbDrone.Api.Config
     public class IndexerConfigResource : RestResource
     {
         public int MinimumAge { get; set; }
-        public int MaximumSize { get; set; }
         public int Retention { get; set; }
         public int RssSyncInterval { get; set; }
     }
@@ -18,7 +17,6 @@ namespace NzbDrone.Api.Config
             return new IndexerConfigResource
             {
                 MinimumAge = model.MinimumAge,
-                MaximumSize = model.MaximumSize,
                 Retention = model.Retention,
                 RssSyncInterval = model.RssSyncInterval,
             };

src/NzbDrone.Api/Config/MediaManagementConfigResource.cs

@@ -1,4 +1,4 @@
-using NzbDrone.Api.REST;
+using NzbDrone.Api.REST;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.MediaFiles;
 
@@ -10,7 +10,6 @@ namespace NzbDrone.Api.Config
         public string RecycleBin { get; set; }
         public bool AutoDownloadPropers { get; set; }
         public bool CreateEmptySeriesFolders { get; set; }
-        public bool DeleteEmptyFolders { get; set; }
         public FileDateType FileDate { get; set; }
 
         public bool SetPermissionsLinux { get; set; }
@@ -36,7 +35,6 @@ namespace NzbDrone.Api.Config
                 RecycleBin = model.RecycleBin,
                 AutoDownloadPropers = model.AutoDownloadPropers,
                 CreateEmptySeriesFolders = model.CreateEmptySeriesFolders,
-                DeleteEmptyFolders = model.DeleteEmptyFolders,
                 FileDate = model.FileDate,
 
                 SetPermissionsLinux = model.SetPermissionsLinux,

src/NzbDrone.Api/EpisodeFiles/EpisodeFileResource.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using NzbDrone.Api.REST;
 using NzbDrone.Core.Qualities;
@@ -15,7 +15,6 @@ namespace NzbDrone.Api.EpisodeFiles
         public DateTime DateAdded { get; set; }
         public string SceneName { get; set; }
         public QualityModel Quality { get; set; }
-        public MediaInfoResource MediaInfo { get; set; }
 
         public bool QualityCutoffNotMet { get; set; }
     }
@@ -38,7 +37,6 @@ namespace NzbDrone.Api.EpisodeFiles
                 DateAdded = model.DateAdded,
                 SceneName = model.SceneName,
                 Quality = model.Quality,
-                MediaInfo = model.MediaInfo.ToResource(model.SceneName)
                 //QualityCutoffNotMet
             };
         }
@@ -59,8 +57,7 @@ namespace NzbDrone.Api.EpisodeFiles
                 DateAdded = model.DateAdded,
                 SceneName = model.SceneName,
                 Quality = model.Quality,
-                QualityCutoffNotMet = qualityUpgradableSpecification.CutoffNotMet(series.Profile.Value, model.Quality),
-                MediaInfo = model.MediaInfo.ToResource(model.SceneName),
+                QualityCutoffNotMet = qualityUpgradableSpecification.CutoffNotMet(series.Profile.Value, model.Quality)
             };
         }
     }

src/NzbDrone.Api/EpisodeFiles/MediaInfoResource.cs

@@ -1,30 +0,0 @@
-using NzbDrone.Api.REST;
-using NzbDrone.Core.MediaFiles.MediaInfo;
-
-namespace NzbDrone.Api.EpisodeFiles
-{
-    public class MediaInfoResource : RestResource
-    {
-        public decimal AudioChannels { get; set; }
-        public string AudioCodec { get; set; }
-        public string VideoCodec { get; set; }
-    }
-
-    public static class MediaInfoResourceMapper
-    {
-        public static MediaInfoResource ToResource(this MediaInfoModel model, string sceneName)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-
-            return new MediaInfoResource
-                   {
-                       AudioChannels = MediaInfoFormatter.FormatAudioChannels(model),
-                       AudioCodec = MediaInfoFormatter.FormatAudioCodec(model, sceneName),
-                       VideoCodec = MediaInfoFormatter.FormatVideoCodec(model, sceneName)
-                   };
-        }
-    }
-}

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

@@ -23,8 +23,6 @@ namespace NzbDrone.Api.Extensions.Pipelines
 
         private void Handle(NancyContext context)
         {
-            if (context.Request.Method == "OPTIONS") return;
-
             if (_cacheableSpecification.IsCacheable(context))
             {
                 context.Response.Headers.EnableCache();
@@ -35,4 +33,4 @@ namespace NzbDrone.Api.Extensions.Pipelines
             }
         }
     }
-}
+}

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

@@ -2,7 +2,6 @@
 using System.Linq;
 using Nancy;
 using Nancy.Bootstrapper;
-using NzbDrone.Common.Extensions;
 
 namespace NzbDrone.Api.Extensions.Pipelines
 {
@@ -12,25 +11,10 @@ namespace NzbDrone.Api.Extensions.Pipelines
 
         public void Register(IPipelines pipelines)
         {
-            pipelines.BeforeRequest.AddItemToEndOfPipeline(HandleRequest);
-            pipelines.AfterRequest.AddItemToEndOfPipeline(HandleResponse);
+            pipelines.AfterRequest.AddItemToEndOfPipeline((Action<NancyContext>) Handle);
         }
 
-        private Response HandleRequest(NancyContext context)
-        {
-            if (context == null || context.Request.Method != "OPTIONS")
-            {
-                return null;
-            }
-
-            var response = new Response()
-                .WithStatusCode(HttpStatusCode.OK)
-                .WithContentType("");
-            ApplyResponseHeaders(response, context.Request);
-            return response;
-        }
-
-        private void HandleResponse(NancyContext context)
+        private void Handle(NancyContext context)
         {
             if (context == null || context.Response.Headers.ContainsKey(AccessControlHeaders.AllowOrigin))
             {
@@ -42,39 +26,21 @@ namespace NzbDrone.Api.Extensions.Pipelines
 
         private static void ApplyResponseHeaders(Response response, Request request)
         {
-            if (request.IsApiRequest())
+            var allowedMethods = "GET, OPTIONS, PATCH, POST, PUT, DELETE";
+
+            if (response.Headers.ContainsKey("Allow"))
             {
-                // Allow Cross-Origin access to the API since it's protected with the apikey, and nothing else.
-                ApplyCorsResponseHeaders(response, request, "*", "GET, OPTIONS, PATCH, POST, PUT, DELETE");
+                allowedMethods = response.Headers["Allow"];
             }
-            else if (request.IsSharedContentRequest())
+            
+            var requestedHeaders = string.Join(", ", request.Headers[AccessControlHeaders.RequestHeaders]);
+
+            response.Headers.Add(AccessControlHeaders.AllowOrigin, "*");
+            response.Headers.Add(AccessControlHeaders.AllowMethods, allowedMethods);
+
+            if (request.Headers[AccessControlHeaders.RequestHeaders].Any())
             {
-                // Allow Cross-Origin access to specific shared content such as mediacovers and images.
-                ApplyCorsResponseHeaders(response, request, "*", "GET, OPTIONS");
-            }
-
-            // Disallow Cross-Origin access for any other route.
-        }
-
-        private static void ApplyCorsResponseHeaders(Response response, Request request, string allowOrigin, string allowedMethods)
-        {
-            response.Headers.Add(AccessControlHeaders.AllowOrigin, allowOrigin);
-
-            if (request.Method == "OPTIONS")
-            {
-                if (response.Headers.ContainsKey("Allow"))
-                {
-                    allowedMethods = response.Headers["Allow"];
-                }
-
-                response.Headers.Add(AccessControlHeaders.AllowMethods, allowedMethods);
-
-                if (request.Headers[AccessControlHeaders.RequestHeaders].Any())
-                {
-                    var requestedHeaders = request.Headers[AccessControlHeaders.RequestHeaders].Join(", ");
-
-                    response.Headers.Add(AccessControlHeaders.AllowHeaders, requestedHeaders);
-                }
+                response.Headers.Add(AccessControlHeaders.AllowHeaders, requestedHeaders);
             }
         }
     }

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

@@ -33,8 +33,7 @@ namespace NzbDrone.Api.Extensions.Pipelines
             try
             {
                 if (
-                   response.Contents != Response.NoBody
-                && !response.ContentType.Contains("image")
+                   !response.ContentType.Contains("image")
                 && !response.ContentType.Contains("font")
                 && request.Headers.AcceptEncoding.Any(x => x.Contains("gzip"))
                 && !AlreadyGzipEncoded(response)
@@ -81,4 +80,4 @@ namespace NzbDrone.Api.Extensions.Pipelines
             return false;
         }
     }
-}
+}

src/NzbDrone.Api/Extensions/RequestExtensions.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Nancy;
 
 namespace NzbDrone.Api.Extensions
@@ -36,23 +36,5 @@ namespace NzbDrone.Api.Extensions
         {
             return request.Path.StartsWith("/Content/", StringComparison.InvariantCultureIgnoreCase);
         }
-
-        public static bool IsSharedContentRequest(this Request request)
-        {
-            return request.Path.StartsWith("/MediaCover/", StringComparison.InvariantCultureIgnoreCase) ||
-                   request.Path.StartsWith("/Content/Images/", StringComparison.InvariantCultureIgnoreCase);
-        }
-
-        public static bool GetBooleanQueryParameter(this Request request, string parameter, bool defaultValue = false)
-        {
-            var parameterValue = request.Query[parameter];
-
-            if (parameterValue.HasValue)
-            {
-                return bool.Parse(parameterValue.Value);
-            }
-
-            return defaultValue;
-        }
     }
 }

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

@@ -49,12 +49,7 @@ namespace NzbDrone.Api.Frontend.Mappers
 
         public override bool CanHandle(string resourceUrl)
         {
-            resourceUrl = resourceUrl.ToLowerInvariant();
-
-            return !resourceUrl.StartsWith("/content") &&
-                   !resourceUrl.StartsWith("/mediacover") &&
-                   !resourceUrl.Contains(".") &&
-                   !resourceUrl.StartsWith("/login");
+            return !resourceUrl.Contains(".") && !resourceUrl.StartsWith("/login");
         }
 
         public override Response GetResponse(string resourceUrl)
@@ -118,4 +113,4 @@ namespace NzbDrone.Api.Frontend.Mappers
             return _generatedContent;
         }
     }
-}
+}

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

@@ -1,4 +1,3 @@
-using System;
 using System.IO;
 using System.Text.RegularExpressions;
 using NLog;
@@ -43,7 +42,7 @@ namespace NzbDrone.Api.Frontend.Mappers
 
         public override bool CanHandle(string resourceUrl)
         {
-            return resourceUrl.StartsWith("/MediaCover", StringComparison.InvariantCultureIgnoreCase);
+            return resourceUrl.StartsWith("/MediaCover");
         }
     }
-}
+}

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

@@ -1,4 +1,3 @@
-using System;
 using System.IO;
 using NLog;
 using NzbDrone.Common.Disk;
@@ -29,9 +28,7 @@ namespace NzbDrone.Api.Frontend.Mappers
 
         public override bool CanHandle(string resourceUrl)
         {
-            resourceUrl = resourceUrl.ToLowerInvariant();
-
-            return resourceUrl.StartsWith("/content") ||
+            return resourceUrl.StartsWith("/Content") ||
                    resourceUrl.EndsWith(".js") ||
                    resourceUrl.EndsWith(".map") ||
                    resourceUrl.EndsWith(".css") ||
@@ -40,4 +37,4 @@ namespace NzbDrone.Api.Frontend.Mappers
                    resourceUrl.EndsWith("oauth.html");
         }
     }
-}
+}

src/NzbDrone.Api/Frontend/StaticResourceModule.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Nancy.Responses;
 using NLog;
 using Nancy;
 using NzbDrone.Api.Frontend.Mappers;

src/NzbDrone.Api/History/HistoryModule.cs

@@ -1,10 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System;
 using Nancy;
 using NzbDrone.Api.Episodes;
 using NzbDrone.Api.Extensions;
-using NzbDrone.Api.REST;
 using NzbDrone.Api.Series;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.DecisionEngine;
@@ -28,7 +25,6 @@ namespace NzbDrone.Api.History
             _failedDownloadService = failedDownloadService;
             GetResourcePaged = GetHistory;
 
-            Get["/since"] = x => GetHistorySince();
             Post["/failed"] = x => MarkAsFailed();
         }
 
@@ -68,27 +64,6 @@ namespace NzbDrone.Api.History
             return ApplyToPage(_historyService.Paged, pagingSpec, MapToResource);
         }
 
-        private List<HistoryResource> GetHistorySince()
-        {
-            var queryDate = Request.Query.Date;
-            var queryEventType = Request.Query.EventType;
-
-            if (!queryDate.HasValue)
-            {
-                throw new BadRequestException("date is missing");
-            }
-
-            DateTime date = DateTime.Parse(queryDate.Value);
-            HistoryEventType? eventType = null;
-
-            if (queryEventType.HasValue)
-            {
-                eventType = (HistoryEventType)Convert.ToInt32(queryEventType.Value);
-            }
-
-            return _historyService.Since(date, eventType).Select(MapToResource).ToList();
-        }
-
         private Response MarkAsFailed()
         {
             var id = (int)Request.Form.Id;

src/NzbDrone.Api/NancyBootstrapper.cs

@@ -34,6 +34,7 @@ namespace NzbDrone.Api
             RegisterPipelines(pipelines);
 
             container.Resolve<DatabaseTarget>().Register();
+            container.Resolve<IEventAggregator>().PublishEvent(new ApplicationStartedEvent());
         }
 
         private void RegisterPipelines(IPipelines pipelines)
@@ -55,4 +56,4 @@ namespace NzbDrone.Api
 
         protected override byte[] FavIcon => null;
     }
-}
+}

src/NzbDrone.Api/NzbDrone.Api.csproj

@@ -70,7 +70,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.3\lib\net40\NLog.dll</HintPath>
     </Reference>
     <Reference Include="NodaTime, Version=1.3.0.0, Culture=neutral, PublicKeyToken=4226afe0d9b296d1, processorArchitecture=MSIL">
       <HintPath>..\packages\Ical.Net.2.2.32\lib\net40\NodaTime.dll</HintPath>
@@ -104,7 +104,6 @@
     <Compile Include="ClientSchema\SelectOption.cs" />
     <Compile Include="Commands\CommandModule.cs" />
     <Compile Include="Commands\CommandResource.cs" />
-    <Compile Include="EpisodeFiles\MediaInfoResource.cs" />
     <Compile Include="Extensions\AccessControlHeaders.cs" />
     <Compile Include="Extensions\Pipelines\CorsPipeline.cs" />
     <Compile Include="Extensions\Pipelines\UrlBasePipeline.cs" />

src/NzbDrone.Api/RootFolders/RootFolderModule.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using FluentValidation;
 using NzbDrone.Core.RootFolders;
 using NzbDrone.Core.Validation.Paths;
@@ -17,9 +17,7 @@ namespace NzbDrone.Api.RootFolders
                                 DroneFactoryValidator droneFactoryValidator,
                                 MappedNetworkDriveValidator mappedNetworkDriveValidator,
                                 StartupFolderValidator startupFolderValidator,
-                                SystemFolderValidator systemFolderValidator,
-                                FolderWritableValidator folderWritableValidator
-            )
+                                FolderWritableValidator folderWritableValidator)
             : base(signalRBroadcaster)
         {
             _rootFolderService = rootFolderService;
@@ -37,7 +35,6 @@ namespace NzbDrone.Api.RootFolders
                            .SetValidator(mappedNetworkDriveValidator)
                            .SetValidator(startupFolderValidator)
                            .SetValidator(pathExistsValidator)
-                           .SetValidator(systemFolderValidator)
                            .SetValidator(folderWritableValidator);
         }
 
@@ -63,4 +60,4 @@ namespace NzbDrone.Api.RootFolders
             _rootFolderService.Remove(id);
         }
     }
-}
+}

src/NzbDrone.Api/RootFolders/RootFolderResource.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Api.REST;
 using NzbDrone.Core.RootFolders;
@@ -9,7 +9,6 @@ namespace NzbDrone.Api.RootFolders
     {
         public string Path { get; set; }
         public long? FreeSpace { get; set; }
-        public long? TotalSpace { get; set; }
 
         public List<UnmappedFolder> UnmappedFolders { get; set; }
     }
@@ -26,7 +25,6 @@ namespace NzbDrone.Api.RootFolders
 
                 Path = model.Path,
                 FreeSpace = model.FreeSpace,
-                TotalSpace = model.TotalSpace,
                 UnmappedFolders = model.UnmappedFolders
             };
         }
@@ -50,4 +48,4 @@ namespace NzbDrone.Api.RootFolders
             return models.Select(ToResource).ToList();
         }
     }
-}
+}

src/NzbDrone.Api/Series/SeasonResource.cs

@@ -1,6 +1,5 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using NzbDrone.Core.MediaCover;
 using NzbDrone.Core.Tv;
 namespace NzbDrone.Api.Series
 {
@@ -9,20 +8,18 @@ namespace NzbDrone.Api.Series
         public int SeasonNumber { get; set; }
         public bool Monitored { get; set; }
         public SeasonStatisticsResource Statistics { get; set; }
-        public List<MediaCover> Images { get; set; }
     }
 
     public static class SeasonResourceMapper
     {
-        public static SeasonResource ToResource(this Season model, bool includeImages = false)
+        public static SeasonResource ToResource(this Season model)
         {
             if (model == null) return null;
 
             return new SeasonResource
             {
                 SeasonNumber = model.SeasonNumber,
-                Monitored = model.Monitored,
-                Images = includeImages ? model.Images : null
+                Monitored = model.Monitored
             };
         }
 
@@ -33,14 +30,13 @@ namespace NzbDrone.Api.Series
             return new Season
             {
                 SeasonNumber = resource.SeasonNumber,
-                Monitored = resource.Monitored,
-                Images = resource.Images
+                Monitored = resource.Monitored
             };
         }
 
-        public static List<SeasonResource> ToResource(this IEnumerable<Season> models, bool includeImages = false)
+        public static List<SeasonResource> ToResource(this IEnumerable<Season> models)
         {
-            return models.Select(s => ToResource(s, includeImages)).ToList();
+            return models.Select(ToResource).ToList();
         }
 
         public static List<Season> ToModel(this IEnumerable<SeasonResource> resources)

src/NzbDrone.Api/Series/SeriesEditorModule.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Nancy;
 using NzbDrone.Api.Extensions;
@@ -24,7 +24,7 @@ namespace NzbDrone.Api.Series
             var series = resources.Select(seriesResource => seriesResource.ToModel(_seriesService.GetSeries(seriesResource.Id))).ToList();
 
             return _seriesService.UpdateSeries(series)
-                                 .ToResource(false)
+                                 .ToResource()
                                  .AsResponse(HttpStatusCode.Accepted);
         }
     }

src/NzbDrone.Api/Series/SeriesModule.cs

@@ -1,8 +1,7 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using FluentValidation;
-using NzbDrone.Api.Extensions;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Datastore.Events;
 using NzbDrone.Core.MediaCover;
@@ -46,7 +45,6 @@ namespace NzbDrone.Api.Series
                             SeriesExistsValidator seriesExistsValidator,
                             DroneFactoryValidator droneFactoryValidator,
                             SeriesAncestorValidator seriesAncestorValidator,
-                            SystemFolderValidator systemFolderValidator,
                             ProfileExistsValidator profileExistsValidator
             )
             : base(signalRBroadcaster)
@@ -73,7 +71,6 @@ namespace NzbDrone.Api.Series
                            .SetValidator(seriesPathValidator)
                            .SetValidator(droneFactoryValidator)
                            .SetValidator(seriesAncestorValidator)
-                           .SetValidator(systemFolderValidator)
                            .When(s => !s.Path.IsNullOrWhiteSpace());
 
             SharedValidator.RuleFor(s => s.ProfileId).SetValidator(profileExistsValidator);
@@ -87,17 +84,26 @@ namespace NzbDrone.Api.Series
 
         private SeriesResource GetSeries(int id)
         {
-            var includeSeasonImages = Context != null && Request.GetBooleanQueryParameter("includeSeasonImages");
-
             var series = _seriesService.GetSeries(id);
-            return MapToResource(series, includeSeasonImages);
+            return MapToResource(series);
+        }
+
+        private SeriesResource MapToResource(Core.Tv.Series series)
+        {
+            if (series == null) return null;
+
+            var resource = series.ToResource();
+            MapCoversToLocal(resource);
+            FetchAndLinkSeriesStatistics(resource);
+            PopulateAlternateTitles(resource);
+
+            return resource;
         }
 
         private List<SeriesResource> AllSeries()
         {
-            var includeSeasonImages = Request.GetBooleanQueryParameter("includeSeasonImages");
             var seriesStats = _seriesStatisticsService.SeriesStatistics();
-            var seriesResources = _seriesService.GetAllSeries().Select(s => s.ToResource(includeSeasonImages)).ToList();
+            var seriesResources = _seriesService.GetAllSeries().ToResource();
 
             MapCoversToLocal(seriesResources.ToArray());
             LinkSeriesStatistics(seriesResources, seriesStats);
@@ -135,18 +141,6 @@ namespace NzbDrone.Api.Series
             _seriesService.DeleteSeries(id, deleteFiles);
         }
 
-        private SeriesResource MapToResource(Core.Tv.Series series, bool includeSeasonImages)
-        {
-            if (series == null) return null;
-
-            var resource = series.ToResource(includeSeasonImages);
-            MapCoversToLocal(resource);
-            FetchAndLinkSeriesStatistics(resource);
-            PopulateAlternateTitles(resource);
-
-            return resource;
-        }
-
         private void MapCoversToLocal(params SeriesResource[] series)
         {
             foreach (var seriesResource in series)

src/NzbDrone.Api/Series/SeriesResource.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Api.REST;
@@ -97,7 +97,7 @@ namespace NzbDrone.Api.Series
 
     public static class SeriesResourceMapper
     {
-        public static SeriesResource ToResource(this Core.Tv.Series model, bool includeSeasonImages = false)
+        public static SeriesResource ToResource(this Core.Tv.Series model)
         {
             if (model == null) return null;
 
@@ -121,7 +121,7 @@ namespace NzbDrone.Api.Series
                 AirTime = model.AirTime,
                 Images = model.Images,
                 
-                Seasons = model.Seasons.ToResource(includeSeasonImages),
+                Seasons = model.Seasons.ToResource(),
                 Year = model.Year,
                 
                 Path = model.Path,
@@ -214,9 +214,9 @@ namespace NzbDrone.Api.Series
             return series;
         }
 
-        public static List<SeriesResource> ToResource(this IEnumerable<Core.Tv.Series> series, bool includeSeasonImages)
+        public static List<SeriesResource> ToResource(this IEnumerable<Core.Tv.Series> series)
         {
-            return series.Select(s => ToResource(s, includeSeasonImages)).ToList();
+            return series.Select(ToResource).ToList();
         }
     }
 }

src/NzbDrone.Api/packages.config

@@ -6,5 +6,5 @@
   <package id="Nancy.Authentication.Basic" version="1.4.1" targetFramework="net40" />
   <package id="Nancy.Authentication.Forms" version="1.4.1" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" />
-  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
+  <package id="NLog" version="4.4.3" targetFramework="net40" />
 </packages>

src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj

@@ -47,12 +47,8 @@
     <Reference Include="FluentAssertions.Core, Version=4.19.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
       <HintPath>..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Moq, Version=4.0.10827.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.3\lib\net40\NLog.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll</HintPath>
@@ -62,6 +58,9 @@
     <Reference Include="System.ServiceProcess" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
+    <Reference Include="Moq">
+      <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ContainerFixture.cs" />

src/NzbDrone.App.Test/packages.config

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="FluentAssertions" version="4.19.0" targetFramework="net40" />
-  <package id="Moq" version="4.0.10827" targetFramework="net40" />
+  <package id="Moq" version="4.0.10827" />
   <package id="NBuilder" version="4.0.0" targetFramework="net40" />
-  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
+  <package id="NLog" version="4.4.3" targetFramework="net40" />
   <package id="NUnit" version="3.6.0" targetFramework="net40" />
 </packages>

src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj

@@ -45,7 +45,7 @@
       <HintPath>..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.Core.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.3\lib\net40\NLog.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll</HintPath>

src/NzbDrone.Automation.Test/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="FluentAssertions" version="4.19.0" targetFramework="net40" />
-  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
+  <package id="NLog" version="4.4.3" targetFramework="net40" />
   <package id="NUnit" version="3.6.0" targetFramework="net40" />
   <package id="Selenium.Support" version="3.2.0" targetFramework="net40" />
   <package id="Selenium.WebDriver" version="3.2.0" targetFramework="net40" />

src/NzbDrone.Common.Test/DiskTests/DiskTransferServiceFixture.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using Moq;
@@ -238,7 +238,7 @@ namespace NzbDrone.Common.Test.DiskTests
 
             WithExistingFile(_targetPath);
 
-            Assert.Throws<DestinationAlreadyExistsException>(() => Subject.TransferFile(_sourcePath, _targetPath, TransferMode.Move, false));
+            Assert.Throws<IOException>(() => Subject.TransferFile(_sourcePath, _targetPath, TransferMode.Move, false));
 
             Mocker.GetMock<IDiskProvider>()
                 .Verify(v => v.DeleteFile(_targetPath), Times.Never());

src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj

@@ -43,12 +43,8 @@
     <Reference Include="FluentAssertions.Core, Version=4.19.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
       <HintPath>..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Moq, Version=4.0.10827.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.3\lib\net40\NLog.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll</HintPath>
@@ -61,6 +57,9 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Moq">
+      <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CacheTests\CachedDictionaryFixture.cs" />

src/NzbDrone.Common.Test/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="FluentAssertions" version="4.19.0" targetFramework="net40" />
-  <package id="Moq" version="4.0.10827" targetFramework="net40" />
-  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
+  <package id="Moq" version="4.0.10827" />
+  <package id="NLog" version="4.4.3" targetFramework="net40" />
   <package id="NUnit" version="3.6.0" targetFramework="net40" />
 </packages>

src/NzbDrone.Common/Disk/DestinationAlreadyExistsException.cs

@@ -1,29 +0,0 @@
-using System;
-using System.IO;
-using System.Runtime.Serialization;
-
-namespace NzbDrone.Common.Disk
-{
-    public class DestinationAlreadyExistsException : IOException
-    {
-        public DestinationAlreadyExistsException()
-        {
-        }
-
-        public DestinationAlreadyExistsException(string message) : base(message)
-        {
-        }
-
-        public DestinationAlreadyExistsException(string message, int hresult) : base(message, hresult)
-        {
-        }
-
-        public DestinationAlreadyExistsException(string message, Exception innerException) : base(message, innerException)
-        {
-        }
-
-        protected DestinationAlreadyExistsException(SerializationInfo info, StreamingContext context) : base(info, context)
-        {
-        }
-    }
-}

src/NzbDrone.Common/Disk/DiskProviderBase.cs

@@ -200,11 +200,6 @@ namespace NzbDrone.Common.Disk
                 throw new IOException(string.Format("Source and destination can't be the same {0}", source));
             }
 
-            CopyFileInternal(source, destination, overwrite);
-        }
-
-        protected virtual void CopyFileInternal(string source, string destination, bool overwrite = false)
-        {
             File.Copy(source, destination, overwrite);
         }
 
@@ -224,11 +219,6 @@ namespace NzbDrone.Common.Disk
             }
 
             RemoveReadOnly(source);
-            MoveFileInternal(source, destination);
-        }
-
-        protected virtual void MoveFileInternal(string source, string destination)
-        {
             File.Move(source, destination);
         }
 

src/NzbDrone.Common/Disk/DiskTransferService.cs

@@ -1,11 +1,10 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using System.Threading;
 using NLog;
 using NzbDrone.Common.EnsureThat;
 using NzbDrone.Common.EnvironmentInfo;
-using NzbDrone.Common.Exceptions;
 using NzbDrone.Common.Extensions;
 
 namespace NzbDrone.Common.Disk
@@ -341,7 +340,7 @@ namespace NzbDrone.Common.Disk
                 }
                 else
                 {
-                    throw new DestinationAlreadyExistsException($"Destination {targetPath} already exists.");
+                    throw new IOException(string.Format("Destination already exists. [{0}] to [{1}]", sourcePath, targetPath));
                 }
             }
         }

src/NzbDrone.Common/Exceptions/NotParentException.cs

@@ -1,6 +1,4 @@
-using NzbDrone.Common.Exceptions;
-
-namespace NzbDrone.Common.Disk
+namespace NzbDrone.Common.Exceptions
 {
     public class NotParentException : NzbDroneException
     {

src/NzbDrone.Common/Extensions/PathExtensions.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
@@ -59,7 +59,7 @@ namespace NzbDrone.Common.Extensions
         {
             if (!parentPath.IsParentPath(childPath))
             {
-                throw new NotParentException("{0} is not a child of {1}", childPath, parentPath);
+                throw new Exceptions.NotParentException("{0} is not a child of {1}", childPath, parentPath);
             }
 
             return childPath.Substring(parentPath.Length).Trim(Path.DirectorySeparatorChar);

src/NzbDrone.Common/Http/HttpRequest.cs

@@ -76,12 +76,5 @@ namespace NzbDrone.Common.Http
             var encoding = HttpHeader.GetEncodingFromContentType(Headers.ContentType);
             ContentData = encoding.GetBytes(data);
         }
-
-        public void AddBasicAuthentication(string username, string password)
-        {
-            var authInfo = Convert.ToBase64String(Encoding.GetEncoding("ISO-8859-1").GetBytes($"{username}:{password}"));
-
-            Headers.Set("Authorization", "Basic " + authInfo);
-        }
     }
-}
+}

src/NzbDrone.Common/Instrumentation/Extensions/SentryLoggerExtensions.cs

@@ -51,7 +51,7 @@ namespace NzbDrone.Common.Instrumentation.Extensions
             return logBuilder.LoggerName(logEvent.LoggerName)
                              .TimeStamp(logEvent.TimeStamp)
                              .Message(logEvent.Message, logEvent.Parameters)
-                             .Properties(logEvent.Properties.ToDictionary(v => v.Key, v => v.Value))
+                             .Properties((Dictionary<object, object>)logEvent.Properties)
                              .Exception(logEvent.Exception);
         }
     }

src/NzbDrone.Common/Instrumentation/GlobalExceptionHandlers.cs

@@ -31,7 +31,7 @@ namespace NzbDrone.Common.Instrumentation
             if (exception is NullReferenceException &&
                 exception.ToString().Contains("Microsoft.AspNet.SignalR.Transports.TransportHeartbeat.ProcessServerCommand"))
             {
-                Logger.Warn("SignalR Heartbeat interrupted");
+                Logger.Warn("SignalR Heartbeat interupted");
                 return;
             }
 
@@ -49,4 +49,4 @@ namespace NzbDrone.Common.Instrumentation
             Logger.Fatal(exception, "EPIC FAIL.");
         }
     }
-}
+}

src/NzbDrone.Common/NzbDrone.Common.csproj

@@ -44,7 +44,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.3\lib\net40\NLog.dll</HintPath>
     </Reference>
     <Reference Include="Org.Mentalis, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\DotNet4.SocksProxy.1.3.4.0\lib\net40\Org.Mentalis.dll</HintPath>
@@ -92,7 +92,6 @@
     <Compile Include="EnvironmentInfo\IOsVersionAdapter.cs" />
     <Compile Include="EnvironmentInfo\IPlatformInfo.cs" />
     <Compile Include="EnvironmentInfo\OsVersionModel.cs" />
-    <Compile Include="Disk\DestinationAlreadyExistsException.cs" />
     <Compile Include="Exceptions\SonarrStartupException.cs" />
     <Compile Include="Extensions\DictionaryExtensions.cs" />
     <Compile Include="Disk\OsPath.cs" />
@@ -126,7 +125,7 @@
     <Compile Include="EnvironmentInfo\IRuntimeInfo.cs" />
     <Compile Include="EnvironmentInfo\RuntimeInfo.cs" />
     <Compile Include="EnvironmentInfo\StartupContext.cs" />
-    <Compile Include="Disk\NotParentException.cs" />
+    <Compile Include="Exceptions\NotParentException.cs" />
     <Compile Include="Exceptions\NzbDroneException.cs" />
     <Compile Include="Expansive\CircularReferenceException.cs" />
     <Compile Include="Expansive\Expansive.cs" />
@@ -212,7 +211,6 @@
     <Compile Include="Serializer\IntConverter.cs" />
     <Compile Include="Serializer\Json.cs" />
     <Compile Include="Serializer\JsonVisitor.cs" />
-    <Compile Include="Serializer\UnderscoreStringEnumConverter.cs" />
     <Compile Include="ServiceFactory.cs" />
     <Compile Include="ServiceProvider.cs" />
     <Compile Include="Extensions\StringExtensions.cs" />

src/NzbDrone.Common/Serializer/UnderscoreStringEnumConverter.cs

@@ -1,58 +0,0 @@
-using System;
-using System.Text;
-using Newtonsoft.Json;
-
-namespace NzbDrone.Common.Serializer
-{
-    public class UnderscoreStringEnumConverter : JsonConverter
-    {
-        public object UnknownValue { get; set; }
-
-        public UnderscoreStringEnumConverter(object unknownValue)
-        {
-            UnknownValue = unknownValue;
-        }
-
-        public override bool CanConvert(Type objectType)
-        {
-            return objectType.IsEnum;
-        }
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-        {
-            var enumString = reader.Value.ToString().Replace("_", string.Empty);
-
-            try
-            {
-                return Enum.Parse(objectType, enumString, true);
-            }
-            catch
-            {
-                if (UnknownValue == null)
-                {
-                    throw;
-                }
-
-                return UnknownValue;
-            }
-        }
-
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            var enumText = value.ToString();
-            var builder = new StringBuilder(enumText.Length + 4);
-            builder.Append(char.ToLower(enumText[0]));
-            for (int i = 1; i < enumText.Length; i++)
-            {
-                if (char.IsUpper(enumText[i]))
-                {
-                    builder.Append('_');
-                }
-                builder.Append(char.ToLower(enumText[i]));
-            }
-            enumText = builder.ToString();
-
-            writer.WriteValue(enumText);
-        }
-    }
-}

src/NzbDrone.Common/packages.config

@@ -3,6 +3,6 @@
   <package id="DotNet4.SocksProxy" version="1.3.4.0" targetFramework="net40" />
   <package id="ICSharpCode.SharpZipLib.Patched" version="0.86.5" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" />
-  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
+  <package id="NLog" version="4.4.3" targetFramework="net40" />
   <package id="SharpRaven" version="2.2.0" targetFramework="net40" />
 </packages>

src/NzbDrone.Console/ConsoleApp.cs

@@ -25,15 +25,7 @@ namespace NzbDrone.Console
             try
             {
                 var startupArgs = new StartupContext(args);
-                try
-                {
-                    NzbDroneLogger.Register(startupArgs, false, true);
-                }
-                catch (Exception ex)
-                {
-                    System.Console.WriteLine("NLog Exception: " + ex.ToString());
-                    throw;
-                }
+                NzbDroneLogger.Register(startupArgs, false, true);
                 Bootstrap.Start(startupArgs, new ConsoleAlerts());
             }
             catch (SonarrStartupException ex)
@@ -65,7 +57,7 @@ namespace NzbDrone.Console
 
         private static void Exit(ExitCodes exitCode)
         {
-            LogManager.Shutdown();
+            LogManager.Flush();
 
             if (exitCode != ExitCodes.Normal)
             {
@@ -88,6 +80,8 @@ namespace NzbDrone.Console
                 System.Console.ReadLine();
             }
 
+            //Need this to terminate on mono (thanks nlog)
+            LogManager.Configuration = null;
             Environment.Exit((int)exitCode);
         }
     }

src/NzbDrone.Console/NzbDrone.Console.csproj

@@ -79,7 +79,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.3\lib\net40\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

src/NzbDrone.Console/packages.config

@@ -3,6 +3,6 @@
   <package id="Microsoft.Owin" version="2.1.0" targetFramework="net40" />
   <package id="Microsoft.Owin.Hosting" version="2.1.0" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" />
-  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
+  <package id="NLog" version="4.4.3" targetFramework="net40" />
   <package id="Owin" version="1.0" targetFramework="net40" />
 </packages>

src/NzbDrone.Core.Test/Datastore/Converters/BooleanIntConverterFixture.cs

@@ -1,59 +0,0 @@
-using System;
-using FluentAssertions;
-using Marr.Data.Converters;
-using NUnit.Framework;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.Datastore.Converters
-{
-    [TestFixture]
-    public class BooleanIntConverterFixture : CoreTest<Core.Datastore.Converters.BooleanIntConverter>
-    {
-        [TestCase(true, 1)]
-        [TestCase(false, 0)]
-        public void should_return_int_when_saving_boolean_to_db(bool input, int expected)
-        {
-            Subject.ToDB(input).Should().Be(expected);
-        }
-
-        [Test]
-        public void should_return_db_null_for_null_value_when_saving_to_db()
-        {
-            Subject.ToDB(null).Should().Be(DBNull.Value);
-        }
-
-        [TestCase(1, true)]
-        [TestCase(0, false)]
-        public void should_return_bool_when_getting_int_from_db(int input, bool expected)
-        {
-            var context = new ConverterContext
-                          {
-                              DbValue = (long)input
-                          };
-
-            Subject.FromDB(context).Should().Be(expected);
-        }
-
-        [Test]
-        public void should_return_db_null_for_null_value_when_getting_from_db()
-        {
-            var context = new ConverterContext
-                          {
-                              DbValue = DBNull.Value
-                          };
-
-            Subject.FromDB(context).Should().Be(DBNull.Value);
-        }
-
-        [Test]
-        public void should_throw_for_non_boolean_equivalent_number_value_when_getting_from_db()
-        {
-            var context = new ConverterContext
-                          {
-                              DbValue = (long)2
-                          };
-
-            Assert.Throws<ConversionException>(() => Subject.FromDB(context));
-        }
-    }
-}

src/NzbDrone.Core.Test/Datastore/Converters/CommandConverterFixture.cs

@@ -1,64 +0,0 @@
-using System;
-using System.Data;
-using FluentAssertions;
-using Marr.Data.Converters;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Common.Serializer;
-using NzbDrone.Core.Datastore.Converters;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv.Commands;
-
-namespace NzbDrone.Core.Test.Datastore.Converters
-{
-    [TestFixture]
-    public class CommandConverterFixture : CoreTest<CommandConverter>
-    {
-        [Test]
-        public void should_return_json_string_when_saving_boolean_to_db()
-        {
-            var command = new RefreshSeriesCommand();
-
-            Subject.ToDB(command).Should().BeOfType<string>();
-        }
-
-        [Test]
-        public void should_return_null_for_null_value_when_saving_to_db()
-        {
-            Subject.ToDB(null).Should().Be(null);
-        }
-
-        [Test]
-        public void should_return_db_null_for_db_null_value_when_saving_to_db()
-        {
-            Subject.ToDB(DBNull.Value).Should().Be(DBNull.Value);
-        }
-
-        [Test]
-        public void should_return_command_when_getting_json_from_db()
-        {
-            var dataRecordMock = new Mock<IDataRecord>();
-            dataRecordMock.Setup(s => s.GetOrdinal("Name")).Returns(0);
-            dataRecordMock.Setup(s => s.GetString(0)).Returns("RefreshSeries");
-
-            var context = new ConverterContext
-                          {
-                              DataRecord = dataRecordMock.Object,
-                              DbValue = new RefreshSeriesCommand().ToJson()
-                          };
-
-            Subject.FromDB(context).Should().BeOfType<RefreshSeriesCommand>();
-        }
-
-        [Test]
-        public void should_return_null_for_null_value_when_getting_from_db()
-        {
-            var context = new ConverterContext
-                          {
-                              DbValue = DBNull.Value
-                          };
-
-            Subject.FromDB(context).Should().Be(null);
-        }
-    }
-}

src/NzbDrone.Core.Test/Datastore/Converters/DoubleConverterFixture.cs

@@ -1,70 +0,0 @@
-using System;
-using FluentAssertions;
-using Marr.Data.Converters;
-using NUnit.Framework;
-using NzbDrone.Core.Datastore.Converters;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.Datastore.Converters
-{
-    [TestFixture]
-    public class DoubleConverterFixture : CoreTest<DoubleConverter>
-    {
-        [Test]
-        public void should_return_double_when_saving_double_to_db()
-        {
-            var input = 10.5D;
-
-            Subject.ToDB(input).Should().Be(input);
-        }
-
-        [Test]
-        public void should_return_null_for_null_value_when_saving_to_db()
-        {
-            Subject.ToDB(null).Should().Be(null);
-        }
-
-        [Test]
-        public void should_return_db_null_for_db_null_value_when_saving_to_db()
-        {
-            Subject.ToDB(DBNull.Value).Should().Be(DBNull.Value);
-        }
-
-        [Test]
-        public void should_return_double_when_getting_double_from_db()
-        {
-            var expected = 10.5D;
-
-            var context = new ConverterContext
-                          {
-                              DbValue = expected
-                          };
-
-            Subject.FromDB(context).Should().Be(expected);
-        }
-
-        [Test]
-        public void should_return_double_when_getting_string_from_db()
-        {
-            var expected = 10.5D;
-
-            var context = new ConverterContext
-                          {
-                              DbValue = $"{expected}"
-                          };
-
-            Subject.FromDB(context).Should().Be(expected);
-        }
-
-        [Test]
-        public void should_return_null_for_null_value_when_getting_from_db()
-        {
-            var context = new ConverterContext
-                          {
-                              DbValue = DBNull.Value
-                          };
-
-            Subject.FromDB(context).Should().Be(DBNull.Value);
-        }
-    }
-}

src/NzbDrone.Core.Test/Datastore/Converters/EnumIntConverterFixture.cs

@@ -1,57 +0,0 @@
-using System;
-using System.Reflection;
-using FluentAssertions;
-using Marr.Data.Converters;
-using Marr.Data.Mapping;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv;
-
-namespace NzbDrone.Core.Test.Datastore.Converters
-{
-    [TestFixture]
-    public class EnumIntConverterFixture : CoreTest<Core.Datastore.Converters.EnumIntConverter>
-    {
-        [Test]
-        public void should_return_int_when_saving_enum_to_db()
-        {
-            Subject.ToDB(SeriesTypes.Standard).Should().Be((int)SeriesTypes.Standard);
-        }
-
-        [Test]
-        public void should_return_db_null_for_null_value_when_saving_to_db()
-        {
-            Subject.ToDB(null).Should().Be(DBNull.Value);
-        }
-
-        [Test]
-        public void should_return_enum_when_getting_int_from_db()
-        {
-            var mockMemberInfo = new Mock<MemberInfo>();
-            mockMemberInfo.SetupGet(s => s.DeclaringType).Returns(typeof(Series));
-            mockMemberInfo.SetupGet(s => s.Name).Returns("SeriesType");
-
-            var expected = SeriesTypes.Standard;
-
-            var context = new ConverterContext
-                          {
-                              ColumnMap = new ColumnMap(mockMemberInfo.Object) { FieldType = typeof(SeriesTypes) },
-                              DbValue = (long)expected
-                          };
-
-            Subject.FromDB(context).Should().Be(expected);
-        }
-
-        [Test]
-        public void should_return_null_for_null_value_when_getting_from_db()
-        {
-            var context = new ConverterContext
-                          {
-                              DbValue = DBNull.Value
-                          };
-
-            Subject.FromDB(context).Should().Be(null);
-        }
-    }
-}

src/NzbDrone.Core.Test/Datastore/Converters/GuidConverterFixture.cs

@@ -1,51 +0,0 @@
-using System;
-using FluentAssertions;
-using Marr.Data.Converters;
-using NUnit.Framework;
-using NzbDrone.Core.Datastore.Converters;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.Datastore.Converters
-{
-    [TestFixture]
-    public class GuidConverterFixture : CoreTest<GuidConverter>
-    {
-        [Test]
-        public void should_return_string_when_saving_guid_to_db()
-        {
-            var guid = Guid.NewGuid();
-
-            Subject.ToDB(guid).Should().Be(guid.ToString());
-        }
-
-        [Test]
-        public void should_return_db_null_for_null_value_when_saving_to_db()
-        {
-            Subject.ToDB(null).Should().Be(DBNull.Value);
-        }
-
-        [Test]
-        public void should_return_guid_when_getting_string_from_db()
-        {
-            var guid = Guid.NewGuid();
-
-            var context = new ConverterContext
-                          {
-                              DbValue = guid.ToString()
-                          };
-
-            Subject.FromDB(context).Should().Be(guid);
-        }
-
-        [Test]
-        public void should_return_empty_guid_for_db_null_value_when_getting_from_db()
-        {
-            var context = new ConverterContext
-                          {
-                              DbValue = DBNull.Value
-                          };
-
-            Subject.FromDB(context).Should().Be(Guid.Empty);
-        }
-    }
-}

src/NzbDrone.Core.Test/Datastore/Converters/Int32ConverterFixture.cs

@@ -1,58 +0,0 @@
-using System;
-using FluentAssertions;
-using Marr.Data.Converters;
-using NUnit.Framework;
-using NzbDrone.Core.Datastore.Converters;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.Datastore.Converters
-{
-    [TestFixture]
-    public class Int32ConverterFixture : CoreTest<Int32Converter>
-    {
-        [Test]
-        public void should_return_int_when_saving_int_to_db()
-        {
-            var i = 5;
-
-            Subject.ToDB(5).Should().Be(5);
-        }
-
-        [Test]
-        public void should_return_int_when_getting_int_from_db()
-        {
-            var i = 5;
-
-            var context = new ConverterContext
-                          {
-                              DbValue = i
-                          };
-
-            Subject.FromDB(context).Should().Be(i);
-        }
-
-        [Test]
-        public void should_return_int_when_getting_string_from_db()
-        {
-            var i = 5;
-
-            var context = new ConverterContext
-                          {
-                              DbValue = i.ToString()
-                          };
-
-            Subject.FromDB(context).Should().Be(i);
-        }
-
-        [Test]
-        public void should_return_db_null_for_db_null_value_when_getting_from_db()
-        {
-            var context = new ConverterContext
-                          {
-                              DbValue = DBNull.Value
-                          };
-
-            Subject.FromDB(context).Should().Be(DBNull.Value);
-        }
-    }
-}

src/NzbDrone.Core.Test/Datastore/Converters/OsPathConverterFixture.cs

@@ -1,49 +0,0 @@
-using System;
-using FluentAssertions;
-using Marr.Data.Converters;
-using NUnit.Framework;
-using NzbDrone.Common.Disk;
-using NzbDrone.Core.Datastore.Converters;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Test.Common;
-
-namespace NzbDrone.Core.Test.Datastore.Converters
-{
-    [TestFixture]
-    public class OsPathConverterFixture : CoreTest<OsPathConverter>
-    {
-        [Test]
-        public void should_return_string_when_saving_os_path_to_db()
-        {
-            var path = @"C:\Test\TV".AsOsAgnostic();
-            var osPath = new OsPath(path);
-
-            Subject.ToDB(osPath).Should().Be(path);
-        }
-
-        [Test]
-        public void should_return_os_path_when_getting_string_from_db()
-        {
-            var path = @"C:\Test\TV".AsOsAgnostic();
-            var osPath = new OsPath(path);
-
-            var context = new ConverterContext
-                          {
-                              DbValue = path
-                          };
-
-            Subject.FromDB(context).Should().Be(osPath);
-        }
-
-        [Test]
-        public void should_return_db_null_for_db_null_value_when_getting_from_db()
-        {
-            var context = new ConverterContext
-                          {
-                              DbValue = DBNull.Value
-                          };
-
-            Subject.FromDB(context).Should().Be(DBNull.Value);
-        }
-    }
-}

src/NzbDrone.Core.Test/Datastore/Converters/QualityIntConverterFixture.cs

@@ -1,58 +0,0 @@
-using System;
-using FluentAssertions;
-using Marr.Data.Converters;
-using NUnit.Framework;
-using NzbDrone.Core.Datastore.Converters;
-using NzbDrone.Core.Qualities;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.Datastore.Converters
-{
-    [TestFixture]
-    public class QualityIntConverterFixture : CoreTest<QualityIntConverter>
-    {
-        [Test]
-        public void should_return_int_when_saving_quality_to_db()
-        {
-            var quality = Quality.Bluray1080p;
-
-            Subject.ToDB(quality).Should().Be(quality.Id);
-        }
-
-        [Test]
-        public void should_return_0_when_saving_db_null_to_db()
-        {
-            Subject.ToDB(DBNull.Value).Should().Be(0);
-        }
-
-        [Test]
-        public void should_throw_when_saving_another_object_to_db()
-        {
-            Assert.Throws<InvalidOperationException>(() => Subject.ToDB("Not a quality"));
-        }
-
-        [Test]
-        public void should_return_quality_when_getting_string_from_db()
-        {
-            var quality = Quality.Bluray1080p;
-
-            var context = new ConverterContext
-                          {
-                              DbValue = quality.Id
-                          };
-
-            Subject.FromDB(context).Should().Be(quality);
-        }
-
-        [Test]
-        public void should_return_db_null_for_db_null_value_when_getting_from_db()
-        {
-            var context = new ConverterContext
-                          {
-                              DbValue = DBNull.Value
-                          };
-
-            Subject.FromDB(context).Should().Be(Quality.Unknown);
-        }
-    }
-}

src/NzbDrone.Core.Test/Datastore/Converters/TimeSpanConverterFixture.cs

@@ -1,65 +0,0 @@
-using System;
-using System.Globalization;
-using FluentAssertions;
-using Marr.Data.Converters;
-using NUnit.Framework;
-using NzbDrone.Core.Datastore.Converters;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.Datastore.Converters
-{
-    [TestFixture]
-    public class TimeSpanConverterFixture : CoreTest<TimeSpanConverter>
-    {
-        [Test]
-        public void should_return_string_when_saving_timespan_to_db()
-        {
-            var timeSpan = TimeSpan.FromMinutes(5);
-
-            Subject.ToDB(timeSpan).Should().Be(timeSpan.ToString("c", CultureInfo.InvariantCulture));
-        }
-
-        [Test]
-        public void should_return_null_when_saving_empty_string_to_db()
-        {
-            Subject.ToDB("").Should().Be(null);
-        }
-
-        [Test]
-        public void should_return_time_span_when_getting_time_span_from_db()
-        {
-            var timeSpan = TimeSpan.FromMinutes(5);
-
-            var context = new ConverterContext
-                          {
-                              DbValue = timeSpan
-                          };
-
-            Subject.FromDB(context).Should().Be(timeSpan);
-        }
-
-        [Test]
-        public void should_return_time_span_when_getting_string_from_db()
-        {
-            var timeSpan = TimeSpan.FromMinutes(5);
-
-            var context = new ConverterContext
-                          {
-                              DbValue = timeSpan.ToString("c", CultureInfo.InvariantCulture)
-                          };
-
-            Subject.FromDB(context).Should().Be(timeSpan);
-        }
-
-        [Test]
-        public void should_return_time_span_zero_for_db_null_value_when_getting_from_db()
-        {
-            var context = new ConverterContext
-                          {
-                              DbValue = DBNull.Value
-                          };
-
-            Subject.FromDB(context).Should().Be(TimeSpan.Zero);
-        }
-    }
-}

src/NzbDrone.Core.Test/Datastore/Converters/UtcConverterFixture.cs

@@ -1,51 +0,0 @@
-using System;
-using FluentAssertions;
-using Marr.Data.Converters;
-using NUnit.Framework;
-using NzbDrone.Core.Datastore.Converters;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.Datastore.Converters
-{
-    [TestFixture]
-    public class UtcConverterFixture : CoreTest<UtcConverter>
-    {
-        [Test]
-        public void should_return_date_time_when_saving_date_time_to_db()
-        {
-            var dateTime = DateTime.Now;
-
-            Subject.ToDB(dateTime).Should().Be(dateTime.ToUniversalTime());
-        }
-
-        [Test]
-        public void should_return_db_null_when_saving_db_null_to_db()
-        {
-            Subject.ToDB(DBNull.Value).Should().Be(DBNull.Value);
-        }
-
-        [Test]
-        public void should_return_time_span_when_getting_time_span_from_db()
-        {
-            var dateTime = DateTime.Now.ToUniversalTime();
-
-            var context = new ConverterContext
-                          {
-                              DbValue = dateTime
-            };
-
-            Subject.FromDB(context).Should().Be(dateTime);
-        }
-
-        [Test]
-        public void should_return_db_null_for_db_null_value_when_getting_from_db()
-        {
-            var context = new ConverterContext
-                          {
-                              DbValue = DBNull.Value
-                          };
-
-            Subject.FromDB(context).Should().Be(DBNull.Value);
-        }
-    }
-}

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

@@ -1,75 +0,0 @@
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Core.Configuration;
-using NzbDrone.Core.DecisionEngine.Specifications;
-using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.DecisionEngineTests
-{
-    public class MaximumSizeSpecificationFixture : CoreTest<MaximumSizeSpecification>
-    {
-        private RemoteEpisode _remoteEpisode;
-
-        [SetUp]
-        public void Setup()
-        {
-            _remoteEpisode = new RemoteEpisode() { Release = new ReleaseInfo() };
-        }
-
-        private void WithMaximumSize(int size)
-        {
-            Mocker.GetMock<IConfigService>().SetupGet(c => c.MaximumSize).Returns(size);
-        }
-
-        private void WithSize(int size)
-        {
-            _remoteEpisode.Release.Size = size * 1024 * 1024;
-        }
-
-        [Test]
-        public void should_return_true_when_maximum_size_is_set_to_zero()
-        {
-            WithMaximumSize(0);
-            WithSize(1000);
-
-            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
-        }
-
-        [Test]
-        public void should_return_true_when_size_is_smaller_than_maximum_size()
-        {
-            WithMaximumSize(2000);
-            WithSize(1999);
-
-            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
-        }
-
-        [Test]
-        public void should_return_true_when_size_is_equals_to_maximum_size()
-        {
-            WithMaximumSize(2000);
-            WithSize(2000);
-
-            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
-        }
-
-        [Test]
-        public void should_return_false_when_size_is_bigger_than_maximum_size()
-        {
-            WithMaximumSize(2000);
-            WithSize(2001);
-
-            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeFalse();
-        }
-
-        [Test]
-        public void should_return_true_when_size_is_zero()
-        {
-            WithMaximumSize(2000);
-            WithSize(0);
-
-            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
-        }
-    }
-}

src/NzbDrone.Core.Test/DecisionEngineTests/Search/TorrentSeedingSpecificationFixture.cs

@@ -1,11 +1,12 @@
-using FizzWare.NBuilder;
+using FizzWare.NBuilder;
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Core.Datastore;
-using NzbDrone.Core.DecisionEngine.Specifications;
+using NzbDrone.Core.DecisionEngine.Specifications.Search;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Indexers.TorrentRss;
+using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Tv;
 using NzbDrone.Test.Common;

src/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs

@@ -8,7 +8,6 @@ using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.Download.Clients;
 using NzbDrone.Core.Download.Pending;
-using NzbDrone.Core.Exceptions;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Profiles;
@@ -179,7 +178,7 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
         }
 
         [Test]
-        public void should_return_an_empty_list_when_none_are_approved()
+        public void should_return_an_empty_list_when_none_are_appproved()
         {
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(null, new Rejection("Failure!")));
@@ -264,26 +263,5 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
             Mocker.GetMock<IDownloadService>().Verify(v => v.DownloadReport(It.Is<RemoteEpisode>(r => r.Release.DownloadProtocol == DownloadProtocol.Usenet)), Times.Once());
             Mocker.GetMock<IDownloadService>().Verify(v => v.DownloadReport(It.Is<RemoteEpisode>(r => r.Release.DownloadProtocol == DownloadProtocol.Torrent)), Times.Once());
         }
-
-        [Test]
-        public void should_add_to_rejected_if_release_unavailable_on_indexer()
-        {
-            var episodes = new List<Episode> { GetEpisode(1) };
-            var remoteEpisode = GetRemoteEpisode(episodes, new QualityModel(Quality.HDTV720p));
-
-            var decisions = new List<DownloadDecision>();
-            decisions.Add(new DownloadDecision(remoteEpisode));
-
-            Mocker.GetMock<IDownloadService>()
-                  .Setup(s => s.DownloadReport(It.IsAny<RemoteEpisode>()))
-                  .Throws(new ReleaseUnavailableException(remoteEpisode.Release, "That 404 Error is not just a Quirk"));
-
-            var result = Subject.ProcessDecisions(decisions);
-
-            result.Grabbed.Should().BeEmpty();
-            result.Rejected.Should().NotBeEmpty();
-
-            ExceptionVerification.ExpectedWarns(1);
-        }
     }
 }

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

@@ -7,11 +7,12 @@ using NzbDrone.Core.Download.Clients.DownloadStation;
 using NzbDrone.Core.Download.Clients.DownloadStation.Proxies;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;
+using NzbDrone.Core.Download.Clients.DownloadStation.Responses;
 
 namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
 {
     [TestFixture]
-    public class SerialNumberProviderFixture : CoreTest<SerialNumberProvider>
+    public class DSMInfoProviderFixture : CoreTest<DSMInfoProvider>
     {
         protected DownloadStationSettings _settings;
 
@@ -24,17 +25,27 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
         private void GivenValidResponse()
         {
             Mocker.GetMock<IDSMInfoProxy>()
-                  .Setup(d => d.GetSerialNumber(It.IsAny<DownloadStationSettings>()))
-                  .Returns("serial");
+                  .Setup(d => d.GetInfo(It.IsAny<DownloadStationSettings>()))
+                  .Returns(new DSMInfoResponse() { SerialNumber = "serial", Version = "DSM 6.0.1" });
         }
 
         private void GivenInvalidResponse()
         {
             Mocker.GetMock<IDSMInfoProxy>()
-                  .Setup(d => d.GetSerialNumber(It.IsAny<DownloadStationSettings>()))
+                  .Setup(d => d.GetInfo(It.IsAny<DownloadStationSettings>()))
                   .Throws(new DownloadClientException("Serial response invalid"));
         }
 
+        [Test]
+        public void should_return_version()
+        {
+            GivenValidResponse();
+
+            var version = Subject.GetDSMVersion(_settings);
+
+            version.Should().Be(new Version("6.0.1"));
+        }
+
         [Test]
         public void should_return_hashedserialnumber()
         {
@@ -46,7 +57,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
             serial.Should().Be("50DE66B735D30738618568294742FCF1DFA52A47");
 
             Mocker.GetMock<IDSMInfoProxy>()
-                  .Verify(d => d.GetSerialNumber(It.IsAny<DownloadStationSettings>()), Times.Once());
+                  .Verify(d => d.GetInfo(It.IsAny<DownloadStationSettings>()), Times.Once());
         }
 
         [Test]
@@ -60,7 +71,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
             serial2.Should().Be(serial1);
 
             Mocker.GetMock<IDSMInfoProxy>()
-                  .Verify(d => d.GetSerialNumber(It.IsAny<DownloadStationSettings>()), Times.Once());
+                  .Verify(d => d.GetInfo(It.IsAny<DownloadStationSettings>()), Times.Once());
         }
 
         [Test]

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

@@ -1,49 +0,0 @@
-using FluentAssertions;
-using Newtonsoft.Json;
-using NUnit.Framework;
-using NzbDrone.Core.Download.Clients.DownloadStation;
-
-namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
-{
-    [TestFixture]
-    public class DownloadStationsTaskStatusJsonConverterFixture
-    {
-        [TestCase("captcha_needed", DownloadStationTaskStatus.CaptchaNeeded)]
-        [TestCase("filehosting_waiting", DownloadStationTaskStatus.FilehostingWaiting)]
-        [TestCase("hash_checking", DownloadStationTaskStatus.HashChecking)]
-        [TestCase("error", DownloadStationTaskStatus.Error)]
-        [TestCase("downloading", DownloadStationTaskStatus.Downloading)]
-        public void should_parse_enum_correctly(string value, DownloadStationTaskStatus expected)
-        {
-            var task = "{\"Status\": \"" + value + "\"}";
-
-            var item = JsonConvert.DeserializeObject<DownloadStationTask>(task);
-
-            item.Status.Should().Be(expected);
-        }
-
-        [TestCase("captcha_needed", DownloadStationTaskStatus.CaptchaNeeded)]
-        [TestCase("filehosting_waiting", DownloadStationTaskStatus.FilehostingWaiting)]
-        [TestCase("hash_checking", DownloadStationTaskStatus.HashChecking)]
-        [TestCase("error", DownloadStationTaskStatus.Error)]
-        [TestCase("downloading", DownloadStationTaskStatus.Downloading)]
-        public void should_serialize_enum_correctly(string expected, DownloadStationTaskStatus value)
-        {
-            var task = new DownloadStationTask { Status = value };
-
-            var item = JsonConvert.SerializeObject(task);
-
-            item.Should().Contain(expected);
-        }
-
-        [Test]
-        public void should_return_unknown_if_unknown_enum_value()
-        {
-            var task = "{\"Status\": \"some_unknown_value\"}";
-
-            var item = JsonConvert.DeserializeObject<DownloadStationTask>(task);
-
-            item.Status.Should().Be(DownloadStationTaskStatus.Unknown);
-        }
-    }
-}

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

@@ -12,6 +12,7 @@ using NzbDrone.Core.Download.Clients.DownloadStation.Proxies;
 using NzbDrone.Core.MediaFiles.TorrentInfo;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Test.Common;
+using NzbDrone.Core.Download.Clients.DownloadStation.Responses;
 
 namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
 {
@@ -280,6 +281,21 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
               .Returns(_downloadStationConfigItems);
         }
 
+        protected void GivenApiVersions()
+        {
+            Mocker.GetMock<IDownloadStationTaskProxy>()
+                .Setup(s => s.GetApiInfo(It.IsAny<DownloadStationSettings>()))
+                .Returns(new DiskStationApiInfo() { Name = "Task", MinVersion = 1, MaxVersion = 2 });
+
+            Mocker.GetMock<IDownloadStationInfoProxy>()
+                .Setup(s => s.GetApiInfo(It.IsAny<DownloadStationSettings>()))
+                .Returns(new DiskStationApiInfo() { Name = "Info", MinVersion = 1, MaxVersion = 3 });
+
+            Mocker.GetMock<IFileStationProxy>()
+                .Setup(s => s.GetApiInfo(It.IsAny<DownloadStationSettings>()))
+                .Returns(new DiskStationApiInfo() { Name = "File", MinVersion = 1, MaxVersion = 2 });
+        }
+
         protected void GivenSharedFolder()
         {
             Mocker.GetMock<ISharedFolderResolver>()
@@ -289,7 +305,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
 
         protected void GivenSerialNumber()
         {
-            Mocker.GetMock<ISerialNumberProvider>()
+            Mocker.GetMock<IDSMInfoProvider>()
                 .Setup(s => s.GetSerialNumber(It.IsAny<DownloadStationSettings>()))
                 .Returns(_serialNumber);
         }
@@ -359,6 +375,26 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
             return tasks.Count;
         }
 
+
+        protected void GivenDSMVersion(string version)
+        {
+            Mocker.GetMock<IDSMInfoProvider>()
+                .Setup(d => d.GetDSMVersion(It.IsAny<DownloadStationSettings>()))
+                .Returns(new Version(version));
+        }
+
+        [TestCase("6.0.0", 0)]
+        [TestCase("5.0.0", 1)]
+        public void TestConnection_should_return_validation_failure_as_expected(string version, int count)
+        {
+            GivenApiVersions();
+            GivenDSMVersion(version);
+
+            var result = Subject.Test();
+
+            result.Errors.Should().HaveCount(count);
+        }
+
         [Test]
         public void Download_with_TvDirectory_should_force_directory()
         {
@@ -460,7 +496,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
         [Test]
         public void GetItems_should_throw_if_serial_number_unavailable()
         {
-            Mocker.GetMock<ISerialNumberProvider>()
+            Mocker.GetMock<IDSMInfoProvider>()
                   .Setup(s => s.GetSerialNumber(_settings))
                   .Throws(new ApplicationException("Some unknown exception, HttpException or DownloadClientException"));
 
@@ -476,7 +512,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
         {
             var remoteEpisode = CreateRemoteEpisode();
 
-            Mocker.GetMock<ISerialNumberProvider>()
+            Mocker.GetMock<IDSMInfoProvider>()
                   .Setup(s => s.GetSerialNumber(_settings))
                   .Throws(new ApplicationException("Some unknown exception, HttpException or DownloadClientException"));
 
@@ -605,12 +641,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
         [TestCase(DownloadStationTaskStatus.Finished, DownloadItemStatus.Completed)]
         [TestCase(DownloadStationTaskStatus.Finishing, DownloadItemStatus.Downloading)]
         [TestCase(DownloadStationTaskStatus.HashChecking, DownloadItemStatus.Downloading)]
-        [TestCase(DownloadStationTaskStatus.CaptchaNeeded, DownloadItemStatus.Downloading)]
         [TestCase(DownloadStationTaskStatus.Paused, DownloadItemStatus.Paused)]
         [TestCase(DownloadStationTaskStatus.Seeding, DownloadItemStatus.Completed)]
-        [TestCase(DownloadStationTaskStatus.FilehostingWaiting, DownloadItemStatus.Queued)]
         [TestCase(DownloadStationTaskStatus.Waiting, DownloadItemStatus.Queued)]
-        [TestCase(DownloadStationTaskStatus.Unknown, DownloadItemStatus.Queued)]
         public void GetItems_should_return_item_as_downloadItemStatus(DownloadStationTaskStatus apiStatus, DownloadItemStatus expectedItemStatus)
         {
             GivenSerialNumber();

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

@@ -182,6 +182,21 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
               .Returns(_downloadStationConfigItems);
         }
 
+        protected void GivenApiVersions()
+        {
+            Mocker.GetMock<IDownloadStationTaskProxy>()
+                .Setup(s => s.GetApiInfo(It.IsAny<DownloadStationSettings>()))
+                .Returns(new DiskStationApiInfo() { Name = "Task", MinVersion = 1, MaxVersion = 2 });
+
+            Mocker.GetMock<IDownloadStationInfoProxy>()
+                .Setup(s => s.GetApiInfo(It.IsAny<DownloadStationSettings>()))
+                .Returns(new DiskStationApiInfo() { Name = "Info", MinVersion = 1, MaxVersion = 3 });
+
+            Mocker.GetMock<IFileStationProxy>()
+                .Setup(s => s.GetApiInfo(It.IsAny<DownloadStationSettings>()))
+                .Returns(new DiskStationApiInfo() { Name = "File", MinVersion = 1, MaxVersion = 2 });
+        }
+
         protected void GivenSharedFolder()
         {
             Mocker.GetMock<ISharedFolderResolver>()
@@ -191,7 +206,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
 
         protected void GivenSerialNumber()
         {
-            Mocker.GetMock<ISerialNumberProvider>()
+            Mocker.GetMock<IDSMInfoProvider>()
                 .Setup(s => s.GetSerialNumber(It.IsAny<DownloadStationSettings>()))
                 .Returns(_serialNumber);
         }
@@ -245,6 +260,25 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
             Mocker.GetMock<IDownloadStationTaskProxy>()
                   .Setup(d => d.GetTasks(_settings))
                   .Returns(tasks);
+		}
+
+ 		protected void GivenDSMVersion(string version)
+        {
+            Mocker.GetMock<IDSMInfoProvider>()
+                .Setup(d => d.GetDSMVersion(It.IsAny<DownloadStationSettings>()))
+                .Returns(new Version(version));
+        }
+
+        [TestCase("6.0.0", 0)]
+        [TestCase("5.0.0", 1)]
+        public void TestConnection_should_return_validation_failure_as_expected(string version, int count)
+        {
+            GivenApiVersions();
+            GivenDSMVersion(version);
+
+            var result = Subject.Test();
+
+            result.Errors.Should().HaveCount(count);
         }
 
         [Test]
@@ -348,7 +382,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
         [Test]
         public void GetItems_should_throw_if_serial_number_unavailable()
         {
-            Mocker.GetMock<ISerialNumberProvider>()
+            Mocker.GetMock<IDSMInfoProvider>()
                   .Setup(s => s.GetSerialNumber(_settings))
                   .Throws(new ApplicationException("Some unknown exception, HttpException or DownloadClientException"));
 
@@ -364,7 +398,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
         {
             var remoteEpisode = CreateRemoteEpisode();
 
-            Mocker.GetMock<ISerialNumberProvider>()
+            Mocker.GetMock<IDSMInfoProvider>()
                   .Setup(s => s.GetSerialNumber(_settings))
                   .Throws(new ApplicationException("Some unknown exception, HttpException or DownloadClientException"));
 
@@ -414,12 +448,8 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
         [TestCase(DownloadStationTaskStatus.Finished, DownloadItemStatus.Completed)]
         [TestCase(DownloadStationTaskStatus.Finishing, DownloadItemStatus.Downloading)]
         [TestCase(DownloadStationTaskStatus.HashChecking, DownloadItemStatus.Downloading)]
-        [TestCase(DownloadStationTaskStatus.CaptchaNeeded, DownloadItemStatus.Downloading)]
         [TestCase(DownloadStationTaskStatus.Paused, DownloadItemStatus.Paused)]
-        [TestCase(DownloadStationTaskStatus.Seeding, DownloadItemStatus.Completed)]
-        [TestCase(DownloadStationTaskStatus.FilehostingWaiting, DownloadItemStatus.Queued)]
         [TestCase(DownloadStationTaskStatus.Waiting, DownloadItemStatus.Queued)]
-        [TestCase(DownloadStationTaskStatus.Unknown, DownloadItemStatus.Queued)]
         public void GetItems_should_return_item_as_downloadItemStatus(DownloadStationTaskStatus apiStatus, DownloadItemStatus expectedItemStatus)
         {
             GivenSerialNumber();

src/NzbDrone.Core.Test/Download/DownloadServiceFixture.cs

@@ -180,21 +180,6 @@ namespace NzbDrone.Core.Test.Download
                 .Verify(v => v.RecordFailure(It.IsAny<int>(), It.IsAny<TimeSpan>()), Times.Never());
         }
 
-        [Test]
-        public void Download_report_should_not_trigger_indexer_backoff_on_indexer_404_error()
-        {
-            var mock = WithUsenetClient();
-            mock.Setup(s => s.Download(It.IsAny<RemoteEpisode>()))
-                .Callback<RemoteEpisode>(v => {
-                    throw new ReleaseUnavailableException(v.Release, "Error", new WebException());
-                });
-
-            Assert.Throws<ReleaseUnavailableException>(() => Subject.DownloadReport(_parseResult));
-
-            Mocker.GetMock<IIndexerStatusService>()
-                .Verify(v => v.RecordFailure(It.IsAny<int>(), It.IsAny<TimeSpan>()), Times.Never());
-        }
-
         [Test]
         public void should_not_attempt_download_if_client_isnt_configured()
         {
@@ -205,26 +190,18 @@ namespace NzbDrone.Core.Test.Download
         }
 
         [Test]
-        public void should_attempt_download_even_if_client_is_disabled()
+        public void should_not_attempt_download_if_client_is_disabled()
         {
-            var mockUsenet = WithUsenetClient();
+            WithUsenetClient();
 
             Mocker.GetMock<IDownloadClientStatusService>()
-                  .Setup(v => v.GetBlockedProviders())
-                  .Returns(new List<DownloadClientStatus>
-                  {
-                      new DownloadClientStatus
-                      {
-                          ProviderId = _downloadClients.First().Definition.Id,
-                          DisabledTill = DateTime.UtcNow.AddHours(3)
-                      }
-                  });
+                  .Setup(v => v.IsDisabled(It.IsAny<int>()))
+                  .Returns(true);
 
-            Subject.DownloadReport(_parseResult);
+            Assert.Throws<DownloadClientUnavailableException>(() => Subject.DownloadReport(_parseResult));
 
-            Mocker.GetMock<IDownloadClientStatusService>().Verify(c => c.GetBlockedProviders(), Times.Never());
-            mockUsenet.Verify(c => c.Download(It.IsAny<RemoteEpisode>()), Times.Once());
-            VerifyEventPublished<EpisodeGrabbedEvent>();
+            Mocker.GetMock<IDownloadClient>().Verify(c => c.Download(It.IsAny<RemoteEpisode>()), Times.Never());
+            VerifyEventNotPublished<EpisodeGrabbedEvent>();
         }
 
         [Test]

src/NzbDrone.Core.Test/Download/NzbValidationServiceFixture.cs

@@ -1,43 +0,0 @@
-using System.IO;
-using NUnit.Framework;
-using NzbDrone.Core.Download;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.Download
-{
-    [TestFixture]
-    public class NzbValidationServiceFixture : CoreTest<NzbValidationService>
-    {
-        private byte[] GivenNzbFile(string name)
-        {
-            return File.ReadAllBytes(GetTestPath("Files/Nzbs/" + name + ".nzb"));
-        }
-
-        [Test]
-        public void should_throw_on_invalid_nzb()
-        {
-            var filename = "NotNzb";
-            var fileContent = GivenNzbFile(filename);
-
-            Assert.Throws<InvalidNzbException>(() => Subject.Validate(filename, fileContent));
-        }
-
-        [Test]
-        public void should_throw_when_no_files()
-        {
-            var filename = "NoFiles";
-            var fileContent = GivenNzbFile(filename);
-
-            Assert.Throws<InvalidNzbException>(() => Subject.Validate(filename, fileContent));
-        }
-
-        [Test]
-        public void should_validate_nzb()
-        {
-            var filename = "ValidNzb";
-            var fileContent = GivenNzbFile(filename);
-
-            Subject.Validate(filename, fileContent);
-        }
-    }
-}

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

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using FizzWare.NBuilder;
 using Marr.Data;
 using Moq;
@@ -27,7 +26,6 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
         private ReleaseInfo _release;
         private ParsedEpisodeInfo _parsedEpisodeInfo;
         private RemoteEpisode _remoteEpisode;
-        private List<PendingRelease> _heldReleases;
 
         [SetUp]
         public void Setup()
@@ -62,27 +60,17 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
             _remoteEpisode.Series = _series;
             _remoteEpisode.ParsedEpisodeInfo = _parsedEpisodeInfo;
             _remoteEpisode.Release = _release;
-
+            
             _temporarilyRejected = new DownloadDecision(_remoteEpisode, new Rejection("Temp Rejected", RejectionType.Temporary));
 
-            _heldReleases = new List<PendingRelease>();
-
             Mocker.GetMock<IPendingReleaseRepository>()
                   .Setup(s => s.All())
-                  .Returns(_heldReleases);
-
-            Mocker.GetMock<IPendingReleaseRepository>()
-                  .Setup(s => s.AllBySeriesId(It.IsAny<int>()))
-                  .Returns<int>(i => _heldReleases.Where(v => v.SeriesId == i).ToList());
+                  .Returns(new List<PendingRelease>());
 
             Mocker.GetMock<ISeriesService>()
                   .Setup(s => s.GetSeries(It.IsAny<int>()))
                   .Returns(_series);
 
-            Mocker.GetMock<ISeriesService>()
-                  .Setup(s => s.GetSeries(It.IsAny<IEnumerable<int>>()))
-                  .Returns(new List<Series> { _series });
-
             Mocker.GetMock<IParsingService>()
                   .Setup(s => s.GetEpisodes(It.IsAny<ParsedEpisodeInfo>(), _series, true, null))
                   .Returns(new List<Episode> {_episode});
@@ -92,7 +80,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
                   .Returns((List<DownloadDecision> d) => d);
         }
 
-        private void GivenHeldRelease(string title, string indexer, DateTime publishDate, PendingReleaseReason reason = PendingReleaseReason.Delay)
+        private void GivenHeldRelease(string title, string indexer, DateTime publishDate)
         {
             var release = _release.JsonClone();
             release.Indexer = indexer;
@@ -104,10 +92,11 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
                                                    .With(h => h.SeriesId = _series.Id)
                                                    .With(h => h.Title = title)
                                                    .With(h => h.Release = release)
-                                                   .With(h => h.Reason = reason)
                                                    .Build();
 
-            _heldReleases.AddRange(heldReleases);
+            Mocker.GetMock<IPendingReleaseRepository>()
+                  .Setup(s => s.All())
+                  .Returns(heldReleases);
         }
 
         [Test]
@@ -128,29 +117,6 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
             VerifyNoInsert();
         }
 
-        [Test]
-        public void should_not_add_if_it_is_the_same_release_from_the_same_indexer_twice()
-        {
-            GivenHeldRelease(_release.Title, _release.Indexer, _release.PublishDate, PendingReleaseReason.DownloadClientUnavailable);
-            GivenHeldRelease(_release.Title, _release.Indexer, _release.PublishDate, PendingReleaseReason.Fallback);
-
-            Subject.Add(_temporarilyRejected, PendingReleaseReason.Delay);
-
-            VerifyNoInsert();
-        }
-
-        [Test]
-        public void should_remove_duplicate_if_it_is_the_same_release_from_the_same_indexer_twice()
-        {
-            GivenHeldRelease(_release.Title, _release.Indexer, _release.PublishDate, PendingReleaseReason.DownloadClientUnavailable);
-            GivenHeldRelease(_release.Title, _release.Indexer, _release.PublishDate, PendingReleaseReason.Fallback);
-
-            Subject.Add(_temporarilyRejected, PendingReleaseReason.Fallback);
-
-            Mocker.GetMock<IPendingReleaseRepository>()
-                  .Verify(v => v.Delete(It.IsAny<int>()), Times.Once());
-        }
-
         [Test]
         public void should_add_if_title_is_different()
         {

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

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using FizzWare.NBuilder;
 using Marr.Data;
 using Moq;
@@ -27,7 +26,6 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
         private ReleaseInfo _release;
         private ParsedEpisodeInfo _parsedEpisodeInfo;
         private RemoteEpisode _remoteEpisode;
-        private List<PendingRelease> _heldReleases;
 
         [SetUp]
         public void Setup()
@@ -62,27 +60,17 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
             _remoteEpisode.Series = _series;
             _remoteEpisode.ParsedEpisodeInfo = _parsedEpisodeInfo;
             _remoteEpisode.Release = _release;
-
+            
             _temporarilyRejected = new DownloadDecision(_remoteEpisode, new Rejection("Temp Rejected", RejectionType.Temporary));
 
-            _heldReleases = new List<PendingRelease>();
-
             Mocker.GetMock<IPendingReleaseRepository>()
                   .Setup(s => s.All())
-                  .Returns(_heldReleases);
-
-            Mocker.GetMock<IPendingReleaseRepository>()
-                  .Setup(s => s.AllBySeriesId(It.IsAny<int>()))
-                  .Returns<int>(i => _heldReleases.Where(v => v.SeriesId == i).ToList());
+                  .Returns(new List<PendingRelease>());
 
             Mocker.GetMock<ISeriesService>()
                   .Setup(s => s.GetSeries(It.IsAny<int>()))
                   .Returns(_series);
 
-            Mocker.GetMock<ISeriesService>()
-                  .Setup(s => s.GetSeries(It.IsAny<IEnumerable<int>>()))
-                  .Returns(new List<Series> { _series });
-
             Mocker.GetMock<IParsingService>()
                   .Setup(s => s.GetEpisodes(It.IsAny<ParsedEpisodeInfo>(), _series, true, null))
                   .Returns(new List<Episode> {_episode});
@@ -104,7 +92,9 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
                                                    .With(h => h.ParsedEpisodeInfo = parsedEpisodeInfo)
                                                    .Build();
 
-            _heldReleases.AddRange(heldReleases);
+            Mocker.GetMock<IPendingReleaseRepository>()
+                  .Setup(s => s.All())
+                  .Returns(heldReleases);
         }
 
         [Test]

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

@@ -38,10 +38,6 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
                   .Setup(s => s.GetSeries(It.IsAny<int>()))
                   .Returns(new Series());
 
-            Mocker.GetMock<ISeriesService>()
-                  .Setup(s => s.GetSeries(It.IsAny<IEnumerable<int>>()))
-                  .Returns(new List<Series> { new Series() });
-
             Mocker.GetMock<IParsingService>()
                   .Setup(s => s.GetEpisodes(It.IsAny<ParsedEpisodeInfo>(), It.IsAny<Series>(), It.IsAny<bool>(), null))
                   .Returns(new List<Episode>{ _episode });
@@ -67,7 +63,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
 
             AssertRemoved(1);
         }
-
+        
         [Test]
         public void should_remove_multiple_releases_release()
         {
@@ -138,7 +134,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
 
             AssertRemoved(2);
         }
-
+        
         private void AssertRemoved(params int[] ids)
         {
             Mocker.GetMock<IPendingReleaseRepository>().Verify(c => c.DeleteMany(It.Is<IEnumerable<int>>(s => s.SequenceEqual(ids))));

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

@@ -62,7 +62,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
             _remoteEpisode.Series = _series;
             _remoteEpisode.ParsedEpisodeInfo = _parsedEpisodeInfo;
             _remoteEpisode.Release = _release;
-
+            
             _temporarilyRejected = new DownloadDecision(_remoteEpisode, new Rejection("Temp Rejected", RejectionType.Temporary));
 
             Mocker.GetMock<IPendingReleaseRepository>()
@@ -73,10 +73,6 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
                   .Setup(s => s.GetSeries(It.IsAny<int>()))
                   .Returns(_series);
 
-            Mocker.GetMock<ISeriesService>()
-                  .Setup(s => s.GetSeries(It.IsAny<IEnumerable<int>>()))
-                  .Returns(new List<Series> { _series });
-
             Mocker.GetMock<IParsingService>()
                   .Setup(s => s.GetEpisodes(It.IsAny<ParsedEpisodeInfo>(), _series, true, null))
                   .Returns(new List<Episode> {_episode});

src/NzbDrone.Core.Test/Download/TrackedDownloads/TrackedDownloadServiceFixture.cs

@@ -104,7 +104,7 @@ namespace NzbDrone.Core.Test.Download.TrackedDownloads
                   .Returns(remoteEpisode);
 
             Mocker.GetMock<IParsingService>()
-                  .Setup(s => s.ParseSpecialEpisodeTitle(It.IsAny<ParsedEpisodeInfo>(), It.IsAny<string>(), It.IsAny<int>(), It.IsAny<int>(), null))
+                  .Setup(s => s.ParseSpecialEpisodeTitle(It.IsAny<string>(), It.IsAny<int>(), It.IsAny<int>(), null))
                   .Returns(remoteEpisode.ParsedEpisodeInfo);
 
             var client = new DownloadClientDefinition()

src/NzbDrone.Core.Test/Files/Nzbs/NoFiles.nzb

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE nzb
-  PUBLIC '-//newzBin//DTD NZB 1.1//EN'
-  'http://www.newzbin.com/DTD/nzb/nzb-1.1.dtd'>
-<nzb xmlns="http://www.newzbin.com/DTD/2003/nzb">
-</nzb>

src/NzbDrone.Core.Test/Files/Nzbs/NotNzb.nzb

@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fail>
-  <file date="1504571104" poster="autom@gical.tv (M@GiC)" subject="[432278]-[FULL]-[#a.b.teevee@EFNet]-[ Series.Title.S04E06.720p.HDTV.x264-KILLERS ]-[01/46] - &quot;Series.Title.s04e06.720p.hdtv.x264-killers.nfo&quot; yEnc (1/1)">
-    <groups>
-      <group>alt.binaries.teevee</group>
-    </groups>
-    <segments>
-      <segment bytes="12053" number="1">ZQ9h749E781168561i4J0Q6-01m6Q3185@2894t-767038L.Pg7769</segment>
-    </segments>
-  </file>
-  <file date="1504571104" poster="autom@gical.tv (M@GiC)" subject="[432278]-[FULL]-[#a.b.teevee@EFNet]-[ Series.Title.S04E06.720p.HDTV.x264-KILLERS ]-[02/46] - &quot;Series.Title.s04e06.720p.hdtv.x264-killers.par2&quot; yEnc (1/1)">
-    <groups>
-      <group>alt.binaries.teevee</group>
-    </groups>
-    <segments>
-      <segment bytes="26932" number="1">405Z5Y4066010l377VP1k6$U4873W933@f32Bs90575538201.pj54</segment>
-    </segments>
-  </file>
-  <file date="1504571104" poster="autom@gical.tv (M@GiC)" subject="[432278]-[FULL]-[#a.b.teevee@EFNet]-[ Series.Title.S04E06.720p.HDTV.x264-KILLERS ]-[03/46] - &quot;Series.Title.s04e06.720p.hdtv.x264-killers.r00&quot; yEnc (1/66)">
-    <groups>
-      <group>alt.binaries.teevee</group>
-    </groups>
-    <segments>
-      <segment bytes="793068" number="1">1x9894417$M.1s25279485O1s1Fi95Z1_18Z554u440@D1k0854_134551.0794144</segment>
-      <segment bytes="793234" number="2">48JYp$W18B2R1s2rI24EG7$907$r89875n60@8xK3374080716.115545M</segment>
-      <segment bytes="793346" number="3">0U93471uI59Y781x77Q8-4286308-4aU35$07-179z@u90567568251.4zgUW968</segment>
-      <segment bytes="793302" number="4">5119x6417a.s06F$1k46$2q89298-C0@G7C-7811268.bK9x00B</segment>
-      <segment bytes="793289" number="5">B8$1_h0b64Z14-16_O6$ESw481L421n9agj7731k@414.473581-K$4.0Zd5A</segment>
-      <segment bytes="793380" number="6">O-4731$tn71v05623J9GT.yc22O975111dR01r58065p@Da1G9L33q74h3095.5X240</segment>
-      <segment bytes="793253" number="7">d9R03J$07w75945Z556197z50F0w.0-5.x9$58311S@J0-v50033110.4a440EYJ</segment>
-      <segment bytes="793317" number="8">05e650149.5r1Hk$E0Bko7G5B.1107mz8l17PS8F@vr816$S6T19245w.042B9</segment>
-      <segment bytes="793060" number="9">245Xy0w4o$tN6428321b.n1816Q1n95bE0816Y@q-qv7E12k.F3672H.16E19</segment>
-      <segment bytes="793266" number="10">H681i185g64H23101kP125z41101O91P384l@E9n597k05j798D94X.2ezz1K</segment>
-      <segment bytes="793223" number="11">T18.6136787.HLJ806.8$Si49m0459445101Z15-5@b80M7.788598D.gXu201cR</segment>
-      <segment bytes="793346" number="12">Vdl8H243Go28j1o865772039416v2@090a20-v365N5S7qf.G225s6</segment>
-      <segment bytes="793305" number="13">S9769892v956069345.0TN.i05R@I04825Gt2706N.BAj1DT1T</segment>
-      <segment bytes="793187" number="14">041800q6F28q44365799m5CQ4D43895@1Bf6268z_Q20F.045JXl</segment>
-      <segment bytes="793119" number="15">1c-e034z4l$9K45i44218ss25$X5_5R-1i76$40-71P@Xt691t8B686Fgv.VBSl</segment>
-      <segment bytes="793262" number="16">76l441W.R146a5368ed02cp_44171410hT.l@Z98.k.70X9c.5mZ1w49</segment>
-      <segment bytes="793221" number="17">12D035G5745-KO43wZ9920ttr1338@V7d871S2-t04t8520.uQ18</segment>
-      <segment bytes="793221" number="18">59V4O77211HA1f5T8h1-53952zV-55294K4M04v@kS878H3g4z.B5561.L330519</segment>
-      <segment bytes="793087" number="19">44-yi1-79$751944J7094$y7-y49994440d86cSn@5C82v-1O9N.wk8wMb6</segment>
-      <segment bytes="793375" number="20">oF7Wj3$Ydh7e030oD4.e81JM464O791495lJ@Pm058Qt4-G8Wv.T1i1a6O1</segment>
-      <segment bytes="793293" number="21">1T7_71M9d10F2.5953VP.11.4h75L@5049bBn384.14Ms</segment>
-      <segment bytes="793266" number="22">u8601765028G662749SD41j0m57651Zq70u1@J5281423406375.z.6PDSx57</segment>
-      <segment bytes="793376" number="23">XY0476$R87Y16g2n45OO335541589V140R026j@y2q9296x7f23C.sqK71b9</segment>
-      <segment bytes="793363" number="24">X7N3440l08B9T5940na4Ls397-T2.P5M12241525J57@r44O419p594M6G4I.d66RQ1</segment>
-      <segment bytes="793203" number="25">p4148978k45.t88w2K9886H4223y5553T7$7p287TN@N8e1T98b_0.mo55a14G</segment>
-      <segment bytes="793039" number="26">50U0a9iP07$A66010-51h55w386f@c$42$S96V57F5u0Y.6UDV35D</segment>
-      <segment bytes="792999" number="27">FnKN4n2749v958xa36J2570506414D293S@8H1A1X490$z3bv.ut6KQ4N</segment>
-      <segment bytes="793316" number="28">q4$d0$X8x6rm85m0Ewh307m255N@t2C7484zq870u.1RLndQ</segment>
-      <segment bytes="793238" number="29">364U4342$5I242404oH90-1W3c0t16705057m650Cq9f@K32rE5297347130W.UNs8evbH</segment>
-      <segment bytes="793461" number="30">M3081U097-r06Y.yy9-1A538001B27f@L2834Y80c7b1075.Dy150</segment>
-      <segment bytes="793326" number="31">189585554.NS66E5D840N4Yq5m07NC1n@51L0393057L528n.k1Mc3j0S</segment>
-      <segment bytes="793380" number="32">189048V505q89216C149I5f$53x-T@0V9i8n7o95.I.Z1lBJ5</segment>
-      <segment bytes="793205" number="33">5-L.555$139r45100-S23-59859@54844694q2.3EY9b</segment>
-      <segment bytes="793258" number="34">641655313y0.Z002L0g39AZ11716U-uX015PI5.v6y@veS44H89Js91903K8.P3MAvk4k</segment>
-      <segment bytes="793229" number="35">1C8f-yz-U-b20.610.0P1M-6Z5418i229160865010s1@M7l210D48Nc.nB0sPmi</segment>
-      <segment bytes="793169" number="36">0653$L0.58749-1U_1PS95-1h9gQ145@0117y0-1x1p-h94.za18yc5</segment>
-      <segment bytes="793109" number="37">77-Mo3-a6514904987865.K0W710G4HB9237@501F7910J6j50-Bh.6cHx1</segment>
-      <segment bytes="793350" number="38">m4I47082655rz$b7P751u9W679475F.89p@f.o.XZv5O7y.855rgXX</segment>
-      <segment bytes="793193" number="39">f075$y56E57d.t11787.0$6D155735M_w89-Y57q2@x0t5H91021wZ52Vh.1h7vabU</segment>
-      <segment bytes="793251" number="40">H7U1331Ad7718$Y69T-q3w4$l247HV49s985J@vi800i0004p.YD5oK</segment>
-      <segment bytes="793106" number="41">9nr786955Ker.M583315CoJ1-W65a817-704@IN-wU12$M1E0g466.5sMJ3</segment>
-      <segment bytes="793006" number="42">0.3R9mN.n2_V086N0-4.Z5gAgZo@ey3G316U382o537.f51Ed5B</segment>
-      <segment bytes="793198" number="43">l106Z1-N411r7j44197l628r.b5Uwc55@k4-Cl_n5xc.1B.xZbNm</segment>
-      <segment bytes="793070" number="44">A91LT1X591x81.TI4130N$555A57q0@L70-p5qa50.40GB</segment>
-      <segment bytes="793457" number="45">V5$765JR6503w0-K63099R615736843G$Qj0ev@mz776wM86445N0.4I56ne</segment>
-      <segment bytes="793109" number="46">A86H2P415S689$568152-025O45V@s079644915.Dd57p0</segment>
-      <segment bytes="793169" number="47">31x5o36q14y9554L42882X0Q10e360Z64W4K9Onx38D@5g1509788414q.Y8wib</segment>
-      <segment bytes="793219" number="48">b$6795157EX1044V964e14-Y9E68614O94C@4061937876$f5.6.19tV</segment>
-      <segment bytes="793349" number="49">D00v8X$b80m93181273J-g076Qj2p79867v5d9689Rb2@r0592.v900.j43E050E</segment>
-      <segment bytes="793228" number="50">Tf78L4e535.o86PK0S.M2R3-66012814z@q-5j89Y29J214Y902.53Ra0f</segment>
-      <segment bytes="793353" number="51">7i01.23411-lQW0212-Er260e9.N5e256jx243EX@91-T.15v40K5Hj.Fo1f</segment>
-      <segment bytes="793290" number="52">3A$H7m63$i595.4713vv0A4$A7Lk7Jsq@0cM0Tw4107f.B520.q5Z91</segment>
-      <segment bytes="793364" number="53">j572m$3h87LS$37167Wp10k41541.T779-Fn@V53C11045619xJ.52.0PnnX4v5</segment>
-      <segment bytes="793506" number="54">A.2d4599a720rk2IB32h0X523MjTL415v89706-7Z45y@R4746-B106358.t3g62r4</segment>
-      <segment bytes="793118" number="55">5q6100961jM-G9F7t755x366zxc102M1SdMF@7394521p651X1I.AL05545a</segment>
-      <segment bytes="793137" number="56">04e851111$12u2213-80VR133125B@7x8865M4hQ9$5.1N345x</segment>
-      <segment bytes="793180" number="57">K2476D3600-73B4W363$008s888980421f27125V$q0@0Zc0a56-m7550.1637vAr1</segment>
-      <segment bytes="793214" number="58">0306u425024v448ZeCE3Q9825m9th1858@5648018-H0.2k7J4.12k0B</segment>
-      <segment bytes="793274" number="59">220u4SK433564Cr2l004t0wP888545779g@19j360863S$55559m.70V7Ndr</segment>
-      <segment bytes="793339" number="60">5u1q051C5Qq8Z9Iy$Z.5.1510NY.S2565n@7m.5-09$z235p74.8kW5</segment>
-      <segment bytes="793297" number="61">6F472C8nh2621_X0C1093P7n39643b5p2f76s60r@1T55203qQY6.wZml1Vb</segment>
-      <segment bytes="793351" number="62">5qC4568844767324-o8i05983-0f.n4.y.OBZ41f@q36B50684KU66.0R1784</segment>
-      <segment bytes="793257" number="63">4P0g470-F59307aDf.JF070Xx959648dO3y00463J6s@71P$D961$C0.11.I096sQ</segment>
-      <segment bytes="793277" number="64">z5kod75077z01w11-A5h.wiG550.J5-p756$81.Db@5l01K49h3K.Ok4R5512</segment>
-      <segment bytes="793292" number="65">F3JX28.B8h90T0075-08001X5w611V071@D75X9263$6$9f.OT050p5Z</segment>
-      <segment bytes="83545" number="66">2B8sT.A650z101514671183y47977219.M4211xYp@0b0021p736BX92.B0lSm4J3</segment>
-    </segments>
-  </file>
-  <file date="1504571157" poster="autom@gical.tv (M@GiC)" subject="[432278]-[FULL]-[#a.b.teevee@EFNet]-[ Series.Title.S04E06.720p.HDTV.x264-KILLERS ]-[46/46] - &quot;sample-Series.Title.s04e06.720p.hdtv.x264-killers.vol31+04.par2&quot; yEnc (1/3)">
-    <groups>
-      <group>alt.binaries.teevee</group>
-    </groups>
-    <segments>
-      <segment bytes="793316" number="1">16ND-8I545Pq-s107t0h07g8908870711@K401476783.5.0mFs1</segment>
-      <segment bytes="793409" number="2">iYdZ2D11089F310711.ci-O7O4KG03@260c03388O84Kd.GCEgv</segment>
-      <segment bytes="6784" number="3">r63cDD59Mg1c95738Sn75085O4X7823V1@16V6-b87O21S1937O.lw17o1VS</segment>
-    </segments>
-  </file>
-</fail>

src/NzbDrone.Core.Test/Files/Nzbs/ValidNzb.nzb

@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE nzb
-  PUBLIC '-//newzBin//DTD NZB 1.1//EN'
-  'http://www.newzbin.com/DTD/nzb/nzb-1.1.dtd'>
-<nzb xmlns="http://www.newzbin.com/DTD/2003/nzb">
-  <file date="1504571104" poster="autom@gical.tv (M@GiC)" subject="[432278]-[FULL]-[#a.b.teevee@EFNet]-[ Series.Title.S04E06.720p.HDTV.x264-KILLERS ]-[01/46] - &quot;Series.Title.s04e06.720p.hdtv.x264-killers.nfo&quot; yEnc (1/1)">
-    <groups>
-      <group>alt.binaries.teevee</group>
-    </groups>
-    <segments>
-      <segment bytes="12053" number="1">ZQ9h749E781168561i4J0Q6-01m6Q3185@2894t-767038L.Pg7769</segment>
-    </segments>
-  </file>
-  <file date="1504571104" poster="autom@gical.tv (M@GiC)" subject="[432278]-[FULL]-[#a.b.teevee@EFNet]-[ Series.Title.S04E06.720p.HDTV.x264-KILLERS ]-[02/46] - &quot;Series.Title.s04e06.720p.hdtv.x264-killers.par2&quot; yEnc (1/1)">
-    <groups>
-      <group>alt.binaries.teevee</group>
-    </groups>
-    <segments>
-      <segment bytes="26932" number="1">405Z5Y4066010l377VP1k6$U4873W933@f32Bs90575538201.pj54</segment>
-    </segments>
-  </file>
-  <file date="1504571104" poster="autom@gical.tv (M@GiC)" subject="[432278]-[FULL]-[#a.b.teevee@EFNet]-[ Series.Title.S04E06.720p.HDTV.x264-KILLERS ]-[03/46] - &quot;Series.Title.s04e06.720p.hdtv.x264-killers.r00&quot; yEnc (1/66)">
-    <groups>
-      <group>alt.binaries.teevee</group>
-    </groups>
-    <segments>
-      <segment bytes="793068" number="1">1x9894417$M.1s25279485O1s1Fi95Z1_18Z554u440@D1k0854_134551.0794144</segment>
-      <segment bytes="793234" number="2">48JYp$W18B2R1s2rI24EG7$907$r89875n60@8xK3374080716.115545M</segment>
-      <segment bytes="793346" number="3">0U93471uI59Y781x77Q8-4286308-4aU35$07-179z@u90567568251.4zgUW968</segment>
-      <segment bytes="793302" number="4">5119x6417a.s06F$1k46$2q89298-C0@G7C-7811268.bK9x00B</segment>
-      <segment bytes="793289" number="5">B8$1_h0b64Z14-16_O6$ESw481L421n9agj7731k@414.473581-K$4.0Zd5A</segment>
-      <segment bytes="793380" number="6">O-4731$tn71v05623J9GT.yc22O975111dR01r58065p@Da1G9L33q74h3095.5X240</segment>
-      <segment bytes="793253" number="7">d9R03J$07w75945Z556197z50F0w.0-5.x9$58311S@J0-v50033110.4a440EYJ</segment>
-      <segment bytes="793317" number="8">05e650149.5r1Hk$E0Bko7G5B.1107mz8l17PS8F@vr816$S6T19245w.042B9</segment>
-      <segment bytes="793060" number="9">245Xy0w4o$tN6428321b.n1816Q1n95bE0816Y@q-qv7E12k.F3672H.16E19</segment>
-      <segment bytes="793266" number="10">H681i185g64H23101kP125z41101O91P384l@E9n597k05j798D94X.2ezz1K</segment>
-      <segment bytes="793223" number="11">T18.6136787.HLJ806.8$Si49m0459445101Z15-5@b80M7.788598D.gXu201cR</segment>
-      <segment bytes="793346" number="12">Vdl8H243Go28j1o865772039416v2@090a20-v365N5S7qf.G225s6</segment>
-      <segment bytes="793305" number="13">S9769892v956069345.0TN.i05R@I04825Gt2706N.BAj1DT1T</segment>
-      <segment bytes="793187" number="14">041800q6F28q44365799m5CQ4D43895@1Bf6268z_Q20F.045JXl</segment>
-      <segment bytes="793119" number="15">1c-e034z4l$9K45i44218ss25$X5_5R-1i76$40-71P@Xt691t8B686Fgv.VBSl</segment>
-      <segment bytes="793262" number="16">76l441W.R146a5368ed02cp_44171410hT.l@Z98.k.70X9c.5mZ1w49</segment>
-      <segment bytes="793221" number="17">12D035G5745-KO43wZ9920ttr1338@V7d871S2-t04t8520.uQ18</segment>
-      <segment bytes="793221" number="18">59V4O77211HA1f5T8h1-53952zV-55294K4M04v@kS878H3g4z.B5561.L330519</segment>
-      <segment bytes="793087" number="19">44-yi1-79$751944J7094$y7-y49994440d86cSn@5C82v-1O9N.wk8wMb6</segment>
-      <segment bytes="793375" number="20">oF7Wj3$Ydh7e030oD4.e81JM464O791495lJ@Pm058Qt4-G8Wv.T1i1a6O1</segment>
-      <segment bytes="793293" number="21">1T7_71M9d10F2.5953VP.11.4h75L@5049bBn384.14Ms</segment>
-      <segment bytes="793266" number="22">u8601765028G662749SD41j0m57651Zq70u1@J5281423406375.z.6PDSx57</segment>
-      <segment bytes="793376" number="23">XY0476$R87Y16g2n45OO335541589V140R026j@y2q9296x7f23C.sqK71b9</segment>
-      <segment bytes="793363" number="24">X7N3440l08B9T5940na4Ls397-T2.P5M12241525J57@r44O419p594M6G4I.d66RQ1</segment>
-      <segment bytes="793203" number="25">p4148978k45.t88w2K9886H4223y5553T7$7p287TN@N8e1T98b_0.mo55a14G</segment>
-      <segment bytes="793039" number="26">50U0a9iP07$A66010-51h55w386f@c$42$S96V57F5u0Y.6UDV35D</segment>
-      <segment bytes="792999" number="27">FnKN4n2749v958xa36J2570506414D293S@8H1A1X490$z3bv.ut6KQ4N</segment>
-      <segment bytes="793316" number="28">q4$d0$X8x6rm85m0Ewh307m255N@t2C7484zq870u.1RLndQ</segment>
-      <segment bytes="793238" number="29">364U4342$5I242404oH90-1W3c0t16705057m650Cq9f@K32rE5297347130W.UNs8evbH</segment>
-      <segment bytes="793461" number="30">M3081U097-r06Y.yy9-1A538001B27f@L2834Y80c7b1075.Dy150</segment>
-      <segment bytes="793326" number="31">189585554.NS66E5D840N4Yq5m07NC1n@51L0393057L528n.k1Mc3j0S</segment>
-      <segment bytes="793380" number="32">189048V505q89216C149I5f$53x-T@0V9i8n7o95.I.Z1lBJ5</segment>
-      <segment bytes="793205" number="33">5-L.555$139r45100-S23-59859@54844694q2.3EY9b</segment>
-      <segment bytes="793258" number="34">641655313y0.Z002L0g39AZ11716U-uX015PI5.v6y@veS44H89Js91903K8.P3MAvk4k</segment>
-      <segment bytes="793229" number="35">1C8f-yz-U-b20.610.0P1M-6Z5418i229160865010s1@M7l210D48Nc.nB0sPmi</segment>
-      <segment bytes="793169" number="36">0653$L0.58749-1U_1PS95-1h9gQ145@0117y0-1x1p-h94.za18yc5</segment>
-      <segment bytes="793109" number="37">77-Mo3-a6514904987865.K0W710G4HB9237@501F7910J6j50-Bh.6cHx1</segment>
-      <segment bytes="793350" number="38">m4I47082655rz$b7P751u9W679475F.89p@f.o.XZv5O7y.855rgXX</segment>
-      <segment bytes="793193" number="39">f075$y56E57d.t11787.0$6D155735M_w89-Y57q2@x0t5H91021wZ52Vh.1h7vabU</segment>
-      <segment bytes="793251" number="40">H7U1331Ad7718$Y69T-q3w4$l247HV49s985J@vi800i0004p.YD5oK</segment>
-      <segment bytes="793106" number="41">9nr786955Ker.M583315CoJ1-W65a817-704@IN-wU12$M1E0g466.5sMJ3</segment>
-      <segment bytes="793006" number="42">0.3R9mN.n2_V086N0-4.Z5gAgZo@ey3G316U382o537.f51Ed5B</segment>
-      <segment bytes="793198" number="43">l106Z1-N411r7j44197l628r.b5Uwc55@k4-Cl_n5xc.1B.xZbNm</segment>
-      <segment bytes="793070" number="44">A91LT1X591x81.TI4130N$555A57q0@L70-p5qa50.40GB</segment>
-      <segment bytes="793457" number="45">V5$765JR6503w0-K63099R615736843G$Qj0ev@mz776wM86445N0.4I56ne</segment>
-      <segment bytes="793109" number="46">A86H2P415S689$568152-025O45V@s079644915.Dd57p0</segment>
-      <segment bytes="793169" number="47">31x5o36q14y9554L42882X0Q10e360Z64W4K9Onx38D@5g1509788414q.Y8wib</segment>
-      <segment bytes="793219" number="48">b$6795157EX1044V964e14-Y9E68614O94C@4061937876$f5.6.19tV</segment>
-      <segment bytes="793349" number="49">D00v8X$b80m93181273J-g076Qj2p79867v5d9689Rb2@r0592.v900.j43E050E</segment>
-      <segment bytes="793228" number="50">Tf78L4e535.o86PK0S.M2R3-66012814z@q-5j89Y29J214Y902.53Ra0f</segment>
-      <segment bytes="793353" number="51">7i01.23411-lQW0212-Er260e9.N5e256jx243EX@91-T.15v40K5Hj.Fo1f</segment>
-      <segment bytes="793290" number="52">3A$H7m63$i595.4713vv0A4$A7Lk7Jsq@0cM0Tw4107f.B520.q5Z91</segment>
-      <segment bytes="793364" number="53">j572m$3h87LS$37167Wp10k41541.T779-Fn@V53C11045619xJ.52.0PnnX4v5</segment>
-      <segment bytes="793506" number="54">A.2d4599a720rk2IB32h0X523MjTL415v89706-7Z45y@R4746-B106358.t3g62r4</segment>
-      <segment bytes="793118" number="55">5q6100961jM-G9F7t755x366zxc102M1SdMF@7394521p651X1I.AL05545a</segment>
-      <segment bytes="793137" number="56">04e851111$12u2213-80VR133125B@7x8865M4hQ9$5.1N345x</segment>
-      <segment bytes="793180" number="57">K2476D3600-73B4W363$008s888980421f27125V$q0@0Zc0a56-m7550.1637vAr1</segment>
-      <segment bytes="793214" number="58">0306u425024v448ZeCE3Q9825m9th1858@5648018-H0.2k7J4.12k0B</segment>
-      <segment bytes="793274" number="59">220u4SK433564Cr2l004t0wP888545779g@19j360863S$55559m.70V7Ndr</segment>
-      <segment bytes="793339" number="60">5u1q051C5Qq8Z9Iy$Z.5.1510NY.S2565n@7m.5-09$z235p74.8kW5</segment>
-      <segment bytes="793297" number="61">6F472C8nh2621_X0C1093P7n39643b5p2f76s60r@1T55203qQY6.wZml1Vb</segment>
-      <segment bytes="793351" number="62">5qC4568844767324-o8i05983-0f.n4.y.OBZ41f@q36B50684KU66.0R1784</segment>
-      <segment bytes="793257" number="63">4P0g470-F59307aDf.JF070Xx959648dO3y00463J6s@71P$D961$C0.11.I096sQ</segment>
-      <segment bytes="793277" number="64">z5kod75077z01w11-A5h.wiG550.J5-p756$81.Db@5l01K49h3K.Ok4R5512</segment>
-      <segment bytes="793292" number="65">F3JX28.B8h90T0075-08001X5w611V071@D75X9263$6$9f.OT050p5Z</segment>
-      <segment bytes="83545" number="66">2B8sT.A650z101514671183y47977219.M4211xYp@0b0021p736BX92.B0lSm4J3</segment>
-    </segments>
-  </file>
-  <file date="1504571157" poster="autom@gical.tv (M@GiC)" subject="[432278]-[FULL]-[#a.b.teevee@EFNet]-[ Series.Title.S04E06.720p.HDTV.x264-KILLERS ]-[46/46] - &quot;sample-Series.Title.s04e06.720p.hdtv.x264-killers.vol31+04.par2&quot; yEnc (1/3)">
-    <groups>
-      <group>alt.binaries.teevee</group>
-    </groups>
-    <segments>
-      <segment bytes="793316" number="1">16ND-8I545Pq-s107t0h07g8908870711@K401476783.5.0mFs1</segment>
-      <segment bytes="793409" number="2">iYdZ2D11089F310711.ci-O7O4KG03@260c03388O84Kd.GCEgv</segment>
-      <segment bytes="6784" number="3">r63cDD59Mg1c95738Sn75085O4X7823V1@16V6-b87O21S1937O.lw17o1VS</segment>
-    </segments>
-  </file>
-</nzb>

src/NzbDrone.Core.Test/Housekeeping/Housekeepers/FixFutureIndexerStatusTimesFixture.cs

@@ -60,7 +60,7 @@ namespace NzbDrone.Core.Test.Housekeeping.Housekeepers
             Mocker.GetMock<IIndexerStatusRepository>()
                   .Verify(v => v.UpdateMany(
                           It.Is<List<IndexerStatus>>(i => i.All(
-                              s => s.InitialFailure.Value <= DateTime.UtcNow))
+                              s => s.InitialFailure.Value < DateTime.UtcNow))
                       )
                   );
         }
@@ -85,7 +85,7 @@ namespace NzbDrone.Core.Test.Housekeeping.Housekeepers
             Mocker.GetMock<IIndexerStatusRepository>()
                   .Verify(v => v.UpdateMany(
                           It.Is<List<IndexerStatus>>(i => i.All(
-                              s => s.MostRecentFailure.Value <= DateTime.UtcNow))
+                              s => s.MostRecentFailure.Value < DateTime.UtcNow))
                       )
                   );
         }
@@ -116,4 +116,4 @@ namespace NzbDrone.Core.Test.Housekeeping.Housekeepers
 
 
     }
-}
+}

src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/ImportDecisionMakerFixture.cs

@@ -60,7 +60,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
             _quality = new QualityModel(Quality.DVD);
 
             _localEpisode = new LocalEpisode
-            {
+            { 
                 Series = _series,
                 Quality = _quality,
                 Episodes = new List<Episode> { new Episode() },
@@ -231,7 +231,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
 
             Mocker.GetMock<IParsingService>()
                   .Setup(c => c.GetLocalEpisode(It.IsAny<string>(), It.IsAny<Series>(), It.IsAny<ParsedEpisodeInfo>(), It.IsAny<bool>()))
-                  .Returns(new LocalEpisode() { Path = "test", ParsedEpisodeInfo = new ParsedEpisodeInfo { } });
+                  .Returns(new LocalEpisode() { Path = "test" });
 
             _videoFiles = new List<string>
                 {

src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/Specifications/EpisodeTitleSpecificationFixture.cs

@@ -1,85 +0,0 @@
-using System;
-using System.Linq;
-using FizzWare.NBuilder;
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Core.MediaFiles.EpisodeImport.Specifications;
-using NzbDrone.Core.Organizer;
-using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv;
-using NzbDrone.Test.Common;
-
-namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
-{
-    [TestFixture]
-    public class EpisodeTitleSpecificationFixture : CoreTest<EpisodeTitleSpecification>
-    {
-        private Series _series;
-        private LocalEpisode _localEpisode;
-
-        [SetUp]
-        public void Setup()
-        {
-            _series = Builder<Series>.CreateNew()
-                                     .With(s => s.SeriesType = SeriesTypes.Standard)
-                                     .With(s => s.Path = @"C:\Test\TV\30 Rock".AsOsAgnostic())
-                                     .Build();
-
-            var episodes = Builder<Episode>.CreateListOfSize(1)
-                                           .All()
-                                           .With(e => e.SeasonNumber = 1)
-                                           .With(e => e.AirDateUtc = DateTime.UtcNow)
-                                           .Build()
-                                           .ToList();
-
-            _localEpisode = new LocalEpisode
-                                {
-                                    Path = @"C:\Test\Unsorted\30 Rock\30.rock.s01e01.avi".AsOsAgnostic(),
-                                    Episodes = episodes,
-                                    Series = _series
-                                };
-
-            Mocker.GetMock<IBuildFileNames>()
-                  .Setup(s => s.RequiresEpisodeTitle(_series, episodes))
-                  .Returns(true);
-        }
-
-        [Test]
-        public void should_reject_when_title_is_null()
-        {
-            _localEpisode.Episodes.First().Title = null;
-
-            Subject.IsSatisfiedBy(_localEpisode, null).Accepted.Should().BeFalse();
-        }
-
-        [Test]
-        public void should_reject_when_title_is_TBA()
-        {
-            _localEpisode.Episodes.First().Title = "TBA";
-
-            Subject.IsSatisfiedBy(_localEpisode, null).Accepted.Should().BeFalse();
-        }
-
-        [Test]
-        public void should_accept_when_did_not_air_recently_but_title_is_TBA()
-        {
-            _localEpisode.Episodes.First().AirDateUtc = DateTime.UtcNow.AddDays(-7);
-            _localEpisode.Episodes.First().Title = "TBA";
-
-            Subject.IsSatisfiedBy(_localEpisode, null).Accepted.Should().BeTrue();
-        }
-
-        [Test]
-        public void should_accept_when_episode_title_is_not_required()
-        {
-            _localEpisode.Episodes.First().Title = "TBA";
-
-            Mocker.GetMock<IBuildFileNames>()
-                  .Setup(s => s.RequiresEpisodeTitle(_series, _localEpisode.Episodes))
-                  .Returns(false);
-
-            Subject.IsSatisfiedBy(_localEpisode, null).Accepted.Should().BeTrue();
-        }
-    }
-}

src/NzbDrone.Core.Test/MediaFiles/MediaFileDeletionService/DeleteEpisodeFileFixture.cs

@@ -64,16 +64,13 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaFileDeletionService
         public void should_throw_if_root_folder_does_not_exist()
         {
             Assert.Throws<NzbDroneClientException>(() => Subject.DeleteEpisodeFile(_series, _episodeFile));
-            ExceptionVerification.ExpectedWarns(1);
         }
 
         [Test]
         public void should_should_throw_if_root_folder_is_empty()
         {
             GivenRootFolderExists();
-
             Assert.Throws<NzbDroneClientException>(() => Subject.DeleteEpisodeFile(_series, _episodeFile));
-            ExceptionVerification.ExpectedWarns(1);
         }
 
         [Test]

src/NzbDrone.Core.Test/MediaFiles/MediaInfo/MediaInfoFormatterTests/FormatAudioChannelsFixture.cs

@@ -145,33 +145,5 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo.MediaInfoFormatterTests
 
             MediaInfoFormatter.FormatAudioChannels(mediaInfoModel).Should().Be(2.0m);
         }
-
-        [Test]
-        public void should_use_AudioChannelPositionText_when_AudioChannelChannelPosition_is_invalid()
-        {
-            var mediaInfoModel = new MediaInfoModel
-                {
-                AudioChannels = 6,
-                AudioChannelPositions = "15 objects",
-                AudioChannelPositionsText = "15 objects / Front: L C R, Side: L R, LFE",
-                    SchemaRevision = 3
-            };
-
-            MediaInfoFormatter.FormatAudioChannels(mediaInfoModel).Should().Be(5.1m);
-        }
-
-        [Test]
-        public void should_remove_atmos_objects_from_AudioChannelPostions()
-        {
-            var mediaInfoModel = new MediaInfoModel
-            {
-                AudioChannels = 2,
-                AudioChannelPositions = "15 objects / 3/2.1",
-                AudioChannelPositionsText = null,
-                SchemaRevision = 3
-            };
-
-            MediaInfoFormatter.FormatAudioChannels(mediaInfoModel).Should().Be(5.1m);
-        }
     }
 }

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

@@ -60,7 +60,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
                 .All()
                 .With(v => v.RelativePath = "media.mkv")
                 .TheFirst(1)
-                .With(v => v.MediaInfo = new MediaInfoModel { SchemaRevision = VideoFileInfoReader.CURRENT_MEDIA_INFO_SCHEMA_REVISION })
+                .With(v => v.MediaInfo = new MediaInfoModel { SchemaRevision = UpdateMediaInfoService.CURRENT_MEDIA_INFO_SCHEMA_REVISION })
                 .BuildList();
 
             Mocker.GetMock<IMediaFileService>()
@@ -86,7 +86,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
                 .All()
                 .With(v => v.RelativePath = "media.mkv")
                 .TheFirst(1)
-                .With(v => v.MediaInfo = new MediaInfoModel { SchemaRevision = VideoFileInfoReader.MINIMUM_MEDIA_INFO_SCHEMA_REVISION })
+                .With(v => v.MediaInfo = new MediaInfoModel { SchemaRevision = UpdateMediaInfoService.MINIMUM_MEDIA_INFO_SCHEMA_REVISION })
                 .BuildList();
 
             Mocker.GetMock<IMediaFileService>()

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

@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
@@ -46,7 +46,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
             info.VideoProfile.Should().Be("Baseline@L2.1");
             info.VideoCodecLibrary.Should().Be("");
             info.AudioFormat.Should().Be("AAC");
-            info.AudioCodecID.Should().BeOneOf("40", "mp4a-40-2");
+            info.AudioCodecID.Should().Be("40");
             info.AudioProfile.Should().Be("LC");
             info.AudioCodecLibrary.Should().Be("");
             info.AudioBitrate.Should().Be(128000);
@@ -82,7 +82,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
             info.VideoProfile.Should().Be("Baseline@L2.1");
             info.VideoCodecLibrary.Should().Be("");
             info.AudioFormat.Should().Be("AAC");
-            info.AudioCodecID.Should().BeOneOf("40", "mp4a-40-2");
+            info.AudioCodecID.Should().Be("40");
             info.AudioProfile.Should().Be("LC");
             info.AudioCodecLibrary.Should().Be("");
             info.AudioBitrate.Should().Be(128000);

src/NzbDrone.Core.Test/MediaFiles/UpgradeMediaFileServiceFixture.cs

@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Linq;
 using FizzWare.NBuilder;
 using FluentAssertions;
@@ -7,7 +7,6 @@ using Moq;
 using NUnit.Framework;
 using NzbDrone.Common.Disk;
 using NzbDrone.Core.MediaFiles;
-using NzbDrone.Core.MediaFiles.EpisodeImport;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Core.Tv;
@@ -34,16 +33,12 @@ namespace NzbDrone.Core.Test.MediaFiles
                 .Build();
 
             Mocker.GetMock<IDiskProvider>()
-                  .Setup(c => c.FolderExists(Directory.GetParent(_localEpisode.Series.Path).FullName))
-                  .Returns(true);
+                .Setup(c => c.FileExists(It.IsAny<string>()))
+                .Returns(true);
 
             Mocker.GetMock<IDiskProvider>()
-                  .Setup(c => c.FileExists(It.IsAny<string>()))
-                  .Returns(true);
-
-            Mocker.GetMock<IDiskProvider>()
-                  .Setup(c => c.GetParentFolder(It.IsAny<string>()))
-                  .Returns<string>(c => Path.GetDirectoryName(c));
+                .Setup(c => c.GetParentFolder(It.IsAny<string>()))
+                .Returns<string>(c => Path.GetDirectoryName(c));
         }
 
         private void GivenSingleEpisodeWithSingleEpisodeFile()
@@ -180,19 +175,5 @@ namespace NzbDrone.Core.Test.MediaFiles
 
             Subject.UpgradeEpisodeFile(_episodeFile, _localEpisode).OldFiles.Count.Should().Be(2);
         }
-
-        [Test]
-        public void should_throw_if_there_are_existing_episode_files_and_the_root_folder_is_missing()
-        {
-            GivenSingleEpisodeWithSingleEpisodeFile();
-
-            Mocker.GetMock<IDiskProvider>()
-                  .Setup(c => c.FolderExists(Directory.GetParent(_localEpisode.Series.Path).FullName))
-                  .Returns(false);
-
-            Assert.Throws<RootFolderNotFoundException>(() => Subject.UpgradeEpisodeFile(_episodeFile, _localEpisode));
-
-            Mocker.GetMock<IMediaFileService>().Verify(v => v.Delete(_localEpisode.Episodes.Single().EpisodeFile.Value, DeleteMediaFileReason.Upgrade), Times.Never());
-        }
     }
 }

src/NzbDrone.Core.Test/Messaging/Commands/CommandExecutorFixture.cs

@@ -35,15 +35,6 @@ namespace NzbDrone.Core.Test.Messaging.Commands
                   .Returns(_executorB.Object);
         }
 
-        [TearDown]
-        public void TearDown()
-        {
-            Subject.Handle(new ApplicationShutdownRequested());
-
-            // Give the threads a bit of time to shut down.
-            Thread.Sleep(10);
-        }
-
         private void GivenCommandQueue()
         {
             _commandQueue = new BlockingCollection<CommandModel>(new CommandQueue());
@@ -53,10 +44,8 @@ namespace NzbDrone.Core.Test.Messaging.Commands
                   .Returns(_commandQueue.GetConsumingEnumerable);
         }
 
-        private void QueueAndWaitForExecution(CommandModel commandModel)
+        private void WaitForExecution(CommandModel commandModel)
         {
-            Thread.Sleep(10);
-
             Mocker.GetMock<IManageCommandQueue>()
                   .Setup(s => s.Complete(It.Is<CommandModel>(c => c == commandModel), It.IsAny<string>()))
                   .Callback(() => _commandExecuted = true);
@@ -65,14 +54,12 @@ namespace NzbDrone.Core.Test.Messaging.Commands
                   .Setup(s => s.Fail(It.Is<CommandModel>(c => c == commandModel), It.IsAny<string>(), It.IsAny<Exception>()))
                   .Callback(() => _commandExecuted = true);
 
-            _commandQueue.Add(commandModel);
-
             while (!_commandExecuted)
             {
                 Thread.Sleep(100);
             }
 
-            Thread.Sleep(10);
+            var t1 = 1;
         }
 
         [Test]
@@ -95,8 +82,9 @@ namespace NzbDrone.Core.Test.Messaging.Commands
                                };
 
             Subject.Handle(new ApplicationStartedEvent());
+            _commandQueue.Add(commandModel);
 
-            QueueAndWaitForExecution(commandModel);
+            WaitForExecution(commandModel);
 
             _executorA.Verify(c => c.Execute(commandA), Times.Once());
         }
@@ -112,8 +100,9 @@ namespace NzbDrone.Core.Test.Messaging.Commands
             };
 
             Subject.Handle(new ApplicationStartedEvent());
+            _commandQueue.Add(commandModel);
 
-            QueueAndWaitForExecution(commandModel);
+            WaitForExecution(commandModel);
 
             _executorA.Verify(c => c.Execute(commandA), Times.Once());
             _executorB.Verify(c => c.Execute(It.IsAny<CommandB>()), Times.Never());
@@ -133,8 +122,9 @@ namespace NzbDrone.Core.Test.Messaging.Commands
                       .Throws(new NotImplementedException());
 
             Subject.Handle(new ApplicationStartedEvent());
+            _commandQueue.Add(commandModel);
 
-            QueueAndWaitForExecution(commandModel);
+            WaitForExecution(commandModel);
 
             VerifyEventPublished<CommandExecutedEvent>();
             ExceptionVerification.ExpectedErrors(1);
@@ -151,8 +141,9 @@ namespace NzbDrone.Core.Test.Messaging.Commands
             };
 
             Subject.Handle(new ApplicationStartedEvent());
+            _commandQueue.Add(commandModel);
 
-            QueueAndWaitForExecution(commandModel);
+            WaitForExecution(commandModel);
 
             VerifyEventPublished<CommandExecutedEvent>();
         }
@@ -168,8 +159,9 @@ namespace NzbDrone.Core.Test.Messaging.Commands
             };
 
             Subject.Handle(new ApplicationStartedEvent());
+            _commandQueue.Add(commandModel);
 
-            QueueAndWaitForExecution(commandModel);
+            WaitForExecution(commandModel);
 
             Mocker.GetMock<IManageCommandQueue>()
                   .Setup(s => s.Complete(It.Is<CommandModel>(c => c == commandModel), commandA.CompletionMessage))
@@ -188,8 +180,9 @@ namespace NzbDrone.Core.Test.Messaging.Commands
             };
 
             Subject.Handle(new ApplicationStartedEvent());
+            _commandQueue.Add(commandModel);
 
-            QueueAndWaitForExecution(commandModel);
+            WaitForExecution(commandModel);
 
             Mocker.GetMock<IManageCommandQueue>()
                   .Setup(s => s.Complete(It.Is<CommandModel>(c => c == commandModel), commandModel.Message))
@@ -209,10 +202,10 @@ namespace NzbDrone.Core.Test.Messaging.Commands
 
         public CommandB()
         {
-
+            
         }
 
         public override string CompletionMessage => null;
     }
 
-}
+}

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

@@ -77,10 +77,6 @@
       <HintPath>..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Configuration.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Moq, Version=4.0.10827.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="NCrunch.Framework, Version=3.2.0.3, Culture=neutral, PublicKeyToken=01d101bf6f3e0aea, processorArchitecture=MSIL">
       <HintPath>..\packages\NCrunch.Framework.3.2.0.3\lib\NCrunch.Framework.dll</HintPath>
       <Private>True</Private>
@@ -90,7 +86,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.3\lib\net40\NLog.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll</HintPath>
@@ -101,6 +97,9 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Moq, Version=4.0.10827.0, Culture=neutral, PublicKeyToken=69f491c39445e920">
+      <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
+    </Reference>
     <Reference Include="Prowlin">
       <HintPath>..\packages\Prowlin.0.9.4456.26422\lib\net40\Prowlin.dll</HintPath>
     </Reference>
@@ -115,16 +114,6 @@
     <Compile Include="DataAugmentation\Scene\SceneMappingServiceFixture.cs" />
     <Compile Include="DataAugmentation\DailySeries\DailySeriesDataProxyFixture.cs" />
     <Compile Include="Datastore\BasicRepositoryFixture.cs" />
-    <Compile Include="Datastore\Converters\UtcConverterFixture.cs" />
-    <Compile Include="Datastore\Converters\TimeSpanConverterFixture.cs" />
-    <Compile Include="Datastore\Converters\QualityIntConverterFixture.cs" />
-    <Compile Include="Datastore\Converters\OsPathConverterFixture.cs" />
-    <Compile Include="Datastore\Converters\Int32ConverterFixture.cs" />
-    <Compile Include="Datastore\Converters\GuidConverterFixture.cs" />
-    <Compile Include="Datastore\Converters\EnumIntConverterFixture.cs" />
-    <Compile Include="Datastore\Converters\DoubleConverterFixture.cs" />
-    <Compile Include="Datastore\Converters\CommandConverterFixture.cs" />
-    <Compile Include="Datastore\Converters\BooleanIntConverterFixture.cs" />
     <Compile Include="Datastore\Converters\ProviderSettingConverterFixture.cs" />
     <Compile Include="Datastore\DatabaseFixture.cs" />
     <Compile Include="Datastore\DatabaseRelationshipFixture.cs" />
@@ -156,7 +145,6 @@
     <Compile Include="DecisionEngineTests\AcceptableSizeSpecificationFixture.cs" />
     <Compile Include="DecisionEngineTests\AnimeVersionUpgradeSpecificationFixture.cs" />
     <Compile Include="DecisionEngineTests\FullSeasonSpecificationFixture.cs" />
-    <Compile Include="DecisionEngineTests\MaximumSizeSpecificationFixture.cs" />
     <Compile Include="DecisionEngineTests\ProtocolSpecificationFixture.cs" />
     <Compile Include="DecisionEngineTests\CutoffSpecificationFixture.cs" />
     <Compile Include="DecisionEngineTests\DownloadDecisionMakerFixture.cs" />
@@ -187,9 +175,8 @@
     <Compile Include="Download\DownloadClientTests\Blackhole\UsenetBlackholeFixture.cs" />
     <Compile Include="Download\DownloadClientTests\DelugeTests\DelugeFixture.cs" />
     <Compile Include="Download\DownloadClientTests\DownloadClientFixtureBase.cs" />
-    <Compile Include="Download\DownloadClientTests\DownloadStationTests\DownloadStationsTaskStatusJsonConverterFixture.cs" />
     <Compile Include="Download\DownloadClientTests\DownloadStationTests\TorrentDownloadStationFixture.cs" />
-    <Compile Include="Download\DownloadClientTests\DownloadStationTests\SerialNumberProviderFixture.cs" />
+    <Compile Include="Download\DownloadClientTests\DownloadStationTests\DSMInfoProviderFixture.cs" />
     <Compile Include="Download\DownloadClientTests\DownloadStationTests\SharedFolderResolverFixture.cs" />
     <Compile Include="Download\DownloadClientTests\DownloadStationTests\UsenetDownloadStationFixture.cs" />
     <Compile Include="Download\DownloadClientTests\HadoukenTests\HadoukenFixture.cs" />
@@ -207,7 +194,6 @@
     <Compile Include="Download\DownloadClientTests\VuzeTests\VuzeFixture.cs" />
     <Compile Include="Download\DownloadServiceFixture.cs" />
     <Compile Include="Download\FailedDownloadServiceFixture.cs" />
-    <Compile Include="Download\NzbValidationServiceFixture.cs" />
     <Compile Include="Download\Pending\PendingReleaseServiceTests\PendingReleaseServiceFixture.cs" />
     <Compile Include="Download\Pending\PendingReleaseServiceTests\RemovePendingFixture.cs" />
     <Compile Include="Download\Pending\PendingReleaseServiceTests\RemoveRejectedFixture.cs" />
@@ -300,7 +286,6 @@
     <Compile Include="MediaFiles\EpisodeFileMovingServiceTests\MoveEpisodeFileFixture.cs" />
     <Compile Include="MediaFiles\EpisodeImport\ImportDecisionMakerFixture.cs" />
     <Compile Include="MediaFiles\EpisodeImport\DetectSampleFixture.cs" />
-    <Compile Include="MediaFiles\EpisodeImport\Specifications\EpisodeTitleSpecificationFixture.cs" />
     <Compile Include="MediaFiles\EpisodeImport\Specifications\FreeSpaceSpecificationFixture.cs" />
     <Compile Include="MediaFiles\EpisodeImport\Specifications\FullSeasonSpecificationFixture.cs" />
     <Compile Include="MediaFiles\EpisodeImport\Specifications\SameFileSpecificationFixture.cs" />
@@ -321,7 +306,6 @@
     <Compile Include="MetadataSource\SkyHook\SkyHookProxyFixture.cs" />
     <Compile Include="NotificationTests\NotificationBaseFixture.cs" />
     <Compile Include="NotificationTests\SynologyIndexerFixture.cs" />
-    <Compile Include="OrganizerTests\FileNameBuilderTests\RequiresEpisodeTitleFixture.cs" />
     <Compile Include="OrganizerTests\FileNameBuilderTests\CleanTitleFixture.cs" />
     <Compile Include="OrganizerTests\FileNameBuilderTests\EpisodeTitleCollapseFixture.cs" />
     <Compile Include="OrganizerTests\FileNameBuilderTests\MultiEpisodeFixture.cs" />
@@ -416,7 +400,6 @@
     <Compile Include="TvTests\ShouldRefreshSeriesFixture.cs" />
     <Compile Include="UpdateTests\UpdatePackageProviderFixture.cs" />
     <Compile Include="UpdateTests\UpdateServiceFixture.cs" />
-    <Compile Include="ValidationTests\SystemFolderValidatorFixture.cs" />
     <Compile Include="XbmcVersionTests.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -587,12 +570,6 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Files\Nzbs\NotNzb.nzb">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="Files\Nzbs\NoFiles.nzb">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Include="Files\TestArchive.tar.gz">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -611,9 +588,6 @@
     <Content Include="Files\Xem\Names.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <None Include="Files\Nzbs\ValidNzb.nzb">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>

src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/RequiresEpisodeTitleFixture.cs

@@ -1,57 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using FizzWare.NBuilder;
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Core.MediaFiles;
-using NzbDrone.Core.Organizer;
-using NzbDrone.Core.Qualities;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv;
-
-namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
-{
-    [TestFixture]
-    public class RequiresEpisodeTitleFixture : CoreTest<FileNameBuilder>
-    {
-        private Series _series;
-        private Episode _episode;
-        private EpisodeFile _episodeFile;
-        private NamingConfig _namingConfig;
-
-        [SetUp]
-        public void Setup()
-        {
-            _series = Builder<Series>
-                    .CreateNew()
-                    .With(s => s.Title = "South Park")
-                    .Build();
-
-            _episode = Builder<Episode>.CreateNew()
-                            .With(e => e.Title = "City Sushi")
-                            .With(e => e.SeasonNumber = 15)
-                            .With(e => e.EpisodeNumber = 6)
-                            .With(e => e.AbsoluteEpisodeNumber = 100)
-                            .Build();
-
-            _namingConfig = NamingConfig.Default;
-            _namingConfig.RenameEpisodes = true;
-
-            Mocker.GetMock<INamingConfigService>()
-                  .Setup(c => c.GetConfig()).Returns(_namingConfig);
-        }
-
-        [Test]
-        public void should_return_false_when_episode_title_is_not_part_of_the_pattern()
-        {
-            _namingConfig.StandardEpisodeFormat = "{Series Title} S{season:00}E{episode:00}";
-            Subject.RequiresEpisodeTitle(_series, new List<Episode> { _episode }).Should().BeFalse();
-        }
-
-        [Test]
-        public void should_return_true_when_episode_title_is_part_of_the_pattern()
-        {
-            Subject.RequiresEpisodeTitle(_series, new List<Episode> { _episode }).Should().BeTrue();
-        }
-    }
-}

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

@@ -39,12 +39,5 @@ namespace NzbDrone.Core.Test.ParserTests
         {
             Parser.Parser.ParseTitle(title).IsPossibleSpecialEpisode.Should().BeTrue();
         }
-
-
-        [TestCase("Dr.S11E00.A.Christmas.Carol.Special.720p.HDTV-FieldOfView")]
-        public void IsPossibleSpecialEpisode_should_be_true_if_e00_special(string title)
-        {
-            Parser.Parser.ParseTitle(title).IsPossibleSpecialEpisode.Should().BeTrue();
-        }
     }
 }

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

@@ -57,8 +57,6 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Series Title.S6.E1-E2-E3.Episode Name.1080p.WEB-DL", "Series Title", 6, new[] { 1, 2, 3 })]
         [TestCase("Mad.Men.S05E01-E02.720p.5.1Ch.BluRay", "Mad Men", 5, new[] { 1, 2 })]
         [TestCase("Mad.Men.S05E01-02.720p.5.1Ch.BluRay", "Mad Men", 5, new[] { 1, 2 })]
-        [TestCase("S01E01-E03 - Episode Title.HDTV-720p", "", 1, new [] { 1, 2, 3 })]
-        [TestCase("1x01-x03 - Episode Title.HDTV-720p", "", 1, new [] { 1, 2, 3 })]
         //[TestCase("", "", , new [] {  })]
         public void should_parse_multiple_episodes(string postTitle, string title, int season, int[] episodes)
         {

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

@@ -34,7 +34,6 @@ namespace NzbDrone.Core.Test.ParserTests
         public void should_parse_from_path(string path, int season, int episode)
         {
             var result = Parser.Parser.ParsePath(path.AsOsAgnostic());
-
             result.EpisodeNumbers.Should().HaveCount(1);
             result.SeasonNumber.Should().Be(season);
             result.EpisodeNumbers[0].Should().Be(episode);
@@ -43,20 +42,5 @@ namespace NzbDrone.Core.Test.ParserTests
 
             ExceptionVerification.IgnoreWarns();
         }
-
-        [TestCase("01-03\\The Series Title (2010) - 1x01-02-03 - Episode Title HDTV-720p Proper", "The Series Title (2010)", 1, new [] { 1, 2, 3 })]
-        public void should_parse_multi_episode_from_path(string path, string title, int season, int[] episodes)
-        {
-            var result = Parser.Parser.ParsePath(path.AsOsAgnostic());
-
-            result.SeriesTitle.Should().Be(title);
-            result.EpisodeNumbers.Should().HaveCount(episodes.Length);
-            result.SeasonNumber.Should().Be(season);
-            result.EpisodeNumbers.Should().BeEquivalentTo(episodes);
-            result.AbsoluteEpisodeNumbers.Should().BeEmpty();
-            result.FullSeason.Should().BeFalse();
-
-            ExceptionVerification.IgnoreWarns();
-        }
     }
 }

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

@@ -1,4 +1,4 @@
-using FluentAssertions;
+using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.Parser;
 using NzbDrone.Core.Qualities;
@@ -117,7 +117,6 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("[Eveyuu] No Game No Life - 10 [Hi10P 1280x720 H264][10B23BD8]", false)]
         [TestCase("Hells.Kitchen.US.S12E17.HR.WS.PDTV.X264-DIMENSION", false)]
         [TestCase("Survivorman.The.Lost.Pilots.Summer.HR.WS.PDTV.x264-DHD", false)]
-        [TestCase("Victoria S01E07 - Motor zmen (CZ)[TvRip][HEVC][720p]", false)]
         public void should_parse_hdtv720p_quality(string title, bool proper)
         {
             ParseAndVerifyQuality(title, Quality.HDTV720p, proper);
@@ -129,7 +128,6 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("DEXTER.S07E01.ARE.YOU.1080P.HDTV.proper.X264-QCF", true)]
         [TestCase("Dexter - S01E01 - Title [HDTV-1080p]", false)]
         [TestCase("[HorribleSubs] Yowamushi Pedal - 32 [1080p]", false)]
-        [TestCase("Victoria S01E07 - Motor zmen (CZ)[TvRip][HEVC][1080p]", false)]
         public void should_parse_hdtv1080p_quality(string title, bool proper)
         {
             ParseAndVerifyQuality(title, Quality.HDTV1080p, proper);
@@ -152,8 +150,6 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Incorporated.S01E08.Das.geloeschte.Ich.German.DD51.Dubbed.DL.720p.AmazonHD.x264-TVS", false)]
         [TestCase("Marco.Polo.S01E11.One.Hundred.Eyes.2015.German.DD51.DL.720p.NetflixUHD.x264.NewUp.by.Wunschtante", false)]
         [TestCase("Hush 2016 German DD51 DL 720p NetflixHD x264-TVS", false)]
-        [TestCase("Community.6x10.Basic.RV.Repair.and.Palmistry.ITA.ENG.720p.WEB-DLMux.H.264-GiuseppeTnT", false)]
-        [TestCase("Community.6x11.Modern.Espionage.ITA.ENG.720p.WEB.DLMux.H.264-GiuseppeTnT", false)]
         public void should_parse_webdl720p_quality(string title, bool proper)
         {
             ParseAndVerifyQuality(title, Quality.WEBDL720p, proper);

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

@@ -26,9 +26,6 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("[ www.Torrenting.com ] - Revenge.S03E14.720p.HDTV.X264-DIMENSION", "DIMENSION")]
         [TestCase("Seed S02E09 HDTV x264-2HD [eztv]-[rarbg.com]", "2HD")]
         [TestCase("7s-atlantis-s02e01-720p.mkv", null)]
-        [TestCase("The.Middle.S09E13.720p.HEVC.x265-MeGusta-Pre", "MeGusta")]
-        [TestCase("Ghosted.S01E08.Haunted.Hayride.720p.AMZN.WEBRip.DDP5.1.x264-NTb-postbot", "NTb")]
-        [TestCase("Ghosted.S01E08.Haunted.Hayride.720p.AMZN.WEBRip.DDP5.1.x264-NTb-xpost", "NTb")]
         //[TestCase("", "")]
         public void should_parse_release_group(string title, string expected)
         {

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

@@ -129,7 +129,6 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Jeopardy - 2016x231", "Jeopardy", 2016, 231)]
         [TestCase("Shortland.Street.S26E022.HDTV.x264-FiHTV", "Shortland Street", 26, 22)]
         [TestCase("Super.Potatoes.S01.Ep06.1080p.BluRay.DTS.x264-MiR", "Super Potatoes", 1, 6)]
-        [TestCase("Room 104 - S01E07 The Missionaries [SDTV]", "Room 104", 1, 7)]
         //[TestCase("", "", 0, 0)]
         public void should_parse_single_episode(string postTitle, string title, int seasonNumber, int episodeNumber)
         {

src/NzbDrone.Core.Test/Profiles/ProfileServiceFixture.cs

@@ -41,20 +41,15 @@ namespace NzbDrone.Core.Test.Profiles
         [Test]
         public void should_not_be_able_to_delete_profile_if_assigned_to_series()
         {
-            var profile = Builder<Profile>.CreateNew()
-                                          .With(p => p.Id = 2)
-                                          .Build();
-
             var seriesList = Builder<Series>.CreateListOfSize(3)
                                             .Random(1)
-                                            .With(c => c.ProfileId = profile.Id)
+                                            .With(c => c.ProfileId = 2)
                                             .Build().ToList();
 
 
             Mocker.GetMock<ISeriesService>().Setup(c => c.GetAllSeries()).Returns(seriesList);
-            Mocker.GetMock<IProfileRepository>().Setup(c => c.Get(profile.Id)).Returns(profile);
 
-            Assert.Throws<ProfileInUseException>(() => Subject.Delete(profile.Id));
+            Assert.Throws<ProfileInUseException>(() => Subject.Delete(2));
 
             Mocker.GetMock<IProfileRepository>().Verify(c => c.Delete(It.IsAny<int>()), Times.Never());
 
@@ -77,4 +72,4 @@ namespace NzbDrone.Core.Test.Profiles
             Mocker.GetMock<IProfileRepository>().Verify(c => c.Delete(1), Times.Once());
         }
     }
-}
+}