Merge e1e4cfd02e into fa907da4a4

Public/ConvertTo-ExcelXlsx.ps1

@@ -3,64 +3,76 @@ function ConvertTo-ExcelXlsx {
     param
     (
         [parameter(Mandatory = $true, ValueFromPipeline)]
-        [string]$Path,
+        [string[]]$Path,
         [parameter(Mandatory = $false)]
         [switch]$Force
     )
     process {
-        if (-Not ($Path | Test-Path) ) {
-            throw "File not found"
-        }
-        if (-Not ($Path | Test-Path -PathType Leaf) ) {
-            throw "Folder paths are not allowed"
-        }
+        try {
+            foreach ($singlePath in $Path) {
+                if (-Not ($singlePath | Test-Path) ) {
+                    throw "File not found"
+                }
+                if (-Not ($singlePath | Test-Path -PathType Leaf) ) {
+                    throw "Folder paths are not allowed"
+                }
 
-        $xlFixedFormat = 51 #Constant for XLSX Workbook
-        $xlsFile = Get-Item -Path $Path
-        $xlsxPath = "{0}x" -f $xlsFile.FullName
+                $xlFixedFormat = 51 #Constant for XLSX Workbook
+                $xlsFile = Get-Item -Path $singlePath
+                $xlsxPath = [System.IO.Path]::ChangeExtension($xlsFile.FullName, ".xlsx")
 
-        if ($xlsFile.Extension -ne ".xls") {
-            throw "Expected .xls extension"
-        }
+                if ($xlsFile.Extension -ne ".xls") {
+                    throw "Expected .xls extension"
+                }
 
-        if (Test-Path -Path $xlsxPath) {
-            if ($Force) {
-                try {
-                    Remove-Item $xlsxPath -Force
+                if (Test-Path -Path $xlsxPath) {
+                    if ($Force) {
+                        try {
+                            Remove-Item $xlsxPath -Force
+                        }
+                        catch {
+                            throw "{0} already exists and cannot be removed. The file may be locked by another application." -f $xlsxPath
+                        }
+                        Write-Verbose $("Removed {0}" -f $xlsxPath)
+                    }
+                    else {
+                        throw "{0} already exists!" -f $xlsxPath
+                    }
+                }
+
+                if ($null -eq $Excel)
+                {
+                    try {
+                        $Excel = New-Object -ComObject "Excel.Application"
+                    }
+                    catch {
+                        throw "Could not create Excel.Application ComObject. Please verify that Excel is installed."
+                    }
+                }
+
+                try {  
+                    $Excel.Visible = $false
+                    $workbook = $Excel.Workbooks.Open($xlsFile.FullName, $null, $true)
+                    if ($null -eq $workbook) {
+                        Write-Host "Failed to open workbook"
+                    } else {
+                        $workbook.SaveAs($xlsxPath, $xlFixedFormat)
+                    }
                 }
                 catch {
-                    throw "{0} already exists and cannot be removed. The file may be locked by another application." -f $xlsxPath
+                    Write-Error ("Failed to convert {0} to XLSX." -f $xlsFile.FullName)
+                    throw
+                }
+                finally {
+                    if ($null -ne $workbook) {
+                        $workbook.Close()
+                    }
                 }
-                Write-Verbose $("Removed {0}" -f $xlsxPath)
-            }
-            else {
-                throw "{0} already exists!" -f $xlsxPath
-            }
-        }
-
-        try {
-            $Excel = New-Object -ComObject "Excel.Application"
-        }
-        catch {
-            throw "Could not create Excel.Application ComObject. Please verify that Excel is installed."
-        }
-
-        try {  
-            $Excel.Visible = $false
-            $workbook = $Excel.Workbooks.Open($xlsFile.FullName, $null, $true)
-            if ($null -eq $workbook) {
-                Write-Host "Failed to open workbook"
-            } else {
-                $workbook.SaveAs($xlsxPath, $xlFixedFormat)
             }
         }
         finally {
-            if ($null -ne $workbook) {
-                $workbook.Close()
-            }
-            
             $Excel.Quit()
+            $Excel = $null
         }
     }
 }
-