feat: ⚡ improve and copy LoadNative's cache check over to Resolve-Cac…

…hedPackage (#49)
pwsh-cs-tools · Jan 19, 2024 · 8f112d6 · 8f112d6
1 parent 34b663e
commit 8f112d6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/Import-Package/packaging.ps1 b/Import-Package/packaging.ps1
@@ -220,10 +220,10 @@ public static extern IntPtr dlopen(string path, int flags);
                                     }
                                     Write-Verbose "Loading native dll from path '$CopyTo' (copying from '$Path')."
                                     $end_path = "$CopyTo\$($Path | Split-Path -Leaf)"
-                                    If( -not (Test-Path $end_path -PathType Leaf) ){
-                                        Copy-Item $Path $CopyTo -Force -ErrorAction SilentlyContinue | Out-Null
-                                    } Else {
+                                    If( Test-Path $end_path -PathType Leaf ){
                                         Write-Verbose "$CopyTo is already present and loaded. Native dll not copied - This could cause version conflicts"
+                                    } Else {
+                                        Copy-Item $Path $CopyTo -Force -ErrorAction SilentlyContinue | Out-Null
                                     }
                                     $Path = $end_path
                                 } Else {

diff --git a/Import-Package/src/Resolve-CachedPackage.ps1 b/Import-Package/src/Resolve-CachedPackage.ps1
@@ -386,6 +386,15 @@ function Resolve-CachedPackage {
         If( Test-Path $this_natives_path ){
             Write-Verbose "[Import-Package:Preparation] Native files for $( $Options.Name ) $( $Options.Version ) will be copied from cache now:"
             Write-Verbose "- Folder: $this_natives_path"
+            Resolve-Path (Join-Path $this_natives_path "*") -ErrorAction SilentlyContinue | ForEach-Object {
+                $native = $_
+                $native_name = $_ | Split-Path -Leaf
+                If( Test-Path (Join-Path $base_natives_path $native_name) ){
+                    Write-Verbose "$native_name is already present and loaded. Native dll not copied - This could cause version conflicts"
+                } Else {
+                    Copy-Item $native $base_natives_path -Force -ErrorAction SilentlyContinue | Out-Null
+                }
+            }
         } Else {
             Write-Verbose "[Import-Package:Preparation] Any native files for $( $Options.Name ) $( $Options.Version ) will be copied from source at load time:"
             Write-Verbose "- Folder: $( $Options.Source )"