From 23605b5a4ba23d021968522aefa88240aedb405e Mon Sep 17 00:00:00 2001 From: hartvig Date: Mon, 28 Feb 2011 13:03:09 -0100 Subject: [PATCH] Changing /python to /macroScripts --- .../RazorCore/RazorMacroEngine.cs | 2 +- umbraco/businesslogic/IO/SystemDirectories.cs | 15 ++++++++++++++- umbraco/presentation/library.cs | 2 +- umbraco/presentation/macro.cs | 2 +- umbraco/presentation/macroScripts/temp.txt | 0 umbraco/presentation/python.cs | 4 ++-- .../presentation/umbraco/Trees/loadDLRScripts.cs | 2 +- .../umbraco/create/DLRScriptingTasks.cs | 6 +++--- .../umbraco/developer/Macros/editMacro.aspx.cs | 2 +- .../umbraco/developer/Python/editPython.aspx.cs | 2 +- .../umbraco/webservices/codeEditorSave.asmx.cs | 8 ++++---- 11 files changed, 29 insertions(+), 16 deletions(-) create mode 100644 umbraco/presentation/macroScripts/temp.txt diff --git a/umbraco.MacroEngines.Juno/RazorCore/RazorMacroEngine.cs b/umbraco.MacroEngines.Juno/RazorCore/RazorMacroEngine.cs index 113fa218b1..1d47cb71eb 100644 --- a/umbraco.MacroEngines.Juno/RazorCore/RazorMacroEngine.cs +++ b/umbraco.MacroEngines.Juno/RazorCore/RazorMacroEngine.cs @@ -96,7 +96,7 @@ namespace umbraco.MacroEngines if (macro.ScriptName.StartsWith("~")) fileLocation = macro.ScriptName; else - fileLocation = SystemDirectories.Python + "/" + macro.ScriptName; + fileLocation = SystemDirectories.MacroScripts + "/" + macro.ScriptName; } else if (!string.IsNullOrEmpty(macro.ScriptCode) && !string.IsNullOrEmpty(macro.ScriptLanguage)) { //Inline Razor Syntax fileLocation = CreateInlineRazorFile(macro.ScriptCode, macro.ScriptLanguage); diff --git a/umbraco/businesslogic/IO/SystemDirectories.cs b/umbraco/businesslogic/IO/SystemDirectories.cs index 9db0e398e1..0c0ce810e0 100644 --- a/umbraco/businesslogic/IO/SystemDirectories.cs +++ b/umbraco/businesslogic/IO/SystemDirectories.cs @@ -77,11 +77,24 @@ namespace umbraco.IO } } + [Obsolete("Please use MacroScripts instead!", true)] public static string Python { get { - return IOHelper.returnPath("umbracoPythonPath", "~/python"); + return MacroScripts; + } + } + + public static string MacroScripts + { + get + { + // for legacy we test for the python path first, but else we use the new default location + string tempPath = IOHelper.returnPath("umbracoPythonPath", "") == String.Empty + ? IOHelper.returnPath("umbracoMacroScriptPath", "~/macroScripts") + : IOHelper.returnPath("umbracoPythonPath", "~/python"); + return tempPath; } } diff --git a/umbraco/presentation/library.cs b/umbraco/presentation/library.cs index 841b3a66ff..0d3dce07b8 100644 --- a/umbraco/presentation/library.cs +++ b/umbraco/presentation/library.cs @@ -121,7 +121,7 @@ namespace umbraco { try { - string path = IOHelper.MapPath(SystemDirectories.Python + "/" + file); + string path = IOHelper.MapPath(SystemDirectories.MacroScripts + "/" + file); object res = python.executeFile(path); return res.ToString(); } diff --git a/umbraco/presentation/macro.cs b/umbraco/presentation/macro.cs index e295c2d017..7d2f539143 100644 --- a/umbraco/presentation/macro.cs +++ b/umbraco/presentation/macro.cs @@ -1062,7 +1062,7 @@ namespace umbraco } else { - string path = IOHelper.MapPath(SystemDirectories.Python + "/" + macro.ScriptName); + string path = IOHelper.MapPath(SystemDirectories.MacroScripts + "/" + macro.ScriptName); IMacroEngine engine = MacroEngineFactory.GetByFilename(path); ret.Text = engine.Execute(macro, Node.GetCurrent()); } diff --git a/umbraco/presentation/macroScripts/temp.txt b/umbraco/presentation/macroScripts/temp.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/umbraco/presentation/python.cs b/umbraco/presentation/python.cs index e2f5d79e60..61bda0c142 100644 --- a/umbraco/presentation/python.cs +++ b/umbraco/presentation/python.cs @@ -43,7 +43,7 @@ namespace umbraco.scripting Engine.AddToPath(path); // Add umbracos python folder to python's path - path = IOHelper.MapPath(SystemDirectories.Python); + path = IOHelper.MapPath(SystemDirectories.MacroScripts); Engine.AddToPath(path); // execute the site.py to do all the initial stuff @@ -58,7 +58,7 @@ namespace umbraco.scripting private static void loadScripts() { scripts = new System.Collections.Hashtable(); - string path = IOHelper.MapPath(SystemDirectories.Python); + string path = IOHelper.MapPath(SystemDirectories.MacroScripts); System.IO.DirectoryInfo dir = new System.IO.DirectoryInfo(path); foreach (System.IO.FileInfo f in dir.GetFiles("*.py")) { diff --git a/umbraco/presentation/umbraco/Trees/loadDLRScripts.cs b/umbraco/presentation/umbraco/Trees/loadDLRScripts.cs index 727f34a933..3959400250 100644 --- a/umbraco/presentation/umbraco/Trees/loadDLRScripts.cs +++ b/umbraco/presentation/umbraco/Trees/loadDLRScripts.cs @@ -54,7 +54,7 @@ namespace umbraco { get { - return SystemDirectories.Python + "/"; + return SystemDirectories.MacroScripts + "/"; } } diff --git a/umbraco/presentation/umbraco/create/DLRScriptingTasks.cs b/umbraco/presentation/umbraco/create/DLRScriptingTasks.cs index e1540c65d1..91dba2b16d 100644 --- a/umbraco/presentation/umbraco/create/DLRScriptingTasks.cs +++ b/umbraco/presentation/umbraco/create/DLRScriptingTasks.cs @@ -81,7 +81,7 @@ namespace umbraco if (fileName.Contains("/")) //if there's a / create the folder structure for it { string[] folders = fileName.Split("/".ToCharArray()); - string basePath = IOHelper.MapPath(SystemDirectories.Python); + string basePath = IOHelper.MapPath(SystemDirectories.MacroScripts); for (int i = 0; i < folders.Length - 1; i++) { basePath = System.IO.Path.Combine(basePath, folders[i]); @@ -89,7 +89,7 @@ namespace umbraco } } - string abFileName = IOHelper.MapPath(SystemDirectories.Python + "/" + fileName); + string abFileName = IOHelper.MapPath(SystemDirectories.MacroScripts + "/" + fileName); System.IO.StreamWriter scriptWriter = System.IO.File.CreateText(abFileName); scriptWriter.Write(scriptContent); @@ -111,7 +111,7 @@ namespace umbraco public bool Delete() { - string path = IOHelper.MapPath(SystemDirectories.Python + "/" + Alias.TrimStart('/')); + string path = IOHelper.MapPath(SystemDirectories.MacroScripts + "/" + Alias.TrimStart('/')); System.Web.HttpContext.Current.Trace.Warn("", "*" + path + "*"); try diff --git a/umbraco/presentation/umbraco/developer/Macros/editMacro.aspx.cs b/umbraco/presentation/umbraco/developer/Macros/editMacro.aspx.cs index 5732a16c30..247e04bda5 100644 --- a/umbraco/presentation/umbraco/developer/Macros/editMacro.aspx.cs +++ b/umbraco/presentation/umbraco/developer/Macros/editMacro.aspx.cs @@ -205,7 +205,7 @@ namespace umbraco.cms.presentation.developer private void populatePythonFiles() { ArrayList pythons = new ArrayList(); - string pythonDir = IOHelper.MapPath(SystemDirectories.Python + "/"); + string pythonDir = IOHelper.MapPath(SystemDirectories.MacroScripts + "/"); getPythonFilesFromDir(pythonDir, pythonDir, pythons); pythonFiles.DataSource = pythons; pythonFiles.DataBind(); diff --git a/umbraco/presentation/umbraco/developer/Python/editPython.aspx.cs b/umbraco/presentation/umbraco/developer/Python/editPython.aspx.cs index c4b46e883e..09d5d0fdc3 100644 --- a/umbraco/presentation/umbraco/developer/Python/editPython.aspx.cs +++ b/umbraco/presentation/umbraco/developer/Python/editPython.aspx.cs @@ -51,7 +51,7 @@ namespace umbraco.cms.presentation.developer StreamReader SR; string S; - SR = File.OpenText( IOHelper.MapPath(SystemDirectories.Python + "/" + file)); + SR = File.OpenText(IOHelper.MapPath(SystemDirectories.MacroScripts + "/" + file)); S = SR.ReadToEnd(); SR.Close(); pythonSource.Text = S; diff --git a/umbraco/presentation/umbraco/webservices/codeEditorSave.asmx.cs b/umbraco/presentation/umbraco/webservices/codeEditorSave.asmx.cs index fd656e024c..72e904abe6 100644 --- a/umbraco/presentation/umbraco/webservices/codeEditorSave.asmx.cs +++ b/umbraco/presentation/umbraco/webservices/codeEditorSave.asmx.cs @@ -234,7 +234,7 @@ namespace umbraco.presentation.webservices public string SaveDLRScript(string fileName, string oldName, string fileContents, bool ignoreDebugging) { StreamWriter SW; - string tempFileName = IOHelper.MapPath(SystemDirectories.Python + "/" + System.DateTime.Now.Ticks.ToString() + "_" + fileName); + string tempFileName = IOHelper.MapPath(SystemDirectories.MacroScripts + "/" + System.DateTime.Now.Ticks.ToString() + "_" + fileName); //SW = File.CreateText(tempFileName); @@ -269,9 +269,9 @@ namespace umbraco.presentation.webservices if (errorMessage == "") { //Hardcoded security-check... only allow saving files in xslt directory... - string savePath = IOHelper.MapPath(SystemDirectories.Python + "/" + fileName); + string savePath = IOHelper.MapPath(SystemDirectories.MacroScripts + "/" + fileName); - if (savePath.StartsWith(IOHelper.MapPath(SystemDirectories.Python + "/"))) + if (savePath.StartsWith(IOHelper.MapPath(SystemDirectories.MacroScripts + "/"))) { SW = new System.IO.StreamWriter(savePath, false, Encoding.UTF8); SW.Write(fileContents); @@ -281,7 +281,7 @@ namespace umbraco.presentation.webservices //deletes the old xslt file if (fileName != oldName) { - string p = IOHelper.MapPath(SystemDirectories.Python + "/" + oldName); + string p = IOHelper.MapPath(SystemDirectories.MacroScripts + "/" + oldName); if (System.IO.File.Exists(p)) System.IO.File.Delete(p); }