Refactor searching for files

Cleanup build directory to avoid conflicts

Author: shivammathur

extension/BuildPhpExtension/BuildPhpExtension.psd1

@@ -95,6 +95,7 @@
         'Get-PhpDevelBuild',
         'Get-PhpSdk',
         'Get-PhpSrc',
+        'Get-RecursiveFilePath',
         'Get-TempFiles',
         'Get-VsCacheInfo',
         'Get-VsInstallPath',

extension/BuildPhpExtension/private/Get-Extension.ps1

@@ -106,19 +106,31 @@ function Get-Extension {
             }
         }
 
-        $configW32 = Get-ChildItem (Get-Location).Path -Recurse -Filter "config.w32" -ErrorAction SilentlyContinue | Select-Object -First 1
+        $configW32 = Get-RecursiveFilePath -Directory (Get-Location).Path -FileName 'config.w32'
         if($null -eq $configW32) {
             if($LocalSrc) {
                 throw "No config.w32 found, please make sure you are in the extension source directory and it supports Windows."
             } else {
                 throw "No config.w32 found, please check if the extension supports Windows."
             }
         }
-        $subDirectory = $configW32.DirectoryName
+        $subDirectory = Split-Path -Path $configW32 -Parent
         if((Get-Location).Path -ne $subDirectory) {
             Copy-Item -Path "${subDirectory}\*" -Destination $BuildDirectory -Recurse -Force
             Remove-Item -Path $subDirectory -Recurse -Force
         }
+
+        $selectedConfigW32 = Join-Path (Resolve-Path $BuildDirectory).Path "config.w32"
+        if (Test-Path -LiteralPath $selectedConfigW32 -PathType Leaf) {
+            Get-ChildItem -LiteralPath (Resolve-Path $BuildDirectory).Path -Recurse -Filter "config.w32" -File -ErrorAction SilentlyContinue |
+                Where-Object {
+                    -not [System.StringComparer]::OrdinalIgnoreCase.Equals(
+                        (Resolve-Path -LiteralPath $_.FullName).Path,
+                        $selectedConfigW32
+                    )
+                } |
+                Remove-Item -Force
+        }
         $name = Get-ExtensionName
 
         if(!$patches) {
@@ -132,4 +144,4 @@ function Get-Extension {
     }
     end {
     }
-}
+}

extension/BuildPhpExtension/private/Get-ExtensionConfig.ps1

@@ -251,9 +251,9 @@ Function Get-ExtensionConfig {
             }
 
             # TODO: This should be implemented using composer.json once implemented
-            $packageXml = Get-ChildItem (Get-Location).Path -Recurse -Filter "package.xml" -ErrorAction SilentlyContinue | Select-Object -First 1
+            $packageXml = Get-RecursiveFilePath -Directory (Get-Location).Path -FileName 'package.xml'
             if($null -ne $packageXml) {
-                $xml = [xml](Get-Content $packageXml.FullName)
+                $xml = [xml](Get-Content $packageXml)
                 $config.docs = $xml.SelectNodes("//*[@role='doc']") | ForEach-Object {
                     $path = $_.name
                     $current = $_.ParentNode
@@ -286,4 +286,4 @@ Function Get-ExtensionConfig {
     }
     end {
     }
-}
+}

extension/BuildPhpExtension/private/Get-ExtensionSource.ps1

@@ -19,10 +19,7 @@ function Get-ExtensionSource {
     process {
         if($env:GITHUB_ACTIONS -eq "true") {
             if ($null -eq $ExtensionUrl -or $ExtensionUrl -eq '') {
-                $configW32 = $null
-                try {
-                    $configW32 = [System.IO.Directory]::EnumerateFiles((Get-Location).Path, 'config.w32', [System.IO.SearchOption]::AllDirectories) | Select-Object -First 1
-                } catch { }
+                $configW32 = Get-RecursiveFilePath -Directory (Get-Location).Path -FileName 'config.w32'
                 if($null -eq $configW32) {
                     $ExtensionUrl = "https://github.com/$env:GITHUB_REPOSITORY"
                 }
@@ -65,4 +62,4 @@ function Get-ExtensionSource {
     }
     end {
     }
-}
+}

extension/BuildPhpExtension/private/Get-RecursiveFilePath.ps1

@@ -0,0 +1,44 @@
+Function Get-RecursiveFilePath {
+    <#
+    .SYNOPSIS
+        Get a file path from a directory, preferring the root file over nested matches.
+    .PARAMETER Directory
+        Directory to search.
+    .PARAMETER FileName
+        File name to search for.
+    #>
+    [OutputType([string])]
+    param (
+        [Parameter(Mandatory = $true, Position=0, HelpMessage='Directory to search.')]
+        [ValidateNotNull()]
+        [ValidateLength(1, [int]::MaxValue)]
+        [string] $Directory,
+        [Parameter(Mandatory = $true, Position=1, HelpMessage='File name to search for.')]
+        [ValidateNotNull()]
+        [ValidateLength(1, [int]::MaxValue)]
+        [string] $FileName
+    )
+    begin {
+    }
+    process {
+        if (-not (Test-Path -LiteralPath $Directory -PathType Container)) {
+            return $null
+        }
+
+        $searchRoot = (Resolve-Path -LiteralPath $Directory).Path.TrimEnd('\')
+        $rootFile = Join-Path $searchRoot $FileName
+        if (Test-Path -LiteralPath $rootFile -PathType Leaf) {
+            return $rootFile
+        }
+
+        $filePath = Get-ChildItem -LiteralPath $searchRoot -Recurse -Filter $FileName -File -ErrorAction SilentlyContinue |
+            Select-Object -First 1
+        if ($null -eq $filePath) {
+            return $null
+        }
+
+        return (Resolve-Path -LiteralPath $filePath.FullName).Path
+    }
+    end {
+    }
+}