From d9cc0d46009c19e77a8a69b0ae01b68363a5e8c7 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Fri, 7 Nov 2014 15:16:55 -0800 Subject: [PATCH] Fixed: Parsing Transmission version for nightly builds --- .../TransmissionTests/TransmissionFixture.cs | 13 +++++++++++++ .../Download/Clients/Transmission/Transmission.cs | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/NzbDrone.Core.Test/Download/DownloadClientTests/TransmissionTests/TransmissionFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadClientTests/TransmissionTests/TransmissionFixture.cs index 1ca5e2c2d..0556528cf 100644 --- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/TransmissionTests/TransmissionFixture.cs +++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/TransmissionTests/TransmissionFixture.cs @@ -346,5 +346,18 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests items.Should().HaveCount(1); items.First().OutputPath.Should().Be(@"C:\Downloads\Finished\transmission\" + _title); } + + [TestCase("2.84 ()")] + [TestCase("2.84+ ()")] + [TestCase("2.84 (other info)")] + [TestCase("2.84 (2.84)")] + public void should_version_should_only_check_version_number(String version) + { + Mocker.GetMock() + .Setup(s => s.GetVersion(It.IsAny())) + .Returns(version); + + Subject.Test(); + } } } diff --git a/src/NzbDrone.Core/Download/Clients/Transmission/Transmission.cs b/src/NzbDrone.Core/Download/Clients/Transmission/Transmission.cs index 08adef171..2288b2c28 100644 --- a/src/NzbDrone.Core/Download/Clients/Transmission/Transmission.cs +++ b/src/NzbDrone.Core/Download/Clients/Transmission/Transmission.cs @@ -188,7 +188,7 @@ namespace NzbDrone.Core.Download.Clients.Transmission _logger.Debug("Transmission version information: {0}", versionString); - var versionResult = Regex.Replace(versionString, @"\([^)]*\)", "", RegexOptions.IgnoreCase | RegexOptions.Multiline).Trim(); + var versionResult = Regex.Match(versionString, @"(?