Switching to Get-AnsibleParam

Switching to Win_Unzip

1 files changed, 16 insertions, 38 deletions

diff --git a/windows/win_unzip.ps1 b/windows/win_unzip.ps1
index 1214bbaa..ed90dce3 100644
--- a/windows/win_unzip.ps1
+++ b/windows/win_unzip.ps1
@@ -26,55 +26,33 @@ $result = New-Object psobject @{
     changed = $false
 }
 
-If (Get-Member -InputObject $params -Name creates) {
+$creates = Get-AnsibleParam -obj $params -name "creates"
+If ($creates -ne $null) {
     If (Test-Path $params.creates) {
         Exit-Json $result "The 'creates' file or directory already exists."
     }
-
 }
 
-If (Get-Member -InputObject $params -Name src) {
-    $src = $params.src.toString()
-
-    If (-Not (Test-Path -path $src)){
-        Fail-Json $result "src file: $src does not exist."
-    }
-
-    $ext = [System.IO.Path]::GetExtension($src)
-}
-Else {
-    Fail-Json $result "missing required argument: src"
+$src = Get-AnsibleParam -obj $params -name "src" -failifempty $true
+If (-Not (Test-Path -path $src)){
+    Fail-Json $result "src file: $src does not exist."
 }
 
-If (-Not($params.dest -eq $null)) {
-    $dest = $params.dest.toString()
+$ext = [System.IO.Path]::GetExtension($src)
 
-    If (-Not (Test-Path $dest -PathType Container)){
-        Try{
-            New-Item -itemtype directory -path $dest
-        }
-        Catch {
-            Fail-Json $result "Error creating $dest directory"
-        }
-    }
-}
-Else {
-    Fail-Json $result "missing required argument: dest"
-}
 
-If (Get-Member -InputObject $params -Name recurse) {
-   $recurse = ConvertTo-Bool ($params.recurse)
-}
-Else {
-    $recurse = $false
+$dest = Get-AnsibleParam -obj $params -name "dest" -failifempty $true
+If (-Not (Test-Path $dest -PathType Container)){
+    Try{
+        New-Item -itemtype directory -path $dest
+    }
+    Catch {
+        Fail-Json $result "Error creating $dest directory"
+    }
 }
 
-If (Get-Member -InputObject $params -Name rm) {
-    $rm = ConvertTo-Bool ($params.rm)
-}
-Else {
-    $rm = $false
-}
+$recurse = ConvertTo-Bool (Get-AnsibleParam -obj $params -name "recurse" -default "false")
+$rm = ConvertTo-Bool (Get-AnsibleParam -obj $params -name "rm" -default "false")
 
 If ($ext -eq ".zip" -And $recurse -eq $false) {
     Try {