Added TimerProvider

NzbDrone.Web/Controllers/AddSeriesController (x201's conflicted copy 2011-04-09).cs

@@ -1,134 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
-using NzbDrone.Web.Models;
-
-namespace NzbDrone.Web.Controllers
-{
-    public class AddSeriesController : Controller
-    {
-        public IConfigProvider ConfigProvider { get; set; }
-        private readonly SyncProvider _syncProvider;
-        private readonly RootDirProvider _rootFolderProvider;
-        private readonly IConfigProvider _configProvider;
-        private readonly QualityProvider _qualityProvider;
-        private readonly TvDbProvider _tvDbProvider;
-        private readonly SeriesProvider _seriesProvider;
-
-        public AddSeriesController(SyncProvider syncProvider, RootDirProvider rootFolderProvider, IConfigProvider configProvider,
-            QualityProvider qualityProvider, TvDbProvider tvDbProvider, SeriesProvider seriesProvider)
-        {
-            ConfigProvider = configProvider;
-            _syncProvider = syncProvider;
-            _rootFolderProvider = rootFolderProvider;
-            _configProvider = configProvider;
-            _qualityProvider = qualityProvider;
-            _tvDbProvider = tvDbProvider;
-            _seriesProvider = seriesProvider;
-        }
-
-        [HttpPost]
-        public JsonResult ScanNewSeries()
-        {
-            _syncProvider.BeginUpdateNewSeries();
-            return new JsonResult();
-        }
-
-        public ActionResult AddNew()
-        {
-            ViewData["RootDirs"] = _rootFolderProvider.GetAll();
-            ViewData["DirSep"] = Path.DirectorySeparatorChar;
-
-            var profiles = _qualityProvider.GetAllProfiles();
-            var selectList = new SelectList(profiles, "QualityProfileId", "Name");
-            var defaultQuality = Convert.ToInt32(_configProvider.DefaultQualityProfile);
-
-            var model = new AddNewSeriesModel
-            {
-                DirectorySeparatorChar = Path.DirectorySeparatorChar.ToString(),
-                RootDirectories = _rootFolderProvider.GetAll(),
-                QualityProfileId = defaultQuality,
-                QualitySelectList = selectList
-            };
-
-            return View(model);
-        }
-
-        public ActionResult AddExisting()
-        {
-            var unmappedList = new List<String>();
-
-            var profiles = _qualityProvider.GetAllProfiles();
-            var defaultQuality = Convert.ToInt32(_configProvider.DefaultQualityProfile);
-            var selectList = new SelectList(profiles, "QualityProfileId", "Name", defaultQuality);
-
-            ViewData["qualities"] = selectList;
-
-            foreach (var folder in _rootFolderProvider.GetAll())
-            {
-                unmappedList.AddRange(_syncProvider.GetUnmappedFolders(folder.Path));
-            }
-
-            return View(unmappedList);
-        }
-
-        public ActionResult RenderPartial(string path)
-        {
-
-            var suggestions = GetSuggestionList(new DirectoryInfo(path).Name);
-
-            ViewData["guid"] = Guid.NewGuid();
-            ViewData["path"] = path;
-            ViewData["javaPath"] = path.Replace(Path.DirectorySeparatorChar, '|').Replace(Path.VolumeSeparatorChar, '^');
-
-            var defaultQuality = _configProvider.DefaultQualityProfile;
-            var qualityProfiles = _qualityProvider.GetAllProfiles();
-
-            ViewData["quality"] = new SelectList(
-                qualityProfiles,
-                "QualityProfileId",
-                "Name",
-                defaultQuality); ;
-
-            return PartialView("AddSeriesItem", suggestions);
-
-        }
-
-        public JsonResult AddSeries(string path, int seriesId, int qualityProfileId)
-        {
-            //Get TVDB Series Name
-            //Create new folder for series
-            //Add the new series to the Database
-
-            _seriesProvider.AddSeries(path.Replace('|', Path.DirectorySeparatorChar).Replace('^', Path.VolumeSeparatorChar), seriesId, qualityProfileId);
-            ScanNewSeries();
-            return new JsonResult() { Data = "ok" };
-        }
-
-        [HttpPost]
-        public ActionResult _textLookUp(string text, int? filterMode)
-        {
-            var suggestions = GetSuggestionList(text);
-
-            return new JsonResult
-            {
-                JsonRequestBehavior = JsonRequestBehavior.AllowGet,
-                Data = suggestions
-            };
-        }
-
-        public SelectList GetSuggestionList(string searchString)
-        {
-            var dataVal = _tvDbProvider.SearchSeries(searchString);
-            //var bestResult = _tvDbProvider.GetBestMatch(dataVal.ToList(), searchString);
-
-            return new SelectList(dataVal, "Id", "SeriesName", dataVal[0].Id);
-        }
-
-    }
-}

NzbDrone.Web/Controllers/SeriesController.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Web.Mvc;
 using NzbDrone.Core.Providers;
+using NzbDrone.Core.Providers.Timers;
 using NzbDrone.Core.Repository;
 using NzbDrone.Web.Models;
 using Telerik.Web.Mvc;
@@ -19,28 +20,28 @@ namespace NzbDrone.Web.Controllers
         private readonly QualityProvider _qualityProvider;
         private readonly RenameProvider _renameProvider;
         private readonly RootDirProvider _rootDirProvider;
-        private readonly RssSyncProvider _rssSyncProvider;
         private readonly SeriesProvider _seriesProvider;
         private readonly SyncProvider _syncProvider;
         private readonly TvDbProvider _tvDbProvider;
+        private readonly TimerProvider _timerProvider;
         //
         // GET: /Series/
 
         public SeriesController(SyncProvider syncProvider, SeriesProvider seriesProvider,
-                                EpisodeProvider episodeProvider, RssSyncProvider rssSyncProvider,
+                                EpisodeProvider episodeProvider,
                                 QualityProvider qualityProvider, MediaFileProvider mediaFileProvider,
                                 RenameProvider renameProvider, RootDirProvider rootDirProvider,
-                                TvDbProvider tvDbProvider)
+                                TvDbProvider tvDbProvider, TimerProvider timerProvider)
         {
             _seriesProvider = seriesProvider;
             _episodeProvider = episodeProvider;
             _syncProvider = syncProvider;
-            _rssSyncProvider = rssSyncProvider;
             _qualityProvider = qualityProvider;
             _mediaFileProvider = mediaFileProvider;
             _renameProvider = renameProvider;
             _rootDirProvider = rootDirProvider;
             _tvDbProvider = tvDbProvider;
+            _timerProvider = timerProvider;
         }
 
         public ActionResult Index()
@@ -52,13 +53,13 @@ namespace NzbDrone.Web.Controllers
 
         public ActionResult RssSync()
         {
-            _rssSyncProvider.Begin();
+            _timerProvider.ForceExecute(typeof(RssSyncTimer));
             return RedirectToAction("Index");
         }
 
         public ActionResult UnMapped(string path)
         {
-            return View(_syncProvider.GetUnmappedFolders(path).Select(c => new MappingModel {Id = 1, Path = c}).ToList());
+            return View(_syncProvider.GetUnmappedFolders(path).Select(c => new MappingModel { Id = 1, Path = c }).ToList());
         }
 
         public ActionResult LoadEpisodes(int seriesId)
@@ -121,7 +122,7 @@ namespace NzbDrone.Web.Controllers
                     //We still want to show this series as unmapped, but we don't know what it will be when mapped
                     //Todo: Provide the user with a way to manually map a folder to a TvDb series (or make them rename the folder...)
                     if (tvDbSeries == null)
-                        tvDbSeries = new TvdbSeries {Id = 0, SeriesName = String.Empty};
+                        tvDbSeries = new TvdbSeries { Id = 0, SeriesName = String.Empty };
 
                     unmappedList.Add(new AddExistingSeriesModel
                                          {
@@ -263,7 +264,7 @@ namespace NzbDrone.Web.Controllers
             var series = _seriesProvider.GetSeries(seriesId);
             _mediaFileProvider.Scan(series);
 
-            return RedirectToAction("Details", new {seriesId});
+            return RedirectToAction("Details", new { seriesId });
         }
 
         public ActionResult RenameAll()
@@ -275,7 +276,7 @@ namespace NzbDrone.Web.Controllers
         public ActionResult RenameSeries(int seriesId)
         {
             _renameProvider.RenameSeries(seriesId);
-            return RedirectToAction("Details", new {seriesId});
+            return RedirectToAction("Details", new { seriesId });
         }
 
         public ActionResult RenameSeason(int seasonId)

NzbDrone.Web/Controllers/SharedController.cs

@@ -1,5 +1,7 @@
-using System.Web.Mvc;
+using System;
+using System.Web.Mvc;
 using NzbDrone.Core.Providers;
+using NzbDrone.Core.Providers.Timers;
 
 namespace NzbDrone.Web.Controllers
 {
@@ -20,7 +22,7 @@ namespace NzbDrone.Web.Controllers
         [ChildActionOnly]
         public ActionResult Footer()
         {
-            ViewData["RssTimer"] = _timerProvider.NextRssSyncTime().ToString("yyyyMMddHHmmss");
+            ViewData["RssTimer"] = DateTime.Now.ToString("yyyyMMddHHmmss");
             //ViewData["RssTimer"] = DateTime.Now.AddMinutes(61).AddSeconds(10).ToString("yyyyMMddHHmmss");
             return PartialView();
         }