Fixed: Changes in http redirect logic causing failed grabs and >25% cpu usage.

fixes #1862

.gitignore

@@ -148,8 +148,9 @@ _temp_*/**/*
 Thumbs.db
 
 # AppVeyor
-/tools-cake/
+/tools/cake/
 /_artifacts/
 
 # Cake
 /tools/Addins/*
+packages.config.md5sum

CHANGELOG.md

@@ -3,6 +3,30 @@
 ## (unreleased)
 
 ### **New features**
+- Copy & Paste now triggers search (#2587) [Paul Kozlovitch]
+- Added console logging in case NLog fails to initialize. [Taloth Saldono]
+
+### **Fixes**
+- Movies not getting unmonitored when folder gets deleted (#2588) [Simon Chapman]
+- NLog causing a crash under mono 5.10. [Leonardo Galli]
+- Revert "Fixed: Updated NLog to 4.5 RC6 to handle mono 5.10" [Leonardo Galli]
+- Revert "Fixed: Messed up merge from Cherry pick" [Leonardo Galli]
+- Revert "Fixed: Appveyor build." [Leonardo Galli]
+- Appveyor build. [Leonardo Galli]
+- Messed up merge from Cherry pick. [Leonardo Galli]
+- Updated NLog to 4.5 RC6 to handle mono 5.10. [Leonardo Galli]
+- Revert "Fixed: NLog causing a crash under mono 5.10" [Leonardo Galli]
+- Pin cake and addin versions. [Qstick]
+- Temp Workaround for Appveyor Cake Issue. [Qstick]
+- NLog causing a crash under mono 5.10. [Leonardo Galli]
+- Poster sliding issues (#2570) [Qstick]
+- Multiple History Issues (#2571) [Qstick]
+
+
+## v0.2.0.980 (2018-02-21)
+
+### **New features**
+- Metadata links are now better readable. Also fixed links in the poster view. (#2562) [thezoggy]
 - Handle ctrl-c more gracefully. [Leonardo Galli]
 - Device names for Join notifications (#2544) [Qstick]
 - Same File Size MediaFile Specification (#2532) [Qstick]
@@ -13,6 +37,10 @@
 - NzbDrone references in FirewallAdapter.cs (#2504) [Qstick]
 
 ### **Fixes**
+- Another Delete modal is fixed. (#2560) [thezoggy]
+- Messed up movie deletion modal  (#2552) [thezoggy]
+- Remove sorting on Monitor/Profile columns to prevent unexpected results until sorting can properly be handled. Quick Fix for #2540 (#2553) [thezoggy]
+- OSX app has bundle name of Sonarr (#2555) [thezoggy]
 - Alt Titles from TMDB not getting added when mappings server throws 404. [Leonardo Galli]
 - Unable to execute custom scripts if IMDB ID is null (#2543) [Qstick]
 - Cleanup TV related code in API (#2530) [Qstick]

build-appveyor.cake

@@ -1,6 +1,6 @@
-#addin "Cake.Npm"
-#addin "SharpZipLib"
-#addin "Cake.Compression"
+#addin nuget:?package=Cake.Npm&version=0.12.1
+#addin nuget:?package=SharpZipLib&version=0.86.0
+#addin nuget:?package=Cake.Compression&version=0.1.4
 
 // Build variables
 var outputFolder = "./_output";

build-appveyor.ps1

@@ -81,8 +81,8 @@ if(!$PSScriptRoot){
     $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
 }
 
-$TOOLS_DIR = Join-Path $PSScriptRoot "tools-cake"
-$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe"
+$TOOLS_DIR = Join-Path $PSScriptRoot "tools"
+$NUGET_EXE = Join-Path $TOOLS_DIR "nuget/nuget.exe"
 $CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe"
 $NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
 $PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config"
@@ -156,7 +156,12 @@ if(-Not $SkipToolPackageRestore.IsPresent) {
     if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or
       ($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) {
         Write-Verbose -Message "Missing or changed package.config hash..."
-        Remove-Item * -Recurse -Exclude packages.config,nuget.exe
+        Get-ChildItem -Path $TOOLS_DIR -Recurse -Exclude packages.config |
+        Select -ExpandProperty FullName |
+        Where {$_ -notlike (Join-Path $TOOLS_DIR "pdb2mdb*")} |
+        Where {$_ -notlike (Join-Path $TOOLS_DIR "nuget*")} |
+        sort length -Descending |
+        Remove-Item -Recurse 
     }
 
     Write-Verbose -Message "Restoring tools from NuGet..."

src/LogentriesNLog/LogentriesNLog.csproj

@@ -51,11 +51,15 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
+    <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>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />

src/LogentriesNLog/packages.config

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

src/NzbDrone.Api/Movies/MovieModule.cs

@@ -23,8 +23,8 @@ using Nancy;
 namespace NzbDrone.Api.Movies
 {
     public class MovieModule : NzbDroneRestModuleWithSignalR<MovieResource, Core.Tv.Movie>, 
-                                IHandle<EpisodeImportedEvent>, 
-                                IHandle<EpisodeFileDeletedEvent>,
+                                IHandle<MovieImportedEvent>, 
+                                IHandle<MovieFileDeletedEvent>,
                                 IHandle<MovieUpdatedEvent>,       
                                 IHandle<MovieEditedEvent>,  
                                 IHandle<MovieDeletedEvent>,
@@ -258,16 +258,16 @@ namespace NzbDrone.Api.Movies
             //resource.AlternateTitles = mappings.Select(v => new AlternateTitleResource { Title = v.Title, SeasonNumber = v.SeasonNumber, SceneSeasonNumber = v.SceneSeasonNumber }).ToList();
         }
 
-        public void Handle(EpisodeImportedEvent message)
+        public void Handle(MovieImportedEvent message)
         {
-            //BroadcastResourceChange(ModelAction.Updated, message.ImportedEpisode.MovieId);
+            BroadcastResourceChange(ModelAction.Updated, message.ImportedMovie.MovieId);
         }
 
-        public void Handle(EpisodeFileDeletedEvent message)
+        public void Handle(MovieFileDeletedEvent message)
         {
             if (message.Reason == DeleteMediaFileReason.Upgrade) return;
 
-            //BroadcastResourceChange(ModelAction.Updated, message.EpisodeFile.MovieId);
+            BroadcastResourceChange(ModelAction.Updated, message.MovieFile.MovieId);
         }
 
         public void Handle(MovieUpdatedEvent message)

src/NzbDrone.Api/NzbDrone.Api.csproj

@@ -72,14 +72,15 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
+    <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>
     </Reference>
     <Reference Include="NodaTime, Version=1.3.0.0, Culture=neutral, PublicKeyToken=4226afe0d9b296d1, processorArchitecture=MSIL">
       <HintPath>..\packages\Ical.Net.2.2.25\lib\net40\NodaTime.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="Microsoft.CSharp" />
@@ -87,6 +88,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Libraries\Sqlite\System.Data.SQLite.dll</HintPath>
     </Reference>
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\NzbDrone.Common\Properties\SharedAssemblyInfo.cs">

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="6.0.6" targetFramework="net40" />
-  <package id="NLog" version="4.4.12" targetFramework="net40" />
+  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
 </packages>

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

@@ -49,16 +49,22 @@
       <HintPath>..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
+    <Reference Include="Microsoft.CSharp" />
+    <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>
     </Reference>
     <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.ServiceProcess" />
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Moq">

src/NzbDrone.App.Test/packages.config

@@ -3,6 +3,6 @@
   <package id="FluentAssertions" version="4.18.0" targetFramework="net40" />
   <package id="Moq" version="4.0.10827" />
   <package id="NBuilder" version="4.0.0" targetFramework="net40" />
-  <package id="NLog" version="4.4.12" targetFramework="net40" />
+  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
   <package id="NUnit" version="3.5.0" targetFramework="net40" />
 </packages>

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

@@ -46,18 +46,22 @@
       <HintPath>..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
+    <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>
     </Reference>
     <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />

src/NzbDrone.Automation.Test/packages.config

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

src/NzbDrone.Common.Test/Http/HttpClientFixture.cs

@@ -132,7 +132,49 @@ namespace NzbDrone.Common.Test.Http
             var request = new HttpRequest(string.Format("http://{0}/redirect/1", _httpBinHost));
             request.AllowAutoRedirect = true;
 
-            Subject.Get(request);
+            var response = Subject.Get(request);
+
+            response.StatusCode.Should().Be(HttpStatusCode.OK);
+
+            ExceptionVerification.ExpectedErrors(0);
+        }
+
+        [Test]
+        public void should_not_follow_redirects()
+        {
+            var request = new HttpRequest($"http://{_httpBinHost}/redirect/1");
+            request.AllowAutoRedirect = false;
+
+            var response = Subject.Get(request);
+
+            response.StatusCode.Should().Be(HttpStatusCode.Found);
+
+            ExceptionVerification.ExpectedErrors(1);
+        }
+
+        [Test]
+        public void should_follow_redirects_to_https()
+        {
+            var request = new HttpRequestBuilder($"http://{_httpBinHost}/redirect-to")
+                .AddQueryParam("url", $"https://sonarr.tv/")
+                .Build();
+            request.AllowAutoRedirect = true;
+
+            var response = Subject.Get(request);
+
+            response.StatusCode.Should().Be(HttpStatusCode.OK);
+            response.Content.Should().Contain("Sonarr");
+
+            ExceptionVerification.ExpectedErrors(0);
+        }
+
+        [Test]
+        public void should_throw_on_too_many_redirects()
+        {
+            var request = new HttpRequest($"http://{_httpBinHost}/redirect/4");
+            request.AllowAutoRedirect = true;
+
+            Assert.Throws<WebException>(() => Subject.Get(request));
 
             ExceptionVerification.ExpectedErrors(0);
         }

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

@@ -45,18 +45,22 @@
       <HintPath>..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
+    <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>
     </Reference>
     <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.ServiceProcess" />
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />

src/NzbDrone.Common.Test/packages.config

@@ -2,6 +2,6 @@
 <packages>
   <package id="FluentAssertions" version="4.18.0" targetFramework="net40" />
   <package id="Moq" version="4.0.10827" />
-  <package id="NLog" version="4.4.12" targetFramework="net40" />
+  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
   <package id="NUnit" version="3.5.0" targetFramework="net40" />
 </packages>

src/NzbDrone.Common/Disk/DiskProviderBase.cs

@@ -294,6 +294,11 @@ namespace NzbDrone.Common.Disk
         {
             Ensure.That(path, () => path).IsValidPath();
 
+            if (dateTime.Before(DateTimeExtensions.Epoch))
+            {
+                dateTime = DateTimeExtensions.Epoch;
+            }
+
             Directory.SetLastWriteTimeUtc(path, dateTime);
         }
 
@@ -301,6 +306,11 @@ namespace NzbDrone.Common.Disk
         {
             Ensure.That(path, () => path).IsValidPath();
             
+            if (dateTime.Before(DateTimeExtensions.Epoch))
+            {
+                dateTime = DateTimeExtensions.Epoch;
+            }
+
             File.SetLastWriteTime(path, dateTime);
         }
 

src/NzbDrone.Common/Extensions/DateTimeExtensions.cs

@@ -38,5 +38,7 @@ namespace NzbDrone.Common.Extensions
         {
             return dateTime >= afterDateTime && dateTime <= beforeDateTime;
         }
+        
+        public static DateTime Epoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
     }
 }

src/NzbDrone.Common/Http/Dispatchers/CurlHttpDispatcher.cs

@@ -104,8 +104,8 @@ namespace NzbDrone.Common.Http.Dispatchers
                         default:
                             throw new NotSupportedException(string.Format("HttpCurl method {0} not supported", request.Method));
                     }
+                    curlEasy.FollowLocation = false;
                     curlEasy.UserAgent = request.UseSimplifiedUserAgent ? UserAgentBuilder.UserAgentSimplified : UserAgentBuilder.UserAgent; ;
-                    curlEasy.FollowLocation = request.AllowAutoRedirect;
 
                     if (request.RequestTimeout != TimeSpan.Zero)
                     {

src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs

@@ -30,7 +30,7 @@ namespace NzbDrone.Common.Http.Dispatchers
             webRequest.Method = request.Method.ToString();
             webRequest.UserAgent = request.UseSimplifiedUserAgent ? UserAgentBuilder.UserAgentSimplified : UserAgentBuilder.UserAgent;
             webRequest.KeepAlive = request.ConnectionKeepAlive;
-            webRequest.AllowAutoRedirect = request.AllowAutoRedirect;
+            webRequest.AllowAutoRedirect = false;
             webRequest.CookieContainer = cookies;
 
             if (request.RequestTimeout != TimeSpan.Zero)

src/NzbDrone.Common/Http/HttpClient.cs

@@ -7,6 +7,7 @@ using System.Net;
 using NLog;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http.Dispatchers;
 using NzbDrone.Common.TPL;
 
@@ -43,6 +44,54 @@ namespace NzbDrone.Common.Http
         }
 
         public HttpResponse Execute(HttpRequest request)
+        {
+            var response = ExecuteRequest(request);
+
+            if (request.AllowAutoRedirect && response.HasHttpRedirect)
+            {
+                var autoRedirectChain = new List<string>();
+                autoRedirectChain.Add(request.Url.ToString());
+
+                do
+                {
+                    request.Url += new HttpUri(response.Headers.GetSingleValue("Location"));
+                    autoRedirectChain.Add(request.Url.ToString());
+
+                    _logger.Trace("Redirected to {0}", request.Url);
+
+                    if (autoRedirectChain.Count > 3)
+                    {
+                        throw new WebException($"Too many automatic redirections were attempted for {string.Join(" -> ", autoRedirectChain)}", WebExceptionStatus.ProtocolError);
+                    }
+
+                    response = ExecuteRequest(request);
+                }
+                while (response.HasHttpRedirect);
+            }
+
+            if (response.HasHttpRedirect && !RuntimeInfoBase.IsProduction)
+            {
+                _logger.Error("Server requested a redirect to [{0}] while in developer mode. Update the request URL to avoid this redirect.", response.Headers["Location"]);
+            }
+
+            if (!request.SuppressHttpError && response.HasHttpError)
+            {
+                _logger.Warn("HTTP Error - {0}", response);
+
+                if ((int)response.StatusCode == 429)
+                {
+                    throw new TooManyRequestsException(request, response);
+                }
+                else
+                {
+                    throw new HttpException(request, response);
+                }
+            }
+
+            return response;
+        }
+
+        private HttpResponse ExecuteRequest(HttpRequest request)
         {
             foreach (var interceptor in _requestInterceptors)
             {
@@ -78,28 +127,6 @@ namespace NzbDrone.Common.Http
                 _logger.Trace("Response content ({0} bytes): {1}", response.ResponseData.Length, response.Content);
             }
 
-            if (!RuntimeInfoBase.IsProduction &&
-                (response.StatusCode == HttpStatusCode.Moved ||
-                 response.StatusCode == HttpStatusCode.MovedPermanently ||
-                 response.StatusCode == HttpStatusCode.Found))
-            {
-                _logger.Error("Server requested a redirect to [" + response.Headers["Location"] + "]. Update the request URL to avoid this redirect.");
-            }
-
-            if (!request.SuppressHttpError && response.HasHttpError)
-            {
-                _logger.Warn("HTTP Error - {0}", response);
-
-                if ((int)response.StatusCode == 429)
-                {
-                    throw new TooManyRequestsException(request, response);
-                }
-                else
-                {
-                    throw new HttpException(request, response);
-                }
-            }
-
             return response;
         }
 

src/NzbDrone.Common/Http/HttpResponse.cs

@@ -51,6 +51,10 @@ namespace NzbDrone.Common.Http
 
         public bool HasHttpError => (int)StatusCode >= 400;
 
+        public bool HasHttpRedirect => StatusCode == HttpStatusCode.Moved ||
+                                       StatusCode == HttpStatusCode.MovedPermanently ||
+                                       StatusCode == HttpStatusCode.Found;
+
         public Dictionary<string, string> GetCookies()
         {
             var result = new Dictionary<string, string>();

src/NzbDrone.Common/NzbDrone.Common.csproj

@@ -43,8 +43,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
+    <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>
     </Reference>
     <Reference Include="Org.Mentalis, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\DotNet4.SocksProxy.1.3.2.0\lib\net40\Org.Mentalis.dll</HintPath>
@@ -60,11 +60,14 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.ServiceProcess" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="ICSharpCode.SharpZipLib">
       <HintPath>..\packages\ICSharpCode.SharpZipLib.Patched.0.86.5\lib\net20\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>

src/NzbDrone.Common/packages.config

@@ -3,5 +3,5 @@
   <package id="DotNet4.SocksProxy" version="1.3.2.0" targetFramework="net40" />
   <package id="ICSharpCode.SharpZipLib.Patched" version="0.86.5" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
-  <package id="NLog" version="4.4.12" targetFramework="net40" />
+  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
 </packages>

src/NzbDrone.Console/ConsoleApp.cs

@@ -23,7 +23,15 @@ namespace NzbDrone.Console
             try
             {
                 var startupArgs = new StartupContext(args);
-                NzbDroneLogger.Register(startupArgs, false, true);
+                try
+                {
+                    NzbDroneLogger.Register(startupArgs, false, true);
+                }
+                catch (Exception ex)
+                {
+                    System.Console.WriteLine("NLog Exception: " + ex.ToString());
+                    throw;
+                }
                 Bootstrap.Start(startupArgs, new ConsoleAlerts());
             }
             catch (SocketException e)

src/NzbDrone.Console/NzbDrone.Console.csproj

@@ -63,6 +63,7 @@
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Owin, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Microsoft.Owin.2.1.0\lib\net40\Microsoft.Owin.dll</HintPath>
@@ -75,14 +76,20 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
+    <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>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="Owin">
       <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
     </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\NzbDrone.Common\Properties\SharedAssemblyInfo.cs">

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="6.0.6" targetFramework="net40" />
-  <package id="NLog" version="4.4.12" targetFramework="net40" />
+  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
   <package id="Owin" version="1.0" targetFramework="net40" />
 </packages>

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using FizzWare.NBuilder;
 using FluentAssertions;
@@ -72,7 +72,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
         private void GivenMostRecentForEpisode(int episodeId, string downloadId, QualityModel quality, DateTime date, HistoryEventType eventType)
         {
-            Mocker.GetMock<IHistoryService>().Setup(s => s.MostRecentForEpisode(episodeId))
+            Mocker.GetMock<IHistoryService>().Setup(s => s.MostRecentForMovie(episodeId))
                   .Returns(new History.History { DownloadId = downloadId, Quality = quality, Date = date, EventType = eventType });
         }
 
@@ -92,7 +92,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         [Test]
         public void should_return_true_if_latest_history_item_is_null()
         {
-            Mocker.GetMock<IHistoryService>().Setup(s => s.MostRecentForEpisode(It.IsAny<int>())).Returns((History.History)null);
+            Mocker.GetMock<IHistoryService>().Setup(s => s.MostRecentForMovie(It.IsAny<int>())).Returns((History.History)null);
             _upgradeHistory.IsSatisfiedBy(_parseResultMulti, null).Accepted.Should().BeTrue();
         }
 

src/NzbDrone.Core.Test/HistoryTests/HistoryRepositoryFixture.cs

@@ -1,4 +1,4 @@
-using FizzWare.NBuilder;
+using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.History;
@@ -32,13 +32,13 @@ namespace NzbDrone.Core.Test.HistoryTests
         {
             var historyBluray = Builder<History.History>.CreateNew()
                 .With(c => c.Quality = new QualityModel(Quality.Bluray1080p))
-                .With(c => c.SeriesId = 12)
+                .With(c => c.MovieId = 12)
                 .With(c => c.EventType = HistoryEventType.Grabbed)
                 .BuildNew();
 
             var historyDvd = Builder<History.History>.CreateNew()
                 .With(c => c.Quality = new QualityModel(Quality.DVD))
-                .With(c => c.SeriesId = 12)
+                .With(c => c.MovieId = 12)
                 .With(c => c.EventType = HistoryEventType.Grabbed)
              .BuildNew();
 

src/NzbDrone.Core.Test/HistoryTests/HistoryServiceFixture.cs

@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Linq;
 using FizzWare.NBuilder;
 using Moq;
@@ -68,23 +68,23 @@ namespace NzbDrone.Core.Test.HistoryTests
         [Test]
         public void should_use_file_name_for_source_title_if_scene_name_is_null()
         {
-            var series = Builder<Series>.CreateNew().Build();
-            var episodes = Builder<Episode>.CreateListOfSize(1).Build().ToList();
-            var episodeFile = Builder<EpisodeFile>.CreateNew()
+            // Test fails becuase Radarr is using movie.title in historyService with no fallback
+
+            var movie = Builder<Movie>.CreateNew().Build();
+            var movieFile = Builder<MovieFile>.CreateNew()
                                                   .With(f => f.SceneName = null)
                                                   .Build();
 
-            var localEpisode = new LocalEpisode
+            var localMovie = new LocalMovie()
                                {
-                                   Series = series,
-                                   Episodes = episodes,
-                                   Path = @"C:\Test\Unsorted\Series.s01e01.mkv"
+                                   Movie = movie,
+                                   Path = @"C:\Test\Unsorted\Movie.2011.mkv"
                                };
 
-            Subject.Handle(new EpisodeImportedEvent(localEpisode, episodeFile, true, "sab", "abcd", true));
+            Subject.Handle(new MovieImportedEvent(localMovie, movieFile, true, "sab", "abcd", true));
 
             Mocker.GetMock<IHistoryRepository>()
-                .Verify(v => v.Insert(It.Is<History.History>(h => h.SourceTitle == Path.GetFileNameWithoutExtension(localEpisode.Path))));
+                .Verify(v => v.Insert(It.Is<History.History>(h => h.SourceTitle == Path.GetFileNameWithoutExtension(localMovie.Path))));
         }
     }
 }

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

@@ -84,16 +84,20 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
+    <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>
     </Reference>
     <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />
@@ -576,8 +580,6 @@
     <Folder Include="DataAugmentation\SceneNumbering\" />
     <Folder Include="Providers\" />
     <Folder Include="ProviderTests\UpdateProviderTests\" />
-    <Folder Include="IndexerTests\PTPTests\" />
-    <Folder Include="Files\Indexers\PTP\" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

src/NzbDrone.Core.Test/packages.config

@@ -10,7 +10,7 @@
   <package id="NBuilder" version="4.0.0" targetFramework="net40" />
   <package id="NCrunch.Framework" version="1.46.0.9" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
-  <package id="NLog" version="4.4.12" targetFramework="net40" />
+  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
   <package id="NUnit" version="3.5.0" targetFramework="net40" />
   <package id="Prowlin" version="0.9.4456.26422" targetFramework="net40" />
   <package id="Unity" version="2.1.505.2" targetFramework="net40" />

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

@@ -80,54 +80,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
 
         public virtual Decision IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
         {
-            if (searchCriteria != null)
-            {
-                _logger.Debug("Skipping history check during search");
-                return Decision.Accept();
-            }
-
-            var cdhEnabled = _configService.EnableCompletedDownloadHandling;
-
-            _logger.Debug("Performing history status check on report");
-            foreach (var episode in subject.Episodes)
-            {
-                _logger.Debug("Checking current status of episode [{0}] in history", episode.Id);
-                var mostRecent = _historyService.MostRecentForEpisode(episode.Id);
-
-                if (mostRecent != null && mostRecent.EventType == HistoryEventType.Grabbed)
-                {
-                    var recent = mostRecent.Date.After(DateTime.UtcNow.AddHours(-12));
-                    var cutoffUnmet = _qualityUpgradableSpecification.CutoffNotMet(subject.Series.Profile, mostRecent.Quality, subject.ParsedEpisodeInfo.Quality);
-                    var upgradeable = _qualityUpgradableSpecification.IsUpgradable(subject.Series.Profile, mostRecent.Quality, subject.ParsedEpisodeInfo.Quality);
-
-                    if (!recent && cdhEnabled)
-                    {
-                        continue;
-                    }
-
-                    if (!cutoffUnmet)
-                    {
-                        if (recent)
-                        {
-                            return Decision.Reject("Recent grab event in history already meets cutoff: {0}", mostRecent.Quality);  
-                        }
-
-                        return Decision.Reject("CDH is disabled and grab event in history already meets cutoff: {0}", mostRecent.Quality);
-                    }
-
-                    if (!upgradeable)
-                    {
-                        if (recent)
-                        {
-                            return Decision.Reject("Recent grab event in history is of equal or higher quality: {0}", mostRecent.Quality);
-                        }
-
-                        return Decision.Reject("CDH is disabled and grab event in history is of equal or higher quality: {0}", mostRecent.Quality);
-                    }
-                }
-            }
-
-            return Decision.Accept();
+            throw new NotImplementedException();
         }
     }
 }

src/NzbDrone.Core/History/HistoryRepository.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Marr.Data.QGen;
@@ -11,12 +11,10 @@ namespace NzbDrone.Core.History
 {
     public interface IHistoryRepository : IBasicRepository<History>
     {
-        List<QualityModel> GetBestQualityInHistory(int episodeId);
-        History MostRecentForEpisode(int episodeId);
+        List<QualityModel> GetBestQualityInHistory(int movieId);
         History MostRecentForDownloadId(string downloadId);
         List<History> FindByDownloadId(string downloadId);
-        List<History> FindDownloadHistory(int idSeriesId, QualityModel quality);
-        void DeleteForSeries(int seriesId);
+        List<History> FindDownloadHistory(int idMovieId, QualityModel quality);
         void DeleteForMovie(int movieId);
         History MostRecentForMovie(int movieId);
     }
@@ -29,21 +27,13 @@ namespace NzbDrone.Core.History
         {
         }
 
-
-        public List<QualityModel> GetBestQualityInHistory(int episodeId)
+        public List<QualityModel> GetBestQualityInHistory(int movieId)
         {
-            var history = Query.Where(c => c.EpisodeId == episodeId);
+            var history = Query.Where(c => c.MovieId == movieId);
 
             return history.Select(h => h.Quality).ToList();
         }
 
-        public History MostRecentForEpisode(int episodeId)
-        {
-            return Query.Where(h => h.EpisodeId == episodeId)
-                        .OrderByDescending(h => h.Date)
-                        .FirstOrDefault();
-        }
-
         public History MostRecentForDownloadId(string downloadId)
         {
             return Query.Where(h => h.DownloadId == downloadId)
@@ -56,10 +46,10 @@ namespace NzbDrone.Core.History
             return Query.Where(h => h.DownloadId == downloadId);
         }
 
-        public List<History> FindDownloadHistory(int idSeriesId, QualityModel quality)
+        public List<History> FindDownloadHistory(int idMovieId, QualityModel quality)
         {
             return Query.Where(h =>
-                 h.SeriesId == idSeriesId &&
+                 h.MovieId == idMovieId &&
                  h.Quality == quality &&
                  (h.EventType == HistoryEventType.Grabbed ||
                  h.EventType == HistoryEventType.DownloadFailed ||
@@ -67,11 +57,6 @@ namespace NzbDrone.Core.History
                  ).ToList();
         }
 
-        public void DeleteForSeries(int seriesId)
-        {
-            Delete(c => c.SeriesId == seriesId);
-        }
-
         public void DeleteForMovie(int movieId)
         {
             Delete(c => c.MovieId == movieId);

src/NzbDrone.Core/History/HistoryService.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -21,7 +21,6 @@ namespace NzbDrone.Core.History
         QualityModel GetBestQualityInHistory(Profile profile, int episodeId);
         PagingSpec<History> Paged(PagingSpec<History> pagingSpec);
         History MostRecentForMovie(int movieId);
-        History MostRecentForEpisode(int episodeId);
         History MostRecentForDownloadId(string downloadId);
         History Get(int historyId);
         List<History> Find(string downloadId, HistoryEventType eventType);
@@ -29,14 +28,11 @@ namespace NzbDrone.Core.History
     }
 
     public class HistoryService : IHistoryService,
-                                  IHandle<EpisodeGrabbedEvent>,
                                   IHandle<MovieGrabbedEvent>,
                                   IHandle<MovieImportedEvent>,
-                                  IHandle<EpisodeImportedEvent>,
                                   IHandle<DownloadFailedEvent>,
-                                  IHandle<EpisodeFileDeletedEvent>,
                                   IHandle<MovieFileDeletedEvent>,
-                                  IHandle<SeriesDeletedEvent>
+                                  IHandle<MovieDeletedEvent>
     {
         private readonly IHistoryRepository _historyRepository;
         private readonly Logger _logger;
@@ -52,11 +48,6 @@ namespace NzbDrone.Core.History
             return _historyRepository.GetPaged(pagingSpec);
         }
 
-        public History MostRecentForEpisode(int episodeId)
-        {
-            return _historyRepository.MostRecentForEpisode(episodeId);
-        }
-
         public History MostRecentForMovie(int movieId)
         {
             return _historyRepository.MostRecentForMovie(movieId);
@@ -205,10 +196,7 @@ namespace NzbDrone.Core.History
 
             var movieId = trackedDownload.MovieInfo.Movie.Id;
 
-            var allHistory = _historyRepository.FindDownloadHistory(movieId, trackedDownload.ImportedMovie.Quality);
-
-            //Find download related items for this movie
-            var movieHistory = allHistory.Where(h => movieId == h.MovieId).ToList();
+            var movieHistory = _historyRepository.FindDownloadHistory(movieId, trackedDownload.ImportedMovie.Quality);
 
             var processedDownloadId = movieHistory
                 .Where(c => c.EventType != HistoryEventType.Grabbed && c.DownloadId != null)
@@ -244,136 +232,6 @@ namespace NzbDrone.Core.History
             return downloadId;
         }
 
-        private string FindDownloadId(EpisodeImportedEvent trackedDownload)
-        {
-            _logger.Debug("Trying to find downloadId for {0} from history", trackedDownload.ImportedEpisode.Path);
-
-            var episodeIds = trackedDownload.EpisodeInfo.Episodes.Select(c => c.Id).ToList();
-
-            var allHistory = _historyRepository.FindDownloadHistory(trackedDownload.EpisodeInfo.Series.Id, trackedDownload.ImportedEpisode.Quality);
-
-
-            //Find download related items for these episdoes
-            var episodesHistory = allHistory.Where(h => episodeIds.Contains(h.EpisodeId)).ToList();
-
-            var processedDownloadId = episodesHistory
-                .Where(c => c.EventType != HistoryEventType.Grabbed && c.DownloadId != null)
-                .Select(c => c.DownloadId);
-
-            var stillDownloading = episodesHistory.Where(c => c.EventType == HistoryEventType.Grabbed && !processedDownloadId.Contains(c.DownloadId)).ToList();
-
-            string downloadId = null;
-
-            if (stillDownloading.Any())
-            {
-                foreach (var matchingHistory in trackedDownload.EpisodeInfo.Episodes.Select(e => stillDownloading.Where(c => c.EpisodeId == e.Id).ToList()))
-                {
-                    if (matchingHistory.Count != 1)
-                    {
-                        return null;
-                    }
-
-                    var newDownloadId = matchingHistory.Single().DownloadId;
-
-                    if (downloadId == null || downloadId == newDownloadId)
-                    {
-                        downloadId = newDownloadId;
-                    }
-                    else
-                    {
-                        return null;
-                    }
-                }
-            }
-
-            return downloadId;
-        }
-
-        public void Handle(EpisodeGrabbedEvent message)
-        {
-            foreach (var episode in message.Episode.Episodes)
-            {
-                var history = new History
-                {
-                    EventType = HistoryEventType.Grabbed,
-                    Date = DateTime.UtcNow,
-                    Quality = message.Episode.ParsedEpisodeInfo.Quality,
-                    SourceTitle = message.Episode.Release.Title,
-                    SeriesId = episode.SeriesId,
-                    EpisodeId = episode.Id,
-                    DownloadId = message.DownloadId,
-                    MovieId = 0
-                };
-
-                history.Data.Add("Indexer", message.Episode.Release.Indexer);
-                history.Data.Add("NzbInfoUrl", message.Episode.Release.InfoUrl);
-                history.Data.Add("ReleaseGroup", message.Episode.ParsedEpisodeInfo.ReleaseGroup);
-                history.Data.Add("Age", message.Episode.Release.Age.ToString());
-                history.Data.Add("AgeHours", message.Episode.Release.AgeHours.ToString());
-                history.Data.Add("AgeMinutes", message.Episode.Release.AgeMinutes.ToString());
-                history.Data.Add("PublishedDate", message.Episode.Release.PublishDate.ToString("s") + "Z");
-                history.Data.Add("DownloadClient", message.DownloadClient);
-                history.Data.Add("Size", message.Episode.Release.Size.ToString());
-                history.Data.Add("DownloadUrl", message.Episode.Release.DownloadUrl);
-                history.Data.Add("Guid", message.Episode.Release.Guid);
-                history.Data.Add("TvdbId", message.Episode.Release.TvdbId.ToString());
-                history.Data.Add("TvRageId", message.Episode.Release.TvRageId.ToString());
-                history.Data.Add("Protocol", ((int)message.Episode.Release.DownloadProtocol).ToString());
-
-                if (!message.Episode.ParsedEpisodeInfo.ReleaseHash.IsNullOrWhiteSpace())
-                {
-                    history.Data.Add("ReleaseHash", message.Episode.ParsedEpisodeInfo.ReleaseHash);
-                }
-
-                var torrentRelease = message.Episode.Release as TorrentInfo;
-
-                if (torrentRelease != null)
-                {
-                    history.Data.Add("TorrentInfoHash", torrentRelease.InfoHash);
-                }
-
-                _historyRepository.Insert(history);
-            }
-        }
-
-        public void Handle(EpisodeImportedEvent message)
-        {
-            if (!message.NewDownload)
-            {
-                return;
-            }
-
-            var downloadId = message.DownloadId;
-
-            if (downloadId.IsNullOrWhiteSpace())
-            {
-                downloadId = FindDownloadId(message);
-            }
-
-            foreach (var episode in message.EpisodeInfo.Episodes)
-            {
-                var history = new History
-                {
-                    EventType = HistoryEventType.DownloadFolderImported,
-                    Date = DateTime.UtcNow,
-                    Quality = message.EpisodeInfo.Quality,
-                    SourceTitle = message.ImportedEpisode.SceneName ?? Path.GetFileNameWithoutExtension(message.EpisodeInfo.Path),
-                    SeriesId = message.ImportedEpisode.SeriesId,
-                    EpisodeId = episode.Id,
-                    DownloadId = downloadId,
-                    MovieId = 0,
-                };
-
-                //Won't have a value since we publish this event before saving to DB.
-                //history.Data.Add("FileId", message.ImportedEpisode.Id.ToString());
-                history.Data.Add("DroppedPath", message.EpisodeInfo.Path);
-                history.Data.Add("ImportedPath", Path.Combine(message.EpisodeInfo.Series.Path, message.ImportedEpisode.RelativePath));
-                history.Data.Add("DownloadClient", message.DownloadClient);
-
-                _historyRepository.Insert(history);
-            }
-        }
-
         public void Handle(DownloadFailedEvent message)
         {
             var history = new History
@@ -393,37 +251,5 @@ namespace NzbDrone.Core.History
 
             _historyRepository.Insert(history);
         }
-
-        public void Handle(EpisodeFileDeletedEvent message)
-        {
-            if (message.Reason == DeleteMediaFileReason.NoLinkedEpisodes)
-            {
-                _logger.Debug("Removing episode file from DB as part of cleanup routine, not creating history event.");
-                return;
-            }
-
-            foreach (var episode in message.EpisodeFile.Episodes.Value)
-            {
-                var history = new History
-                {
-                    EventType = HistoryEventType.EpisodeFileDeleted,
-                    Date = DateTime.UtcNow,
-                    Quality = message.EpisodeFile.Quality,
-                    SourceTitle = message.EpisodeFile.Path,
-                    SeriesId = message.EpisodeFile.SeriesId,
-                    EpisodeId = episode.Id,
-                    MovieId = 0
-                };
-
-                history.Data.Add("Reason", message.Reason.ToString());
-
-                _historyRepository.Insert(history);
-            }
-        }
-
-        public void Handle(SeriesDeletedEvent message)
-        {
-            _historyRepository.DeleteForSeries(message.Series.Id);
-        }
     }
 }

src/NzbDrone.Core/MediaFiles/DiskScanService.cs

@@ -165,12 +165,7 @@ namespace NzbDrone.Core.MediaFiles
                 if (movie.MovieFileId != 0)
                 {
                     //Since there is no folder, there can't be any files right?
-                    // Delete Movie from MovieFiles
-                    _movieFileRepository.Delete(movie.MovieFileId);
-
-                    // Update Movie
-                    movie.MovieFileId = 0;
-                    _movieService.UpdateMovie(movie);
+                    _mediaFileTableCleanupService.Clean(movie, new List<string>());
 
                     _logger.Debug("Movies folder doesn't exist: {0}", movie.Path);
                 }

src/NzbDrone.Core/NzbDrone.Core.csproj

@@ -80,8 +80,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
+    <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>
     </Reference>
     <Reference Include="OAuth">
       <HintPath>..\packages\OAuth.1.0.3\lib\net40\OAuth.dll</HintPath>
@@ -95,11 +95,13 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Windows.Forms" />

src/NzbDrone.Core/packages.config

@@ -5,7 +5,7 @@
   <package id="FluentValidation" version="6.2.1.0" targetFramework="net40" />
   <package id="ImageResizer" version="3.4.3" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
-  <package id="NLog" version="4.4.12" targetFramework="net40" />
+  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
   <package id="OAuth" version="1.0.3" targetFramework="net40" />
   <package id="Prowlin" version="0.9.4456.26422" targetFramework="net40" />
   <package id="RestSharp" version="105.2.3" targetFramework="net40" />

src/NzbDrone.Host/NzbDrone.Host.csproj

@@ -60,6 +60,7 @@
     <ApplicationIcon>Radarr.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Owin, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Microsoft.Owin.2.1.0\lib\net40\Microsoft.Owin.dll</HintPath>
@@ -84,11 +85,15 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
+    <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>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.ServiceProcess" />
     <Reference Include="Interop.NetFwTypeLib">
       <HintPath>..\Libraries\Interop.NetFwTypeLib.dll</HintPath>
@@ -97,6 +102,8 @@
     <Reference Include="Owin">
       <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
     </Reference>
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\NzbDrone.Common\Properties\SharedAssemblyInfo.cs">

src/NzbDrone.Host/packages.config

@@ -6,6 +6,6 @@
   <package id="Nancy" version="1.4.3" targetFramework="net40" />
   <package id="Nancy.Owin" version="1.4.1" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
-  <package id="NLog" version="4.4.12" targetFramework="net40" />
+  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
   <package id="Owin" version="1.0" targetFramework="net40" />
 </packages>

src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj

@@ -76,8 +76,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
+    <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>
     </Reference>
     <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll</HintPath>
@@ -88,9 +88,13 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />

src/NzbDrone.Integration.Test/packages.config

@@ -10,7 +10,7 @@
   <package id="Nancy" version="1.4.3" targetFramework="net40" />
   <package id="Nancy.Owin" version="1.4.1" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
-  <package id="NLog" version="4.4.12" targetFramework="net40" />
+  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
   <package id="NUnit" version="3.5.0" targetFramework="net40" />
   <package id="Owin" version="1.0" targetFramework="net40" />
   <package id="RestSharp" version="105.2.3" targetFramework="net40" />

src/NzbDrone.Mono/NzbDrone.Mono.csproj

@@ -51,13 +51,17 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
+    <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>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />

src/NzbDrone.Mono/packages.config

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

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

@@ -49,8 +49,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
+    <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>
     </Reference>
     <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll</HintPath>
@@ -61,9 +61,13 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />

src/NzbDrone.Test.Common/packages.config

@@ -4,7 +4,7 @@
   <package id="FluentAssertions" version="4.18.0" targetFramework="net40" />
   <package id="Moq" version="4.0.10827" />
   <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
-  <package id="NLog" version="4.4.12" targetFramework="net40" />
+  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
   <package id="NUnit" version="3.5.0" targetFramework="net40" />
   <package id="RestSharp" version="105.2.3" targetFramework="net40" />
   <package id="Unity" version="2.1.505.2" targetFramework="net40" />

src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj

@@ -49,17 +49,21 @@
       <HintPath>..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
+    <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>
     </Reference>
     <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />

src/NzbDrone.Update.Test/packages.config

@@ -3,6 +3,6 @@
   <package id="FluentAssertions" version="4.18.0" targetFramework="net40" />
   <package id="Moq" version="4.0.10827" />
   <package id="NBuilder" version="4.0.0" targetFramework="net40" />
-  <package id="NLog" version="4.4.12" targetFramework="net40" />
+  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
   <package id="NUnit" version="3.5.0" targetFramework="net40" />
 </packages>

src/NzbDrone.Update/NzbDrone.Update.csproj

@@ -37,15 +37,22 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
+    <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>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\NzbDrone.Common\Properties\SharedAssemblyInfo.cs">

src/NzbDrone.Update/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
-  <package id="NLog" version="4.4.12" targetFramework="net40" />
+  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
 </packages>

src/NzbDrone.Windows/NzbDrone.Windows.csproj

@@ -50,13 +50,17 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
+    <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>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />

src/NzbDrone.Windows/packages.config

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

src/NzbDrone/NzbDrone.csproj

@@ -63,6 +63,7 @@
     <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Owin, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Microsoft.Owin.2.1.0\lib\net40\Microsoft.Owin.dll</HintPath>
@@ -75,16 +76,22 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
+    <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>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="Owin">
       <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
     </Reference>
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\NzbDrone.Common\Properties\SharedAssemblyInfo.cs">

src/NzbDrone/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="6.0.6" targetFramework="net40" />
-  <package id="NLog" version="4.4.12" targetFramework="net40" />
+  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
   <package id="Owin" version="1.0" targetFramework="net40" />
 </packages>

src/UI/Activity/History/Details/HistoryDetailsLayoutTemplate.hbs

@@ -7,7 +7,7 @@
                 {{#if_eq eventType compare="grabbed"}}Grabbed{{/if_eq}}
                 {{#if_eq eventType compare="downloadFailed"}}Download Failed{{/if_eq}}
                 {{#if_eq eventType compare="downloadFolderImported"}}Movie Imported{{/if_eq}}
-                {{#if_eq eventType compare="episodeFileDeleted"}}Movie File Deleted{{/if_eq}}
+                {{#if_eq eventType compare="movieFileDeleted"}}Movie File Deleted{{/if_eq}}
             </h3>
 
         </div>

src/UI/Activity/History/Details/HistoryDetailsViewTemplate.hbs

@@ -77,7 +77,7 @@
 </dl>
 {{/if_eq}}
 
-{{#if_eq eventType compare="episodeFileDeleted"}}
+{{#if_eq eventType compare="movieFileDeleted"}}
 <dl class="dl-horizontal">
 
     <dt>Path:</dt>

src/UI/AddMovies/AddMoviesView.js

@@ -92,7 +92,7 @@ module.exports = Marionette.Layout.extend({
 
 				this.$el.addClass(this.className);
 
-				this.ui.moviesSearch.keyup(function(e) {
+				this.ui.moviesSearch.on('input', function(e) {
 
 						if (_.contains([
 										9,

src/UI/Movies/Index/Posters/SeriesPostersItemView.js

@@ -5,10 +5,10 @@ module.exports = SeriesIndexItemView.extend({
     template : 'Movies/Index/Posters/SeriesPostersItemViewTemplate',
 
     initialize : function() {
-        this.events['mouseenter .x-series-poster-container'] = 'posterHoverAction';
-        this.events['mouseleave .x-series-poster-container'] = 'posterHoverAction';
+        this.events['mouseenter .x-movie-poster-container'] = 'posterHoverAction';
+        this.events['mouseleave .x-movie-poster-container'] = 'posterHoverAction';
 
-        this.ui.controls = '.x-series-controls';
+        this.ui.controls = '.x-movie-controls';
         this.ui.title = '.x-title';
     },
 

src/UI/Movies/Index/Posters/SeriesPostersItemViewTemplate.hbs

@@ -1,7 +1,7 @@
-<div class="series-posters-item">
+<div class="movie-posters-item">
     <div class="center">
-        <div class="series-poster-container x-series-poster-container">
-            <div class="series-controls x-series-controls">
+        <div class="movie-poster-container x-movie-poster-container">
+            <div class="movie-controls x-movie-controls">
                 <i class="icon-sonarr-refresh x-refresh" title="Refresh Movie"/>
                 <i class="icon-sonarr-edit x-edit" title="Edit Movie"/>
             </div>

src/UI/Movies/movies.less

@@ -125,7 +125,7 @@
     vertical-align : top;
   }
 
-  .series-posters-item {
+  .movie-posters-item {
 
     .card;
     .clickable;
@@ -190,7 +190,7 @@
     }
   }
 
-  .series-poster-container {
+  .movie-poster-container {
     position : relative;
     overflow : hidden;
     display  : inline-block;

tools/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+    <package id="Cake" version="0.25.0" />
+</packages>