Merging into main 4.1.0 branch: Resolves a number of open issues, see associated WorkItems - Fix WP crash on invalid connection string due to generation of XML cache on a separate thread - Added option to generate xml cache file on local filesystem (in ASP.NET Temporary Files / CodeGenDir location) by adding <add key="umbracoContentXMLUseLocalTemp" value="true" /> to web.config file. This allows you to run from a SAN on a load-balanced environment whilst allowing each web node to have isolated copies of the xml cache file to avoid WP crashes due to multiple file locks - Others in WorkItems :) [TFS Changeset #64002]
118 lines
4.0 KiB
C#
118 lines
4.0 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Text;
|
|
using System.IO;
|
|
using System.Configuration;
|
|
using System.Web;
|
|
using umbraco.BusinessLogic;
|
|
|
|
namespace umbraco.IO
|
|
{
|
|
public class IOHelper
|
|
{
|
|
private static string m_rootDir = "";
|
|
|
|
public static char DirSepChar
|
|
{
|
|
get
|
|
{
|
|
return Path.DirectorySeparatorChar;
|
|
}
|
|
}
|
|
|
|
//helper to try and match the old path to a new virtual one
|
|
public static string FindFile(string virtualPath)
|
|
{
|
|
string retval = virtualPath;
|
|
|
|
if (virtualPath.StartsWith("~"))
|
|
retval = virtualPath.Replace("~", SystemDirectories.Root);
|
|
|
|
if(virtualPath.StartsWith("/") && !virtualPath.StartsWith(SystemDirectories.Root))
|
|
retval = SystemDirectories.Root + "/" + virtualPath.TrimStart('/');
|
|
|
|
return retval;
|
|
}
|
|
|
|
//Replaces tildes with the root dir
|
|
public static string ResolveUrl(string virtualPath)
|
|
{
|
|
if (virtualPath.StartsWith("~"))
|
|
return virtualPath.Replace("~", SystemDirectories.Root).Replace("//","/");
|
|
else
|
|
return VirtualPathUtility.ToAbsolute(virtualPath, SystemDirectories.Root);
|
|
}
|
|
|
|
public static string MapPath(string path, bool useHttpContext)
|
|
{
|
|
// Check if the path is already mapped
|
|
if (path.Length >= 2 && path[1] == Path.VolumeSeparatorChar)
|
|
return path;
|
|
|
|
if (useHttpContext)
|
|
{
|
|
//string retval;
|
|
if (!string.IsNullOrEmpty(path) && (path.StartsWith("~") || path.StartsWith(SystemDirectories.Root)))
|
|
return System.Web.Hosting.HostingEnvironment.MapPath(path);
|
|
else
|
|
return System.Web.Hosting.HostingEnvironment.MapPath("~/" + path.TrimStart('/'));
|
|
}
|
|
else
|
|
{
|
|
string _root = (!String.IsNullOrEmpty(System.Web.Hosting.HostingEnvironment.ApplicationPhysicalPath)) ? System.Web.Hosting.HostingEnvironment.ApplicationPhysicalPath.TrimEnd(IOHelper.DirSepChar) : getRootDirectorySafe();
|
|
|
|
string _path = path.TrimStart('~','/').Replace('/', IOHelper.DirSepChar);
|
|
|
|
string retval = _root + IOHelper.DirSepChar.ToString() + _path;
|
|
|
|
return retval;
|
|
}
|
|
}
|
|
|
|
public static string MapPath(string path)
|
|
{
|
|
return MapPath(path, true);
|
|
}
|
|
|
|
//use a tilde character instead of the complete path
|
|
public static string returnPath(string settingsKey, string standardPath, bool useTilde)
|
|
{
|
|
string retval = ConfigurationManager.AppSettings[settingsKey];
|
|
|
|
if ( string.IsNullOrEmpty(retval) )
|
|
retval = standardPath;
|
|
|
|
return retval.TrimEnd('/');
|
|
}
|
|
|
|
|
|
public static string returnPath(string settingsKey, string standardPath)
|
|
{
|
|
return returnPath(settingsKey, standardPath, false);
|
|
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns the path to the root of the application, by getting the path to where the assembly where this
|
|
/// method is included is present, then traversing until it's past the /bin directory. Ie. this makes it work
|
|
/// even if the assembly is in a /bin/debug or /bin/release folder
|
|
/// </summary>
|
|
/// <returns></returns>
|
|
private static string getRootDirectorySafe() {
|
|
if (!String.IsNullOrEmpty(m_rootDir))
|
|
{
|
|
return m_rootDir;
|
|
}
|
|
|
|
string baseDirectory =
|
|
System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().CodeBase.Substring(8));
|
|
m_rootDir = baseDirectory.Substring(0, baseDirectory.LastIndexOf("bin")-1);
|
|
|
|
return m_rootDir;
|
|
|
|
}
|
|
|
|
}
|
|
}
|