Clean up how we initialize the result psobject
This commit is contained in:
parent
cab68bc579
commit
57f43ae518
3 changed files with 21 additions and 16 deletions
|
@ -39,7 +39,9 @@ If (-not $src)
|
|||
$bytes = [System.IO.File]::ReadAllBytes($src);
|
||||
$content = [System.Convert]::ToBase64String($bytes);
|
||||
|
||||
$result = New-Object psobject;
|
||||
$result = New-Object psobject @{
|
||||
changed = $false
|
||||
encoding = "base64"
|
||||
};
|
||||
Set-Attr $result "content" $content;
|
||||
Set-Attr $result "encoding" "base64";
|
||||
echo $result | ConvertTo-Json;
|
||||
|
|
|
@ -25,6 +25,8 @@ If ($params.data.GetType)
|
|||
$data = $params.data;
|
||||
}
|
||||
|
||||
$result = New-Object psobject;
|
||||
Set-Attr $result "ping" $data;
|
||||
$result = New-Object psobject @{
|
||||
changed = $false
|
||||
ping = $data
|
||||
};
|
||||
echo $result | ConvertTo-Json;
|
||||
|
|
|
@ -28,36 +28,37 @@ If ($params.path.GetType)
|
|||
$get_md5 = $TRUE;
|
||||
If ($params.get_md5.GetType)
|
||||
{
|
||||
$get_md5 = $params.get_md5;
|
||||
$get_md5 = $params.get_md5;
|
||||
}
|
||||
|
||||
$stat = New-Object psobject;
|
||||
$result = New-Object psobject @{
|
||||
stat = New-Object psobject
|
||||
changed = $false
|
||||
};
|
||||
|
||||
If (Test-Path $path)
|
||||
{
|
||||
Set-Attr $stat "exists" $TRUE;
|
||||
Set-Attr $result.stat "exists" $TRUE;
|
||||
$info = Get-Item $path;
|
||||
If ($info.Directory) # Only files have the .Directory attribute.
|
||||
{
|
||||
Set-Attr $stat "isdir" $FALSE;
|
||||
Set-Attr $stat "size" $info.Length;
|
||||
Set-Attr $result.stat "isdir" $FALSE;
|
||||
Set-Attr $result.stat "size" $info.Length;
|
||||
}
|
||||
Else
|
||||
{
|
||||
Set-Attr $stat "isdir" $TRUE;
|
||||
Set-Attr $result.stat "isdir" $TRUE;
|
||||
}
|
||||
}
|
||||
Else
|
||||
{
|
||||
Set-Attr $stat "exists" $FALSE;
|
||||
Set-Attr $result.stat "exists" $FALSE;
|
||||
}
|
||||
|
||||
If ($get_md5 -and $stat.exists -and -not $stat.isdir)
|
||||
If ($get_md5 -and $result.stat.exists -and -not $result.stat.isdir)
|
||||
{
|
||||
$path_md5 = (Get-FileHash -Path $path -Algorithm MD5).Hash.ToLower();
|
||||
Set-Attr $stat "md5" $path_md5;
|
||||
Set-Attr $result.stat "md5" $path_md5;
|
||||
}
|
||||
|
||||
$result = New-Object psobject;
|
||||
Set-Attr $result "stat" $stat;
|
||||
Set-Attr $result "changed" $FALSE;
|
||||
echo $result | ConvertTo-Json;
|
||||
|
|
Loading…
Reference in a new issue