Merge pull request #901 from brgaulin/jquery_upgrade

Update jQuery to 1.11.3

src/NzbDrone.Api/ManualImport/ManualImportModule.cs

@@ -30,10 +30,13 @@ namespace NzbDrone.Api.ManualImport
 
         private ManualImportResource AddQualityWeight(ManualImportResource item)
         {
-            item.QualityWeight = Quality.DefaultQualityDefinitions.Single(q => q.Quality == item.Quality.Quality).Weight;
-            item.QualityWeight += item.Quality.Revision.Real * 10;
-            item.QualityWeight += item.Quality.Revision.Version;
-
+            if (item.Quality != null)
+            {
+                item.QualityWeight = Quality.DefaultQualityDefinitions.Single(q => q.Quality == item.Quality.Quality).Weight;
+                item.QualityWeight += item.Quality.Revision.Real * 10;
+                item.QualityWeight += item.Quality.Revision.Version;
+            }
+           
             return item;
         }
     }

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

@@ -34,7 +34,7 @@ namespace NzbDrone.Common.Test.DiskTests
         {
             MonoOnly();
 
-            Subject.VerificationMode.Should().Be(DiskTransferVerificationMode.Transactional);
+            Subject.VerificationMode.Should().Be(DiskTransferVerificationMode.TryTransactional);
         }
 
         [Test]
@@ -199,9 +199,6 @@ namespace NzbDrone.Common.Test.DiskTests
 
             Mocker.GetMock<IDiskProvider>()
                 .Verify(v => v.CopyFile(_sourcePath, _targetPath, false), Times.Once());
-
-            Mocker.GetMock<IDiskProvider>()
-                .Verify(v => v.GetFileSize(It.IsAny<string>()), Times.Never());
         }
 
         [Test]
@@ -213,9 +210,6 @@ namespace NzbDrone.Common.Test.DiskTests
 
             Mocker.GetMock<IDiskProvider>()
                 .Verify(v => v.MoveFile(_sourcePath, _targetPath, false), Times.Once());
-
-            Mocker.GetMock<IDiskProvider>()
-                .Verify(v => v.GetFileSize(It.IsAny<string>()), Times.Never());
         }
 
         [Test]
@@ -377,6 +371,52 @@ namespace NzbDrone.Common.Test.DiskTests
             ExceptionVerification.ExpectedErrors(1);
         }
 
+        [Test]
+        public void mode_transactional_should_move_and_verify_if_same_folder()
+        {
+            Subject.VerificationMode = DiskTransferVerificationMode.Transactional;
+
+            var targetPath = _sourcePath + ".test";
+
+            var result = Subject.TransferFile(_sourcePath, targetPath, TransferMode.Move);
+
+            Mocker.GetMock<IDiskProvider>()
+                .Verify(v => v.TryCreateHardLink(_sourcePath, _backupPath), Times.Never());
+
+            Mocker.GetMock<IDiskProvider>()
+                .Verify(v => v.CopyFile(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()), Times.Never());
+
+            Mocker.GetMock<IDiskProvider>()
+                .Verify(v => v.MoveFile(_sourcePath, targetPath, false), Times.Once());
+        }
+
+        [Test]
+        public void mode_trytransactional_should_revert_to_verifyonly_if_hardlink_fails()
+        {
+            Subject.VerificationMode = DiskTransferVerificationMode.TryTransactional;
+
+            WithFailedHardlink();
+
+            Mocker.GetMock<IDiskProvider>()
+                .Setup(v => v.MoveFile(_sourcePath, _targetPath, false))
+                .Callback(() =>
+                {
+                    WithExistingFile(_sourcePath, false);
+                    WithExistingFile(_targetPath, true);
+                });
+
+            var result = Subject.TransferFile(_sourcePath, _targetPath, TransferMode.Move);
+
+            Mocker.GetMock<IDiskProvider>()
+                .Verify(v => v.TryCreateHardLink(_sourcePath, _backupPath), Times.Once());
+
+            Mocker.GetMock<IDiskProvider>()
+                .Verify(v => v.CopyFile(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()), Times.Never());
+
+            Mocker.GetMock<IDiskProvider>()
+                .Verify(v => v.MoveFile(_sourcePath, _targetPath, false), Times.Once());
+        }
+
         [Test]
         public void mode_transactional_should_delete_old_backup_on_move()
         {

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

@@ -1,17 +1,19 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Net;
+using System.Threading;
 using FluentAssertions;
+using Moq;
+using NLog;
 using NUnit.Framework;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.Http;
+using NzbDrone.Common.Http.Dispatchers;
+using NzbDrone.Common.TPL;
 using NzbDrone.Test.Common;
 using NzbDrone.Test.Common.Categories;
-using NLog;
-using NzbDrone.Common.TPL;
-using Moq;
-using NzbDrone.Common.Http.Dispatchers;
 
 namespace NzbDrone.Common.Test.Http
 {
@@ -309,30 +311,43 @@ namespace NzbDrone.Common.Test.Http
                 .Verify(v => v.PostResponse(It.IsAny<HttpResponse>()), Times.Once());
         }
 
-        public void should_parse_malformed_cloudflare_cookie()
+        [TestCase("en-US")]
+        [TestCase("es-ES")]
+        public void should_parse_malformed_cloudflare_cookie(string culture)
         {
-            // the date is bad in the below - should be 13-Jul-2016
-            string malformedCookie = @"__cfduid=d29e686a9d65800021c66faca0a29b4261436890790; expires=Wed, 13-Jul-16 16:19:50 GMT; path=/; HttpOnly";
-            string url = "http://eu.httpbin.org/response-headers?Set-Cookie=" +
-                System.Uri.EscapeUriString(malformedCookie);
+            var origCulture = Thread.CurrentThread.CurrentCulture;
+            Thread.CurrentThread.CurrentCulture = CultureInfo.GetCultureInfo(culture);
+            Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfo(culture);
+            try
+            {
+                // the date is bad in the below - should be 13-Jul-2016
+                string malformedCookie = @"__cfduid=d29e686a9d65800021c66faca0a29b4261436890790; expires=Wed, 13-Jul-16 16:19:50 GMT; path=/; HttpOnly";
+                string url = "http://eu.httpbin.org/response-headers?Set-Cookie=" +
+                    System.Uri.EscapeUriString(malformedCookie);
 
-            var requestSet = new HttpRequest(url);
-            requestSet.AllowAutoRedirect = false;
-            requestSet.StoreResponseCookie = true;
+                var requestSet = new HttpRequest(url);
+                requestSet.AllowAutoRedirect = false;
+                requestSet.StoreResponseCookie = true;
 
-            var responseSet = Subject.Get(requestSet);
+                var responseSet = Subject.Get(requestSet);
 
-            var request = new HttpRequest("http://eu.httpbin.org/get");
+                var request = new HttpRequest("http://eu.httpbin.org/get");
 
-            var response = Subject.Get<HttpBinResource>(request);
+                var response = Subject.Get<HttpBinResource>(request);
 
-            response.Resource.Headers.Should().ContainKey("Cookie");
+                response.Resource.Headers.Should().ContainKey("Cookie");
 
-            var cookie = response.Resource.Headers["Cookie"].ToString();
+                var cookie = response.Resource.Headers["Cookie"].ToString();
 
-            cookie.Should().Contain("__cfduid=d29e686a9d65800021c66faca0a29b4261436890790");
+                cookie.Should().Contain("__cfduid=d29e686a9d65800021c66faca0a29b4261436890790");
 
-            ExceptionVerification.IgnoreErrors();
+                ExceptionVerification.IgnoreErrors();
+            }
+            finally
+            {
+                Thread.CurrentThread.CurrentCulture = origCulture;
+                Thread.CurrentThread.CurrentUICulture = origCulture;
+            }
         }
     }
 

src/NzbDrone.Common.Test/InstrumentationTests/CleanseLogMessageFixture.cs

@@ -13,6 +13,7 @@ namespace NzbDrone.Common.Test.InstrumentationTests
         [TestCase(@"http://rss.torrentleech.org/mySecret")]
         [TestCase(@"http://www.bitmetv.org/rss.php?uid=mySecret&passkey=mySecret")]
         [TestCase(@"https://rss.omgwtfnzbs.org/rss-search.php?catid=19,20&user=sonarr&api=mySecret&eng=1")]
+        [TestCase(@"https://dognzb.cr/fetch/2b51db35e1912ffc138825a12b9933d2/2b51db35e1910123321025a12b9933d2")]
         // NzbGet
         [TestCase(@"{ ""Name"" : ""ControlUsername"", ""Value"" : ""mySecret"" }, { ""Name"" : ""ControlPassword"", ""Value"" : ""mySecret"" }, ")]
         [TestCase(@"{ ""Name"" : ""Server1.Username"", ""Value"" : ""mySecret"" }, { ""Name"" : ""Server1.Password"", ""Value"" : ""mySecret"" }, ")]
@@ -44,6 +45,7 @@ namespace NzbDrone.Common.Test.InstrumentationTests
             var cleansedMessage = CleanseLogMessage.Cleanse(message);
 
             cleansedMessage.Should().NotContain("mySecret");
+            cleansedMessage.Should().NotContain("01233210");
         }
     }
 }

src/NzbDrone.Common/Disk/DiskTransferService.cs

@@ -21,6 +21,7 @@ namespace NzbDrone.Common.Disk
     {
         None,
         VerifyOnly,
+        TryTransactional,
         Transactional
     }
 
@@ -40,7 +41,7 @@ namespace NzbDrone.Common.Disk
 
             // TODO: Atm we haven't seen partial transfers on windows so we disable verified transfer.
             // (If enabled in the future, be sure to check specifically for ReFS, which doesn't support hardlinks.)
-            VerificationMode = OsInfo.IsWindows ? DiskTransferVerificationMode.VerifyOnly : DiskTransferVerificationMode.Transactional;
+            VerificationMode = OsInfo.IsWindows ? DiskTransferVerificationMode.VerifyOnly : DiskTransferVerificationMode.TryTransactional;
         }
 
         public TransferMode TransferFolder(string sourcePath, string targetPath, TransferMode mode, bool verified = true)
@@ -48,11 +49,6 @@ namespace NzbDrone.Common.Disk
             Ensure.That(sourcePath, () => sourcePath).IsValidPath();
             Ensure.That(targetPath, () => targetPath).IsValidPath();
 
-            if (VerificationMode != DiskTransferVerificationMode.Transactional)
-            {
-                verified = false;
-            }
-
             if (!_diskProvider.FolderExists(targetPath))
             {
                 _diskProvider.CreateFolder(targetPath);
@@ -85,12 +81,14 @@ namespace NzbDrone.Common.Disk
             Ensure.That(sourcePath, () => sourcePath).IsValidPath();
             Ensure.That(targetPath, () => targetPath).IsValidPath();
 
-            if (VerificationMode != DiskTransferVerificationMode.Transactional)
+            if (VerificationMode != DiskTransferVerificationMode.Transactional && VerificationMode != DiskTransferVerificationMode.TryTransactional)
             {
                 verified = false;
             }
 
             _logger.Debug("{0} [{1}] > [{2}]", mode, sourcePath, targetPath);
+            
+            var originalSize = _diskProvider.GetFileSize(sourcePath);
 
             if (sourcePath == targetPath)
             {
@@ -127,6 +125,15 @@ namespace NzbDrone.Common.Disk
                 return TransferMode.None;
             }
 
+            if (sourcePath.GetParentPath() == targetPath.GetParentPath())
+            {
+                if (mode.HasFlag(TransferMode.Move))
+                {
+                    TryMoveFileVerified(sourcePath, targetPath, originalSize);
+                    return TransferMode.Move;
+                }
+            }
+
             if (sourcePath.IsParentPath(targetPath))
             {
                 throw new IOException(string.Format("Destination cannot be a child of the source [{0}] => [{1}]", sourcePath, targetPath));
@@ -151,7 +158,7 @@ namespace NzbDrone.Common.Disk
             {
                 if (mode.HasFlag(TransferMode.Copy))
                 {
-                    if (TryCopyFile(sourcePath, targetPath))
+                    if (TryCopyFileTransactional(sourcePath, targetPath, originalSize))
                     {
                         return TransferMode.Copy;
                     }
@@ -159,7 +166,7 @@ namespace NzbDrone.Common.Disk
 
                 if (mode.HasFlag(TransferMode.Move))
                 {
-                    if (TryMoveFile(sourcePath, targetPath))
+                    if (TryMoveFileTransactional(sourcePath, targetPath, originalSize))
                     {
                         return TransferMode.Move;
                     }
@@ -167,50 +174,18 @@ namespace NzbDrone.Common.Disk
 
                 throw new IOException(string.Format("Failed to completely transfer [{0}] to [{1}], aborting.", sourcePath, targetPath));
             }
-            else if (VerificationMode == DiskTransferVerificationMode.VerifyOnly)
+            else if (VerificationMode != DiskTransferVerificationMode.None)
             {
-                var originalSize = _diskProvider.GetFileSize(sourcePath);
-
                 if (mode.HasFlag(TransferMode.Copy))
                 {
-                    try
-                    {
-                        _diskProvider.CopyFile(sourcePath, targetPath);
-
-                        var targetSize = _diskProvider.GetFileSize(targetPath);
-                        if (targetSize != originalSize)
-                        {
-                            throw new IOException(string.Format("File copy incomplete. [{0}] was {1} bytes long instead of {2} bytes.", targetPath, targetSize, originalSize));
-                        }
-
-                        return TransferMode.Copy;
-                    }
-                    catch
-                    {
-                        RollbackCopy(sourcePath, targetPath);
-                        throw;
-                    }
+                    TryCopyFileVerified(sourcePath, targetPath, originalSize);
+                    return TransferMode.Copy;
                 }
 
                 if (mode.HasFlag(TransferMode.Move))
                 {
-                    try
-                    {
-                        _diskProvider.MoveFile(sourcePath, targetPath);
-
-                        var targetSize = _diskProvider.GetFileSize(targetPath);
-                        if (targetSize != originalSize)
-                        {
-                            throw new IOException(string.Format("File copy incomplete, data loss may have occured. [{0}] was {1} bytes long instead of the expected {2}.", targetPath, targetSize, originalSize));
-                        }
-
-                        return TransferMode.Move;
-                    }
-                    catch
-                    {
-                        RollbackPartialMove(sourcePath, targetPath);
-                        throw;
-                    }
+                    TryMoveFileVerified(sourcePath, targetPath, originalSize);
+                    return TransferMode.Move;
                 }
             }
             else
@@ -310,10 +285,8 @@ namespace NzbDrone.Common.Disk
             Thread.Sleep(3000);
         }
 
-        private bool TryCopyFile(string sourcePath, string targetPath)
+        private bool TryCopyFileTransactional(string sourcePath, string targetPath, long originalSize)
         {
-            var originalSize = _diskProvider.GetFileSize(sourcePath);
-
             var tempTargetPath = targetPath + ".partial~";
 
             if (_diskProvider.FileExists(tempTargetPath))
@@ -367,10 +340,8 @@ namespace NzbDrone.Common.Disk
             return false;
         }
 
-        private bool TryMoveFile(string sourcePath, string targetPath)
+        private bool TryMoveFileTransactional(string sourcePath, string targetPath, long originalSize)
         {
-            var originalSize = _diskProvider.GetFileSize(sourcePath);
-
             var backupPath = sourcePath + ".backup~";
             var tempTargetPath = targetPath + ".partial~";
 
@@ -423,16 +394,63 @@ namespace NzbDrone.Common.Disk
                 }
             }
 
-            _logger.Trace("Hardlink move failed, reverting to copy.");
-            if (TryCopyFile(sourcePath, targetPath))
+            if (VerificationMode == DiskTransferVerificationMode.Transactional)
             {
-                _logger.Trace("Copy succeeded, deleting source.");
-                _diskProvider.DeleteFile(sourcePath);
+                _logger.Trace("Hardlink move failed, reverting to copy.");
+                if (TryCopyFileTransactional(sourcePath, targetPath, originalSize))
+                {
+                    _logger.Trace("Copy succeeded, deleting source.");
+                    _diskProvider.DeleteFile(sourcePath);
+                    return true;
+                }
+            }
+            else
+            {
+                _logger.Trace("Hardlink move failed, reverting to move.");
+                TryMoveFileVerified(sourcePath, targetPath, originalSize);
                 return true;
             }
 
-            _logger.Trace("Copy failed.");
+            _logger.Trace("Move failed.");
             return false;
         }
+
+        private void TryCopyFileVerified(string sourcePath, string targetPath, long originalSize)
+        {
+            try
+            {
+                _diskProvider.CopyFile(sourcePath, targetPath);
+
+                var targetSize = _diskProvider.GetFileSize(targetPath);
+                if (targetSize != originalSize)
+                {
+                    throw new IOException(string.Format("File copy incomplete. [{0}] was {1} bytes long instead of {2} bytes.", targetPath, targetSize, originalSize));
+                }
+            }
+            catch
+            {
+                RollbackCopy(sourcePath, targetPath);
+                throw;
+            }
+        }
+
+        private void TryMoveFileVerified(string sourcePath, string targetPath, long originalSize)
+        {
+            try
+            {
+                _diskProvider.MoveFile(sourcePath, targetPath);
+
+                var targetSize = _diskProvider.GetFileSize(targetPath);
+                if (targetSize != originalSize)
+                {
+                    throw new IOException(string.Format("File move incomplete, data loss may have occurred. [{0}] was {1} bytes long instead of the expected {2}.", targetPath, targetSize, originalSize));
+                }
+            }
+            catch
+            {
+                RollbackPartialMove(sourcePath, targetPath);
+                throw;
+            }
+        }
     }
 }

src/NzbDrone.Common/Disk/OsPath.cs

@@ -153,6 +153,14 @@ namespace NzbDrone.Common.Disk
             }
         }
 
+        public bool IsValid
+        {
+            get
+            {
+                return _path.IsPathValid();
+            }
+        }
+
         private int GetFileNameIndex()
         {
             if (_path.Length < 2)

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

@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
@@ -175,9 +176,15 @@ namespace NzbDrone.Common.Http.Dispatchers
             // fix up the date if it was malformed
             var setCookieClean = ExpiryDate.Replace(setCookie, delegate(Match match)
             {
-                string format = "ddd, dd-MMM-yyyy HH:mm:ss";
-                DateTime dt = Convert.ToDateTime(match.Groups[2].Value);
-                return match.Groups[1].Value + dt.ToUniversalTime().ToString(format) + " GMT";
+                string shortFormat = "ddd, dd-MMM-yy HH:mm:ss";
+                string longFormat = "ddd, dd-MMM-yyyy HH:mm:ss";
+                DateTime dt;
+                if (DateTime.TryParseExact(match.Groups[2].Value, longFormat, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal, out dt) ||
+                    DateTime.TryParseExact(match.Groups[2].Value, shortFormat, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal, out dt) ||
+                    DateTime.TryParse(match.Groups[2].Value, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal, out dt))
+                    return match.Groups[1].Value + dt.ToUniversalTime().ToString(longFormat, CultureInfo.InvariantCulture) + " GMT";
+                else
+                    return match.Value;
             });
             return setCookieClean;
         }

src/NzbDrone.Common/Instrumentation/CleanseLogMessage.cs

@@ -13,6 +13,7 @@ namespace NzbDrone.Common.Instrumentation
                 new Regex(@"(?<=\?|&)[^=]*?(username|password)=(?<secret>[^&=]+?)(?= |&|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                 new Regex(@"torrentleech\.org/(?<secret>[0-9a-z]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                 new Regex(@"iptorrents\.com/[/a-z0-9?&;]*?(?:[?&;](u|tp)=(?<secret>[^&=;]+?))+(?= |;|&|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
+                new Regex(@"/fetch/[a-z0-9]{32}/(?<secret>[a-z0-9]{32})", RegexOptions.Compiled | RegexOptions.IgnoreCase),
 
                 // Path
                 new Regex(@"""C:\\Users\\(?<secret>[^\""]+?)(\\|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),

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

@@ -103,12 +103,12 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             _upgradeHistory.IsSatisfiedBy(_parseResultMulti, null).Accepted.Should().BeTrue();
         }
 
-        [Test]
-        public void should_return_true_if_latest_history_has_a_download_id_and_cdh_is_enabled()
-        {
-            GivenMostRecentForEpisode(FIRST_EPISODE_ID, "test", _upgradableQuality, DateTime.UtcNow, HistoryEventType.Grabbed);
-            _upgradeHistory.IsSatisfiedBy(_parseResultMulti, null).Accepted.Should().BeTrue();
-        }
+//        [Test]
+//        public void should_return_true_if_latest_history_has_a_download_id_and_cdh_is_enabled()
+//        {
+//            GivenMostRecentForEpisode(FIRST_EPISODE_ID, "test", _notupgradableQuality, DateTime.UtcNow, HistoryEventType.Grabbed);
+//            _upgradeHistory.IsSatisfiedBy(_parseResultMulti, null).Accepted.Should().BeTrue();
+//        }
 
         [Test]
         public void should_return_true_if_latest_history_item_is_older_than_twelve_hours()

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

@@ -381,6 +381,30 @@ namespace NzbDrone.Core.Test.Download
             AssertCompletedDownload();
         }
 
+        [Test]
+        public void should_warn_if_path_is_not_valid_for_windows()
+        {
+            WindowsOnly();
+
+            _trackedDownload.DownloadItem.OutputPath = new OsPath(@"/invalid/Windows/Path");
+
+            Subject.Process(_trackedDownload);
+
+            AssertNoAttemptedImport();
+        }
+
+        [Test]
+        public void should_warn_if_path_is_not_valid_for_linux()
+        {
+            MonoOnly();
+
+            _trackedDownload.DownloadItem.OutputPath = new OsPath(@"C:\Invalid\Mono\Path");
+
+            Subject.Process(_trackedDownload);
+
+            AssertNoAttemptedImport();
+        }
+
         private void AssertNoAttemptedImport()
         {
             Mocker.GetMock<IDownloadedEpisodesImportService>()

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

@@ -9,7 +9,9 @@ using NzbDrone.Common.Disk;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.Download.Clients.TorrentBlackhole;
+using NzbDrone.Core.Exceptions;
 using NzbDrone.Core.MediaFiles.TorrentInfo;
+using NzbDrone.Core.Parser.Model;
 using NzbDrone.Test.Common;
 
 namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
@@ -67,6 +69,21 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
                 .Returns(1000000);
         }
 
+        protected override RemoteEpisode CreateRemoteEpisode()
+        {
+            var remoteEpisode = base.CreateRemoteEpisode();
+            var torrentInfo = new TorrentInfo();
+
+            torrentInfo.Title = remoteEpisode.Release.Title;
+            torrentInfo.DownloadUrl = remoteEpisode.Release.DownloadUrl;
+            torrentInfo.DownloadProtocol = remoteEpisode.Release.DownloadProtocol;
+            torrentInfo.MagnetUrl = "magnet:?xt=urn:btih:755248817d32b00cc853e633ecdc48e4c21bff15&dn=Series.S05E10.PROPER.HDTV.x264-DEFiNE%5Brartv%5D&tr=http%3A%2F%2Ftracker.trackerfix.com%3A80%2Fannounce&tr=udp%3A%2F%2F9.rarbg.me%3A2710&tr=udp%3A%2F%2F9.rarbg.to%3A2710";
+
+            remoteEpisode.Release = torrentInfo;
+
+            return remoteEpisode;
+        }
+
         [Test]
         public void completed_download_should_have_required_properties()
         {
@@ -116,6 +133,15 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
             Mocker.GetMock<IHttpClient>().Verify(c => c.DownloadFile(It.IsAny<string>(), It.IsAny<string>()), Times.Never());
         }
 
+        [Test]
+        public void Download_should_throw_if_magnet_and_torrent_url_does_not_exist()
+        {
+            var remoteEpisode = CreateRemoteEpisode();
+            remoteEpisode.Release.DownloadUrl = null;
+
+            Assert.Throws<ReleaseDownloadException>(() => Subject.Download(remoteEpisode));
+        }
+
         [Test]
         public void GetItems_should_considered_locked_files_queued()
         {

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

@@ -3,7 +3,9 @@ using System.Collections.Generic;
 using NUnit.Framework;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.HealthCheck.Checks;
+using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Test.Framework;
+using NzbDrone.Core.ThingiProvider;
 using NzbDrone.Test.Common;
 
 namespace NzbDrone.Core.Test.HealthCheck.Checks
@@ -25,6 +27,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
         public void should_return_error_when_download_client_throws()
         {
             var downloadClient = Mocker.GetMock<IDownloadClient>();
+            downloadClient.Setup(s => s.Definition).Returns(new IndexerDefinition{Name = "Test"});
 
             downloadClient.Setup(s => s.GetItems())
                           .Throws<Exception>();

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

@@ -82,6 +82,9 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("[Hatsuyuki] Dragon Ball Kai (2014) - 018 (116) [1280x720][C4A3B16E]", "Dragon Ball Kai (2014)", 18, 0, 0)]
         [TestCase("Dragon Ball Kai (2014) - 39 (137) [v2][720p.HDTV][Unison Fansub]", "Dragon Ball Kai (2014)", 39, 0, 0)]
         [TestCase("[HorribleSubs] Eyeshield 21 - 101 [480p].mkv", "Eyeshield 21", 101, 0, 0)]
+        [TestCase("[Cthuyuu].Taimadou.Gakuen.35.Shiken.Shoutai.-.03.[720p.H264.AAC][8AD82C3A]", "Taimadou Gakuen 35 Shiken Shoutai", 3, 0, 0)]
+        //[TestCase("Taimadou.Gakuen.35.Shiken.Shoutai.-.03.(1280x720.HEVC.AAC)", "Taimadou Gakuen 35 Shiken Shoutai", 3, 0, 0)]
+        [TestCase("[Cthuyuu] Taimadou Gakuen 35 Shiken Shoutai - 03 [720p H264 AAC][8AD82C3A]", "Taimadou Gakuen 35 Shiken Shoutai", 3, 0, 0)]
         //[TestCase("", "", 0, 0, 0)]
         public void should_parse_absolute_numbers(string postTitle, string title, int absoluteEpisodeNumber, int seasonNumber, int episodeNumber)
         {

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

@@ -42,7 +42,8 @@ namespace NzbDrone.Core.Test.ParserTests
         //[TestCase("Adventure Time - 5x01 - x02 - Finn the Human (2) & Jake the Dog (3)", "Adventure Time", 5, new [] { 1, 2 })]
         [TestCase("The Young And The Restless - S42 Ep10718 - Ep10722", "The Young And The Restless", 42, new[] { 10718, 10719, 10720, 10721, 10722 })]
         [TestCase("The Young And The Restless - S42 Ep10688 - Ep10692", "The Young And The Restless", 42, new[] { 10688, 10689, 10690, 10691, 10692 })]
-        //[TestCase("", "", ,new [] {  })]
+        [TestCase("RWBY.S01E02E03.1080p.BluRay.x264-DeBTViD", "RWBY", 1, new [] { 2, 3 })]
+        //[TestCase("", "", , new [] {  })]
         public void should_parse_multiple_episodes(string postTitle, string title, int season, int[] episodes)
         {
             var result = Parser.Parser.ParseTitle(postTitle);

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

@@ -37,6 +37,7 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Match of the Day 2", "matchday2")]
         [TestCase("[ www.Torrenting.com ] - Revenge.S03E14.720p.HDTV.X264-DIMENSION", "Revenge")]
         [TestCase("Seed S02E09 HDTV x264-2HD [eztv]-[rarbg.com]", "Seed")]
+        [TestCase("Reno.911.S01.DVDRip.DD2.0.x264-DEEP", "Reno 911")]
         public void should_parse_series_name(string postTitle, string title)
         {
             var result = Parser.Parser.ParseSeriesName(postTitle).CleanSeriesTitle();

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

@@ -111,6 +111,8 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Series Title Season 01 Episode 05 720p", "Series Title", 1, 5)]
         //[TestCase("Off the Air - 101 - Animals (460p.x264.vorbis-2.0) [449].mkv", "Off the Air", 1, 1)]
         [TestCase("The Young And the Restless - S42 E10713 - 2015-07-20.mp4", "The Young And the Restless", 42, 10713)]
+        [TestCase("quantico.103.hdtv-lol[ettv].mp4", "quantico", 1, 3)]
+        [TestCase("Fargo - 01x02 - The Rooster Prince - [itz_theo]", "Fargo", 1, 2)]
         //[TestCase("", "", 0, 0)]
         public void should_parse_single_episode(string postTitle, string title, int seasonNumber, int episodeNumber)
         {

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

@@ -46,18 +46,18 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
 
                 if (mostRecent != null && mostRecent.EventType == HistoryEventType.Grabbed)
                 {
-                    var recentBlackhole = mostRecent.DownloadId.IsNullOrWhiteSpace() && mostRecent.Date.After(DateTime.UtcNow.AddHours(-12));
+                    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 (!recentBlackhole && cdhEnabled)
+                    if (!recent && cdhEnabled)
                     {
                         continue;
                     }
 
                     if (!cutoffUnmet)
                     {
-                        if (recentBlackhole)
+                        if (recent)
                         {
                             return Decision.Reject("Recent grab event in history already meets cutoff: {0}", mostRecent.Quality);  
                         }
@@ -67,7 +67,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
 
                     if (!upgradeable)
                     {
-                        if (recentBlackhole)
+                        if (recent)
                         {
                             return Decision.Reject("Recent grab event in history is of equal or higher quality: {0}", mostRecent.Quality);
                         }

src/NzbDrone.Core/Download/CompletedDownloadService.cs

@@ -3,6 +3,8 @@ using System.IO;
 using System.Linq;
 using NLog;
 using NzbDrone.Common.Disk;
+using NzbDrone.Common.EnsureThat;
+using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Download.TrackedDownloads;
@@ -72,6 +74,13 @@ namespace NzbDrone.Core.Download
                     return;
                 }
 
+                if ((OsInfo.IsWindows && !downloadItemOutputPath.IsWindowsPath) ||
+                    (OsInfo.IsNotWindows && !downloadItemOutputPath.IsUnixPath))
+                {
+                    trackedDownload.Warn("[{0}] is not a valid local path. You may need a Remote Path Mapping.", downloadItemOutputPath);
+                    return;
+                }
+
                 var downloadedEpisodesFolder = new OsPath(_configService.DownloadedEpisodesFolder);
 
                 if (downloadedEpisodesFolder.Contains(downloadItemOutputPath))

src/NzbDrone.Core/Download/IDownloadClient.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.ThingiProvider;

src/NzbDrone.Core/Download/TorrentClientBase.cs

@@ -51,8 +51,8 @@ namespace NzbDrone.Core.Download
 
             string magnetUrl = null;
             string torrentUrl = null;
-            
-            if (remoteEpisode.Release.DownloadUrl.StartsWith("magnet:"))
+
+            if (remoteEpisode.Release.DownloadUrl.IsNotNullOrWhiteSpace() && remoteEpisode.Release.DownloadUrl.StartsWith("magnet:"))
             {
                 magnetUrl = remoteEpisode.Release.DownloadUrl;
             }
@@ -76,11 +76,16 @@ namespace NzbDrone.Core.Download
                 }
                 catch (NotSupportedException ex)
                 {
+                    if (torrentUrl.IsNullOrWhiteSpace())
+                    {
+                        throw new ReleaseDownloadException(remoteEpisode.Release, "Magnet not supported by download client. ({0})", ex.Message);
+                    }
+
                     _logger.Debug("Magnet not supported by download client, trying torrent. ({0})", ex.Message);
                 }
             }
 
-            if (hash == null && !torrentUrl.IsNullOrWhiteSpace())
+            if (hash == null && torrentUrl.IsNotNullOrWhiteSpace())
             {
                 hash = DownloadFromWebUrl(remoteEpisode, torrentUrl);
             }

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

@@ -25,17 +25,19 @@ namespace NzbDrone.Core.HealthCheck.Checks
                 return new HealthCheck(GetType(), HealthCheckResult.Warning, "No download client is available");
             }
 
-            try
+            foreach (var downloadClient in downloadClients)
             {
-                foreach (var downloadClient in downloadClients)
+                try
                 {
                     downloadClient.GetItems();
                 }
-            }
-            catch (Exception ex)
-            {
-                _logger.Error("Unable to communicate with download client: ", ex);
-               return new HealthCheck(GetType(), HealthCheckResult.Error, "Unable to communicate with download client: " + ex.Message);
+                catch (Exception ex)
+                {
+                    var message = String.Format("Unable to communicate with {0}.", downloadClient.Definition.Name);
+
+                    _logger.Error(message, ex);
+                    return new HealthCheck(GetType(), HealthCheckResult.Error, message + " " + ex.Message);
+                }
             }
 
             return new HealthCheck(GetType());

src/NzbDrone.Core/IndexerSearch/Definitions/SpecialEpisodeSearchCriteria.cs

@@ -1,4 +1,4 @@
-using System;
+using System.Linq;
 
 namespace NzbDrone.Core.IndexerSearch.Definitions
 {
@@ -8,6 +8,13 @@ namespace NzbDrone.Core.IndexerSearch.Definitions
 
         public override string ToString()
         {
+            var episodeTitles = EpisodeQueryTitles.ToList();
+
+            if (episodeTitles.Count > 0)
+            {
+                return string.Format("[{0}] Specials", Series.Title);
+            }
+
             return string.Format("[{0} : {1}]", Series.Title, string.Join(",", EpisodeQueryTitles));
         }
     }

src/NzbDrone.Core/IndexerSearch/EpisodeSearchService.cs

@@ -50,12 +50,30 @@ namespace NzbDrone.Core.IndexerSearch
 
                     if (season.Count() > 1)
                     {
-                        decisions = _nzbSearchService.SeasonSearch(series.Key, season.Key, true);
+                        try
+                        {
+                            decisions = _nzbSearchService.SeasonSearch(series.Key, season.Key, true);
+                        }
+                        catch (Exception ex)
+                        {
+                            var message = String.Format("Unable to search for missing episodes in season {0} of [{1}]", season.Key, series.Key);
+                            _logger.ErrorException(message, ex);
+                            continue;
+                        }
                     }
 
                     else
                     {
-                        decisions = _nzbSearchService.EpisodeSearch(season.First());
+                        try
+                        {
+                            decisions = _nzbSearchService.EpisodeSearch(season.First());
+                        }
+                        catch (Exception ex)
+                        {
+                            var message = String.Format("Unable to search for missing episode: [{0}]", season.First());
+                            _logger.ErrorException(message, ex);
+                            continue;
+                        }
                     }
 
                     var processed = _processDownloadDecisions.ProcessDecisions(decisions);

src/NzbDrone.Core/Indexers/BroadcastheNet/BroadcastheNetParser.cs

@@ -32,7 +32,13 @@ namespace NzbDrone.Core.Indexers.BroadcastheNet
                     break;
             }
 
-            var jsonResponse = new HttpResponse<JsonRpcResponse<BroadcastheNetTorrents>>(indexerResponse.HttpResponse).Resource;
+            if (indexerResponse.Content == "Query execution was interrupted")
+            {
+                throw new IndexerException(indexerResponse, "Indexer API returned an internal server error");
+            }
+
+
+            JsonRpcResponse<BroadcastheNetTorrents> jsonResponse = new HttpResponse<JsonRpcResponse<BroadcastheNetTorrents>>(indexerResponse.HttpResponse).Resource;
 
             if (jsonResponse.Error != null || jsonResponse.Result == null)
             {

src/NzbDrone.Core/Indexers/HttpIndexerBase.cs

@@ -306,13 +306,19 @@ namespace NzbDrone.Core.Indexers
             }
             catch (UnsupportedFeedException ex)
             {
-                _logger.WarnException("Indexer feed is not supported: " + ex.Message, ex);
+                _logger.WarnException("Indexer feed is not supported", ex);
 
                 return new ValidationFailure(string.Empty, "Indexer feed is not supported: " + ex.Message);
             }
+            catch (IndexerException ex)
+            {
+                _logger.WarnException("Unable to connect to indexer", ex);
+
+                return new ValidationFailure(string.Empty, "Unable to connect to indexer. " + ex.Message);
+            }
             catch (Exception ex)
             {
-                _logger.WarnException("Unable to connect to indexer: " + ex.Message, ex);
+                _logger.WarnException("Unable to connect to indexer", ex);
 
                 return new ValidationFailure(string.Empty, "Unable to connect to indexer, check the log for more details");
             }

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

@@ -51,6 +51,7 @@ namespace NzbDrone.Core.Indexers.Newznab
                 yield return GetDefinition("OZnzb.com", GetSettings("https://api.oznzb.com"));
                 yield return GetDefinition("nzbplanet.net", GetSettings("https://nzbplanet.net"));
                 yield return GetDefinition("NZBgeek", GetSettings("https://api.nzbgeek.info"));
+                yield return GetDefinition("PFmonkey", GetSettings("https://www.pfmonkey.com"));
             }
         }
 

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

@@ -1,14 +1,16 @@
-using NzbDrone.Common.Exceptions;
+using NzbDrone.Core.Indexers.Exceptions;
 
 namespace NzbDrone.Core.Indexers.Newznab
 {
-    public class NewznabException : NzbDroneException
+    public class NewznabException : IndexerException
     {
-        public NewznabException(string message, params object[] args) : base(message, args)
+        public NewznabException(IndexerResponse response, string message, params object[] args)
+            : base(response, message, args)
         {
         }
 
-        public NewznabException(string message) : base(message)
+        public NewznabException(IndexerResponse response, string message)
+            : base(response, message)
         {
         }
     }

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

@@ -37,7 +37,7 @@ namespace NzbDrone.Core.Indexers.Newznab
                 throw new RequestLimitReachedException("API limit reached");
             }
 
-            throw new NewznabException("Newznab error detected: {0}", errorMessage);
+            throw new NewznabException(indexerResponse, errorMessage);
         }
 
         protected override ReleaseInfo ProcessItem(XElement item, ReleaseInfo releaseInfo)

src/NzbDrone.Core/Notifications/Xbmc/XbmcService.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 using FluentValidation.Results;
 using Newtonsoft.Json.Linq;
 using NLog;
@@ -59,32 +60,27 @@ namespace NzbDrone.Core.Notifications.Xbmc
 
         private XbmcVersion GetJsonVersion(XbmcSettings settings)
         {
-            try
+            return _xbmcVersionCache.Get(settings.Address, () =>
             {
-                return _xbmcVersionCache.Get(settings.Address, () =>
+                var response = _proxy.GetJsonVersion(settings);
+
+                _logger.Debug("Getting version from response: " + response);
+                var result = Json.Deserialize<XbmcJsonResult<JObject>>(response);
+
+                var versionObject = result.Result.Property("version");
+
+                if (versionObject.Value.Type == JTokenType.Integer)
                 {
+                    return new XbmcVersion((int)versionObject.Value);
+                }
 
-                    var response = _proxy.GetJsonVersion(settings);
+                if (versionObject.Value.Type == JTokenType.Object)
+                {
+                    return Json.Deserialize<XbmcVersion>(versionObject.Value.ToString());
+                }
 
-                    _logger.Debug("Getting version from response: " + response);
-                    var result = Json.Deserialize<XbmcJsonResult<JObject>>(response);
-
-                    var versionObject = result.Result.Property("version");
-
-                    if (versionObject.Value.Type == JTokenType.Integer) return new XbmcVersion((int) versionObject.Value);
-
-                    if (versionObject.Value.Type == JTokenType.Object) return Json.Deserialize<XbmcVersion>(versionObject.Value.ToString());
-
-                    throw new InvalidCastException("Unknown Version structure!: " + versionObject);
-                }, TimeSpan.FromHours(12));
-            }
-
-            catch (Exception ex)
-            {
-                _logger.DebugException(ex.Message, ex);
-            }
-
-            return new XbmcVersion();
+                throw new InvalidCastException("Unknown Version structure!: " + versionObject);
+            }, TimeSpan.FromHours(12));
         }
 
         private IApiProvider GetApiProvider(XbmcSettings settings)

src/NzbDrone.Core/Parser/Parser.cs

@@ -46,6 +46,10 @@ namespace NzbDrone.Core.Parser
                 new Regex(@"^\[(?<subgroup>.+?)\][-_. ]?(?<title>[^-]+?\d+?)[-_. ]+(?:[-_. ]?(?<absoluteepisode>\d{3}(?!\d+)))+(?:[-_. ]+(?<special>special|ova|ovd))?.*?(?<hash>\[\w{8}\])?(?:$|\.mkv)",
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
+                //Anime - [SubGroup] Title - Absolute Episode Number
+                new Regex(@"^\[(?<subgroup>.+?)\][-_. ]?(?<title>.+?)(?:[. ]-[. ](?<absoluteepisode>\d{2,3}(?!\d+|[-])))+(?:[-_. ]+(?<special>special|ova|ovd))?.*?(?<hash>\[\w{8}\])?(?:$|\.mkv)",
+                          RegexOptions.IgnoreCase | RegexOptions.Compiled),
+
                 //Anime - [SubGroup] Title Absolute Episode Number
                 new Regex(@"^\[(?<subgroup>.+?)\][-_. ]?(?<title>.+?)[-_. ]+(?:[-_. ]?(?<absoluteepisode>\d{2,3}(?!\d+)))+(?:[-_. ]+(?<special>special|ova|ovd))?.*?(?<hash>\[\w{8}\])?(?:$|\.mkv)",
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
@@ -55,7 +59,7 @@ namespace NzbDrone.Core.Parser
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
                 //Anime - Title Absolute Episode Number [Hash]
-                new Regex(@"^(?<title>.+?)(?:(?:_|-|\s|\.)+(?<absoluteepisode>\d{2,3}(?!\d+)))+(?:[-_. ]+(?<special>special|ova|ovd))?.*?(?<hash>\[\w{8}\])(?:$|\.)",
+                new Regex(@"^(?<title>.+?)(?:(?:_|-|\s|\.)+(?<absoluteepisode>\d{2,3}(?!\d+)))+(?:[-_. ]+(?<special>special|ova|ovd))?[-_. ]+.*?(?<hash>\[\w{8}\])(?:$|\.)",
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
                 //Episodes with airdate AND season/episode number
@@ -70,10 +74,6 @@ namespace NzbDrone.Core.Parser
                 new Regex(@"^(?<title>.+?)(?:(?:[-_\W](?<![()\[!]))+S?(?<season>(?<!\d+)(?:\d{1,2}|\d{4})(?!\d+))(?:[ex]|\W[ex]|_){1,2}(?<episode>\d{2,3}(?!\d+))(?:(?:\-|[ex]|\W[ex]|_){1,2}(?<episode>\d{2,3}(?!\d+)))*)\W?(?!\\)",
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
-                //Supports 103/113 naming
-                new Regex(@"^(?<title>.+?)?(?:(?:[-_\W](?<![()\[!]))+(?<season>(?<!\d+)[1-9])(?<episode>[1-9][0-9]|[0][1-9])(?![a-z]|\d+))+",
-                          RegexOptions.IgnoreCase | RegexOptions.Compiled),
-
                 //Mini-Series, treated as season 1, episodes are labelled as Part01, Part 01, Part.1
                 new Regex(@"^(?<title>.+?)(?:\W+(?:(?:Part\W?|(?<!\d+\W+)e)(?<episode>\d{1,2}(?!\d+)))+)",
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
@@ -106,6 +106,10 @@ namespace NzbDrone.Core.Parser
                 new Regex(@"^(?<title>.+?)\W(?:S|Season)\W?(?<season>\d{4}(?!\d+))(\W+|_|$)(?<extras>EXTRAS|SUBPACK)?(?!\\)",
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
+                //Supports 103/113 naming
+                new Regex(@"^(?<title>.+?)?(?:(?:[-_\W](?<![()\[!]))+(?<season>(?<!\d+)[1-9])(?<episode>[1-9][0-9]|[0][1-9])(?![a-z]|\d+))+",
+                          RegexOptions.IgnoreCase | RegexOptions.Compiled),
+
                 //Episodes with airdate
                 new Regex(@"^(?<title>.+?)?\W*(?<airyear>\d{4})\W+(?<airmonth>[0-1][0-9])\W+(?<airday>[0-3][0-9])(?!\W+[0-3][0-9])",
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
@@ -203,6 +207,9 @@ namespace NzbDrone.Core.Parser
         private static readonly Regex CleanReleaseGroupRegex = new Regex(@"^(.*?[-._ ](S\d+E\d+)[-._ ])|-(RP|1|NZBGeek|sample)$",
                                                                 RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
+        private static readonly Regex CleanTorrentSuffixRegex = new Regex(@"\[(?:ettv|rartv|rarbg|cttv)\]$",
+                                                                   RegexOptions.IgnoreCase | RegexOptions.Compiled);
+
         private static readonly Regex ReleaseGroupRegex = new Regex(@"-(?<releasegroup>[a-z0-9]+)\b(?<!WEB-DL|480p|720p|1080p)",
                                                                 RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
@@ -270,9 +277,13 @@ namespace NzbDrone.Core.Parser
 
                 var simpleTitle = SimpleTitleRegex.Replace(title, string.Empty);
 
+                simpleTitle = RemoveFileExtension(simpleTitle);
+
                 // TODO: Quick fix stripping [url] - prefixes.
                 simpleTitle = WebsitePrefixRegex.Replace(simpleTitle, string.Empty);
 
+                simpleTitle = CleanTorrentSuffixRegex.Replace(simpleTitle, string.Empty);
+
                 var airDateMatch = AirDateRegex.Match(simpleTitle);
                 if (airDateMatch.Success)
                 {

src/UI/Activity/Queue/QueueCollection.js

@@ -61,6 +61,19 @@ var QueueCollection = PageableCollection.extend({
 
                 return Number.MAX_VALUE;
             }
+        },
+
+        sizeleft : {
+            sortValue : function(model, attr) {
+                var size = model.get('size');
+                var sizeleft = model.get('sizeleft');
+
+                if (size && sizeleft) {
+                    return sizeleft / size;
+                }
+
+                return 0;
+            }
         }
     }
 });

src/UI/Activity/Queue/QueueLayout.js

@@ -61,7 +61,7 @@ module.exports = Marionette.Layout.extend({
             cellValue : 'this'
         },
         {
-            name      : 'episode',
+            name      : 'sizeleft',
             label     : 'Progress',
             cell      : ProgressCell,
             cellValue : 'this'

src/UI/Calendar/CalendarView.js

@@ -90,7 +90,7 @@ module.exports = Marionette.ItemView.extend({
 
                 element.find('.chart').tooltip({
                     title     : 'Episode is downloading - {0}% {1}'.format(progress.toFixed(1), releaseTitle),
-                    container : '.fc-content-skeleton'
+                    container : '.fc'
                 });
             }
         }
@@ -271,7 +271,7 @@ module.exports = Marionette.ItemView.extend({
         element.find('.fc-time').after('<span class="status pull-right"><i class="{0}"></i></span>'.format(icon));
         element.find('.status').tooltip({
             title     : tooltip,
-            container : '.fc-content-skeleton'
+            container : '.fc'
         });
     },
 

src/UI/Content/theme.less

@@ -81,6 +81,7 @@
 
   .opacity   (0.2);
   position  : fixed;
+  z-index   : 9999;
   bottom    : 50px;
   right     : 50px;
   display   : none;

src/UI/Release/DownloadReportCell.js

@@ -14,15 +14,23 @@ module.exports = Backgrid.Cell.extend({
 
         var self = this;
 
-        this.$el.html('<i class="icon-sonarr-spinner fa-spin" />');
+        this.$el.html('<i class="icon-sonarr-spinner fa-spin" title="Adding to download queue" />');
 
         //Using success callback instead of promise so it
         //gets called before the sync event is triggered
-        this.model.save(null, {
+        var promise = this.model.save(null, {
             success : function() {
                 self.model.set('queued', true);
             }
         });
+
+        promise.fail(function (xhr) {
+            if (xhr.responseJSON && xhr.responseJSON.message) {
+                self.$el.html('<i class="icon-sonarr-download-failed" title="{0}" />'.format(xhr.responseJSON.message));
+            } else {
+                self.$el.html('<i class="icon-sonarr-download-failed" title="Failed to add to download queue" />');
+            }
+        });
     },
 
     render : function() {

src/UI/Series/series.less

@@ -433,7 +433,10 @@
     .label {
       display       : inline-block;
       margin-bottom : 2px;
-      padding       : 4px 6px 3px 6px
+      padding       : 4px 6px 3px 6px;
+      max-width     : 100%;
+      white-space   : normal;
+      word-wrap     : break-word;
     }
   }
 

src/UI/jQuery/RouteBinder.js

@@ -25,9 +25,15 @@ var routeBinder = {
         var linkElement = $target.closest('a').first();
         var href = linkElement.attr('href');
 
-        // Set noreferrer for external links.
-        if (href && href.startsWith('http') && !linkElement.attr('rel')) {
-            linkElement.attr('rel', 'noreferrer');
+        if (href && href.startsWith('http')) {
+            // Set noreferrer for external links.
+            if (!linkElement.attr('rel')) {
+                linkElement.attr('rel', 'noreferrer');
+            }
+            // Open all external links in new windows.
+            if (!linkElement.attr('target')) {
+                linkElement.attr('target', '_blank');
+            }
         }
 
         if (linkElement.hasClass('no-router') || event.type !== 'click') {