Fixed: Security Vulnerabilities allowing authentication to be bypassed (discovered by Kyle Neideck)

Fixes #2167

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

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

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

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

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

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

src/NzbDrone.Api/Extensions/RequestExtensions.cs

@@ -36,5 +36,11 @@ namespace NzbDrone.Api.Extensions
         {
             return request.Path.StartsWith("/Content/", StringComparison.InvariantCultureIgnoreCase);
         }
+
+        public static bool IsSharedContentRequest(this Request request)
+        {
+            return request.Path.StartsWith("/MediaCover/", StringComparison.InvariantCultureIgnoreCase) ||
+                   request.Path.StartsWith("/Content/Images/", StringComparison.InvariantCultureIgnoreCase);
+        }
     }
 }

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

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

src/NzbDrone.Common/Http/HttpRequest.cs

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

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

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

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

@@ -205,18 +205,26 @@ namespace NzbDrone.Core.Test.Download
         }
 
         [Test]
-        public void should_not_attempt_download_if_client_is_disabled()
+        public void should_attempt_download_even_if_client_is_disabled()
         {
-            WithUsenetClient();
+            var mockUsenet = WithUsenetClient();
 
             Mocker.GetMock<IDownloadClientStatusService>()
-                  .Setup(v => v.IsDisabled(It.IsAny<int>()))
-                  .Returns(true);
+                  .Setup(v => v.GetBlockedProviders())
+                  .Returns(new List<DownloadClientStatus>
+                  {
+                      new DownloadClientStatus
+                      {
+                          ProviderId = _downloadClients.First().Definition.Id,
+                          DisabledTill = DateTime.UtcNow.AddHours(3)
+                      }
+                  });
 
-            Assert.Throws<DownloadClientUnavailableException>(() => Subject.DownloadReport(_parseResult));
+            Subject.DownloadReport(_parseResult);
 
-            Mocker.GetMock<IDownloadClient>().Verify(c => c.Download(It.IsAny<RemoteEpisode>()), Times.Never());
-            VerifyEventNotPublished<EpisodeGrabbedEvent>();
+            Mocker.GetMock<IDownloadClientStatusService>().Verify(c => c.GetBlockedProviders(), Times.Never());
+            mockUsenet.Verify(c => c.Download(It.IsAny<RemoteEpisode>()), Times.Once());
+            VerifyEventPublished<EpisodeGrabbedEvent>();
         }
 
         [Test]

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

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

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

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

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

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

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

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

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

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

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

@@ -195,6 +195,7 @@
     <Compile Include="Download\DownloadClientTests\VuzeTests\VuzeFixture.cs" />
     <Compile Include="Download\DownloadServiceFixture.cs" />
     <Compile Include="Download\FailedDownloadServiceFixture.cs" />
+    <Compile Include="Download\NzbValidationServiceFixture.cs" />
     <Compile Include="Download\Pending\PendingReleaseServiceTests\PendingReleaseServiceFixture.cs" />
     <Compile Include="Download\Pending\PendingReleaseServiceTests\RemovePendingFixture.cs" />
     <Compile Include="Download\Pending\PendingReleaseServiceTests\RemoveRejectedFixture.cs" />
@@ -571,6 +572,12 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
+    <None Include="Files\Nzbs\NotNzb.nzb">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Files\Nzbs\NoFiles.nzb">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Files\TestArchive.tar.gz">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -589,6 +596,9 @@
     <Content Include="Files\Xem\Names.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <None Include="Files\Nzbs\ValidNzb.nzb">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>

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

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

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

@@ -1,4 +1,4 @@
-using FluentAssertions;
+using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.Parser;
 using NzbDrone.Core.Qualities;
@@ -117,6 +117,7 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("[Eveyuu] No Game No Life - 10 [Hi10P 1280x720 H264][10B23BD8]", false)]
         [TestCase("Hells.Kitchen.US.S12E17.HR.WS.PDTV.X264-DIMENSION", false)]
         [TestCase("Survivorman.The.Lost.Pilots.Summer.HR.WS.PDTV.x264-DHD", false)]
+        [TestCase("Victoria S01E07 - Motor zmen (CZ)[TvRip][HEVC][720p]", false)]
         public void should_parse_hdtv720p_quality(string title, bool proper)
         {
             ParseAndVerifyQuality(title, Quality.HDTV720p, proper);
@@ -128,6 +129,7 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("DEXTER.S07E01.ARE.YOU.1080P.HDTV.proper.X264-QCF", true)]
         [TestCase("Dexter - S01E01 - Title [HDTV-1080p]", false)]
         [TestCase("[HorribleSubs] Yowamushi Pedal - 32 [1080p]", false)]
+        [TestCase("Victoria S01E07 - Motor zmen (CZ)[TvRip][HEVC][1080p]", false)]
         public void should_parse_hdtv1080p_quality(string title, bool proper)
         {
             ParseAndVerifyQuality(title, Quality.HDTV1080p, proper);

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

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

src/NzbDrone.Core/DecisionEngine/Specifications/TorrentSeedingSpecification.cs

@@ -4,7 +4,7 @@ using NzbDrone.Core.Indexers;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser.Model;
 
-namespace NzbDrone.Core.DecisionEngine.Specifications.Search
+namespace NzbDrone.Core.DecisionEngine.Specifications
 {
     public class TorrentSeedingSpecification : IDecisionEngineSpecification
     {

src/NzbDrone.Core/Download/Clients/Blackhole/UsenetBlackhole.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using FluentValidation.Results;
@@ -24,8 +24,9 @@ namespace NzbDrone.Core.Download.Clients.Blackhole
                                IConfigService configService,
                                IDiskProvider diskProvider,
                                IRemotePathMappingService remotePathMappingService,
+                               IValidateNzbs nzbValidationService,
                                Logger logger)
-            : base(httpClient, configService, diskProvider, remotePathMappingService, logger)
+            : base(httpClient, configService, diskProvider, remotePathMappingService, nzbValidationService, logger)
         {
             _scanWatchFolder = scanWatchFolder;
 

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
@@ -32,9 +32,10 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
                                      IConfigService configService,
                                      IDiskProvider diskProvider,
                                      IRemotePathMappingService remotePathMappingService,
+                                     IValidateNzbs nzbValidationService,
                                      Logger logger
                                      )
-            : base(httpClient, configService, diskProvider, remotePathMappingService, logger)
+            : base(httpClient, configService, diskProvider, remotePathMappingService, nzbValidationService, logger)
         {
             _dsInfoProxy = dsInfoProxy;
             _dsTaskProxy = dsTaskProxy;

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -23,8 +23,9 @@ namespace NzbDrone.Core.Download.Clients.NzbVortex
                        IConfigService configService,
                        IDiskProvider diskProvider,
                        IRemotePathMappingService remotePathMappingService,
+                       IValidateNzbs nzbValidationService,
                        Logger logger)
-            : base(httpClient, configService, diskProvider, remotePathMappingService, logger)
+            : base(httpClient, configService, diskProvider, remotePathMappingService, nzbValidationService, logger)
         {
             _proxy = proxy;
         }

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
@@ -26,8 +26,9 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
                       IConfigService configService,
                       IDiskProvider diskProvider,
                       IRemotePathMappingService remotePathMappingService,
+                      IValidateNzbs nzbValidationService,
                       Logger logger)
-            : base(httpClient, configService, diskProvider, remotePathMappingService, logger)
+            : base(httpClient, configService, diskProvider, remotePathMappingService, nzbValidationService, logger)
         {
             _proxy = proxy;
         }

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -23,8 +23,9 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
                        IConfigService configService,
                        IDiskProvider diskProvider,
                        IRemotePathMappingService remotePathMappingService,
+                       IValidateNzbs nzbValidationService,
                        Logger logger)
-            : base(httpClient, configService, diskProvider, remotePathMappingService, logger)
+            : base(httpClient, configService, diskProvider, remotePathMappingService, nzbValidationService, logger)
         {
             _proxy = proxy;
         }

src/NzbDrone.Core/Download/DownloadService.cs

@@ -56,11 +56,6 @@ namespace NzbDrone.Core.Download
                 throw new DownloadClientUnavailableException($"{remoteEpisode.Release.DownloadProtocol} Download client isn't configured yet");
             }
 
-            if (_downloadClientStatusService.IsDisabled(downloadClient.Definition.Id))
-            {
-                throw new DownloadClientUnavailableException($"{downloadClient.Name} is disabled due to recent failues");
-            }
-
             // Limit grabs to 2 per second.
             if (remoteEpisode.Release.DownloadUrl.IsNotNullOrWhiteSpace() && !remoteEpisode.Release.DownloadUrl.StartsWith("magnet:"))
             {

src/NzbDrone.Core/Download/InvalidNzbException.cs

@@ -0,0 +1,29 @@
+using System;
+using NzbDrone.Common.Exceptions;
+
+namespace NzbDrone.Core.Download
+{
+    public class InvalidNzbException : NzbDroneException
+    {
+        public InvalidNzbException(string message, params object[] args) : base(message, args)
+        {
+        }
+
+        public InvalidNzbException(string message) : base(message)
+        {
+        }
+
+        public InvalidNzbException(string message, Exception innerException, params object[] args) : base(message, innerException, args)
+        {
+        }
+
+        public InvalidNzbException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+
+        public InvalidNzbException(string message, string nzbName)
+            : base($"{message} [{0}]", nzbName)
+        {
+        }
+    }
+}

src/NzbDrone.Core/Download/NzbValidationService.cs

@@ -0,0 +1,45 @@
+using System.IO;
+using System.Linq;
+using System.Xml;
+using System.Xml.Linq;
+using NzbDrone.Common.Extensions;
+
+namespace NzbDrone.Core.Download
+{
+    public interface IValidateNzbs
+    {
+        void Validate(string filename, byte[] fileContent);
+    }
+
+    public class NzbValidationService : IValidateNzbs
+    {
+        public void Validate(string filename, byte[] fileContent)
+        {
+            var reader = new StreamReader(new MemoryStream(fileContent));
+
+            using (var xmlTextReader = XmlReader.Create(reader, new XmlReaderSettings { DtdProcessing = DtdProcessing.Ignore, IgnoreComments = true }))
+            {
+                var xDoc = XDocument.Load(xmlTextReader);
+                var nzb = xDoc.Root;
+
+                if (nzb == null)
+                {
+                    throw new InvalidNzbException("No Root element", filename);
+                }
+
+                if (!nzb.Name.LocalName.Equals("nzb"))
+                {
+                    throw new InvalidNzbException("Invalid root element", filename);
+                }
+
+                var ns = nzb.Name.Namespace;
+                var files = nzb.Elements(ns + "file").ToList();
+
+                if (files.Empty())
+                {
+                    throw new InvalidNzbException("No files", filename);
+                }
+            }
+        }
+    }
+}

src/NzbDrone.Core/Download/UsenetClientBase.cs

@@ -1,4 +1,4 @@
-using System.Net;
+using System.Net;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Exceptions;
@@ -16,15 +16,18 @@ namespace NzbDrone.Core.Download
         where TSettings : IProviderConfig, new()
     {
         protected readonly IHttpClient _httpClient;
+        private readonly IValidateNzbs _nzbValidationService;
 
         protected UsenetClientBase(IHttpClient httpClient,
                                    IConfigService configService,
                                    IDiskProvider diskProvider,
                                    IRemotePathMappingService remotePathMappingService,
+                                   IValidateNzbs nzbValidationService,
                                    Logger logger)
             : base(configService, diskProvider, remotePathMappingService, logger)
         {
             _httpClient = httpClient;
+            _nzbValidationService = nzbValidationService;
         }
 
         public override DownloadProtocol Protocol => DownloadProtocol.Usenet;
@@ -70,6 +73,8 @@ namespace NzbDrone.Core.Download
                 throw new ReleaseDownloadException(remoteEpisode.Release, "Downloading nzb failed", ex);
             }
 
+            _nzbValidationService.Validate(filename, nzbData);
+
             _logger.Info("Adding report [{0}] to the queue.", remoteEpisode.Release.Title);
             return AddFromNzbFile(remoteEpisode, filename, nzbData);
         }

src/NzbDrone.Core/MediaFiles/EpisodeImport/Manual/ManualImportService.cs

@@ -150,6 +150,16 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Manual
                 }
             }
 
+            if (series == null)
+            {
+                var relativeParseInfo = Parser.Parser.ParsePath(relativeFile);
+
+                if (relativeParseInfo != null)
+                {
+                    series = _seriesService.FindByTitle(relativeParseInfo.SeriesTitle);
+                }
+            }
+
             if (series == null)
             {
                 var localEpisode = new LocalEpisode();

src/NzbDrone.Core/MediaFiles/MediaFileDeletionService.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Net;
 using NLog;
@@ -41,11 +41,13 @@ namespace NzbDrone.Core.MediaFiles
 
             if (!_diskProvider.FolderExists(rootFolder))
             {
+                _logger.Warn("Series' root folder ({0}) doesn't exist.", rootFolder);
                 throw new NzbDroneClientException(HttpStatusCode.Conflict, "Series' root folder ({0}) doesn't exist.", rootFolder);
             }
 
             if (_diskProvider.GetDirectories(rootFolder).Empty())
             {
+                _logger.Warn("Series' root folder ({0}) is empty.", rootFolder);
                 throw new NzbDroneClientException(HttpStatusCode.Conflict, "Series' root folder ({0}) is empty.", rootFolder);
             }
 

src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoFormatter.cs

@@ -2,6 +2,7 @@ using System;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 using NLog;
 using NLog.Fluent;
 using NzbDrone.Common.Extensions;
@@ -16,36 +17,19 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
 
         public static decimal FormatAudioChannels(MediaInfoModel mediaInfo)
         {
-            var audioChannelPositions = mediaInfo.AudioChannelPositions;
-            var audioChannelPositionsText = mediaInfo.AudioChannelPositionsText;
-            var audioChannels = mediaInfo.AudioChannels;
+            var audioChannels = FormatAudioChannelsFromAudioChannelPositions(mediaInfo);
 
-            if (audioChannelPositions.IsNullOrWhiteSpace())
+            if (audioChannels == null)
             {
-                if (audioChannelPositionsText.IsNullOrWhiteSpace())
-                {
-                    if (mediaInfo.SchemaRevision >= 3)
-                    {
-                        return audioChannels;
-                    }
-
-                    return 0;
-                }
-
-                return mediaInfo.AudioChannelPositionsText.ContainsIgnoreCase("LFE") ? audioChannels - 1 + 0.1m : audioChannels;
+                audioChannels = FormatAudioChannelsFromAudioChannelPositionsText(mediaInfo);
             }
 
-            if (audioChannelPositions.Contains("+"))
+            if (audioChannels == null)
             {
-                return audioChannelPositions.Split('+')
-                                            .Sum(s => decimal.Parse(s.Trim(), CultureInfo.InvariantCulture));
+                audioChannels = FormatAudioChannelsFromAudioChannels(mediaInfo);
             }
 
-            return audioChannelPositions.Replace("Object Based / ", "")
-                                            .Split(new string[] { " / " }, StringSplitOptions.RemoveEmptyEntries)
-                                            .First()
-                                            .Split('/')
-                                            .Sum(s => decimal.Parse(s, CultureInfo.InvariantCulture));
+            return audioChannels ?? 0;
         }
 
         public static string FormatAudioCodec(MediaInfoModel mediaInfo, string sceneName)
@@ -354,6 +338,79 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
             return videoCodec;
         }
 
+        private static decimal? FormatAudioChannelsFromAudioChannelPositions(MediaInfoModel mediaInfo)
+        {
+            var audioChannelPositions = mediaInfo.AudioChannelPositions;
+
+            if (audioChannelPositions.IsNullOrWhiteSpace())
+            {
+                return null;
+            }
+
+            try
+            {
+                Logger.Debug("Formatiting audio channels using 'AudioChannelPositions', with a value of: '{0}'", audioChannelPositions);
+
+                if (audioChannelPositions.Contains("+"))
+                {
+                    return audioChannelPositions.Split('+')
+                                                .Sum(s => decimal.Parse(s.Trim(), CultureInfo.InvariantCulture));
+                }
+
+
+                return Regex.Replace(audioChannelPositions, @"^\d+\sobjects", "", RegexOptions.Compiled | RegexOptions.IgnoreCase)
+                                            .Replace("Object Based / ", "")
+                                            .Split(new string[] { " / " }, StringSplitOptions.RemoveEmptyEntries)
+                                            .FirstOrDefault()
+                                           ?.Split('/')
+                                            .Sum(s => decimal.Parse(s, CultureInfo.InvariantCulture));
+            }
+            catch (Exception e)
+            {
+                Logger.Warn(e, "Unable to format audio channels using 'AudioChannelPositions'");
+            }
+
+            return null;
+        }
+
+        private static decimal? FormatAudioChannelsFromAudioChannelPositionsText(MediaInfoModel mediaInfo)
+        {
+            var audioChannelPositionsText = mediaInfo.AudioChannelPositionsText;
+            var audioChannels = mediaInfo.AudioChannels;
+
+            if (audioChannelPositionsText.IsNullOrWhiteSpace())
+            {
+                return null;
+            }
+
+            try
+            {
+                Logger.Debug("Formatiting audio channels using 'AudioChannelPositionsText', with a value of: '{0}'", audioChannelPositionsText);
+
+                return mediaInfo.AudioChannelPositionsText.ContainsIgnoreCase("LFE") ? audioChannels - 1 + 0.1m : audioChannels;
+            }
+            catch (Exception e)
+            {
+                Logger.Warn(e, "Unable to format audio channels using 'AudioChannelPositionsText'");
+            }
+
+            return null;
+        }
+
+        private static decimal? FormatAudioChannelsFromAudioChannels(MediaInfoModel mediaInfo)
+        {
+            var audioChannels = mediaInfo.AudioChannels;
+
+            if (mediaInfo.SchemaRevision >= 3)
+            {
+                Logger.Debug("Formatiting audio channels using 'AudioChannels', with a value of: '{0}'", audioChannels);
+
+                return audioChannels;
+            }
+
+            return null;
+        }
+
         private static string GetSceneNameMatch(string sceneName, params string[] tokens)
         {
             sceneName = sceneName.IsNotNullOrWhiteSpace() ? Path.GetFileNameWithoutExtension(sceneName) : string.Empty;

src/NzbDrone.Core/Notifications/Slack/Payloads/SlackPayload.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace NzbDrone.Core.Notifications.Slack.Payloads
@@ -15,6 +15,8 @@ namespace NzbDrone.Core.Notifications.Slack.Payloads
         [JsonProperty("icon_url")]
         public string IconUrl { get; set; }
 
+        public string Channel { get; set; }
+
         public List<Attachment> Attachments { get; set; }
     }
 }

src/NzbDrone.Core/Notifications/Slack/Slack.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using FluentValidation.Results;
 using NLog;
@@ -107,6 +107,7 @@ namespace NzbDrone.Core.Notifications.Slack
         private SlackPayload CreatePayload(string message, List<Attachment> attachments = null)
         {
             var icon = Settings.Icon;
+            var channel = Settings.Channel;
 
             var payload = new SlackPayload
             {
@@ -128,6 +129,11 @@ namespace NzbDrone.Core.Notifications.Slack
                 }
             }
 
+            if (channel.IsNotNullOrWhiteSpace())
+            {
+                payload.Channel = channel;
+            }
+
             return payload;
         }
     }

src/NzbDrone.Core/Notifications/Slack/SlackSettings.cs

@@ -1,4 +1,4 @@
-using FluentValidation;
+using FluentValidation;
 using NzbDrone.Core.Annotations;
 using NzbDrone.Core.ThingiProvider;
 using NzbDrone.Core.Validation;
@@ -27,6 +27,9 @@ namespace NzbDrone.Core.Notifications.Slack
         [FieldDefinition(2, Label = "Icon", HelpText = "Change the icon that is used for messages from this integration (Emoji or URL)", Type = FieldType.Textbox, HelpLink = "http://www.emoji-cheat-sheet.com/")]
         public string Icon { get; set; }
 
+        [FieldDefinition(3, Label = "Channel", HelpText = "Overrides the default channel for the incoming webhook (#other-channel)", Type = FieldType.Textbox)]
+        public string Channel { get; set; }
+
         public NzbDroneValidationResult Validate()
         {
             return new NzbDroneValidationResult(Validator.Validate(this));

src/NzbDrone.Core/Notifications/Webhook/WebhookProxy.cs

@@ -1,6 +1,7 @@
-using NzbDrone.Common.Http;
+using NzbDrone.Common.Http;
 using NzbDrone.Common.Serializer;
 using NzbDrone.Core.Rest;
+using NzbDrone.Common.Extensions;
 
 namespace NzbDrone.Core.Notifications.Webhook
 {
@@ -30,6 +31,10 @@ namespace NzbDrone.Core.Notifications.Webhook
                 request.Headers.ContentType = "application/json";
                 request.SetContent(body.ToJson());
 
+                if (settings.Username.IsNotNullOrWhiteSpace() || settings.Password.IsNotNullOrWhiteSpace())
+                {
+                    request.AddBasicAuthentication(settings.Username, settings.Password);
+                }
                 _httpClient.Execute(request);
             }
             catch (RestException ex)

src/NzbDrone.Core/Notifications/Webhook/WebhookSettings.cs

@@ -29,6 +29,12 @@ namespace NzbDrone.Core.Notifications.Webhook
         [FieldDefinition(1, Label = "Method", Type = FieldType.Select, SelectOptions = typeof(WebhookMethod), HelpText = "Which HTTP method to use submit to the Webservice")]
         public int Method { get; set; }
 
+        [FieldDefinition(2, Label = "Username")]
+        public string Username { get; set; }
+
+        [FieldDefinition(3, Label = "Password", Type = FieldType.Password)]
+        public string Password { get; set; }
+
         public NzbDroneValidationResult Validate()
         {
             return new NzbDroneValidationResult(Validator.Validate(this));

src/NzbDrone.Core/NzbDrone.Core.csproj

@@ -507,6 +507,8 @@
     <Compile Include="Download\DownloadEventHub.cs" />
     <Compile Include="Download\DownloadClientStatusRepository.cs" />
     <Compile Include="Download\DownloadClientStatusService.cs" />
+    <Compile Include="Download\InvalidNzbException.cs" />
+    <Compile Include="Download\NzbValidationService.cs" />
     <Compile Include="Download\Pending\PendingReleaseReason.cs" />
     <Compile Include="Download\TrackedDownloads\DownloadMonitoringService.cs" />
     <Compile Include="Download\TrackedDownloads\TrackedDownload.cs" />

src/NzbDrone.Core/Parser/Parser.cs

@@ -26,8 +26,12 @@ namespace NzbDrone.Core.Parser
                 new Regex(@"^(?:\W*S?(?<season>(?<!\d+)(?:\d{1,2}|\d{4})(?!\d+))(?:(?:[ex]){1,2}(?<episode>\d{1,3}(?!\d+)))+){2,}",
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
-                //Episodes without a title, Single (S01E05, 1x05) AND Multi (S01E04E05, 1x04x05, etc)
-                new Regex(@"^(?:S?(?<season>(?<!\d+)(?:\d{1,2}|\d{4})(?!\d+))(?:(?:\-|[ex]|\W[ex]|_){1,2}(?<episode>\d{2,3}(?!\d+)))+)",
+                //Episodes without a title, Multi (S01E04E05, 1x04x05, etc)
+                new Regex(@"^(?:S?(?<season>(?<!\d+)(?:\d{1,2}|\d{4})(?!\d+))(?:(?:[-_]|[ex])(?<episode>\d{2,3}(?!\d+))){2,})",
+                          RegexOptions.IgnoreCase | RegexOptions.Compiled),
+
+                //Episodes without a title, Single (S01E05, 1x05)
+                new Regex(@"^(?:S?(?<season>(?<!\d+)(?:\d{1,2}|\d{4})(?!\d+))(?:(?:[-_ ]?[ex])(?<episode>\d{2,3}(?!\d+))))",
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
                 //Anime - [SubGroup] Title Episode Absolute Episode Number ([SubGroup] Series Title Episode 01)
@@ -262,6 +266,9 @@ namespace NzbDrone.Core.Parser
         private static readonly Regex CleanTorrentSuffixRegex = new Regex(@"\[(?:ettv|rartv|rarbg|cttv)\]$",
                                                                    RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
+        private static readonly Regex CleanQualityBracketsRegex = new Regex(@"\[[a-z0-9 ._-]+\]$",
+                                                                   RegexOptions.IgnoreCase | RegexOptions.Compiled);
+
         private static readonly Regex ReleaseGroupRegex = new Regex(@"-(?<releasegroup>[a-z0-9]+)(?<!WEB-DL|480p|720p|1080p|2160p)(?:\b|[-._ ])",
                                                                 RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
@@ -329,6 +336,16 @@ namespace NzbDrone.Core.Parser
 
                 simpleTitle = CleanTorrentSuffixRegex.Replace(simpleTitle, string.Empty);
 
+                simpleTitle = CleanQualityBracketsRegex.Replace(simpleTitle, m =>
+                {
+                    if (QualityParser.ParseQualityName(m.Value).Quality != Qualities.Quality.Unknown)
+                    {
+                        return string.Empty;
+                    }
+
+                    return m.Value;
+                });
+
                 var airDateMatch = AirDateRegex.Match(simpleTitle);
                 if (airDateMatch.Success)
                 {

src/NzbDrone.Core/Parser/QualityParser.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -57,6 +57,29 @@ namespace NzbDrone.Core.Parser
             Logger.Debug("Trying to parse quality for {0}", name);
 
             name = name.Trim();
+
+            var result = ParseQualityName(name);
+
+            //Based on extension
+            if (result.Quality == Quality.Unknown && !name.ContainsInvalidPathChars())
+            {
+                try
+                {
+                    result.Quality = MediaFileExtensions.GetQualityForExtension(Path.GetExtension(name));
+                    result.QualitySource = QualitySource.Extension;
+                }
+                catch (ArgumentException)
+                {
+                    //Swallow exception for cases where string contains illegal
+                    //path characters.
+                }
+            }
+
+            return result;
+        }
+
+        public static QualityModel ParseQualityName(string name)
+        {
             var normalizedName = name.Replace('_', ' ').Trim().ToLower();
             var result = ParseQualityModifiers(name, normalizedName);
 
@@ -190,6 +213,18 @@ namespace NzbDrone.Core.Parser
                     sourceMatch.Groups["dsr"].Success ||
                     sourceMatch.Groups["tvrip"].Success)
                 {
+                    if (resolution == Resolution.R1080p || normalizedName.Contains("1080p"))
+                    {
+                        result.Quality = Quality.HDTV1080p;
+                        return result;
+                    }
+
+                    if (resolution == Resolution.R720p || normalizedName.Contains("720p"))
+                    {
+                        result.Quality = Quality.HDTV720p;
+                        return result;
+                    }
+
                     if (HighDefPdtvRegex.IsMatch(normalizedName))
                     {
                         result.Quality = Quality.HDTV720p;
@@ -298,21 +333,6 @@ namespace NzbDrone.Core.Parser
                 result.Quality = otherSourceMatch;
             }
 
-            //Based on extension
-            if (result.Quality == Quality.Unknown && !name.ContainsInvalidPathChars())
-            {
-                try
-                {
-                    result.Quality = MediaFileExtensions.GetQualityForExtension(Path.GetExtension(name));
-                    result.QualitySource = QualitySource.Extension;
-                }
-                catch (ArgumentException)
-                {
-                    //Swallow exception for cases where string contains illegal
-                    //path characters.
-                }
-            }
-
             return result;
         }
 

src/NzbDrone.Core/ThingiProvider/Status/ProviderStatusServiceBase.cs

@@ -10,7 +10,6 @@ namespace NzbDrone.Core.ThingiProvider.Status
     public interface IProviderStatusServiceBase<TModel>
         where TModel : ProviderStatusBase, new()
     {
-        bool IsDisabled(int providerId);
         List<TModel> GetBlockedProviders();
         void RecordSuccess(int providerId);
         void RecordFailure(int providerId, TimeSpan minimumBackOff = default(TimeSpan));
@@ -37,11 +36,6 @@ namespace NzbDrone.Core.ThingiProvider.Status
             _logger = logger;
         }
 
-        public bool IsDisabled(int providerId)
-        {
-            return GetProviderStatus(providerId).IsDisabled();
-        }
-
         public virtual List<TModel> GetBlockedProviders()
         {
             return _providerStatusRepository.All().Where(v => v.IsDisabled()).ToList();

src/NzbDrone.Integration.Test/CorsFixture.cs

@@ -8,30 +8,37 @@ namespace NzbDrone.Integration.Test
     [TestFixture]
     public class CorsFixture : IntegrationTest
     {
-        private RestRequest BuildRequest()
+        private RestRequest BuildGet(string route = "series")
         {
-            var request = new RestRequest("series");
+            var request = new RestRequest(route, Method.GET);
             request.AddHeader(AccessControlHeaders.RequestMethod, "POST");
 
             return request;
         }
 
+        private RestRequest BuildOptions(string route = "series")
+        {
+            var request = new RestRequest(route, Method.OPTIONS);
+
+            return request;
+        }
+
         [Test]
         public void should_not_have_allow_headers_in_response_when_not_included_in_the_request()
         {
-            var request = BuildRequest();
-            var response = RestClient.Get(request);
-            
+            var request = BuildOptions();
+            var response = RestClient.Execute(request);
+
             response.Headers.Should().NotContain(h => h.Name == AccessControlHeaders.AllowHeaders);
         }
 
         [Test]
         public void should_have_allow_headers_in_response_when_included_in_the_request()
         {
-            var request = BuildRequest();
+            var request = BuildOptions();
             request.AddHeader(AccessControlHeaders.RequestHeaders, "X-Test");
 
-            var response = RestClient.Get(request);
+            var response = RestClient.Execute(request);
 
             response.Headers.Should().Contain(h => h.Name == AccessControlHeaders.AllowHeaders);
         }
@@ -39,8 +46,8 @@ namespace NzbDrone.Integration.Test
         [Test]
         public void should_have_allow_origin_in_response()
         {
-            var request = BuildRequest();
-            var response = RestClient.Get(request);
+            var request = BuildOptions();
+            var response = RestClient.Execute(request);
 
             response.Headers.Should().Contain(h => h.Name == AccessControlHeaders.AllowOrigin);
         }
@@ -48,10 +55,37 @@ namespace NzbDrone.Integration.Test
         [Test]
         public void should_have_allow_methods_in_response()
         {
-            var request = BuildRequest();
-            var response = RestClient.Get(request);
+            var request = BuildOptions();
+            var response = RestClient.Execute(request);
 
             response.Headers.Should().Contain(h => h.Name == AccessControlHeaders.AllowMethods);
         }
+
+        [Test]
+        public void should_not_have_allow_methods_in_non_options_request()
+        {
+            var request = BuildGet();
+            var response = RestClient.Execute(request);
+
+            response.Headers.Should().NotContain(h => h.Name == AccessControlHeaders.AllowMethods);
+        }
+
+        [Test]
+        public void should_have_allow_origin_in_non_options_request()
+        {
+            var request = BuildGet();
+            var response = RestClient.Execute(request);
+
+            response.Headers.Should().Contain(h => h.Name == AccessControlHeaders.AllowOrigin);
+        }
+
+        [Test]
+        public void should_not_have_allow_origin_in_non_api_request()
+        {
+            var request = BuildGet("../abc");
+            var response = RestClient.Execute(request);
+
+            response.Headers.Should().NotContain(h => h.Name == AccessControlHeaders.AllowOrigin);
+        }
     }
 }

src/NzbDrone.Mono/Disk/DiskProvider.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -81,8 +81,8 @@ namespace NzbDrone.Mono.Disk
                                      .Concat(GetDriveInfoMounts()
                                                  .Select(d => new DriveInfoMount(d, FindDriveType.Find(d.DriveFormat)))
                                                  .Where(d => d.DriveType == DriveType.Fixed ||
-                                                             d.DriveType == DriveType.Network || d.DriveType ==
-                                                             DriveType.Removable))
+                                                             d.DriveType == DriveType.Network ||
+                                                             d.DriveType == DriveType.Removable))
                                      .DistinctBy(v => v.RootDirectory)
                                      .ToList();
         }

src/NzbDrone.Mono/Disk/FindDriveType.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using NzbDrone.Common.Extensions;
 
@@ -9,6 +9,7 @@ namespace NzbDrone.Mono.Disk
         private static readonly Dictionary<string, DriveType> DriveTypeMap = new Dictionary<string, DriveType>
                                                                                   {
                                                                                       { "afpfs", DriveType.Network },
+                                                                                      { "apfs", DriveType.Fixed },
                                                                                       { "zfs", DriveType.Fixed }
                                                                                   };
 

src/NzbDrone.Mono/EnvironmentInfo/VersionAdapters/SynologyVersionAdapter.cs

@@ -45,7 +45,7 @@ namespace NzbDrone.Mono.EnvironmentInfo.VersionAdapters
                 if (parts.Length >= 2)
                 {
                     var key = parts[0];
-                    var value = parts[1];
+                    var value = parts[1].Trim('"');
 
                     if (!string.IsNullOrWhiteSpace(value))
                     {
@@ -75,4 +75,4 @@ namespace NzbDrone.Mono.EnvironmentInfo.VersionAdapters
 
         public bool Enabled => OsInfo.IsLinux;
     }
-}
+}

src/UI/ManualImport/ManualImportCollection.js

@@ -36,6 +36,12 @@ var Collection = PageableCollection.extend({
     },
 
     sortMappings : {
+        relativePath : {
+            sortValue : function(model, attr, order) {
+                return model.get(attr).toLowerCase();
+            }
+        },
+
         series : {
             sortValue : function(model, attr, order) {
                 var series = model.get(attr);
@@ -71,4 +77,4 @@ var Collection = PageableCollection.extend({
 
 Collection = AsSortedCollection.call(Collection);
 
-module.exports = Collection;
+module.exports = Collection;

src/UI/Series/SeriesCollection.js

@@ -94,8 +94,9 @@ var Collection = PageableCollection.extend({
 
         percentOfEpisodes : {
             sortValue : function(model, attr) {
-                var percentOfEpisodes = model.get(attr);
                 var episodeCount = model.get('episodeCount');
+                var episodeFileCount = model.get('episodeFileCount');
+                var percentOfEpisodes = episodeCount ? episodeFileCount / episodeCount * 100 : 100;
 
                 return percentOfEpisodes + episodeCount / 1000000;
             }