Is_conda and Is_virtualenv added.

pyscripter · pyscripter · commit e66075991470 · 2018-05-05T23:42:03.000+03:00
diff --git a/PythonForDelphi/Components/Sources/Core/PythonVersions.pas b/PythonForDelphi/Components/Sources/Core/PythonVersions.pas
@@ -38,6 +38,8 @@   TPythonVersion = record
     InstallPath: string;
     PythonPath: string;
     function Is_venv: Boolean;
+    function Is_virtualenv: Boolean;
+    function Is_conda: Boolean;
     procedure AssignTo(PythonEngine: TPersistent);
     property PythonExecutable: string read GetPythonExecutable;
     property DLLName: string read GetDLLName;
@@ -132,10 +134,23 @@ function TPythonVersion.GetApiVersion: integer;
 end;
 
 function TPythonVersion.GetDisplayName: string;
+Var
+  FormatStr: string;
 begin
+  if FDisplayName = '' then
+  begin
+    if Is_conda then
+      FormatStr := 'Conda %s (%s)'
+    else
+      FormatStr := 'Python %s (%s)';
+    if Is_venv then
+      FormatStr := FormatStr + ' -venv'
+    else if Is_virtualenv then
+      FormatStr := FormatStr + ' -virtualenv';
+
+    FDisplayName := Format(FormatStr, [SysVersion, SysArchitecture]);
+  end;
   Result := FDisplayName;
-  if Result = '' then
-    Result := Format('Python %s (%s)', [SysVersion, SysArchitecture]);
 end;
 
 function TPythonVersion.GetHelpFile: string;
@@ -178,7 +193,12 @@ function TPythonVersion.GetSysArchitecture: string;
 begin
   Result := fSysArchitecture;
   if Result = '' then
-    Result := 'Unknown';
+    Result := 'Unknown platform';
+end;
+
+function TPythonVersion.Is_conda: Boolean;
+begin
+  Result := FileExists(IncludeTrailingPathDelimiter(InstallPath) + 'scripts\conda.exe');
 end;
 
 function TPythonVersion.Is_venv: Boolean;
@@ -191,6 +211,12 @@ function TPythonVersion.Is_venv: Boolean;
     FileExists(IncludeTrailingPathDelimiter(InstallPath) + 'pyvenv.cfg');
 end;
 
+function TPythonVersion.Is_virtualenv: Boolean;
+begin
+  Result := not IsRegistered and (InstallPath <> DLLPath) and
+    not FileExists(IncludeTrailingPathDelimiter(InstallPath) + 'pyvenv.cfg');
+end;
+
 function  CompareVersions(A, B : String) : Integer;
 
   function GetNextNumber(var Version: string): Integer;
