diff --git a/NzbDrone.Core/Main.cs b/NzbDrone.Core/Main.cs index 1580612f5..9150069d5 100644 --- a/NzbDrone.Core/Main.cs +++ b/NzbDrone.Core/Main.cs @@ -1,4 +1,6 @@ using System; +using System.IO; +using System.Web; using log4net; using Ninject; using NzbDrone.Core.Controllers; @@ -12,8 +14,8 @@ public static class Main public static void BindKernel(IKernel kernel) { - var provider = ProviderFactory.GetProvider("Data Source=filename;Version=3;", "System.Data.SQLite"); - + string connectionString = String.Format("Data Source={0};Version=3;",Path.Combine(AppPath, "nzbdrone.db")) ; + var provider = ProviderFactory.GetProvider(connectionString, "System.Data.SQLite"); kernel.Bind().To(); kernel.Bind().To(); @@ -24,11 +26,11 @@ public static void BindKernel(IKernel kernel) } + private static string _appPath; + public static String AppPath { - get { throw new ApplicationException(); } - + get { return new DirectoryInfo(HttpContext.Current.Server.MapPath("\\")).Parent.FullName; } } - } } diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj index 9182f7709..82585837e 100644 --- a/NzbDrone.Core/NzbDrone.Core.csproj +++ b/NzbDrone.Core/NzbDrone.Core.csproj @@ -129,6 +129,7 @@ + @@ -146,9 +147,6 @@ - - - False diff --git a/NzbDrone.Core/app.config b/NzbDrone.Core/app.config deleted file mode 100644 index e59af44de..000000000 --- a/NzbDrone.Core/app.config +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/NzbDrone.Web/Bin/NzbDrone.Core.dll b/NzbDrone.Web/Bin/NzbDrone.Core.dll index 23670fb25..5fa89af4c 100644 Binary files a/NzbDrone.Web/Bin/NzbDrone.Core.dll and b/NzbDrone.Web/Bin/NzbDrone.Core.dll differ diff --git a/NzbDrone.Web/Bin/NzbDrone.Core.pdb b/NzbDrone.Web/Bin/NzbDrone.Core.pdb index b2e35f797..ee0acb298 100644 Binary files a/NzbDrone.Web/Bin/NzbDrone.Core.pdb and b/NzbDrone.Web/Bin/NzbDrone.Core.pdb differ diff --git a/NzbDrone.Web/Bin/NzbDrone.Web.dll b/NzbDrone.Web/Bin/NzbDrone.Web.dll index 92a31ecac..5f3719d18 100644 Binary files a/NzbDrone.Web/Bin/NzbDrone.Web.dll and b/NzbDrone.Web/Bin/NzbDrone.Web.dll differ diff --git a/NzbDrone.Web/Bin/NzbDrone.Web.pdb b/NzbDrone.Web/Bin/NzbDrone.Web.pdb index 3bb9ffaa8..9031cd3fa 100644 Binary files a/NzbDrone.Web/Bin/NzbDrone.Web.pdb and b/NzbDrone.Web/Bin/NzbDrone.Web.pdb differ diff --git a/NzbDrone.Web/Global.asax.cs b/NzbDrone.Web/Global.asax.cs index 72071c47b..1ad8cebef 100644 --- a/NzbDrone.Web/Global.asax.cs +++ b/NzbDrone.Web/Global.asax.cs @@ -34,7 +34,7 @@ protected override void OnApplicationStarted() AreaRegistration.RegisterAllAreas(); RegisterRoutes(RouteTable.Routes); base.OnApplicationStarted(); - } + } protected override IKernel CreateKernel() { diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj index 4e9e79a28..112d4dd24 100644 --- a/NzbDrone.Web/NzbDrone.Web.csproj +++ b/NzbDrone.Web/NzbDrone.Web.csproj @@ -141,8 +141,7 @@ True 21704 / - - + http://localhost/NzbDrone False False diff --git a/NzbDrone.Web/Web.config b/NzbDrone.Web/Web.config index 68f619e42..a2f139995 100644 --- a/NzbDrone.Web/Web.config +++ b/NzbDrone.Web/Web.config @@ -1,27 +1,61 @@  - - + + + + + +
+ +
+
+
+
+ + + + + + + - + - + + + - - - - + + + + + + + + + @@ -29,50 +63,142 @@ - + - + - - - + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + - - + + + diff --git a/NzbDrone.sln b/NzbDrone.sln index def44a117..67cb4f774 100644 --- a/NzbDrone.sln +++ b/NzbDrone.sln @@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone", "NzbDrone\NzbDro EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{57A04B72-8088-4F75-A582-1158CF8291F7}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcApplication1", "MvcApplication1\MvcApplication1.csproj", "{23650B89-93C1-4512-8133-55AFF80AEC73}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -89,6 +91,18 @@ Global {D12F7F2F-8A3C-415F-88FA-6DD061A84869}.Release|x64.ActiveCfg = Release|x86 {D12F7F2F-8A3C-415F-88FA-6DD061A84869}.Release|x86.ActiveCfg = Release|x86 {D12F7F2F-8A3C-415F-88FA-6DD061A84869}.Release|x86.Build.0 = Release|x86 + {23650B89-93C1-4512-8133-55AFF80AEC73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {23650B89-93C1-4512-8133-55AFF80AEC73}.Debug|Any CPU.Build.0 = Debug|Any CPU + {23650B89-93C1-4512-8133-55AFF80AEC73}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {23650B89-93C1-4512-8133-55AFF80AEC73}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {23650B89-93C1-4512-8133-55AFF80AEC73}.Debug|x64.ActiveCfg = Debug|Any CPU + {23650B89-93C1-4512-8133-55AFF80AEC73}.Debug|x86.ActiveCfg = Debug|Any CPU + {23650B89-93C1-4512-8133-55AFF80AEC73}.Release|Any CPU.ActiveCfg = Release|Any CPU + {23650B89-93C1-4512-8133-55AFF80AEC73}.Release|Any CPU.Build.0 = Release|Any CPU + {23650B89-93C1-4512-8133-55AFF80AEC73}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {23650B89-93C1-4512-8133-55AFF80AEC73}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {23650B89-93C1-4512-8133-55AFF80AEC73}.Release|x64.ActiveCfg = Release|Any CPU + {23650B89-93C1-4512-8133-55AFF80AEC73}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE