Python setup and activate enhancements

Former-commit-id: 4e52141d773f122c59fc5b84d2c164c9b845120c [formerly afa544fbfa4fc8a23fc6562db8d58a7ba8f020ee] [formerly f6ec52401f49802f78be9ddbf41f93e5d4de256f [formerly 4a5514277a6f235e909b5a0557c6a851132bb5a9]]
Former-commit-id: 2a6be6f53904762480986bb7d9489ee3b68caab0 [formerly 59ad6b5c40a21308761bd1155d8d84a43cf3458d]
Former-commit-id: 7d6adba012f6988f6b118d64bea7930d356792c8
Former-commit-id: 7d16379

Author: lmbelo

src/AddOn/PyEnvironment.AddOn.EnsurePip.pas

@@ -77,6 +77,7 @@ procedure TPyEnvironmentAddOnEnsurePip.InternalExecute(
   LOutput: string;
 begin
   inherited;
+  { TODO : Check for valida executable and shared library files }
   if (TExecCmdService.Cmd(ADistribution.Executable,
         TExecCmdArgs.BuildArgv(
           ADistribution.Executable, ['-m', 'pip', '--version']),

src/Embeddable/PyEnvironment.Embeddable.pas

@@ -127,7 +127,7 @@     TScanner = class(TPersistent)
       FEnvironmentPath: string;
       FDeleteEmbeddable: boolean;
     public
-      procedure Scan(ACallback: TProc<TPythonVersionProp, string>);
+      procedure Scan(const AEmbedabblesPath: string; ACallback: TProc<TPythonVersionProp, string>);
     published
       property AutoScan: boolean read FAutoScan write FAutoScan default false;
       property ScanRule: TScanRule read FScanRule write FScanRule;
@@ -207,6 +207,7 @@ function TPyCustomEmbeddableDistribution.FileIsExecutable(
   const AFilePath: string): boolean;
 begin
   {$WARN SYMBOL_PLATFORM OFF}
+  //Avoiding symlinks
   Result := (TFileAttribute.faOwnerExecute in TFile.GetAttributes(AFilePath))
     or (TFileAttribute.faGroupExecute in TFile.GetAttributes(AFilePath))
     or (TFileAttribute.faOthersExecute in TFile.GetAttributes(AFilePath));
@@ -233,15 +234,6 @@ function TPyCustomEmbeddableDistribution.FindExecutable: string;
       if (TPath.GetFileName(LFile) = 'python' + PythonVersion) and (FileIsExecutable(LFile)) then
         Exit(TArray<string>.Create(LFile));
     end;
-
-    {$WARN SYMBOL_PLATFORM OFF}
-    LFile := Result[High(Result)];
-    if (TFileAttribute.faOwnerExecute in TFile.GetAttributes(LFile))
-      or (TFileAttribute.faGroupExecute in TFile.GetAttributes(LFile))
-      or (TFileAttribute.faOthersExecute in TFile.GetAttributes(LFile)) then //Avoiding symlinks
-        Exit(TArray<string>.Create(LFile));
-    {$WARN SYMBOL_PLATFORM ON}
-
     {$ENDIF POSIX}
   end;
 {$IFNDEF MSWINDOWS}
@@ -252,25 +244,25 @@ function TPyCustomEmbeddableDistribution.FindExecutable: string;
   {$IFDEF MSWINDOWS}
   Result := TPath.Combine(GetEnvironmentPath(), 'python.exe');
   if not TFile.Exists(Result) then
-    Result := String.Empty;
+    Exit(String.Empty);
   {$ELSEIF DEFINED(ANDROID)}
+  //Let's try it in the library path first - we should place it in the library path in Android
   Result := TPath.GetLibraryPath();
   LFiles := DoSearch(Result);
   if LFiles <> nil then
     Exit(LFiles[Low(LFiles)]);
   Result := TPath.Combine(GetEnvironmentPath(), 'bin');
   {$ELSE}
   Result := TPath.Combine(GetEnvironmentPath(), 'bin');
+  {$ENDIF}
 
   LFiles := DoSearch(Result);
-
   if Length(LFiles) > 0 then begin
     Result := LFiles[Low(LFiles)];
     if not TFile.Exists(Result) then
       Result := String.Empty;
   end else
     Result := String.Empty;
-  {$ENDIF}
 end;
 
 function TPyCustomEmbeddableDistribution.FindSharedLibrary: string;
@@ -306,11 +298,13 @@ function TPyCustomEmbeddableDistribution.FindSharedLibrary: string;
   {$IFDEF MSWINDOWS}
   LPath := GetEnvironmentPath();
   {$ELSEIF DEFINED(ANDROID)}
+  //Let's try it in the library path first - we should place it in the library path in Android
   LPath := TPath.GetLibraryPath();
   LFiles := DoSearch(LLibName, LPath);
   if LFiles <> nil then
     Exit(LFiles[Low(LFiles)]);
-  LPath := GetEnvironmentPath();
+  //Try to find it in the environments path
+  LPath := TPath.Combine(GetEnvironmentPath(), 'lib');
   {$ELSE}
   LPath := TPath.Combine(GetEnvironmentPath(), 'lib');
   {$ENDIF}
@@ -406,12 +400,13 @@ procedure TPyEmbeddedEnvironment.Prepare;
   if FScanner.AutoScan then begin
     if PythonProject.Enabled then
       if FScanner.EmbeddablesPath.IsEmpty() then begin
-        FScanner.EmbeddablesPath := TPyEnvironmentPath.ResolvePath(TPyEnvironmentPath.DEPLOY_PATH);
+        FScanner.EmbeddablesPath := TPyEnvironmentPath.DEPLOY_PATH;
         FScanner.ScanRule := TScanRule.srFileName;
         FScanner.DeleteEmbeddable := true;
       end;
 
     FScanner.Scan(
+      TPyEnvironmentPath.ResolvePath(FScanner.EmbeddablesPath),
       procedure(APyVersionInfo: TPythonVersionProp; AEmbeddablePackage: string) begin
         if Assigned(Distributions.LocateEnvironment(APyVersionInfo.RegVersion)) then
           Exit;
@@ -441,7 +436,7 @@ procedure TPyEmbeddedEnvironment.SetScanner(const Value: TScanner);
 
 { TPyEmbeddedEnvironment.TScanner }
 
-procedure TPyEmbeddedEnvironment.TScanner.Scan(
+procedure TPyEmbeddedEnvironment.TScanner.Scan(const AEmbedabblesPath: string;
   ACallback: TProc<TPythonVersionProp, string>);
 var
   I: Integer;
@@ -453,14 +448,14 @@ procedure TPyEmbeddedEnvironment.TScanner.Scan(
   if not Assigned(ACallback) then
     Exit;
 
-  if not TDirectory.Exists(FEmbeddablesPath) then
+  if not TDirectory.Exists(AEmbedabblesPath) then
     raise Exception.Create('Directory not found.');
 
   //Look for version named subfolders
   if (FScanRule = TScanRule.srFolder) then begin
     LSearchPatter := '*.zip';
     for I := Low(PYTHON_KNOWN_VERSIONS) to High(PYTHON_KNOWN_VERSIONS) do begin
-      LPath := TPath.Combine(FEmbeddablesPath, PYTHON_KNOWN_VERSIONS[I].RegVersion);
+      LPath := TPath.Combine(AEmbedabblesPath, PYTHON_KNOWN_VERSIONS[I].RegVersion);
       if not TDirectory.Exists(LPath) then
         Continue;
 
@@ -475,7 +470,7 @@ procedure TPyEmbeddedEnvironment.TScanner.Scan(
     for I := Low(PYTHON_KNOWN_VERSIONS) to High(PYTHON_KNOWN_VERSIONS) do begin
       LPythonVersion := PYTHON_KNOWN_VERSIONS[I].RegVersion;
       LSearchPatter := Format('python3-*-%s*.zip', [LPythonVersion]);
-      LFiles := TDirectory.GetFiles(FEmbeddablesPath, LSearchPatter, TSearchOption.soTopDirectoryOnly);
+      LFiles := TDirectory.GetFiles(AEmbedabblesPath, LSearchPatter, TSearchOption.soTopDirectoryOnly);
       if (Length(LFiles) = 0) then
         Continue;
 

src/PyEnvironment.pas

@@ -173,8 +173,7 @@ procedure TPyCustomEnvironment.Notification(AComponent: TComponent;
 
 procedure TPyCustomEnvironment.Setup(APythonVersion: string);
 begin
-  InternalSetup(
-    IfThen(APythonVersion.IsEmpty(), PythonVersion, APythonVersion));
+  InternalSetup(APythonVersion);
 end;
 
 function TPyCustomEnvironment.SetupAsync(APythonVersion: string): ITask;
@@ -325,6 +324,8 @@ procedure TPyCustomEnvironment.InternalSetup(APythonVersion: string);
 
   Prepare();
 
+  APythonVersion := IfThen(APythonVersion.IsEmpty(), PythonVersion, APythonVersion);
+
   LDistribution := FDistributions.LocateEnvironment(APythonVersion);
   if not Assigned(LDistribution) then
     Exit();