covers are re-downloaded if remote size is different than

local size.

NzbDrone.Common/HttpProvider.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Net;
@@ -12,6 +13,8 @@ public interface IHttpProvider
         string DownloadString(string address);
         string DownloadString(string address, string username, string password);
         string DownloadString(string address, ICredentials identity);
+        Dictionary<string, string> DownloadHeader(string url);
+
         Stream DownloadStream(string url, NetworkCredential credential = null);
         void DownloadFile(string url, string fileName);
         string PostCommand(string address, string username, string password, string command);
@@ -19,6 +22,9 @@ public interface IHttpProvider
 
     public class HttpProvider : IHttpProvider
     {
+
+        public const string ContentLenghtHeader = "Content-Length";
+
         private readonly IEnvironmentProvider _environmentProvider;
         private static readonly Logger logger = LogManager.GetCurrentClassLogger();
         private readonly string _userAgent;
@@ -54,6 +60,22 @@ public string DownloadString(string address, ICredentials identity)
             }
         }
 
+        public Dictionary<string, string> DownloadHeader(string url)
+        {
+            var headers = new Dictionary<string, string>();
+            var request = WebRequest.Create(url);
+            request.Method = "HEAD";
+
+            var response = request.GetResponse();
+
+            foreach (var key in headers.Keys)
+            {
+                headers.Add(key, response.Headers[key]);
+            }
+
+            return headers;
+        }
+
         public Stream DownloadStream(string url, NetworkCredential credential = null)
         {
             var request = (HttpWebRequest)WebRequest.Create(url);
@@ -70,7 +92,7 @@ public void DownloadFile(string url, string fileName)
             try
             {
                 var fileInfo = new FileInfo(fileName);
-                if (!fileInfo.Directory.Exists)
+                if (fileInfo.Directory != null && !fileInfo.Directory.Exists)
                 {
                     fileInfo.Directory.Create();
                 }

NzbDrone.Common/IDiskProvider.cs

@@ -18,7 +18,7 @@ public interface IDiskProvider
         string[] GetDirectories(string path);
         string[] GetFiles(string path, SearchOption searchOption);
         long GetDirectorySize(string path);
-        long GetSize(string path);
+        long GetFileSize(string path);
         String CreateFolder(string path);
         void CopyDirectory(string source, string target);
         void MoveDirectory(string source, string destination);
@@ -131,7 +131,7 @@ public virtual long GetDirectorySize(string path)
             return GetFiles(path, SearchOption.AllDirectories).Sum(e => new FileInfo(e).Length);
         }
 
-        public virtual long GetSize(string path)
+        public virtual long GetFileSize(string path)
         {
             Ensure.That(() => path).IsValidPath();
 

NzbDrone.Core.Test/MediaCoverTests/CoverExistsSpecificationFixture.cs

@@ -0,0 +1,72 @@
+using System.Collections.Generic;
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using NzbDrone.Common;
+using NzbDrone.Core.MediaCover;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.MediaCoverTests
+{
+    [TestFixture]
+    public class CoverAlreadyExistsSpecificationFixture : CoreTest<CoverAlreadyExistsSpecification>
+    {
+        private Dictionary<string, string> _headers;
+
+        [SetUp]
+        public void Setup()
+        {
+            _headers = new Dictionary<string, string>();
+            Mocker.GetMock<IDiskProvider>().Setup(c => c.GetFileSize(It.IsAny<string>())).Returns(100);
+            Mocker.GetMock<IHttpProvider>().Setup(c => c.DownloadHeader(It.IsAny<string>())).Returns(_headers);
+
+        }
+
+
+        private void GivenFileExistsOnDisk()
+        {
+            Mocker.GetMock<IDiskProvider>().Setup(c => c.FileExists(It.IsAny<string>())).Returns(true);
+        }
+
+
+        private void GivenExistingFileSize(long bytes)
+        {
+            GivenFileExistsOnDisk();
+            Mocker.GetMock<IDiskProvider>().Setup(c => c.GetFileSize(It.IsAny<string>())).Returns(bytes);
+
+        }
+
+
+        [Test]
+        public void should_return_false_if_file_not_exists()
+        {
+            Subject.AlreadyExists("http://url", "c:\\file.exe").Should().BeFalse();
+        }
+
+        [Test]
+        public void should_return_false_if_file_exists_but_diffrent_size()
+        {
+            GivenExistingFileSize(100);
+            _headers.Add(HttpProvider.ContentLenghtHeader, "200");
+
+            Subject.AlreadyExists("http://url", "c:\\file.exe").Should().BeFalse();
+        }
+
+
+        [Test]
+        public void should_return_ture_if_file_exists_and_same_size()
+        {
+            GivenExistingFileSize(100);
+            _headers.Add(HttpProvider.ContentLenghtHeader, "100");
+
+            Subject.AlreadyExists("http://url", "c:\\file.exe").Should().BeTrue();
+        }
+
+        [Test]
+        public void should_return_true_if_there_is_no_size_header_and_file_exist()
+        {
+            GivenExistingFileSize(100);
+            Subject.AlreadyExists("http://url", "c:\\file.exe").Should().BeTrue();
+        }
+    }
+}

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

@@ -142,6 +142,7 @@
     <Compile Include="JobTests\JobRepositoryFixture.cs" />
     <Compile Include="DecisionEngineTests\LanguageSpecificationFixture.cs" />
     <Compile Include="JobTests\TestJobs.cs" />
+    <Compile Include="MediaCoverTests\CoverExistsSpecificationFixture.cs" />
     <Compile Include="MediaCoverTests\MediaCoverServiceFixture.cs" />
     <Compile Include="MediaFileTests\MediaFileTableCleanupServiceFixture.cs" />
     <Compile Include="MediaFileTests\MediaFileRepositoryFixture.cs" />

NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ImportFileFixture.cs

@@ -58,7 +58,7 @@ private void GivenFileSize(long size)
             _fileSize = size;
 
             Mocker.GetMock<IDiskProvider>()
-                    .Setup(d => d.GetSize(It.IsAny<String>()))
+                    .Setup(d => d.GetFileSize(It.IsAny<String>()))
                     .Returns(size);
         }
 

NzbDrone.Core/MediaCover/CoverAlreadyExistsSpecification.cs

@@ -0,0 +1,47 @@
+using NzbDrone.Common;
+
+namespace NzbDrone.Core.MediaCover
+{
+    public interface ICoverExistsSpecification
+    {
+        bool AlreadyExists(string url, string paht);
+    }
+
+    public class CoverAlreadyExistsSpecification : ICoverExistsSpecification
+    {
+        private readonly IDiskProvider _diskProvider;
+        private readonly IHttpProvider _httpProvider;
+
+        public CoverAlreadyExistsSpecification(IDiskProvider diskProvider, IHttpProvider httpProvider)
+        {
+            _diskProvider = diskProvider;
+            _httpProvider = httpProvider;
+        }
+
+        public bool AlreadyExists(string url, string path)
+        {
+            if (!_diskProvider.FileExists(path))
+            {
+                return false;
+            }
+
+            var headers = _httpProvider.DownloadHeader(url);
+
+            string sizeString = null;
+
+            if (headers.TryGetValue(HttpProvider.ContentLenghtHeader, out sizeString))
+            {
+                int size;
+                int.TryParse(sizeString, out size);
+                var fileSize = _diskProvider.GetFileSize(path);
+
+                if (fileSize != size)
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+    }
+}

NzbDrone.Core/MediaCover/MediaCoverService.cs

@@ -14,14 +14,17 @@ public class MediaCoverService :
     {
         private readonly IHttpProvider _httpProvider;
         private readonly IDiskProvider _diskProvider;
+        private readonly ICoverExistsSpecification _coverExistsSpecification;
         private readonly Logger _logger;
 
         private readonly string _coverRootFolder;
 
-        public MediaCoverService(IHttpProvider httpProvider, IDiskProvider diskProvider, IEnvironmentProvider environmentProvider, Logger logger)
+        public MediaCoverService(IHttpProvider httpProvider, IDiskProvider diskProvider, IEnvironmentProvider environmentProvider,
+            ICoverExistsSpecification coverExistsSpecification, Logger logger)
         {
             _httpProvider = httpProvider;
             _diskProvider = diskProvider;
+            _coverExistsSpecification = coverExistsSpecification;
             _logger = logger;
 
             _coverRootFolder = environmentProvider.GetMediaCoverPath();
@@ -37,7 +40,7 @@ private void EnsureCovers(Series series)
             foreach (var cover in series.Images)
             {
                 var fileName = GetCoverPath(series.Id, cover.CoverType);
-                if (!_diskProvider.FileExists(fileName))
+                if (!_coverExistsSpecification.AlreadyExists(cover.Url, fileName))
                 {
                     DownloadCover(series, cover);
                 }

NzbDrone.Core/MediaFiles/DiskScanService.cs

@@ -86,7 +86,7 @@ public EpisodeFile ImportFile(Series series, string filePath)
                 return null;
             }
 
-            var size = _diskProvider.GetSize(filePath);
+            var size = _diskProvider.GetFileSize(filePath);
 
             if (series.SeriesType == SeriesTypes.Daily || parsedEpisode.SeasonNumber > 0)
             {

NzbDrone.Core/MetadataSource/TraktProxy.cs

@@ -87,7 +87,7 @@ private static string GetPosterThumbnailUrl(string posterUrl)
 
             var extension = Path.GetExtension(posterUrl);
             var withoutExtension = posterUrl.Substring(0, posterUrl.Length - extension.Length);
-            return withoutExtension + "-138" + extension;
+            return withoutExtension + "-300" + extension;
         }
 
         private static SeriesStatusType GetSeriesStatus(string status)

NzbDrone.Core/NzbDrone.Core.csproj

@@ -249,6 +249,7 @@
     <Compile Include="Indexers\RssSyncCommand.cs" />
     <Compile Include="Jobs\TaskManager.cs" />
     <Compile Include="Lifecycle\ApplicationShutdownRequested.cs" />
+    <Compile Include="MediaCover\CoverAlreadyExistsSpecification.cs" />
     <Compile Include="MediaFiles\Commands\CleanMediaFileDb.cs" />
     <Compile Include="MediaFiles\Commands\CleanUpRecycleBinCommand.cs" />
     <Compile Include="MediaFiles\Commands\DownloadedEpisodesScanCommand.cs" />