diff --git a/NzbDrone.Core/CentralDispatch.cs b/NzbDrone.Core/CentralDispatch.cs index 663c42889..37661a956 100644 --- a/NzbDrone.Core/CentralDispatch.cs +++ b/NzbDrone.Core/CentralDispatch.cs @@ -64,13 +64,14 @@ namespace NzbDrone.Core _kernel.Bind().To().InSingletonScope(); _kernel.Bind().To(); _kernel.Bind().To(); - _kernel.Bind().To(); + _kernel.Bind().To(); _kernel.Bind().To(); - _kernel.Bind().To(); + _kernel.Bind().To(); _kernel.Bind().To(); - _kernel.Bind().To(); - _kernel.Bind().To(); - _kernel.Bind().To(); + _kernel.Bind().To(); + _kernel.Bind().To(); + _kernel.Bind().To(); + _kernel.Bind().To(); _kernel.Bind().To().InSingletonScope(); _kernel.Bind().To().InSingletonScope(); _kernel.Bind().To().InSingletonScope(); @@ -78,7 +79,7 @@ namespace NzbDrone.Core _kernel.Bind().To().InSingletonScope(); _kernel.Bind().To().InSingletonScope(); _kernel.Bind().To().InSingletonScope(); - _kernel.Bind().To().InSingletonScope(); + _kernel.Bind().To().InSingletonScope(); _kernel.Bind().ToMethod(c => new SimpleRepository(dbProvider, SimpleRepositoryOptions.RunMigrations)).InSingletonScope(); _kernel.Bind().ToConstant(logRepository).WhenInjectedInto().InSingletonScope(); @@ -90,7 +91,7 @@ namespace NzbDrone.Core //Get the Timers going var config = _kernel.Get(); - var timer = _kernel.Get(); + var timer = _kernel.Get(); timer.SetRssSyncTimer(Convert.ToInt32(config.GetValue("SyncFrequency", "15", true))); timer.StartRssSyncTimer(); } diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj index 024448b3b..061f1b71b 100644 --- a/NzbDrone.Core/NzbDrone.Core.csproj +++ b/NzbDrone.Core/NzbDrone.Core.csproj @@ -183,17 +183,11 @@ - - - - - - @@ -218,7 +212,6 @@ - diff --git a/NzbDrone.Core/Providers/ExternalNotificationProvider.cs b/NzbDrone.Core/Providers/ExternalNotificationProvider.cs index 5c397d268..84cd9d078 100644 --- a/NzbDrone.Core/Providers/ExternalNotificationProvider.cs +++ b/NzbDrone.Core/Providers/ExternalNotificationProvider.cs @@ -10,22 +10,21 @@ using NzbDrone.Core.Repository; namespace NzbDrone.Core.Providers { - public class ExternalNotificationProvider : IExtenalNotificationProvider + public class ExternalNotificationProvider { private readonly IConfigProvider _configProvider; - private readonly IXbmcProvider _xbmcProvider; - + private readonly XbmcProvider _xbmcProvider; private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); - public ExternalNotificationProvider(IConfigProvider configProvider, IXbmcProvider xbmcProvider) + public ExternalNotificationProvider(IConfigProvider configProvider, XbmcProvider xbmcProvider) { _configProvider = configProvider; _xbmcProvider = xbmcProvider; } - #region IExternalNotificationProvider Members - public void OnGrab(string message) + #region ExternalNotificationProvider Members + public virtual void OnGrab(string message) { var header = "NzbDrone [TV] - Grabbed"; @@ -43,7 +42,7 @@ namespace NzbDrone.Core.Providers Logger.Trace("XBMC Notifier is not enabled"); } - public void OnDownload(EpisodeRenameModel erm) + public virtual void OnDownload(EpisodeRenameModel erm) { var header = "NzbDrone [TV] - Downloaded"; var message = EpisodeRenameHelper.GetNewName(erm); @@ -75,7 +74,7 @@ namespace NzbDrone.Core.Providers throw new NotImplementedException(); } - public void OnRename(EpisodeRenameModel erm) + public virtual void OnRename(EpisodeRenameModel erm) { var header = "NzbDrone [TV] - Renamed"; var message = EpisodeRenameHelper.GetNewName(erm); diff --git a/NzbDrone.Core/Providers/IBacklogProvider.cs b/NzbDrone.Core/Providers/IBacklogProvider.cs index 8afaf62cc..4b1e3cd71 100644 --- a/NzbDrone.Core/Providers/IBacklogProvider.cs +++ b/NzbDrone.Core/Providers/IBacklogProvider.cs @@ -12,4 +12,4 @@ namespace NzbDrone.Core.Providers bool StartSearch(); bool StartSearch(int seriesId); } -} +} \ No newline at end of file diff --git a/NzbDrone.Core/Providers/IDownloadProvider.cs b/NzbDrone.Core/Providers/IDownloadProvider.cs deleted file mode 100644 index 8cd36844a..000000000 --- a/NzbDrone.Core/Providers/IDownloadProvider.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace NzbDrone.Core.Providers -{ - public interface IDownloadProvider - { - bool AddByUrl(string url, string title); //Should accept something other than string (NzbInfo?) returns success or failure - bool IsInQueue(string title); //Should accept something other than string (Episode?) returns bool - bool AddById(string id, string title); - } -} \ No newline at end of file diff --git a/NzbDrone.Core/Providers/IExtenalNotificationProvider.cs b/NzbDrone.Core/Providers/IExtenalNotificationProvider.cs deleted file mode 100644 index 6c483b44e..000000000 --- a/NzbDrone.Core/Providers/IExtenalNotificationProvider.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using NzbDrone.Core.Model; - -namespace NzbDrone.Core.Providers -{ - public interface IExtenalNotificationProvider - { - void OnGrab(string message); - void OnDownload(EpisodeRenameModel erm); - void OnRename(EpisodeRenameModel erm); - } -} diff --git a/NzbDrone.Core/Providers/IPostProcessingProvider.cs b/NzbDrone.Core/Providers/IPostProcessingProvider.cs deleted file mode 100644 index 68b869cb6..000000000 --- a/NzbDrone.Core/Providers/IPostProcessingProvider.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace NzbDrone.Core.Providers -{ - public interface IPostProcessingProvider - { - void ProcessEpisode(string dir, string nzbName); - } -} diff --git a/NzbDrone.Core/Providers/IRootDirProvider.cs b/NzbDrone.Core/Providers/IRootDirProvider.cs deleted file mode 100644 index d295ba146..000000000 --- a/NzbDrone.Core/Providers/IRootDirProvider.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using NzbDrone.Core.Repository; - -namespace NzbDrone.Core.Providers -{ - public interface IRootDirProvider - { - List GetAll(); - void Add(RootDir rootDir); - void Remove(int rootDirId); - void Update(RootDir rootDir); - RootDir GetRootDir(int rootDirId); - } -} diff --git a/NzbDrone.Core/Providers/ITimerProvider.cs b/NzbDrone.Core/Providers/ITimerProvider.cs deleted file mode 100644 index ca6d56bdb..000000000 --- a/NzbDrone.Core/Providers/ITimerProvider.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace NzbDrone.Core.Providers -{ - public interface ITimerProvider - { - void ResetRssSyncTimer(); - void StartRssSyncTimer(); - void StopRssSyncTimer(); - void SetRssSyncTimer(int minutes); - TimeSpan RssSyncTimeLeft(); - DateTime NextRssSyncTime(); - void StartMinuteTimer(); - void StopMinuteTimer(); - } -} diff --git a/NzbDrone.Core/Providers/IUpcomingEpisodesProvider.cs b/NzbDrone.Core/Providers/IUpcomingEpisodesProvider.cs deleted file mode 100644 index 137813105..000000000 --- a/NzbDrone.Core/Providers/IUpcomingEpisodesProvider.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using NzbDrone.Core.Model; -using NzbDrone.Core.Repository; - -namespace NzbDrone.Core.Providers -{ - public interface IUpcomingEpisodesProvider - { - UpcomingEpisodesModel Upcoming(); - List Yesterday(); - List Today(); - List Week(); - } -} diff --git a/NzbDrone.Core/Providers/IXbmcProvider.cs b/NzbDrone.Core/Providers/IXbmcProvider.cs deleted file mode 100644 index 81c50696b..000000000 --- a/NzbDrone.Core/Providers/IXbmcProvider.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace NzbDrone.Core.Providers -{ - public interface IXbmcProvider - { - void Notify(string header, string message); - void Update(int seriesId); - void Clean(); - } -} diff --git a/NzbDrone.Core/Providers/PostProcessingProvider.cs b/NzbDrone.Core/Providers/PostProcessingProvider.cs index 7eed8f415..63ff28361 100644 --- a/NzbDrone.Core/Providers/PostProcessingProvider.cs +++ b/NzbDrone.Core/Providers/PostProcessingProvider.cs @@ -9,7 +9,7 @@ using NzbDrone.Core.Providers.Core; namespace NzbDrone.Core.Providers { - public class PostProcessingProvider : IPostProcessingProvider + public class PostProcessingProvider { private readonly ISeriesProvider _seriesProvider; private readonly IMediaFileProvider _mediaFileProvider; @@ -23,9 +23,9 @@ namespace NzbDrone.Core.Providers _renameProvider = renameProvider; } - #region IPostProcessingProvider Members + #region PostProcessingProvider Members - public void ProcessEpisode(string dir, string nzbName) + public virtual void ProcessEpisode(string dir, string nzbName) { var parsedSeries = Parser.ParseSeriesName(nzbName); var series = _seriesProvider.FindSeries(parsedSeries); diff --git a/NzbDrone.Core/Providers/RenameProvider.cs b/NzbDrone.Core/Providers/RenameProvider.cs index 570bf8898..90dcd2775 100644 --- a/NzbDrone.Core/Providers/RenameProvider.cs +++ b/NzbDrone.Core/Providers/RenameProvider.cs @@ -20,7 +20,7 @@ namespace NzbDrone.Core.Providers private readonly IMediaFileProvider _mediaFileProvider; private readonly IDiskProvider _diskProvider; private readonly IConfigProvider _configProvider; - private readonly IExtenalNotificationProvider _externalNotificationProvider; + private readonly ExternalNotificationProvider _externalNotificationProvider; private Thread _renameThread; private List _epsToRename = new List(); @@ -30,7 +30,7 @@ namespace NzbDrone.Core.Providers public RenameProvider(ISeriesProvider seriesProvider, ISeasonProvider seasonProvider, IEpisodeProvider episodeProvider, IMediaFileProvider mediaFileProvider, IDiskProvider diskProvider, IConfigProvider configProvider, - IExtenalNotificationProvider extenalNotificationProvider) + ExternalNotificationProvider extenalNotificationProvider) { _seriesProvider = seriesProvider; _seasonProvider = seasonProvider; diff --git a/NzbDrone.Core/Providers/RootDirProvider.cs b/NzbDrone.Core/Providers/RootDirProvider.cs index c1d86dbb6..a1557cb19 100644 --- a/NzbDrone.Core/Providers/RootDirProvider.cs +++ b/NzbDrone.Core/Providers/RootDirProvider.cs @@ -7,7 +7,7 @@ using SubSonic.Repository; namespace NzbDrone.Core.Providers { - public class RootDirProvider : IRootDirProvider + public class RootDirProvider { private readonly IRepository _sonioRepo; @@ -18,27 +18,27 @@ namespace NzbDrone.Core.Providers #region IRootDirProvider - public List GetAll() + public virtual List GetAll() { return _sonioRepo.All().ToList(); } - public void Add(RootDir rootDir) + public virtual void Add(RootDir rootDir) { _sonioRepo.Add(rootDir); } - - public void Remove(int rootDirId) + + public virtual void Remove(int rootDirId) { _sonioRepo.Delete(rootDirId); } - - public void Update(RootDir rootDir) + + public virtual void Update(RootDir rootDir) { _sonioRepo.Update(rootDir); } - - public RootDir GetRootDir(int rootDirId) + + public virtual RootDir GetRootDir(int rootDirId) { return _sonioRepo.Single(rootDirId); } diff --git a/NzbDrone.Core/Providers/SabProvider.cs b/NzbDrone.Core/Providers/SabProvider.cs index a689ae5a6..d2889f24f 100644 --- a/NzbDrone.Core/Providers/SabProvider.cs +++ b/NzbDrone.Core/Providers/SabProvider.cs @@ -7,7 +7,7 @@ using NzbDrone.Core.Providers.Core; namespace NzbDrone.Core.Providers { - public class SabProvider : IDownloadProvider + public class SabProvider { private readonly IConfigProvider _config; private readonly HttpProvider _http; @@ -22,7 +22,7 @@ namespace NzbDrone.Core.Providers #region IDownloadProvider Members - public bool AddByUrl(string url, string title) + public virtual bool AddByUrl(string url, string title) { const string mode = "addurl"; string cat = _config.GetValue("SabTvCategory", String.Empty, true); @@ -45,7 +45,7 @@ namespace NzbDrone.Core.Providers return false; } - public bool IsInQueue(string title) + public virtual bool IsInQueue(string title) { const string action = "mode=queue&output=xml"; string request = GetSabRequest(action); @@ -71,7 +71,7 @@ namespace NzbDrone.Core.Providers return false; //Not in Queue } - public bool AddById(string id, string title) + public virtual bool AddById(string id, string title) { //mode=addid&name=333333&pp=3&script=customscript.cmd&cat=Example&priority=-1 diff --git a/NzbDrone.Core/Providers/TimerProvider.cs b/NzbDrone.Core/Providers/TimerProvider.cs index 2aeccb290..e9b8d6f58 100644 --- a/NzbDrone.Core/Providers/TimerProvider.cs +++ b/NzbDrone.Core/Providers/TimerProvider.cs @@ -8,7 +8,7 @@ using NzbDrone.Core.Model.Notification; namespace NzbDrone.Core.Providers { - public class TimerProvider : ITimerProvider + public class TimerProvider { private readonly IRssSyncProvider _rssSyncProvider; private readonly ISeriesProvider _seriesProvider; @@ -33,15 +33,15 @@ namespace NzbDrone.Core.Providers _minuteTimer = new Timer(60000); } - #region ITimerProvider Members + #region TimerProvider Members - public void ResetRssSyncTimer() + public virtual void ResetRssSyncTimer() { double interval = _rssSyncTimer.Interval; _rssSyncTimer.Interval = interval; } - - public void StartRssSyncTimer() + + public virtual void StartRssSyncTimer() { if (_rssSyncTimer.Interval < 900000) //If Timer is less than 15 minutes, throw an error! This should also be handled when saving the config, though a user could by-pass it by editing the DB directly... TNO (Trust No One) { @@ -53,35 +53,35 @@ namespace NzbDrone.Core.Providers _rssSyncTimer.Start(); _rssSyncNextInterval = DateTime.Now.AddMilliseconds(_rssSyncTimer.Interval); } - - public void StopRssSyncTimer() + + public virtual void StopRssSyncTimer() { _rssSyncTimer.Stop(); } - - public void SetRssSyncTimer(int minutes) + + public virtual void SetRssSyncTimer(int minutes) { long ms = minutes * 60 * 1000; _rssSyncTimer.Interval = ms; } - - public TimeSpan RssSyncTimeLeft() + + public virtual TimeSpan RssSyncTimeLeft() { return _rssSyncNextInterval.Subtract(DateTime.Now); } - - public DateTime NextRssSyncTime() + + public virtual DateTime NextRssSyncTime() { return _rssSyncNextInterval; } - - public void StartMinuteTimer() + + public virtual void StartMinuteTimer() { _minuteTimer.Elapsed += new ElapsedEventHandler(MinuteTimer_Elapsed); _minuteTimer.Start(); } - - public void StopMinuteTimer() + + public virtual void StopMinuteTimer() { _minuteTimer.Stop(); } diff --git a/NzbDrone.Core/Providers/UpcomingEpisodesProvider.cs b/NzbDrone.Core/Providers/UpcomingEpisodesProvider.cs index 4fd87711c..de24334a2 100644 --- a/NzbDrone.Core/Providers/UpcomingEpisodesProvider.cs +++ b/NzbDrone.Core/Providers/UpcomingEpisodesProvider.cs @@ -8,7 +8,7 @@ using SubSonic.Repository; namespace NzbDrone.Core.Providers { - public class UpcomingEpisodesProvider : IUpcomingEpisodesProvider + public class UpcomingEpisodesProvider { private IRepository _sonicRepo; @@ -17,9 +17,9 @@ namespace NzbDrone.Core.Providers _sonicRepo = sonicRepo; } - #region IUpcomingEpisodesProvider + #region UpcomingEpisodesProvider Members - public UpcomingEpisodesModel Upcoming() + public virtual UpcomingEpisodesModel Upcoming() { var allEps = _sonicRepo.All().Where(e => e.AirDate >= DateTime.Today.AddDays(-1) && e.AirDate < DateTime.Today.AddDays(8)); @@ -30,17 +30,17 @@ namespace NzbDrone.Core.Providers return new UpcomingEpisodesModel {Yesterday = yesterday, Today = today, Week = week}; } - public List Yesterday() + public virtual List Yesterday() { return _sonicRepo.All().Where(e => e.AirDate == DateTime.Today.AddDays(-1)).ToList(); } - public List Today() + public virtual List Today() { return _sonicRepo.All().Where(e => e.AirDate == DateTime.Today).ToList(); } - public List Week() + public virtual List Week() { return _sonicRepo.All().Where(e => e.AirDate > DateTime.Today && e.AirDate < DateTime.Today.AddDays(8)).ToList(); } diff --git a/NzbDrone.Core/Providers/XbmcProvider.cs b/NzbDrone.Core/Providers/XbmcProvider.cs index 3dc53785d..072408b1f 100644 --- a/NzbDrone.Core/Providers/XbmcProvider.cs +++ b/NzbDrone.Core/Providers/XbmcProvider.cs @@ -10,7 +10,7 @@ using NzbDrone.Core.Providers.Core; namespace NzbDrone.Core.Providers { - public class XbmcProvider : IXbmcProvider + public class XbmcProvider { private readonly IConfigProvider _configProvider; private readonly HttpProvider _httpProvider; @@ -23,9 +23,9 @@ namespace NzbDrone.Core.Providers _httpProvider = httpProvider; } - #region IXbmcProvider Members + #region XbmcProvider Members - public void Notify(string header, string message) + public virtual void Notify(string header, string message) { //Get time in seconds and convert to ms var time = Convert.ToInt32(_configProvider.GetValue("XbmcDisplayTime", "3", true)) * 1000; @@ -47,7 +47,7 @@ namespace NzbDrone.Core.Providers } } - public void Update(int seriesId) + public virtual void Update(int seriesId) { foreach (var host in _configProvider.GetValue("XbmcHosts", "localhost:80", true).Split(',')) { @@ -68,7 +68,7 @@ namespace NzbDrone.Core.Providers } } - public void Clean() + public virtual void Clean() { foreach (var host in _configProvider.GetValue("XbmcHosts", "localhost:80", true).Split(',')) { diff --git a/NzbDrone.Web/Controllers/AddSeriesController.cs b/NzbDrone.Web/Controllers/AddSeriesController.cs index 8b3ad777b..bedf5b62e 100644 --- a/NzbDrone.Web/Controllers/AddSeriesController.cs +++ b/NzbDrone.Web/Controllers/AddSeriesController.cs @@ -14,13 +14,13 @@ namespace NzbDrone.Web.Controllers { public IConfigProvider ConfigProvider { get; set; } private readonly ISyncProvider _syncProvider; - private readonly IRootDirProvider _rootFolderProvider; + private readonly RootDirProvider _rootFolderProvider; private readonly IConfigProvider _configProvider; private readonly QualityProvider _qualityProvider; private readonly TvDbProvider _tvDbProvider; private readonly ISeriesProvider _seriesProvider; - public AddSeriesController(ISyncProvider syncProvider, IRootDirProvider rootFolderProvider, IConfigProvider configProvider, + public AddSeriesController(ISyncProvider syncProvider, RootDirProvider rootFolderProvider, IConfigProvider configProvider, QualityProvider qualityProvider, TvDbProvider tvDbProvider, ISeriesProvider seriesProvider) { ConfigProvider = configProvider; @@ -63,6 +63,12 @@ namespace NzbDrone.Web.Controllers { var unmappedList = new List(); + 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)); diff --git a/NzbDrone.Web/Controllers/ApiController.cs b/NzbDrone.Web/Controllers/ApiController.cs index 7edaa0a65..e6b670839 100644 --- a/NzbDrone.Web/Controllers/ApiController.cs +++ b/NzbDrone.Web/Controllers/ApiController.cs @@ -13,12 +13,12 @@ namespace NzbDrone.Web.Controllers { public class ApiController : Controller { - private readonly IPostProcessingProvider _postProcessingProvider; + private readonly PostProcessingProvider _postProcessingProvider; private readonly IConfigProvider _configProvider; private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); - public ApiController(IPostProcessingProvider postProcessingProvider, IConfigProvider configProvider) + public ApiController(PostProcessingProvider postProcessingProvider, IConfigProvider configProvider) { _postProcessingProvider = postProcessingProvider; _configProvider = configProvider; diff --git a/NzbDrone.Web/Controllers/SeriesController.cs b/NzbDrone.Web/Controllers/SeriesController.cs index 3ee7b1d0f..db837e854 100644 --- a/NzbDrone.Web/Controllers/SeriesController.cs +++ b/NzbDrone.Web/Controllers/SeriesController.cs @@ -28,7 +28,7 @@ namespace NzbDrone.Web.Controllers private readonly QualityProvider _qualityProvider; private readonly IMediaFileProvider _mediaFileProvider; private readonly IRenameProvider _renameProvider; - private readonly IRootDirProvider _rootDirProvider; + private readonly RootDirProvider _rootDirProvider; private readonly TvDbProvider _tvDbProvider; // // GET: /Series/ @@ -36,7 +36,7 @@ namespace NzbDrone.Web.Controllers public SeriesController(ISyncProvider syncProvider, ISeriesProvider seriesProvider, IEpisodeProvider episodeProvider, IRssSyncProvider rssSyncProvider, QualityProvider qualityProvider, IMediaFileProvider mediaFileProvider, - IRenameProvider renameProvider, IRootDirProvider rootDirProvider, + IRenameProvider renameProvider, RootDirProvider rootDirProvider, TvDbProvider tvDbProvider) { _seriesProvider = seriesProvider; diff --git a/NzbDrone.Web/Controllers/SettingsController.cs b/NzbDrone.Web/Controllers/SettingsController.cs index e9cbc9348..edbdecc8a 100644 --- a/NzbDrone.Web/Controllers/SettingsController.cs +++ b/NzbDrone.Web/Controllers/SettingsController.cs @@ -22,14 +22,14 @@ namespace NzbDrone.Web.Controllers private IConfigProvider _configProvider; private IIndexerProvider _indexerProvider; private QualityProvider _qualityProvider; - private IRootDirProvider _rootDirProvider; + private RootDirProvider _rootDirProvider; private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); private const string SETTINGS_SAVED = "Settings Saved."; private const string SETTINGS_FAILED = "Error Saving Settings, please fix any errors"; public SettingsController(IConfigProvider configProvider, IIndexerProvider indexerProvider, - QualityProvider qualityProvider, IRootDirProvider rootDirProvider) + QualityProvider qualityProvider, RootDirProvider rootDirProvider) { _configProvider = configProvider; _indexerProvider = indexerProvider; diff --git a/NzbDrone.Web/Controllers/SharedController.cs b/NzbDrone.Web/Controllers/SharedController.cs index 8a92bfb52..79e235a05 100644 --- a/NzbDrone.Web/Controllers/SharedController.cs +++ b/NzbDrone.Web/Controllers/SharedController.cs @@ -9,9 +9,9 @@ namespace NzbDrone.Web.Controllers { public class SharedController : Controller { - private ITimerProvider _timerProvider; + private TimerProvider _timerProvider; - public SharedController(ITimerProvider timerProvider) + public SharedController(TimerProvider timerProvider) { _timerProvider = timerProvider; } diff --git a/NzbDrone.Web/Controllers/UpcomingController.cs b/NzbDrone.Web/Controllers/UpcomingController.cs index 13de33206..dcf66cf55 100644 --- a/NzbDrone.Web/Controllers/UpcomingController.cs +++ b/NzbDrone.Web/Controllers/UpcomingController.cs @@ -11,9 +11,9 @@ namespace NzbDrone.Web.Controllers { public class UpcomingController : Controller { - private IUpcomingEpisodesProvider _upcomingEpisodesProvider; + private UpcomingEpisodesProvider _upcomingEpisodesProvider; - public UpcomingController(IUpcomingEpisodesProvider upcomingEpisodesProvider) + public UpcomingController(UpcomingEpisodesProvider upcomingEpisodesProvider) { _upcomingEpisodesProvider = upcomingEpisodesProvider; } diff --git a/NzbDrone.Web/Views/AddSeries/AddExisting.aspx b/NzbDrone.Web/Views/AddSeries/AddExisting.aspx index de3aa9c21..cd6972573 100644 --- a/NzbDrone.Web/Views/AddSeries/AddExisting.aspx +++ b/NzbDrone.Web/Views/AddSeries/AddExisting.aspx @@ -9,11 +9,36 @@ <% if (Model.Count() == 0) Html.DisplayText("No Series to Add"); + %> + + <%: Html.DropDownList("masterDropbox", (SelectList)ViewData["qualities"], new { style = "width: 100px;", id = "masterDropboxId" })%> + + <%: @Html.Telerik().DropDownList().Name("tester").BindTo((SelectList)ViewData["qualities"]).HtmlAttributes(new { style = "width: 100px", @class = "qualityDropbox" })%> + + + <% foreach (var path in Model) { Html.RenderAction("RenderPartial", "AddSeries", new { path }); } %> - + + + + \ No newline at end of file diff --git a/NzbDrone.Web/Views/AddSeries/AddSeriesItem.cshtml b/NzbDrone.Web/Views/AddSeries/AddSeriesItem.cshtml index 5240e1aaa..63f728966 100644 --- a/NzbDrone.Web/Views/AddSeries/AddSeriesItem.cshtml +++ b/NzbDrone.Web/Views/AddSeries/AddSeriesItem.cshtml @@ -12,7 +12,7 @@ .HighlightFirstMatch(true) .HtmlAttributes(new { style = "width: 300px;" }) .Render();} - @Html.Telerik().DropDownList().Name("qualityList_" + ViewData["guid"].ToString()).BindTo((SelectList)ViewData["quality"]).HtmlAttributes(new { style = "width: 100px;" }).SelectedIndex(0) + @Html.Telerik().DropDownList().Name("qualityList_" + ViewData["guid"].ToString()).BindTo((SelectList)ViewData["quality"]).HtmlAttributes(new { style = "width: 100px", @class = "qualityDropbox" }) diff --git a/packages/Ninject.2.2.1.0/lib/.NetFramework 3.5/Ninject.pdb b/packages/Ninject.2.2.1.0/lib/.NetFramework 3.5/Ninject.pdb deleted file mode 100644 index a05635209..000000000 Binary files a/packages/Ninject.2.2.1.0/lib/.NetFramework 3.5/Ninject.pdb and /dev/null differ diff --git a/packages/Ninject.2.2.1.0/lib/.NetFramework 4.0/Ninject.pdb b/packages/Ninject.2.2.1.0/lib/.NetFramework 4.0/Ninject.pdb deleted file mode 100644 index 6eeb30e42..000000000 Binary files a/packages/Ninject.2.2.1.0/lib/.NetFramework 4.0/Ninject.pdb and /dev/null differ diff --git a/packages/Ninject.2.2.1.0/lib/Silverlight 2.0/Ninject.pdb b/packages/Ninject.2.2.1.0/lib/Silverlight 2.0/Ninject.pdb deleted file mode 100644 index 27923ed5c..000000000 Binary files a/packages/Ninject.2.2.1.0/lib/Silverlight 2.0/Ninject.pdb and /dev/null differ diff --git a/packages/Ninject.2.2.1.0/lib/Silverlight 3.0/Ninject.pdb b/packages/Ninject.2.2.1.0/lib/Silverlight 3.0/Ninject.pdb deleted file mode 100644 index da812c8f4..000000000 Binary files a/packages/Ninject.2.2.1.0/lib/Silverlight 3.0/Ninject.pdb and /dev/null differ diff --git a/packages/Ninject.2.2.1.0/lib/Silverlight 4.0/Ninject.pdb b/packages/Ninject.2.2.1.0/lib/Silverlight 4.0/Ninject.pdb deleted file mode 100644 index 6b0514137..000000000 Binary files a/packages/Ninject.2.2.1.0/lib/Silverlight 4.0/Ninject.pdb and /dev/null differ