From 036b2e7f4f9f5823d82ee6b6e3317b221e0ddbd3 Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Thu, 23 Sep 2010 19:19:55 -0700 Subject: [PATCH] updated the apppath logic and db location --- NzbDrone.Core/Main.cs | 12 +- NzbDrone.Core/NzbDrone.Core.csproj | 4 +- NzbDrone.Core/app.config | 3 - NzbDrone.Web/Bin/NzbDrone.Core.dll | Bin 13824 -> 14336 bytes NzbDrone.Web/Bin/NzbDrone.Core.pdb | Bin 28160 -> 34304 bytes NzbDrone.Web/Bin/NzbDrone.Web.dll | Bin 22528 -> 22528 bytes NzbDrone.Web/Bin/NzbDrone.Web.pdb | Bin 34304 -> 38400 bytes NzbDrone.Web/Global.asax.cs | 2 +- NzbDrone.Web/NzbDrone.Web.csproj | 3 +- NzbDrone.Web/Web.config | 182 ++++++++++++++++++++++++----- NzbDrone.sln | 14 +++ 11 files changed, 178 insertions(+), 42 deletions(-) delete mode 100644 NzbDrone.Core/app.config 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 @@ namespace NzbDrone.Core 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 @@ namespace NzbDrone.Core } + 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 23670fb256078b5523ef1fa189a539cf0229c45b..5fa89af4c5d968505d8b7586e3fbdcb5dd7be7ed 100644 GIT binary patch delta 2253 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 diff --git a/NzbDrone.Web/Bin/NzbDrone.Core.pdb b/NzbDrone.Web/Bin/NzbDrone.Core.pdb index b2e35f797cfd20a9f4c502f53240b23c5f122e10..ee0acb29865a9e1c282dcded75d3db2fd308d4a8 100644 GIT binary patch delta 1905 zcmb_dZA?>F7(VB6sjWh}g|-(e6DZXJ7OCj`1OX+k1F8+8mRW3VL9kIEuJI%8qh`ht zq6T?cMl!cB!h%2c1ABGJlKogVf6Yu?<`%aQ6OCD1_Ms;GVHVUq=Te>9vOmk-;f%2jK)o11>a-HWC2kz8bxPt@hc1hRl^ zzyjC+l{y?T%QB3rf#tySfcDj!Rep8p#u!)DeY@K3_89C^02usk8n#~4Y> zMCampT+nn|#PotnP^NAs_nbhb45!nV?YB zgfjn@mxoY=j;uXbPVKnF5#`mR%1U<~oQ+yIVR;hu`;~obL{uhOoL|d7t~*&V8{(cw zxoYN6P1VJeCm~Z}`7{L@rc%{`3<|8CO076+9&s2zx6P;T~Tm38PM0+AzG}szeq3>W~Z&xg_r>}QQ zV*j4rZaA2e65>!Gl}QY+hZou@Vp$l5^LA)ab;NI4hv^WiX6-4`^B3R+8f57oA+nV)dRu2Fld z+Z;qSI)M@3LrHtDEy`2D;tbwNB|GNhS-V5^h^iS_cUL0Z(BB`}mFU4_c2=%`F1srF z2NFWMNW1gK5N+P+qIW`dHZ$u_dq>mWvVkGG8;aR1EFsQ6#E5@@$m=;SJf$?)QDgh( zVtU@3^*(|(hh>TX2BZ;*B6k3}n|Fq7RyLj9gg5QU2VYTmKHb>qvE{KTJ&Q3Pw8+ap zCcJf`GayBDG_2Aq;R+fIo9TSm0sAS~yL9`{`uk#}RnxABO0I|lTvQ*~Nb!i7Mk1|f zs_$SrE@p;^m1qwljhs(XZB)$^?NLtcQ8&LqN24nd%~&%q3fu(BIDHYVqsq=YdKhh| z+p!nv-PjAXEw+~Sb}r7!X3ssnC+PkHzjkl8!c8MfmU54Lrp2I{b{~=W|8Y@dF2G{; zQf7P^)x-;xGJL^j?<(Sw)iQ$+@h28-FD@zr{m1*_bG{Cj;$yBU#(U2^P6xby0NsDD A1poj5 delta 1230 zcmY*ZUr1YL6#vdOCb?-6a}%$L{~D|IpGj*vt9D(AW>?!V6n$7(w6<1;oorJRb8X8e zT~@|$ovdC@9?JeOX+eA_%-jommeGf9dnvSKNXyDxAId0`F&TT1X6L(J3p?=pe%|x@ z&iT%Fz7unELhdolH%bCytetQGXd!De_Sk<0ST!VJ1F%l;IgXkB+>XPwU@v!7vSQIj z{*s&lSJnZOS-0W7vIz(ChmSzi_H_@>_K)|w2b&+PC9aR%um9%4^DoUjv~UgRm|sA5 zr-VXc8FXJ#Fp?pk`LR%+;=Tn}(s%XveEZ+u-wmD#-BKn3i|-W@w*gl&HgrZejjbvh zX#Gxc$-bR<38ll$M$EnnH+S2l>h%~5(MjDuIGvxLp&OwTyKg+LuL1pN+=21P9X+nv z3d$VlulJW|%8Gt+*;!Chp!c75Xv*S3>H!4tVX9eEwmkf*$61ra59&nE;A_Gb!#4)Q z_}So(V8_U*O8+yff7*62wBot9ZZ_eQk$uIpxEr zLp4x=a5nhSJh{E*ZeTkJUF7@3O84i+iyXhTm$96KxQw`l*iU?bI6!=qxSY6?SSIcv zt{}cd93;L@93m!SB6Beh%MiK=2@DLpD%O(5tF6V;1MQlk>gQ*vU6(<>P$f_;MY1Zf z`7e6M$DqGkR{~wQXS|x$6XU_A=M-sY|G#GiJ7_j=TZ^^D$XbqRiK{ZtbxAw|{5UG{ zT98d%452*HD+ky;-g~kk8dR>QpX9MG-H2aJbjW2aZK*dbb#Xn98xwEKex{b1Va!>w z9k=ouR~qozcwClP4$J`Xdt&1eC-XpayJuJ&CWyOUoCHH$C z!EmE!FOo!iV-aBlmj16~VI@2cfj^J`;pQKEFLCWY$HH%L& z`~BI`2&H(%@&X$h!O+w`VKj@KQzwOC1!t$u`Ny+sRM4mVEHZ%=_Zt6BbpdF2LJgMk zd2`@^x*wMCW3}DiXzhDMd-H@|hCittxVAfl;ptYyI={((OrOGRxZM0(obJH)FGk#6 z8VmkP+zN@aAin&a8{*{;g+g)$N-HU42uo*LU<+Gk!nJeM#aVivDEV{r8oa431U{H{ zly(KMuFSTVMwj^ryhVJJodl7<$9)&UP4Hl0CV)NBH$4&hY9jEQhqS~aXr=!@MfeXq CxgIzG diff --git a/NzbDrone.Web/Bin/NzbDrone.Web.dll b/NzbDrone.Web/Bin/NzbDrone.Web.dll index 92a31ecacf24421f556977bfef043765b5bbcaeb..5f3719d1844c304e0b5efc50d592e6970f73b168 100644 GIT binary patch delta 50 zcmZqJz}T>XaY6@E3)jZ3GDzB=Zt{p>2g*&3^VeeJ*xcz~ G&H(@|P87lb delta 50 zcmZqJz}T>XaY6@^F3ZNQGqEhdy-oi1cB|CO!=6LlBWYOc`Sjd#qY?55@RBN$NioMezq8 z_}%mSbI$MF-|rL_l){R#81it&*wY{<6-ZLF)U9*p#qO5s!cT%LKXALLd?U3jUaZrd z0ah;C;cF`huHNQLvr5sG(lr}nw=~999gOXSb>lw9h%5e~Fh2H6cOb*+KpZ4MFX#hL zfqviujld5O&s2b%tO2-zkG`He8Ql%719XBYcpU5jUEm3@7d#1Kpd0i6<6JLUT1xq= zbL#)>FiEK3A?vn5lQcwZ7FCk8Yz)7FY%%`MPtLJ$hV&1MLoqg=-S~XF&=uG zS3Dkphb!qmd;a7HsuJEe{o%qZTXpN#>1cdJtb|AY)F@KzhzcY`!o13hrdoe`K3{rk zbe*f@F<-Kee-V0(7R?eZhx%x#?TCBF?Fb)3sm~jG_DVPM1R|6$2e&;xr}=n<79P%7 ztrwkSM!Q5Q65~R9w8ZIVN63nN%;~#MFI|szS-U?~X*%u|U-sl zU*(kO2-EW6F{^Jwu{AIkec%83{du(OB3Q9AI(=Zq8pzlwbLd@)jOk>K-m(TY8)?sO zTEllWarda7TSrzMv^qI#od_uI&oCwBa-jaPZ*jl!irY_o#jUhj*C3l3jq`?|O-w&P zzEeX+1N%r$1!NKbPflLid$5IuGd_Cr)B(f8f^rQq0;HPy)$F3iiMZiqS86WHHJ7yh zO9qWzo#-~)EG8QSGFaQ>j8Sn3(&of~;bK}X!xgwlRrOWO$Bjl-l3|b=K$_O7$%Aw! z(_`rD4mwdv8a8Q8Zzmp^JZSjXmRy5u0;#69&85jhhQSJQ(jhvIC(UbBv#edC=cc-i zCKjn}5P@B~+^gWKVbI&0BJ*3Ri3%O=-BX?72OJai}kj4HHKU|M-M!O!2l9rDZ^Da7{f0>f`K^mR$ z(fh$L-Fv8!GBa&jOQiv16O_y6dXE*IDpy7Qi$B^Ntw=mhj=2ts&2{393|8JAIfwhe U0Qe_wdE`1E0(9o^!tE+~2vspMQq) z2f0wLfg^;7h?hcb{{gvJ8=-VbHgP{F*g2!V8bi#sc3e71YcXVycwCKMm0zZzFBH51 zUgkqFDvj&1DEj-S#@{|SdK#j4&&3aZT$p4Pm{FkpY1rc>jq+YD;+m#Wqnnf6wgr`B z_p*1%;5L@{>xlejz0&mI*@?+%w<+S9rJyUUM&S~Dkg1l6bo%^HPj$D?zoHaOMc3t^ zeSk_%{D#t?AtH9usPi+0IY+MKRLknRD1~`PtIQvt*G1}`+lh^RG%N-b&FO9~A_mco zxy|1>*z^Qsrgk&1j#Lw=(O?X%G0|ihBEJ0)8#*PV5I!Ma z#5h}ewmWpD8p$%#psgS*w5rI~{7%72*4SY|>&Adm;hWMm6IyOI7zOf2@evZk6iVQU zuUQ(-7Sf1+kD?+L{34cO-=#BW`(}796kxJ z$c}|w9e6V+mG$GlRGJK|Y6Hzg87+W{iK-s_Kg5AJ5q2=D5O(d3AV-m7NDY#Vq##Cw zO;m^I5d*RpVIxRF*r3cvDq=ybh=8OaHh5>aY%0T5DN>G9AeCX)V_J)cHm>;#{viH8 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 @@ namespace NzbDrone.Web 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