From d28e94868ca28eec667a3d605883a7d9d08f50de Mon Sep 17 00:00:00 2001
From: Mark McDowall <markus.mcd5@gmail.com>
Date: Fri, 17 Jun 2011 20:11:04 -0700
Subject: [PATCH] Parser will remove quotes before trying to get filename from
 the path.

HistoryController - Gets Series from seriesProvider.
UpcomingComtroller - Gets Series from seriesProvider.
---
 NzbDrone.Core.Test/ParserTest.cs               |  2 ++
 NzbDrone.Core/NzbDrone.Core.csproj             |  4 +---
 NzbDrone.Core/Parser.cs                        |  2 +-
 NzbDrone.Web/Controllers/HistoryController.cs  | 14 +++++++-------
 NzbDrone.Web/Controllers/UpcomingController.cs | 12 +++++++-----
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/NzbDrone.Core.Test/ParserTest.cs b/NzbDrone.Core.Test/ParserTest.cs
index 27e5a8309..0958a65b1 100644
--- a/NzbDrone.Core.Test/ParserTest.cs
+++ b/NzbDrone.Core.Test/ParserTest.cs
@@ -38,6 +38,8 @@ namespace NzbDrone.Core.Test
         [TestCase("The.Office.S03E115.DVDRip.XviD-OSiTV", "The.Office", 3, 115)]
         [TestCase(@"Parks and Recreation - S02E21 - 94 Meetings - 720p TV.mkv", "Parks and Recreation", 2, 21)]
         [TestCase(@"24-7 Penguins-Capitals- Road to the NHL Winter Classic - S01E03 - Episode 3.mkv", "24-7 Penguins-Capitals- Road to the NHL Winter Classic", 1, 3)]
+        [TestCase("Adventure.Inc.S03E19.DVDRip.\"XviD\"-OSiTV", "Adventure.Inc", 3, 19)]
+        [TestCase("C:/Test/TV/Chuck.4x05.HDTV.XviD-LOL", "Chuck", 4, 5)]
         public void episode_parse(string postTitle, string title, int season, int episode)
         {
             var result = Parser.ParseEpisodeInfo(postTitle);
diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj
index 7a891636b..7025f290c 100644
--- a/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/NzbDrone.Core/NzbDrone.Core.csproj
@@ -305,9 +305,7 @@
   <ItemGroup>
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Models\" />
-  </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/Parser.cs b/NzbDrone.Core/Parser.cs
index bf259a852..6079340af 100644
--- a/NzbDrone.Core/Parser.cs
+++ b/NzbDrone.Core/Parser.cs
@@ -46,7 +46,7 @@ namespace NzbDrone.Core
         private static readonly Regex NormalizeRegex = new Regex(@"((^|\W)(a|an|the|and|or|of)($|\W))|\W|(?:(?<=[^0-9]+)|\b)(?!(?:19\d{2}|20\d{2}))\d+(?=[^0-9ip]+|\b)",
                                                                  RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
-        private static readonly Regex SimpleTitleRegex = new Regex(@"480[i|p]|720[i|p]|1080[i|p]|[x|h]264|\<|\>|\?|\*|\:|\|",
+        private static readonly Regex SimpleTitleRegex = new Regex(@"480[i|p]|720[i|p]|1080[i|p]|[x|h]264|\<|\>|\?|\*|\:|\||""",
                                                               RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
         /// <summary>
diff --git a/NzbDrone.Web/Controllers/HistoryController.cs b/NzbDrone.Web/Controllers/HistoryController.cs
index 31aa45275..344af644a 100644
--- a/NzbDrone.Web/Controllers/HistoryController.cs
+++ b/NzbDrone.Web/Controllers/HistoryController.cs
@@ -13,11 +13,14 @@ namespace NzbDrone.Web.Controllers
     {
         private readonly HistoryProvider _historyProvider;
         private readonly EpisodeProvider _episodeProvider;
+        private readonly SeriesProvider _seriesProvider;
 
-        public HistoryController(HistoryProvider historyProvider, EpisodeProvider episodeProvider)
+        public HistoryController(HistoryProvider historyProvider, EpisodeProvider episodeProvider,
+            SeriesProvider seriesProvider)
         {
             _historyProvider = historyProvider;
             _episodeProvider = episodeProvider;
+            _seriesProvider = seriesProvider;
         }
 
         //
@@ -43,17 +46,14 @@ namespace NzbDrone.Web.Controllers
         [GridAction]
         public ActionResult _AjaxBinding()
         {
-
-            //TODO: possible subsonic bug, IQuarible causes some issues so ToList() is called
-            //https://github.com/subsonic/SubSonic-3.0/issues/263
-
-            var historyDb = _historyProvider.AllItems().ToList();
+            var historyDb = _historyProvider.AllItems();
             
             var history = new List<HistoryModel>();
 
             foreach (var item in historyDb)
             {
                 var episode = _episodeProvider.GetEpisode(item.EpisodeId);
+                var series = _seriesProvider.GetSeries(item.SeriesId);
        
                 history.Add(new HistoryModel
                                             {
@@ -62,7 +62,7 @@ namespace NzbDrone.Web.Controllers
                                                 EpisodeNumber = episode.EpisodeNumber,
                                                 EpisodeTitle = episode.Title,
                                                 EpisodeOverview = episode.Overview,
-                                                SeriesTitle = episode.Series.Title,
+                                                SeriesTitle = series.Title,
                                                 NzbTitle = item.NzbTitle,
                                                 Quality = item.Quality.ToString(),
                                                 IsProper = item.IsProper,
diff --git a/NzbDrone.Web/Controllers/UpcomingController.cs b/NzbDrone.Web/Controllers/UpcomingController.cs
index a214e3ebf..d5c02f4a4 100644
--- a/NzbDrone.Web/Controllers/UpcomingController.cs
+++ b/NzbDrone.Web/Controllers/UpcomingController.cs
@@ -11,10 +11,12 @@ namespace NzbDrone.Web.Controllers
     public class UpcomingController : Controller
     {
         private readonly UpcomingEpisodesProvider _upcomingEpisodesProvider;
+        private readonly SeriesProvider _seriesProvider;
 
-        public UpcomingController(UpcomingEpisodesProvider upcomingEpisodesProvider)
+        public UpcomingController(UpcomingEpisodesProvider upcomingEpisodesProvider, SeriesProvider seriesProvider)
         {
             _upcomingEpisodesProvider = upcomingEpisodesProvider;
+            _seriesProvider = seriesProvider;
         }
 
         //
@@ -33,7 +35,7 @@ namespace NzbDrone.Web.Controllers
                 
             foreach (var item in upcomingDb)
             {
-                var series = item.Series;
+                var series = _seriesProvider.GetSeries(item.SeriesId);
 
                 upcoming.Add(new UpcomingEpisodeModel
                                                     {
@@ -59,7 +61,7 @@ namespace NzbDrone.Web.Controllers
 
             foreach (var item in upcomingDb)
             {
-                var series = item.Series;
+                var series = _seriesProvider.GetSeries(item.SeriesId);
 
                 upcoming.Add(new UpcomingEpisodeModel
                 {
@@ -85,7 +87,7 @@ namespace NzbDrone.Web.Controllers
 
             foreach (var item in upcomingDb)
             {
-                var series = item.Series;
+                var series = _seriesProvider.GetSeries(item.SeriesId);
 
                 upcoming.Add(new UpcomingEpisodeModel
                 {
@@ -111,7 +113,7 @@ namespace NzbDrone.Web.Controllers
 
             foreach (var item in upcomingDb)
             {
-                var series = item.Series;
+                var series = _seriesProvider.GetSeries(item.SeriesId);
 
                 upcoming.Add(new UpcomingEpisodeModel
                 {