Fix progress/status not returning values because spectre console just…

… returns task.complete instead of fromresult
ShaunLawrie · Dec 7, 2023 · 1773fe1 · 1773fe1
1 parent f6be726
commit 1773fe1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/PwshSpectreConsole/private/Start-AnsiConsoleProgress.ps1 b/PwshSpectreConsole/private/Start-AnsiConsoleProgress.ps1
@@ -20,10 +20,13 @@ function Start-AnsiConsoleProgress {
         [Parameter(Mandatory)]
         [scriptblock] $ScriptBlock
     )
+    $resultVariableName = "AnsiConsoleProgressResult-$([guid]::NewGuid())"
+    New-Variable -Name $resultVariableName -Scope "Script"
     [Spectre.Console.AnsiConsole]::Progress().Start({
         param (
             $ctx
         )
-        & $ScriptBlock $ctx
+        Set-Variable -Name $resultVariableName -Value (& $ScriptBlock $ctx) -Scope "Script"
     })
+    return Get-Variable -Name $resultVariableName -ValueOnly
 }
diff --git a/PwshSpectreConsole/private/Start-AnsiConsoleStatus.ps1 b/PwshSpectreConsole/private/Start-AnsiConsoleStatus.ps1
@@ -9,12 +9,15 @@ function Start-AnsiConsoleStatus {
         [Parameter(Mandatory)]
         [scriptblock] $ScriptBlock
     )
+    $resultVariableName = "AnsiConsoleStatusResult-$([guid]::NewGuid())"
+    New-Variable -Name $resultVariableName -Scope "Script"
     [Spectre.Console.AnsiConsole]::Status().Start($Title, {
         param (
             $ctx
         )
         $ctx.Spinner = $Spinner
         $ctx.SpinnerStyle = $SpinnerStyle
-        & $ScriptBlock $ctx
+        Set-Variable -Name $resultVariableName -Value (& $ScriptBlock $ctx) -Scope "Script"
     })
+    return Get-Variable -Name $resultVariableName -ValueOnly
 }