MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Use helpers enums for django mange tasks.

Browse Source
This commit is contained in:
Dmitry Trofimov
2015-08-04 18:33:07 +02:00
parent c568fc3d71
commit 5eb99fc881
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/PythonHelpersLocator.java
+2
View File
@@ -47,6 +47,8 @@ public enum PythonHelpersLocator implements PythonHelper {
LETTUCE("pycharm", "lettuce_runner"),
DJANGO_TEST_MANAGE("pycharm", "django_test_manage"),
DJANGO_MANAGE("pycharm", "django_manage"),
MANAGE_TASKS_PROVIDER("pycharm", "_jb_manage_tasks_provider")
;
python/src/com/jetbrains/python/run/PythonTask.java
+21 -3
View File
@@ -34,6 +34,7 @@ import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.NotNullFunction;
import com.jetbrains.python.PyBundle;
import com.jetbrains.python.PythonHelper;
import com.jetbrains.python.buildout.BuildoutFacet;
import com.jetbrains.python.console.PydevConsoleRunner;
import com.jetbrains.python.sdk.PySdkUtil;
@@ -60,6 +61,8 @@ public class PythonTask {
private final Sdk mySdk;
private String myWorkingDirectory;
private String myRunnerScript;
private PythonHelper myHelper = null;
private List<String> myParameters = new ArrayList<String>();
private final String myRunTabTitle;
private String myHelpId;
@@ -90,6 +93,10 @@ public class PythonTask {
myRunnerScript = script;
}
public void setHelper(PythonHelper helper) {
myHelper = helper;
}
public void setParameters(List<String> parameters) {
myParameters = parameters;
}
@@ -151,8 +158,14 @@ public class PythonTask {
bashParams.addParameter("-cl");
NotNullFunction<String, String> escaperFunction = StringUtil.escaper(false, "|>$\"'& ");
StringBuilder paramString = new StringBuilder(escaperFunction.fun(homePath) + " " + escaperFunction.fun(myRunnerScript));
StringBuilder paramString;
if (myHelper != null) {
paramString= new StringBuilder(escaperFunction.fun(homePath) + " " + escaperFunction.fun(myHelper.asParamString()));
myHelper.addToPythonPath(cmd.getEnvironment());
}
else {
paramString= new StringBuilder(escaperFunction.fun(homePath) + " " + escaperFunction.fun(myRunnerScript));
}
for (String p : myParameters) {
paramString.append(" ").append(p);
}
@@ -160,7 +173,12 @@ public class PythonTask {
}
else {
cmd.setExePath(homePath);
scriptParams.addParameter(myRunnerScript);
if (myHelper != null) {
myHelper.addToGroup(scriptParams, cmd);
}
else {
scriptParams.addParameter(myRunnerScript);
}
scriptParams.addParameters(myParameters);
}