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

Remove code duplication and provide more conda-env related API methods

Browse Source
This commit is contained in:
Dmitry Trofimov
2018-11-09 00:15:20 +01:00
parent 424205b72b
commit a1b3067c90
1 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/packaging/PyCondaPackageManagerImpl.java
+29 -13
View File
@@ -27,6 +27,7 @@ import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.StandardFileSystems;
import com.intellij.openapi.vfs.VirtualFile;
import com.jetbrains.python.sdk.PythonSdkType;
import org.jetbrains.annotations.NotNull;
@@ -180,25 +181,40 @@ public class PyCondaPackageManagerImpl extends PyPackageManagerImpl {
}
public static boolean isCondaVEnv(@NotNull final Sdk sdk) {
final String condaName = "conda-meta";
final VirtualFile homeDirectory = sdk.getHomeDirectory();
if (homeDirectory == null) return false;
final VirtualFile condaParent = SystemInfo.isWindows ? homeDirectory.getParent()
: homeDirectory.getParent().getParent();
final VirtualFile condaMeta = condaParent.findChild(condaName);
final VirtualFile envs = condaParent.findChild("envs");
return condaMeta != null && envs == null;
return isCondaEnv(sdk.getHomePath());
}
public static boolean isCondaEnv(@Nullable String sdkPath) {
final VirtualFile condaMeta = findCondaMeta(sdkPath);
if (condaMeta == null) {
return false;
}
final VirtualFile envs = condaMeta.getParent().findChild("envs");
return envs == null;
}
// Conda virtual environment and system conda
public static boolean isConda(@NotNull final Sdk sdk) {
final String condaName = "conda-meta";
final VirtualFile homeDirectory = sdk.getHomeDirectory();
if (homeDirectory == null) return false;
return isConda(sdk.getHomePath());
}
public static boolean isConda(@Nullable String sdkPath) {
final VirtualFile condaMeta = findCondaMeta(sdkPath);
return condaMeta != null;
}
@Nullable
private static VirtualFile findCondaMeta(@Nullable String sdkPath) {
if (sdkPath == null) {
return null;
}
final VirtualFile homeDirectory = StandardFileSystems.local().findFileByPath(sdkPath);
if (homeDirectory == null) {
return null;
}
final VirtualFile condaParent = SystemInfo.isWindows ? homeDirectory.getParent()
: homeDirectory.getParent().getParent();
final VirtualFile condaMeta = condaParent.findChild(condaName);
return condaMeta != null;
return condaParent.findChild("conda-meta");
}
@NotNull