From d6920ee8eafe26ca36b9879e5aae656c187002c9 Mon Sep 17 00:00:00 2001
From: Mark McDowall <markus.mcd5@gmail.com>
Date: Sat, 18 Jun 2011 00:17:47 -0700
Subject: [PATCH] Fixed EpisodeProvider queries with multiple terms.

SeriesProvider.FindSeries will now return the QualityProfile when a series is found.
---
 NzbDrone.Core.Test/MediaFileProviderTests.cs |   1 -
 NzbDrone.Core.Test/SeriesProviderTest.cs     | Bin 7923 -> 9396 bytes
 NzbDrone.Core/NzbDrone.Core.csproj           |   1 -
 NzbDrone.Core/Providers/EpisodeProvider.cs   |   4 ++--
 NzbDrone.Core/Providers/SeriesProvider.cs    |  10 +++++++++-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/NzbDrone.Core.Test/MediaFileProviderTests.cs b/NzbDrone.Core.Test/MediaFileProviderTests.cs
index e784982ca..e99763e0b 100644
--- a/NzbDrone.Core.Test/MediaFileProviderTests.cs
+++ b/NzbDrone.Core.Test/MediaFileProviderTests.cs
@@ -106,7 +106,6 @@ namespace NzbDrone.Core.Test
             mocker.GetMock<DiskProvider>()
                 .Setup(e => e.GetSize(fileName)).Returns(size).Verifiable();
 
-
             //Act
             var result = mocker.Resolve<MediaFileProvider>().ImportFile(fakeSeries, fileName);
 
diff --git a/NzbDrone.Core.Test/SeriesProviderTest.cs b/NzbDrone.Core.Test/SeriesProviderTest.cs
index 1a24be68f77b8700a55d154053b39931f0805b1b..b1eb188ad733ccf9d7e71d93839643d6c02ceacf 100644
GIT binary patch
delta 279
zcmextyTx-uo{+p-W?o8sacWU!YH@s0Wqfi@YGR&WVs2`DZel?}YRcpZOwyA-@ExAq
z$1E{<C%??(PfQYW$qKf13dwrTAhjWxB{``IwhBr)iRJl4DXB$DlNnj$CLa|LnEZkN
z;p7B<_F(ta65ssfY@6WZ)Vx$*ps|^G=>bLgWtl+Lb{d*`!Ko#s1scU5LyPr*ii5$f
z@l4S`n5n6$7X(yQlvk`_sA<j1HTfZ@^yGU2ilQLrL)0Uwo-D{Cx>;V(fqAk$yU^xh
ykvWW$ZG^=q|Kr!59KbI=d4+)NWKo`;$-QENlf`-XC$AUFoZKn+bhD%QCUyWRz+qSb

delta 54
zcmV-60LlNfN%K9hZW5D-3lg&h7vBMs`V0@V@fe{2la3G*lkW)%lRyk%law0~lcO7Y
MlbjAIvjQEm2UQ*va{vGU

diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj
index 2c886d4bc..d5188af6d 100644
--- a/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/NzbDrone.Core/NzbDrone.Core.csproj
@@ -292,7 +292,6 @@
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
-  <ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/NzbDrone.Core/Providers/EpisodeProvider.cs b/NzbDrone.Core/Providers/EpisodeProvider.cs
index 86d1e68e0..66f2e342c 100644
--- a/NzbDrone.Core/Providers/EpisodeProvider.cs
+++ b/NzbDrone.Core/Providers/EpisodeProvider.cs
@@ -38,12 +38,12 @@ namespace NzbDrone.Core.Providers
 
         public virtual Episode GetEpisode(int seriesId, int seasonNumber, int episodeNumber)
         {
-            return _database.Single<Episode>("WHERE SeriesId = @0 AND SeasonNumber = @2 AND EpisodeNumber = @3", seriesId, seasonNumber, episodeNumber);
+            return _database.Single<Episode>("WHERE SeriesId = @0 AND SeasonNumber = @1 AND EpisodeNumber = @2", seriesId, seasonNumber, episodeNumber);
         }
 
         public virtual Episode GetEpisode(int seriesId, DateTime date)
         {
-            return _database.Single<Episode>("WHERE SeriesId = @0 AND AirDate = @2", seriesId, date.Date);
+            return _database.Single<Episode>("WHERE SeriesId = @0 AND AirDate = @1", seriesId, date.Date);
         }
 
         public virtual IList<Episode> GetEpisodeBySeries(long seriesId)
diff --git a/NzbDrone.Core/Providers/SeriesProvider.cs b/NzbDrone.Core/Providers/SeriesProvider.cs
index c2c5b02b8..1eab2b3bd 100644
--- a/NzbDrone.Core/Providers/SeriesProvider.cs
+++ b/NzbDrone.Core/Providers/SeriesProvider.cs
@@ -119,7 +119,15 @@ namespace NzbDrone.Core.Providers
                 return GetSeries(seriesId.Value);
             }
 
-            return _database.FirstOrDefault<Series>("WHERE CleanTitle = @0", normalizeTitle);
+            var series = _database.FirstOrDefault<Series>("WHERE CleanTitle = @0", normalizeTitle);
+
+            if (series != null)
+            {
+                series.QualityProfile = _qualityProvider.Get(series.QualityProfileId);
+                return series;
+            }
+
+            return null;
         }
 
         public virtual void UpdateSeries(Series series)