diff --git a/IISExpress/AppServer/applicationhost.config b/IISExpress/AppServer/applicationhost.config index 93f26b580..93879e48b 100644 --- a/IISExpress/AppServer/applicationhost.config +++ b/IISExpress/AppServer/applicationhost.config @@ -694,4 +694,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/NzbDrone.App.Test/MonitoringProviderTest.cs b/NzbDrone.App.Test/MonitoringProviderTest.cs index 0713810c5..f2439d9d4 100644 --- a/NzbDrone.App.Test/MonitoringProviderTest.cs +++ b/NzbDrone.App.Test/MonitoringProviderTest.cs @@ -8,6 +8,7 @@ using FizzWare.NBuilder; using FluentAssertions; using Moq; using NUnit.Framework; +using NzbDrone.Model; using NzbDrone.Providers; namespace NzbDrone.App.Test diff --git a/NzbDrone.App.Test/ProgramTest.cs b/NzbDrone.App.Test/ProgramTest.cs index 26827b648..388a3ab0e 100644 --- a/NzbDrone.App.Test/ProgramTest.cs +++ b/NzbDrone.App.Test/ProgramTest.cs @@ -1,6 +1,7 @@ using FluentAssertions; using Moq; using NUnit.Framework; +using NzbDrone.Model; using NzbDrone.Providers; namespace NzbDrone.App.Test diff --git a/NzbDrone.Core.Test/ConfigFileProviderTest.cs b/NzbDrone.Core.Test/ConfigFileProviderTest.cs index 471bec774..cf02dae96 100644 --- a/NzbDrone.Core.Test/ConfigFileProviderTest.cs +++ b/NzbDrone.Core.Test/ConfigFileProviderTest.cs @@ -2,6 +2,7 @@ using AutoMoq; using FluentAssertions; using NUnit.Framework; +using NzbDrone.Core.Model; using NzbDrone.Core.Providers.Core; using NzbDrone.Core.Repository; using NzbDrone.Core.Test.Framework; @@ -32,7 +33,7 @@ namespace NzbDrone.Core.Test var mocker = new AutoMoqer(); //Act - var result = mocker.Resolve().GetValue(key); + var result = mocker.Resolve().GetValue(key, value); //Assert result.Should().Be(value); @@ -47,7 +48,7 @@ namespace NzbDrone.Core.Test var mocker = new AutoMoqer(); //Act - var result = mocker.Resolve().GetValueInt(key); + var result = mocker.Resolve().GetValueInt(key, value); //Assert result.Should().Be(value); @@ -57,11 +58,12 @@ namespace NzbDrone.Core.Test public void GetBool_Success() { const string key = "LaunchBrowser"; + const bool value = true; var mocker = new AutoMoqer(); //Act - var result = mocker.Resolve().GetValueBoolean(key); + var result = mocker.Resolve().GetValueBoolean(key, value); //Assert result.Should().BeTrue(); @@ -124,5 +126,60 @@ namespace NzbDrone.Core.Test var result = mocker.Resolve().Port; result.Should().Be(value); } + + [Test] + public void GetValue_New_Key() + { + const string key = "Hello"; + const string value = "World"; + + var mocker = new AutoMoqer(); + + //Act + var result = mocker.Resolve().GetValue(key, value); + + //Assert + result.Should().Be(value); + } + + [Test] + public void GetValue_New_Key_with_new_parent() + { + const string key = "Hello"; + const string value = "World"; + + var mocker = new AutoMoqer(); + + //Act + var result = mocker.Resolve().GetValue(key, value, "Universe"); + + //Assert + result.Should().Be(value); + } + + [Test] + public void GetAuthenticationType_No_Existing_Value() + { + var mocker = new AutoMoqer(); + + //Act + var result = mocker.Resolve().AuthenticationType; + + //Assert + result.Should().Be(AuthenticationType.Anonymous); + } + + [Test] + public void GetAuthenticationType_Windows() + { + var mocker = new AutoMoqer(); + mocker.Resolve().SetValue("AuthenticationType", 1); + + //Act + var result = mocker.Resolve().AuthenticationType; + + //Assert + result.Should().Be(AuthenticationType.Windows); + } } } \ No newline at end of file diff --git a/NzbDrone.Core/CentralDispatch.cs b/NzbDrone.Core/CentralDispatch.cs index ca707daa5..6eccb3a2c 100644 --- a/NzbDrone.Core/CentralDispatch.cs +++ b/NzbDrone.Core/CentralDispatch.cs @@ -113,6 +113,7 @@ namespace NzbDrone.Core _kernel.Bind().To().InSingletonScope(); _kernel.Bind().To().InSingletonScope(); _kernel.Bind().To().InSingletonScope(); + _kernel.Bind().To().InSingletonScope(); _kernel.Get().Initialize(); _kernel.Get().StartTimer(30); diff --git a/NzbDrone.Core/Model/AtomicParsleyTitleType.cs b/NzbDrone.Core/Model/AtomicParsleyTitleType.cs new file mode 100644 index 000000000..d133b977a --- /dev/null +++ b/NzbDrone.Core/Model/AtomicParsleyTitleType.cs @@ -0,0 +1,9 @@ +namespace NzbDrone.Core.Model +{ + public enum AtomicParsleyTitleType + { + None = 0, + EpisodeNumber = 1, + Both = 2 + } +} \ No newline at end of file diff --git a/NzbDrone.Core/Model/AuthenticationType.cs b/NzbDrone.Core/Model/AuthenticationType.cs new file mode 100644 index 000000000..0ffc02991 --- /dev/null +++ b/NzbDrone.Core/Model/AuthenticationType.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace NzbDrone.Core.Model +{ + public enum AuthenticationType + { + Anonymous = 0, + Windows = 1 + } +} diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj index ea2d903c2..5a958d2e4 100644 --- a/NzbDrone.Core/NzbDrone.Core.csproj +++ b/NzbDrone.Core/NzbDrone.Core.csproj @@ -189,6 +189,8 @@ + + @@ -203,10 +205,13 @@ + + + diff --git a/NzbDrone.Core/Providers/Converting/AtomicParsleyProvider.cs b/NzbDrone.Core/Providers/Converting/AtomicParsleyProvider.cs new file mode 100644 index 000000000..ae99c9258 --- /dev/null +++ b/NzbDrone.Core/Providers/Converting/AtomicParsleyProvider.cs @@ -0,0 +1,74 @@ +using System; +using System.Diagnostics; +using System.IO; +using NLog; +using NzbDrone.Core.Model; +using NzbDrone.Core.Providers.Core; +using NzbDrone.Core.Repository; + +namespace NzbDrone.Core.Providers.Converting +{ + public class AtomicParsleyProvider + { + private readonly ConfigProvider _configProvider; + + private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); + + public AtomicParsleyProvider(ConfigProvider configProvider) + { + _configProvider = configProvider; + } + + public AtomicParsleyProvider() + { + + } + + public virtual bool RunAtomicParsley(Episode episode, string outputFile) + { + throw new NotImplementedException(); + + var atomicParsleyLocation = _configProvider.GetValue("AtomicParsleyLocation", ""); + var atomicParsleyTitleType = (AtomicParsleyTitleType) System.Convert.ToInt32(_configProvider.GetValue("AtomicParsley", 0)); + + var atomicParsleyCommand = String.Format("\"{0}\" --overWrite --title \"{1}\" --genre \"TV Shows\" --stik \"TV Show\" --TVShowName \"{2}\" --TVEpisodeNum \"{3}\" --TVSeason \"{4}\"", + outputFile, episode.Title, episode.Series.Title, episode.EpisodeNumber, episode.SeasonNumber); + + //If Episode Number + Name should be in Episode Title (Number - Title) + if (atomicParsleyTitleType == AtomicParsleyTitleType.EpisodeNumber) + { + atomicParsleyCommand = String.Format("\"{0}\" --overWrite --title \"{3} - {1}\" --genre \"TV Shows\" --stik \"TV Show\" --TVShowName \"{2}\" --TVEpisodeNum \"{3}\" --TVSeason \"{4}\"", + outputFile, episode.Title, episode.Series.Title, episode.EpisodeNumber, episode.SeasonNumber); + } + + //If Season/Episode Number + Name should be in Episode Title (SeasonNumber'x'EpisodeNumber - Title) + else if (atomicParsleyTitleType == AtomicParsleyTitleType.Both) + { + atomicParsleyCommand = String.Format("\"{0}\" --overWrite --title \"{4}x{3:00} - {1}\" --genre \"TV Shows\" --stik \"TV Show\" --TVShowName \"{2}\" --TVEpisodeNum \"{3}\" --TVSeason \"{4}\"", + outputFile, episode.Title, episode.Series.Title, episode.EpisodeNumber, episode.SeasonNumber); + } + + try + { + var process = new Process(); + process.StartInfo.FileName = Path.Combine(atomicParsleyLocation, "AtomicParsley.exe"); + process.StartInfo.Arguments = atomicParsleyCommand; + process.StartInfo.UseShellExecute = false; + process.StartInfo.CreateNoWindow = true; + process.StartInfo.RedirectStandardOutput = true; + //process.OutputDataReceived += new DataReceivedEventHandler(HandBrakeOutputDataReceived); + process.Start(); + //process.BeginOutputReadLine(); + process.WaitForExit(); + } + + catch (Exception ex) + { + Logger.DebugException(ex.Message, ex); + return false; + } + + return true; + } + } +} diff --git a/NzbDrone.Core/Providers/Converting/HandbrakeProvider.cs b/NzbDrone.Core/Providers/Converting/HandbrakeProvider.cs new file mode 100644 index 000000000..0379730ca --- /dev/null +++ b/NzbDrone.Core/Providers/Converting/HandbrakeProvider.cs @@ -0,0 +1,105 @@ +using System; +using System.Diagnostics; +using System.Text.RegularExpressions; +using NLog; +using NzbDrone.Core.Model.Notification; +using NzbDrone.Core.Providers.Core; +using NzbDrone.Core.Repository; + +namespace NzbDrone.Core.Providers.Converting +{ + public class HandbrakeProvider + { + //Interacts with Handbrake + private readonly ConfigProvider _configProvider; + private ProgressNotification _notification; + private Episode _currentEpisode; + + private Regex _processingRegex = + new Regex(@"^(?:Encoding).+?(?:\,\s(?\d{1,3}\.\d{2})\s\%)(?:.+?ETA\s(?\d{2})h(?\d{2})m(?\d{2})s)?", + RegexOptions.IgnoreCase | RegexOptions.Compiled); + + private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); + + public HandbrakeProvider(ConfigProvider configProvider) + { + _configProvider = configProvider; + } + + public HandbrakeProvider() + { + + } + + public virtual string ConvertFile(Episode episode, ProgressNotification notification) + { + _notification = notification; + _currentEpisode = episode; + + var outputFile = _configProvider.GetValue("iPodConvertDir", ""); + + var handBrakePreset = _configProvider.GetValue("HandBrakePreset", "iPhone & iPod Touch"); + var handBrakeCommand = String.Format("-i \"{0}\" -o \"{1}\" --preset=\"{2}\"", episode.EpisodeFile.Path, outputFile, handBrakePreset); + var handBrakeFile = @"C:\Program Files (x86)\Handbrake\HandBrakeCLI.exe"; + + try + { + var process = new Process(); + process.StartInfo.FileName = handBrakeFile; + process.StartInfo.Arguments = handBrakeCommand; + process.StartInfo.UseShellExecute = false; + process.StartInfo.CreateNoWindow = true; + process.StartInfo.RedirectStandardOutput = true; + process.OutputDataReceived += new DataReceivedEventHandler(HandBrakeOutputDataReceived); + process.Start(); + process.BeginOutputReadLine(); + process.WaitForExit(); + } + + catch (Exception ex) + { + Logger.DebugException(ex.Message, ex); + return String.Empty; + } + + return outputFile; + } + + private void HandBrakeOutputDataReceived(object obj, DataReceivedEventArgs args) + { + throw new NotImplementedException(); + + //args.Data contains the line writen + + var match = _processingRegex.Matches(args.Data); + + if (match.Count != 1) + return; + + var episodeString = String.Format("{0} - {1}x{2:00}", + _currentEpisode.Series.Title, + _currentEpisode.SeasonNumber, + _currentEpisode.EpisodeNumber); + + var percent = System.Convert.ToDecimal(match[0].Groups["percent"].Value); + int hours; + int minutes; + int seconds; + + Int32.TryParse(match[0].Groups["hours"].Value, out hours); + Int32.TryParse(match[0].Groups["minutes"].Value, out minutes); + Int32.TryParse(match[0].Groups["seconds"].Value, out seconds); + + if (seconds > 0 || minutes > 0 || hours > 0) + { + var eta = DateTime.Now.Add(new TimeSpan(0, hours, minutes, seconds)); + _notification.CurrentMessage = String.Format("Converting: {0}, {1}%. ETA: {2}", episodeString, percent, eta); + } + + else + _notification.CurrentMessage = String.Format("Converting: {0}, {1}%.", episodeString, percent); + + Console.WriteLine(args.Data); + } + } +} diff --git a/NzbDrone.Core/Providers/Core/ConfigFileProvider.cs b/NzbDrone.Core/Providers/Core/ConfigFileProvider.cs index 193c126a3..e6fdc787a 100644 --- a/NzbDrone.Core/Providers/Core/ConfigFileProvider.cs +++ b/NzbDrone.Core/Providers/Core/ConfigFileProvider.cs @@ -5,29 +5,39 @@ using System.Linq; using System.Reflection; using System.Text; using System.Xml.Linq; +using NzbDrone.Core.Model; namespace NzbDrone.Core.Providers.Core { public class ConfigFileProvider { + private string _configFile = Path.Combine(CentralDispatch.AppPath, "App_Data", "Config.xml"); + public string ConfigFile { - get { return Path.Combine(CentralDispatch.AppPath, "App_Data", "Config.xml"); } + get { return _configFile; } + set { _configFile = value; } } public virtual int Port { - get { return GetValueInt("Port"); } + get { return GetValueInt("Port", 8989); } set { SetValue("Port", value); } } public virtual bool LaunchBrowser { - get { return GetValueBoolean("LaunchBrowser"); } + get { return GetValueBoolean("LaunchBrowser", true); } set { SetValue("LaunchBrowser", value); } } - public virtual string GetValue(string key, string parent = null) + public virtual AuthenticationType AuthenticationType + { + get { return (AuthenticationType)GetValueInt("AuthenticationType", 0); } + set { SetValue("AuthenticationType", (int)value); } + } + + public virtual string GetValue(string key, object defaultValue, string parent = null) { var xDoc = XDocument.Load(ConfigFile); var config = xDoc.Descendants("Config").Single(); @@ -35,21 +45,40 @@ namespace NzbDrone.Core.Providers.Core var parentContainer = config; if (!String.IsNullOrEmpty(parent)) + { + //Add the parent + if (config.Descendants(parent).Count() != 1) + { + SetValue(key, defaultValue, parent); + + //Reload the configFile + xDoc = XDocument.Load(ConfigFile); + config = xDoc.Descendants("Config").Single(); + } + parentContainer = config.Descendants(parent).Single(); + } - var value = parentContainer.Descendants(key).Single().Value; + var valueHolder = parentContainer.Descendants(key).ToList(); + + if (valueHolder.Count() == 1) + return valueHolder.First().Value; - return value; + //Save the value + SetValue(key, defaultValue, parent); + + //return the default value + return defaultValue.ToString(); } - public virtual int GetValueInt(string key, string parent = null) + public virtual int GetValueInt(string key, int defaultValue, string parent = null) { - return Convert.ToInt32(GetValue(key, parent)); + return Convert.ToInt32(GetValue(key, defaultValue, parent)); } - public virtual bool GetValueBoolean(string key, string parent = null) + public virtual bool GetValueBoolean(string key, bool defaultValue, string parent = null) { - return Convert.ToBoolean(GetValue(key, parent)); + return Convert.ToBoolean(GetValue(key, defaultValue, parent)); } public virtual void SetValue(string key, object value, string parent = null) @@ -60,9 +89,23 @@ namespace NzbDrone.Core.Providers.Core var parentContainer = config; if (!String.IsNullOrEmpty(parent)) - parentContainer = config.Descendants(parent).Single(); + { + //Add the parent container if it doesn't already exist + if (config.Descendants(parent).Count() != 1) + { + config.Add(new XElement(parent)); + } - parentContainer.Descendants(key).Single().Value = value.ToString(); + parentContainer = config.Descendants(parent).Single(); + } + + var keyHolder = parentContainer.Descendants(key); + + if (keyHolder.Count() != 1) + parentContainer.Add(new XElement(key, value)); + + else + parentContainer.Descendants(key).Single().Value = value.ToString(); xDoc.Save(ConfigFile); } @@ -82,11 +125,7 @@ namespace NzbDrone.Core.Providers.Core { var xDoc = new XDocument(new XDeclaration("1.0", "utf-8", "yes")); - xDoc.Add(new XElement("Config", - new XElement("Port", 8989), - new XElement("LaunchBrowser", true) - ) - ); + xDoc.Add(new XElement("Config")); xDoc.Save(ConfigFile); } diff --git a/NzbDrone.Core/Providers/Jobs/ConvertEpisodeJob.cs b/NzbDrone.Core/Providers/Jobs/ConvertEpisodeJob.cs new file mode 100644 index 000000000..5363fc3e9 --- /dev/null +++ b/NzbDrone.Core/Providers/Jobs/ConvertEpisodeJob.cs @@ -0,0 +1,53 @@ +using System; +using Ninject; +using NLog; +using NzbDrone.Core.Model.Notification; +using NzbDrone.Core.Providers.Converting; + +namespace NzbDrone.Core.Providers.Jobs +{ + public class ConvertEpisodeJob : IJob + { + private readonly HandbrakeProvider _handbrakeProvider; + private readonly AtomicParsleyProvider _atomicParsleyProvider; + private readonly EpisodeProvider _episodeProvider; + + private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); + + [Inject] + public ConvertEpisodeJob(HandbrakeProvider handbrakeProvider, AtomicParsleyProvider atomicParsleyProvider, + EpisodeProvider episodeProvider) + { + _handbrakeProvider = handbrakeProvider; + _atomicParsleyProvider = atomicParsleyProvider; + _episodeProvider = episodeProvider; + } + + public string Name + { + get { return "Convert Episode"; } + } + + public int DefaultInterval + { + get { return 0; } + } + + public void Start(ProgressNotification notification, int targetId, int secondaryTargetId) + { + if (targetId <= 0) + throw new ArgumentOutOfRangeException("targetId"); + + var episode = _episodeProvider.GetEpisode(targetId); + notification.CurrentMessage = String.Format("Starting Conversion for {0}", episode); + var outputFile = _handbrakeProvider.ConvertFile(episode, notification); + + if (String.IsNullOrEmpty(outputFile)) + notification.CurrentMessage = String.Format("Conversion failed for {0}", episode); + + _atomicParsleyProvider.RunAtomicParsley(episode, outputFile); + + notification.CurrentMessage = String.Format("Conversion completed for {0}", episode); + } + } +} \ No newline at end of file diff --git a/NzbDrone.Web/Controllers/SettingsController.cs b/NzbDrone.Web/Controllers/SettingsController.cs index 0620b792c..84bf6f023 100644 --- a/NzbDrone.Web/Controllers/SettingsController.cs +++ b/NzbDrone.Web/Controllers/SettingsController.cs @@ -189,9 +189,21 @@ namespace NzbDrone.Web.Controllers public ActionResult System() { + var selectedAuthenticationType = _configFileProvider.AuthenticationType; + var authenticationTypes = new List(); + + foreach (AuthenticationType authenticationType in Enum.GetValues(typeof(AuthenticationType))) + { + authenticationTypes.Add(authenticationType); + } + + var authTypeSelectList = new SelectList(authenticationTypes, selectedAuthenticationType); + var model = new SystemSettingsModel(); model.Port = _configFileProvider.Port; model.LaunchBrowser = _configFileProvider.LaunchBrowser; + model.AuthenticationType = selectedAuthenticationType; + model.AuthTypeSelectList = authTypeSelectList; return View(model); } @@ -455,6 +467,7 @@ namespace NzbDrone.Web.Controllers { _configFileProvider.Port = data.Port; _configFileProvider.LaunchBrowser = data.LaunchBrowser; + _configFileProvider.AuthenticationType = data.AuthenticationType; return GetSuccessResult(); } diff --git a/NzbDrone.Web/Models/SystemSettingsModel.cs b/NzbDrone.Web/Models/SystemSettingsModel.cs index 25615eb77..19a17791d 100644 --- a/NzbDrone.Web/Models/SystemSettingsModel.cs +++ b/NzbDrone.Web/Models/SystemSettingsModel.cs @@ -4,6 +4,8 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.Linq; using System.Web; +using System.Web.Mvc; +using NzbDrone.Core.Model; namespace NzbDrone.Web.Models { @@ -17,5 +19,11 @@ namespace NzbDrone.Web.Models [DisplayName("Launch Browser")] [Description("Start default webrowser when NzbDrone starts?")] public bool LaunchBrowser { get; set; } + + [DisplayName("Authentication")] + [Description("Secure the webserver with Authentication?")] + public AuthenticationType AuthenticationType { get; set; } + + public SelectList AuthTypeSelectList { get; set; } } } \ No newline at end of file diff --git a/NzbDrone.Web/Views/Settings/System.cshtml b/NzbDrone.Web/Views/Settings/System.cshtml index 2bfc9a5cb..7af233bd2 100644 --- a/NzbDrone.Web/Views/Settings/System.cshtml +++ b/NzbDrone.Web/Views/Settings/System.cshtml @@ -31,6 +31,11 @@ @Html.DescriptionFor(m => m.Port) @Html.TextBoxFor(m => m.Port, new { @class = "inputClass" }) + + + @Html.DropDownListFor(m => m.AuthenticationType, Model.AuthTypeSelectList, new { @class = "inputClass" }) } diff --git a/NzbDrone/Console.cs b/NzbDrone/Console.cs index 0da1cfc03..8c32dea47 100644 --- a/NzbDrone/Console.cs +++ b/NzbDrone/Console.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Reflection; using NLog; using Ninject; +using NzbDrone.Model; using NzbDrone.Providers; namespace NzbDrone diff --git a/NzbDrone/ApplicationMode.cs b/NzbDrone/Model/ApplicationMode.cs similarity index 54% rename from NzbDrone/ApplicationMode.cs rename to NzbDrone/Model/ApplicationMode.cs index 7bd8835c6..58eccb381 100644 --- a/NzbDrone/ApplicationMode.cs +++ b/NzbDrone/Model/ApplicationMode.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace NzbDrone +namespace NzbDrone.Model { public enum ApplicationMode { diff --git a/NzbDrone/Model/AuthenticationType.cs b/NzbDrone/Model/AuthenticationType.cs new file mode 100644 index 000000000..243154383 --- /dev/null +++ b/NzbDrone/Model/AuthenticationType.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace NzbDrone.Model +{ + public enum AuthenticationType + { + Anonymous = 0, + Windows = 1 + } +} diff --git a/NzbDrone/ProcessInfo.cs b/NzbDrone/Model/ProcessInfo.cs similarity index 89% rename from NzbDrone/ProcessInfo.cs rename to NzbDrone/Model/ProcessInfo.cs index 858989d70..f1086c2ab 100644 --- a/NzbDrone/ProcessInfo.cs +++ b/NzbDrone/Model/ProcessInfo.cs @@ -1,6 +1,6 @@ using System.Diagnostics; -namespace NzbDrone +namespace NzbDrone.Model { public class ProcessInfo { diff --git a/NzbDrone/NzbDrone.csproj b/NzbDrone/NzbDrone.csproj index 63449e4ea..d3a1b88be 100644 --- a/NzbDrone/NzbDrone.csproj +++ b/NzbDrone/NzbDrone.csproj @@ -86,8 +86,9 @@ - - + + + @@ -134,6 +135,7 @@ true + diff --git a/NzbDrone/NzbDrone.csproj.orig b/NzbDrone/NzbDrone.csproj.orig new file mode 100644 index 000000000..2f3a2bcbb --- /dev/null +++ b/NzbDrone/NzbDrone.csproj.orig @@ -0,0 +1,154 @@ + + + + Debug + x86 + 8.0.30703 + 2.0 + {D12F7F2F-8A3C-415F-88FA-6DD061A84869} + Exe + Properties + NzbDrone + NzbDrone + v4.0 + 512 + + false + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + true + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + true + BasicCorrectnessRules.ruleset + + + x86 + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + NzbDrone.ico + + + + True + + + True + + + True + + + False + ..\Libraries\Exceptioneer.WindowsFormsClient.dll + + + ..\packages\Ninject.2.2.1.4\lib\net40-Full\Ninject.dll + + + False + ..\Libraries\NLog.dll + + + + + + + + + + + + + +<<<<<<< HEAD + +======= + +>>>>>>> markus + + + + + + Component + + + + + + + + + + + + + + + + + + + + + + False + Microsoft .NET Framework 4 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + false + + + False + Windows Installer 3.1 + true + + + + + + + + + + \ No newline at end of file diff --git a/NzbDrone/Providers/ConfigProvider.cs b/NzbDrone/Providers/ConfigProvider.cs index 0aaf0076e..e5c435fdd 100644 --- a/NzbDrone/Providers/ConfigProvider.cs +++ b/NzbDrone/Providers/ConfigProvider.cs @@ -6,6 +6,7 @@ using System.Xml.XPath; using NLog; using NLog.Config; using Ninject; +using NzbDrone.Model; namespace NzbDrone.Providers { @@ -27,12 +28,12 @@ namespace NzbDrone.Providers public virtual int PortNumber { - get { return GetValueInt("Port"); } + get { return GetValueInt("Port", 8989); } } public virtual bool LaunchBrowser { - get { return GetValueBoolean("LaunchBrowser"); } + get { return GetValueBoolean("LaunchBrowser", true); } } public virtual string IISDirectory @@ -65,6 +66,10 @@ namespace NzbDrone.Providers get { return Path.Combine(_enviromentProvider.ApplicationPath, "NzbDrone.Web\\log.config"); } } + public virtual AuthenticationType AuthenticationType + { + get { return (AuthenticationType)GetValueInt("AuthenticationType", 0); } + } public virtual void ConfigureNlog() { @@ -94,6 +99,25 @@ namespace NzbDrone.Providers new XAttribute("bindingInformation", String.Format("*:{0}:", PortNumber)) )); + //Update the authenticationTypes + + var location = configXml.XPathSelectElement("configuration").Elements("location").Where( + d => d.Attribute("path").Value.ToLowerInvariant() == "nzbdrone").First(); + + + var authenticationTypes = location.XPathSelectElements("system.webServer/security/authentication").First().Descendants(); + + //Set all authentication types enabled to false + foreach (var child in authenticationTypes) + { + child.Attribute("enabled").Value = "false"; + } + + var configuredAuthType = String.Format("{0}Authentication", AuthenticationType.ToString()).ToLowerInvariant(); + + //Set the users authenticationType to true + authenticationTypes.Where(t => t.Name.ToString().ToLowerInvariant() == configuredAuthType).Single().Attribute("enabled").Value = "true"; + configXml.Save(configPath); } @@ -108,42 +132,86 @@ namespace NzbDrone.Providers } } - private void WriteDefaultConfig() - { - var xDoc = new XDocument(new XDeclaration("1.0", "utf-8", "yes")); - - xDoc.Add(new XElement("Config", - new XElement("Port", 8989), - new XElement("LaunchBrowser", true) - ) - ); - - xDoc.Save(ConfigFile); - } - - private string GetValue(string key, string parent = null) + public virtual string GetValue(string key, object defaultValue, string parent = null) { var xDoc = XDocument.Load(ConfigFile); var config = xDoc.Descendants("Config").Single(); var parentContainer = config; - if (parent != null) + if (!String.IsNullOrEmpty(parent)) + { + //Add the parent + if (config.Descendants(parent).Count() != 1) + { + SetValue(key, defaultValue, parent); + + //Reload the configFile + xDoc = XDocument.Load(ConfigFile); + config = xDoc.Descendants("Config").Single(); + } + parentContainer = config.Descendants(parent).Single(); + } - string value = parentContainer.Descendants(key).Single().Value; + var valueHolder = parentContainer.Descendants(key).ToList(); - return value; + if (valueHolder.Count() == 1) + return valueHolder.First().Value; + + //Save the value + SetValue(key, defaultValue, parent); + + //return the default value + return defaultValue.ToString(); } - private int GetValueInt(string key, string parent = null) + public virtual int GetValueInt(string key, int defaultValue, string parent = null) { - return Convert.ToInt32(GetValue(key, parent)); + return Convert.ToInt32(GetValue(key, defaultValue, parent)); } - private bool GetValueBoolean(string key, string parent = null) + public virtual bool GetValueBoolean(string key, bool defaultValue, string parent = null) { - return Convert.ToBoolean(GetValue(key, parent)); + return Convert.ToBoolean(GetValue(key, defaultValue, parent)); + } + + public virtual void SetValue(string key, object value, string parent = null) + { + var xDoc = XDocument.Load(ConfigFile); + var config = xDoc.Descendants("Config").Single(); + + var parentContainer = config; + + if (!String.IsNullOrEmpty(parent)) + { + //Add the parent container if it doesn't already exist + if (config.Descendants(parent).Count() != 1) + { + config.Add(new XElement(parent)); + } + + parentContainer = config.Descendants(parent).Single(); + } + + var keyHolder = parentContainer.Descendants(key); + + if (keyHolder.Count() != 1) + parentContainer.Add(new XElement(key, value)); + + else + parentContainer.Descendants(key).Single().Value = value.ToString(); + + xDoc.Save(ConfigFile); + } + + public virtual void WriteDefaultConfig() + { + var xDoc = new XDocument(new XDeclaration("1.0", "utf-8", "yes")); + + xDoc.Add(new XElement("Config")); + + xDoc.Save(ConfigFile); } } } \ No newline at end of file diff --git a/NzbDrone/Providers/ConfigProvider.cs.orig b/NzbDrone/Providers/ConfigProvider.cs.orig new file mode 100644 index 000000000..f1e6db1be --- /dev/null +++ b/NzbDrone/Providers/ConfigProvider.cs.orig @@ -0,0 +1,228 @@ +using System; +using System.IO; +using System.Linq; +using System.Xml.Linq; +using System.Xml.XPath; +using NLog; +using NLog.Config; +<<<<<<< HEAD +using Ninject; +======= +using NzbDrone.Model; +>>>>>>> markus + +namespace NzbDrone.Providers +{ + public class ConfigProvider + { + private readonly EnviromentProvider _enviromentProvider; + private static readonly Logger Logger = LogManager.GetLogger("Host.ConfigProvider"); + + [Inject] + public ConfigProvider(EnviromentProvider enviromentProvider) + { + _enviromentProvider = enviromentProvider; + } + + public ConfigProvider() + { + + } + + public virtual int PortNumber + { + get { return GetValueInt("Port", 8989); } + } + + public virtual bool LaunchBrowser + { + get { return GetValueBoolean("LaunchBrowser", true); } + } + + public virtual string IISDirectory + { + get { return Path.Combine(_enviromentProvider.ApplicationPath, "IISExpress"); } + } + + public virtual string IISExePath + { + get { return Path.Combine(IISDirectory, "iisexpress.exe"); } + } + + public virtual string IISConfigPath + { + get { return Path.Combine(IISDirectory, "AppServer", "applicationhost.config"); } + } + + public virtual string AppDataDirectory + { + get { return Path.Combine(_enviromentProvider.ApplicationPath, "NzbDrone.Web", "App_Data"); } + } + + public virtual string ConfigFile + { + get { return Path.Combine(AppDataDirectory, "Config.xml"); } + } + + public virtual string NlogConfigPath + { + get { return Path.Combine(_enviromentProvider.ApplicationPath, "NzbDrone.Web\\log.config"); } + } + +<<<<<<< HEAD +======= + public virtual AuthenticationType AuthenticationType + { + get { return (AuthenticationType)GetValueInt("AuthenticationType", 0); } + set { SetValue("AuthenticationType", (int)value); } + } +>>>>>>> markus + + public virtual void ConfigureNlog() + { + LogManager.Configuration = new XmlLoggingConfiguration(NlogConfigPath, false); + } + + public virtual void UpdateIISConfig(string configPath) + { + Logger.Info(@"Server configuration file: {0}", configPath); + Logger.Info(@"Configuring server to: [http://localhost:{0}]", PortNumber); + + var configXml = XDocument.Load(configPath); + + var bindings = + configXml.XPathSelectElement("configuration/system.applicationHost/sites").Elements("site").Where( + d => d.Attribute("name").Value.ToLowerInvariant() == "nzbdrone").First().Element("bindings"); + bindings.Descendants().Remove(); + bindings.Add( + new XElement("binding", + new XAttribute("protocol", "http"), + new XAttribute("bindingInformation", String.Format("*:{0}:localhost", PortNumber)) + )); + + bindings.Add( + new XElement("binding", + new XAttribute("protocol", "http"), + new XAttribute("bindingInformation", String.Format("*:{0}:", PortNumber)) + )); + + //Update the authenticationTypes + + var location = configXml.XPathSelectElement("configuration").Elements("location").Where( + d => d.Attribute("path").Value.ToLowerInvariant() == "nzbdrone").First(); + + + var authenticationTypes = location.XPathSelectElements("system.webServer/security/authentication").First().Descendants(); + + //Set all authentication types enabled to false + foreach (var child in authenticationTypes) + { + child.Attribute("enabled").Value = "false"; + } + + var configuredAuthType = String.Format("{0}Authentication", AuthenticationType.ToString()).ToLowerInvariant(); + + //Set the users authenticationType to true + authenticationTypes.Where(t => t.Name.ToString().ToLowerInvariant() == configuredAuthType).Single().Attribute("enabled").Value = "true"; + + configXml.Save(configPath); + } + + public virtual void CreateDefaultConfigFile() + { + //Create the config file here + Directory.CreateDirectory(AppDataDirectory); + + if (!File.Exists(ConfigFile)) + { + WriteDefaultConfig(); + } + } + +<<<<<<< HEAD + private void WriteDefaultConfig() +======= + public virtual string GetValue(string key, object defaultValue, string parent = null) +>>>>>>> markus + { + var xDoc = XDocument.Load(ConfigFile); + var config = xDoc.Descendants("Config").Single(); + + var parentContainer = config; + + if (!String.IsNullOrEmpty(parent)) + { + //Add the parent + if (config.Descendants(parent).Count() != 1) + { + SetValue(key, defaultValue, parent); + + //Reload the configFile + xDoc = XDocument.Load(ConfigFile); + config = xDoc.Descendants("Config").Single(); + } + + parentContainer = config.Descendants(parent).Single(); + } + + var valueHolder = parentContainer.Descendants(key).ToList(); + + if (valueHolder.Count() == 1) + return valueHolder.First().Value; + + //Save the value + SetValue(key, defaultValue, parent); + + //return the default value + return defaultValue.ToString(); + } + + public virtual int GetValueInt(string key, int defaultValue, string parent = null) + { + return Convert.ToInt32(GetValue(key, defaultValue, parent)); + } + + public virtual bool GetValueBoolean(string key, bool defaultValue, string parent = null) + { + return Convert.ToBoolean(GetValue(key, defaultValue, parent)); + } + + public virtual void SetValue(string key, object value, string parent = null) + { + var xDoc = XDocument.Load(ConfigFile); + var config = xDoc.Descendants("Config").Single(); + + var parentContainer = config; + + if (!String.IsNullOrEmpty(parent)) + { + //Add the parent container if it doesn't already exist + if (config.Descendants(parent).Count() != 1) + { + config.Add(new XElement(parent)); + } + + parentContainer = config.Descendants(parent).Single(); + } + + var keyHolder = parentContainer.Descendants(key); + + if (keyHolder.Count() != 1) + parentContainer.Add(new XElement(key, value)); + + else + parentContainer.Descendants(key).Single().Value = value.ToString(); + + xDoc.Save(ConfigFile); + } + + public virtual void WriteDefaultConfig() + { + var xDoc = new XDocument(new XDeclaration("1.0", "utf-8", "yes")); + + xDoc.Add(new XElement("Config")); + + xDoc.Save(ConfigFile); + } + } +} \ No newline at end of file diff --git a/NzbDrone/Providers/ProcessProvider.cs b/NzbDrone/Providers/ProcessProvider.cs index fd12e3e68..da8822155 100644 --- a/NzbDrone/Providers/ProcessProvider.cs +++ b/NzbDrone/Providers/ProcessProvider.cs @@ -2,6 +2,7 @@ using System.Diagnostics; using System.Linq; using NLog; +using NzbDrone.Model; namespace NzbDrone.Providers { diff --git a/NzbDrone/Router.cs b/NzbDrone/Router.cs index 56d0a88b6..a03b0c9a3 100644 --- a/NzbDrone/Router.cs +++ b/NzbDrone/Router.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using NzbDrone.Model; using NzbDrone.Providers; namespace NzbDrone