Merge branch 'markus101'

NzbDrone.Core/Providers/EpisodeProvider.cs

@@ -241,8 +241,6 @@ namespace NzbDrone.Core.Providers
                          tvDbSeriesInfo.SeriesName, successCount, failCount);
         }
 
-
-
         public virtual void UpdateEpisode(Episode episode)
         {
             _database.Update(episode);

NzbDrone.Core/Providers/SeriesProvider.cs

@@ -118,19 +118,29 @@ namespace NzbDrone.Core.Providers
 
         public virtual Series FindSeries(string title)
         {
-            var normalizeTitle = Parser.NormalizeTitle(title);
-
-            var seriesId = _sceneNameMappingProvider.GetSeriesId(normalizeTitle);
-            if (seriesId != null)
+            try
             {
-                return GetSeries(seriesId.Value);
-            }
+                var normalizeTitle = Parser.NormalizeTitle(title);
 
-            var series = _database.Fetch<Series, QualityProfile>(@"SELECT * FROM Series
+                var seriesId = _sceneNameMappingProvider.GetSeriesId(normalizeTitle);
+                if (seriesId != null)
+                {
+                    return GetSeries(seriesId.Value);
+                }
+
+                var series = _database.Fetch<Series, QualityProfile>(@"SELECT * FROM Series
                             INNER JOIN QualityProfiles ON Series.QualityProfileId = QualityProfiles.QualityProfileId
                             WHERE CleanTitle = @0", normalizeTitle).FirstOrDefault();
 
-            return series;
+                return series;
+            }
+
+            //This will catch InvalidOperationExceptions that may be thrown for GetSeries due to the series being in SceneMapping, but not in the users Database
+            catch (InvalidOperationException ex)
+            {
+                Logger.DebugException(ex.Message, ex);
+                return null;
+            }
         }
 
         public virtual void UpdateSeries(Series series)

NzbDrone.Core/Repository/Series.cs

@@ -46,7 +46,7 @@ namespace NzbDrone.Core.Repository
         [Ignore]
         public bool Hidden { get; set; }
 
-        [Ignore]
+        [ResultColumn]
         public QualityProfile QualityProfile { get; set; }
 
         [ResultColumn]

NzbDrone.Web/Controllers/AddSeriesController.cs

@@ -215,6 +215,7 @@ namespace NzbDrone.Web.Controllers
                             {
                                 Id = 0,
                                 Path = "",
+                                CleanPath = "",
                                 SelectList = new SelectList(new List<string> { "" }, "")
                             };
 

NzbDrone.Web/Controllers/HistoryController.cs

@@ -12,15 +12,10 @@ namespace NzbDrone.Web.Controllers
     public class HistoryController : Controller
     {
         private readonly HistoryProvider _historyProvider;
-        private readonly EpisodeProvider _episodeProvider;
-        private readonly SeriesProvider _seriesProvider;
 
-        public HistoryController(HistoryProvider historyProvider, EpisodeProvider episodeProvider,
-            SeriesProvider seriesProvider)
+        public HistoryController(HistoryProvider historyProvider)
         {
             _historyProvider = historyProvider;
-            _episodeProvider = episodeProvider;
-            _seriesProvider = seriesProvider;
         }
 
         //

NzbDrone.Web/Controllers/UpcomingController.cs

@@ -11,12 +11,10 @@ namespace NzbDrone.Web.Controllers
     public class UpcomingController : Controller
     {
         private readonly UpcomingEpisodesProvider _upcomingEpisodesProvider;
-        private readonly SeriesProvider _seriesProvider;
 
-        public UpcomingController(UpcomingEpisodesProvider upcomingEpisodesProvider, SeriesProvider seriesProvider)
+        public UpcomingController(UpcomingEpisodesProvider upcomingEpisodesProvider)
         {
             _upcomingEpisodesProvider = upcomingEpisodesProvider;
-            _seriesProvider = seriesProvider;
         }
 
         //

NzbDrone.Web/Views/AddSeries/Index.cshtml

@@ -1,7 +1,13 @@
 @model List<RootDir>
 @using NzbDrone.Core.Repository
 
-<script type="text/javascript" src="../../Scripts/2011.1.315/telerik.window.min.js"></script>
+@{ Html.Telerik().ScriptRegistrar().DefaultGroup(group => group
+                                        .Add("telerik.common.min.js")
+                                        .Add("telerik.draganddrop.min.js")
+                                        .Add("telerik.window.min.js")
+                                        .Add("telerik.panelbar.min.js")
+                                        .Add("telerik.list.min.js")
+                                        .Add("telerik.combobox.min.js")); }
 
 <style>
 .root_dir_text