Refactoring

added Test-ByteArrayType. Test-StreamType

Author: alan-null

Photo.Shell/Private/Test-ByteArrayType.ps1

@@ -0,0 +1,20 @@
+function Test-ByteArrayType {
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory = $true, Position = 0 )]
+        $Object
+    )
+
+    begin {
+        Write-Verbose "Cmdlet Test-ByteArrayType - Begin"
+    }
+
+    process {
+        Write-Verbose "Cmdlet Test-ByteArrayType - Process"
+        $Object.PSTypeNames -contains [System.Byte[]].ToString()
+    }
+
+    end {
+        Write-Verbose "Cmdlet Test-ByteArrayType - End"
+    }
+}

Photo.Shell/Private/Test-StreamType.ps1

@@ -0,0 +1,20 @@
+function Test-StreamType {
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory = $true, Position = 0 )]
+        $Object
+    )
+
+    begin {
+        Write-Verbose "Cmdlet Test-StreamType - Begin"
+    }
+
+    process {
+        Write-Verbose "Cmdlet Test-StreamType - Process"
+        $Object.PSTypeNames -contains [System.IO.Stream]
+    }
+
+    end {
+        Write-Verbose "Cmdlet Test-StreamType - End"
+    }
+}

Photo.Shell/Public/Compress-Image.ps1

@@ -15,8 +15,8 @@ function Compress-Image {
 
     process {
         Write-Verbose "Cmdlet Compress-Image - Process"
-        $isByte = $Image.PSTypeNames -contains [System.Byte[]].ToString()
-        $isStream = $Image.PSTypeNames -contains [System.IO.Stream]
+        $isByte = Test-ByteArrayType $Image
+        $isStream = Test-StreamType $Image
 
         if (!$isByte -and !$isStream ) {
             throw [System.ArgumentException]::new("Invalid input. Accepted types are: [System.IO.Stream] and [System.Byte[]]")

Photo.Shell/Public/Get-ImageCodecInfo.ps1

@@ -3,7 +3,6 @@
 function Get-ImageCodecInfo {
     [CmdletBinding()]
     param (
-        # [byte[]] or [System.IO.Stream]
         [Parameter(Mandatory = $true, Position = 0 )]
         $Image
     )
@@ -15,7 +14,14 @@ function Get-ImageCodecInfo {
     process {
         Write-Verbose "Cmdlet Get-ImageCodecInfo - Process"
 
-        if ($Image.PSTypeNames -contains [System.IO.Stream]) {
+        $isByte = Test-ByteArrayType $Image
+        $isStream = Test-StreamType $Image
+
+        if (!$isByte -and !$isStream ) {
+            throw [System.ArgumentException]::new("Invalid input. Accepted types are: [System.IO.Stream] and [System.Byte[]]")
+        }
+
+        if ($isStream) {
             $Image = $Image.ToArray()
         }
 

Photo.Shell/Public/Resize-Image.ps1

@@ -20,7 +20,14 @@ function Resize-Image {
     process {
         Write-Verbose "Cmdlet Resize-Image - Process"
 
-        if ($Image.PSTypeNames -contains [System.Byte[]].ToString()) {
+        $isByte = Test-ByteArrayType $Image
+        $isStream = Test-StreamType $Image
+
+        if (!$isByte -and !$isStream ) {
+            throw [System.ArgumentException]::new("Invalid input. Accepted types are: [System.IO.Stream] and [System.Byte[]]")
+        }
+
+        if ($isByte) {
             $stream = [System.IO.MemoryStream]::new($Image)
         }
         else {

Tests/Photo.Shell.Tests.ps1

@@ -50,6 +50,10 @@ Describe 'Photo.Shell.Tests' {
             $img = Get-TestImage -Format $Format
             Get-ImageCodecInfo $img | Select-Object -ExpandProperty MimeType  | Should -BeExactly $Expected
         }
+
+        It "shouldn't accept" {
+            { Get-ImageCodecInfo $false } | Should -Throw -ExceptionType ([System.ArgumentException])
+        }
     }
 
     Context "Resize-Image" {
@@ -103,9 +107,7 @@ Describe 'Photo.Shell.Tests' {
         }
 
         It "shouldn't accept" {
-            $stream = [System.IO.MemoryStream]::new($testImage)
-            $img = [System.Drawing.Image]::FromStream($stream)
-            { Resize-Image -Image $img -Ratio 1 } | Should -Throw
+            { Resize-Image -Image $false -Ratio 1 } | Should -Throw -ExceptionType ([System.ArgumentException])
         }
     }
 
@@ -133,10 +135,7 @@ Describe 'Photo.Shell.Tests' {
         }
 
         It "shouldn't accept" {
-            $type = [System.Drawing.Imaging.ImageFormat]::Png
-            $img_before = Get-TestImage -Format $type
-            $img_before = Convert-BytesToImage $img_before
-            { Compress-Image $img_before -Format $type -Compression 10L } | Should -Throw -ExceptionType ([System.ArgumentException])
+            { Compress-Image $false -Format $type -Compression 10L } | Should -Throw -ExceptionType ([System.ArgumentException])
         }
     }
 }