lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-24 13:33:34 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Adding AppDataFolder service

Browse Source 
Factoring references to Server.MapPath and HostingEnvironment.MapPath out of components
Building testing around setup package to isolate database deadlock

--HG--
branch : dev
This commit is contained in:
Louis DeJardin
2010-02-13 19:25:03 -08:00
parent ec5450ac2d
commit 6baef5ca02
11 changed files with 291 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
View File

@@ -18,19 +18,19 @@ using Orchard.UI.Notify;
namespace Orchard.Setup.Controllers {
public class SetupController : Controller {
private readonly INotifier _notifier;
private readonly IDatabaseMigrationManager _databaseMigrationManager;
private readonly IOrchardHost _orchardHost;
private readonly IShellSettingsLoader _shellSettingsLoader;
private readonly IAppDataFolder _appDataFolder;
public SetupController(
INotifier notifier,
IDatabaseMigrationManager databaseMigrationManager,
IOrchardHost orchardHost,
IShellSettingsLoader shellSettingsLoader) {
IOrchardHost orchardHost,
IShellSettingsLoader shellSettingsLoader,
IAppDataFolder appDataFolder) {
_notifier = notifier;
_databaseMigrationManager = databaseMigrationManager;
_orchardHost = orchardHost;
_shellSettingsLoader = shellSettingsLoader;
_appDataFolder = appDataFolder;
T = NullLocalizer.Instance;
}
@@ -38,7 +38,7 @@ namespace Orchard.Setup.Controllers {
public ActionResult Index(SetupViewModel model) {
string message = "";
if(!CanWriteTo(Server.MapPath("~/App_Data"), out message)) {
if (!CanWriteTo(out message)) {
_notifier.Error(
T(
"Hey, it looks like I can't write to the App_Data folder in the root of this application and that's where I need to save some of the information you're about to enter.\r\n\r\nPlease give me (the machine account this application is running under) write access to App_Data so I can get this app all set up for you.\r\n\r\nThanks!\r\n\r\n----\r\n{0}",
@@ -60,11 +60,11 @@ namespace Orchard.Setup.Controllers {
try {
var shellSettings = new ShellSettings {
Name = "default",
DataProvider = model.DatabaseOptions ? "SQLite" : "SqlServer",
DataConnectionString = model.DatabaseConnectionString
};
Name = "default",
DataProvider = model.DatabaseOptions ? "SQLite" : "SqlServer",
DataConnectionString = model.DatabaseConnectionString
};
// creating a standalone environment.
// in theory this environment can be used to resolve any normal components by interface, and those
// components will exist entirely in isolation - no crossover between the safemode container currently in effect
@@ -74,7 +74,6 @@ namespace Orchard.Setup.Controllers {
var sessionFactoryHolder = finiteEnvironment.Resolve<ISessionFactoryHolder>();
sessionFactoryHolder.UpdateSchema();
var contentManager = finiteEnvironment.Resolve<IContentManager>();
// create superuser
var membershipService = finiteEnvironment.Resolve<IMembershipService>();
@@ -83,6 +82,7 @@ namespace Orchard.Setup.Controllers {
String.Empty, String.Empty, String.Empty,
true));
/*
// set site name and settings
var siteService = finiteEnvironment.Resolve<ISiteService>();
var siteSettings = siteService.GetSiteSettings().As<SiteSettings>();
@@ -91,6 +91,9 @@ namespace Orchard.Setup.Controllers {
siteSettings.Record.SuperUser = model.AdminUsername;
siteSettings.Record.PageTitleSeparator = " - ";
var contentManager = finiteEnvironment.Resolve<IContentManager>();
// create home page as a CMS page
var page = contentManager.Create("page");
page.As<BodyAspect>().Text = "Welcome to Orchard";
@@ -102,6 +105,7 @@ namespace Orchard.Setup.Controllers {
var authenticationService = finiteEnvironment.Resolve<IAuthenticationService>();
authenticationService.SignIn(user, true);
*/
}
catch {
finiteEnvironment.Resolve<ITransactionManager>().Cancel();
@@ -124,17 +128,15 @@ namespace Orchard.Setup.Controllers {
}
}
static bool CanWriteTo(string path, out string message) {
bool CanWriteTo(out string message) {
try {
var systemCheckPath = Path.Combine(path, "_systemcheck.txt");
System.IO.File.WriteAllText(systemCheckPath, "Communicator check one two one two");
System.IO.File.AppendAllText(systemCheckPath, "\r\nThis is Bones McCoy on a line to Sulu");
System.IO.File.Delete(systemCheckPath);
_appDataFolder.CreateFile("_systemcheck.txt", "Communicator check one two one two");
_appDataFolder.DeleteFile("_systemcheck.txt");
message = "";
return true;
} catch (Exception ex) {
}
catch (Exception ex) {
message = ex.Message.Replace("_systemcheck.txt", "");
return false;
}