From 7cb1e91ba1766091aebf126f5aa26a495c55ebcc Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 16 Feb 2016 23:49:13 -0800 Subject: [PATCH] Handle 1.1x version from Sabnzbd --- .../DownloadClientTests/SabnzbdTests/SabnzbdFixture.cs | 1 + src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/NzbDrone.Core.Test/Download/DownloadClientTests/SabnzbdTests/SabnzbdFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadClientTests/SabnzbdTests/SabnzbdFixture.cs index 668f66143..a6fe80687 100644 --- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/SabnzbdTests/SabnzbdFixture.cs +++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/SabnzbdTests/SabnzbdFixture.cs @@ -402,6 +402,7 @@ public void should_return_status_with_mounted_outputdir() [TestCase("0.8.0", true)] [TestCase("1.0.0", true)] [TestCase("1.0.0RC1", true)] + [TestCase("1.1.x", true)] public void should_test_version(string version, bool expected) { Mocker.GetMock() diff --git a/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs b/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs index 79830fb6b..06054da8c 100644 --- a/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs +++ b/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs @@ -29,7 +29,8 @@ public Sabnzbd(ISabnzbdProxy proxy, _proxy = proxy; } - private static readonly Regex VersionRegex = new Regex(@"(?\d+)\.(?\d+)\.(?\d+)(?.*)", RegexOptions.Compiled); + // patch can be a number (releases) or 'x' (git) + private static readonly Regex VersionRegex = new Regex(@"(?\d+)\.(?\d+)\.(?\d+|x)(?.*)", RegexOptions.Compiled); protected override string AddFromNzbFile(RemoteEpisode remoteEpisode, string filename, byte[] fileContent) {