Merge pull request #1648 from evenmartinsen/master

Remove flagged URL

ImportExcel.psd1

@@ -6,7 +6,7 @@
     RootModule         = 'ImportExcel.psm1'
 
     # Version number of this module.
-    ModuleVersion      = '7.8.9'
+    ModuleVersion      = '7.8.10'
 
     # ID used to uniquely identify this module
     GUID               = '60dd4136-feff-401a-ba27-a84458c57ede'
@@ -150,7 +150,7 @@ Check out the How To Videos https://www.youtube.com/watch?v=U3Ne_yX4tYo&list=PL5
             Tags         = @("Excel", "EPPlus", "Export", "Import")
 
             # The web address of an icon which can be used in galleries to represent this module
-            #IconUri = "http://pesterbdd.com/images/Pester.png"
+            #IconUri = 
 
             # The web address of this module's project or support homepage.
             ProjectUri   = "https://github.com/dfinke/ImportExcel"
@@ -215,4 +215,4 @@ Check out the How To Videos https://www.youtube.com/watch?v=U3Ne_yX4tYo&list=PL5
     # Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
     # DefaultCommandPrefix = ''
 
-}
+}

Public/ConvertTo-ExcelXlsx.ps1

@@ -3,121 +3,60 @@ function ConvertTo-ExcelXlsx {
     param
     (
         [parameter(Mandatory = $true, ValueFromPipeline)]
-        [string[]]$Path,
+        [string]$Path,
         [parameter(Mandatory = $false)]
-        [switch]$Force,
-        [parameter(Mandatory = $false)]
-        [switch]$CacheToTemp,
-        [parameter(Mandatory = $false)]
-        [string]$CacheToDirectory
+        [switch]$Force
     )
     process {
-        try {
+        if (-Not ($Path | Test-Path) ) {
+            throw "File not found"
+        }
+        if (-Not ($Path | Test-Path -PathType Leaf) ) {
+            throw "Folder paths are not allowed"
+        }
 
-            if ($CacheToTemp -and $CacheToDirectory) {
-                throw "Cannot specify both -CacheToTemp and -CacheToDirectory. Please choose one or the other."
-            }
+        $xlFixedFormat = 51 #Constant for XLSX Workbook
+        $xlsFile = Get-Item -Path $Path
+        $xlsxPath = "{0}x" -f $xlsFile.FullName
 
-            if ($CacheToTemp) {
-                $CacheToDirectory = [System.IO.Path]::GetTempPath()
-            }
+        if ($xlsFile.Extension -ne ".xls") {
+            throw "Expected .xls extension"
+        }
 
-            if ($CacheToDirectory) {
-                if (-not (Test-Path -Path $CacheToDirectory -PathType Container)) {
-                    throw "CacheToDirectory path does not exist or is not writeable"
-                }
-            }
-
-            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 $singlePath
-                $destinationXlsxPath = [System.IO.Path]::ChangeExtension($xlsFile.FullName, ".xlsx")
-
-                if ($xlsFile.Extension -ne ".xls") {
-                    throw "Expected .xls extension"
-                }
-
-                if (Test-Path -Path $destinationXlsxPath) {
-                    if ($Force) {
-                        try {
-                            Remove-Item $destinationXlsxPath -Force
-                        }
-                        catch {
-                            throw "{0} already exists and cannot be removed. The file may be locked by another application." -f $destinationXlsxPath
-                        }
-                        Write-Verbose $("Removed {0}" -f $destinationXlsxPath)
-                    }
-                    else {
-                        throw "{0} already exists!" -f $destinationXlsxPath
-                    }
-                }
-
-                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."
-                    }
-                }
-
-                if ($CacheToDirectory) {
-                    $tempPath = [System.IO.Path]::Combine($CacheToDirectory, [System.IO.Path]::GetFileName($xlsFile.FullName))
-                    Write-Host ("Using Temp path: {0}" -f $tempPath)
-                    Copy-Item -Path $xlsFile.FullName -Destination $tempPath -Force
-                    $fileToProcess = $tempPath
-                }
-                else {
-                    $fileToProcess = $xlsFile.FullName
-                }
-
-                $xlsxPath = [System.IO.Path]::ChangeExtension($fileToProcess, ".xlsx")
-
-                try {  
-                    $Excel.Visible = $false
-                    $workbook = $Excel.Workbooks.Open($fileToProcess, $null, $true)
-                    if ($null -eq $workbook) {
-                        Write-Host "Failed to open workbook"
-                    } else {
-                        $workbook.SaveAs($xlsxPath, $xlFixedFormat)
-                        
-                        if ($CacheToDirectory) {
-                            Copy-Item -Path $xlsxPath -Destination $destinationXlsxPath -Force
-                        }
-                    }
+        if (Test-Path -Path $xlsxPath) {
+            if ($Force) {
+                try {
+                    Remove-Item $xlsxPath -Force
                 }
                 catch {
-                    Write-Error ("Failed to convert {0} to XLSX. To avoid network issues or locking issues, you could try the -CacheToTemp or -CacheToDirectory parameter." -f $xlsFile.FullName)
-                    throw
-                }
-                finally {
-                    if ($null -ne $workbook) {
-                        $workbook.Close()
-                        [System.Runtime.InteropServices.Marshal]::ReleaseComObject($workbook) | Out-Null
-                        $workbook = $null
-                    }
-
-                    if ($CacheToDirectory) {
-                        Remove-Item -Path $tempPath -Force
-                        Remove-Item -Path $xlsxPath -Force
-                    }
+                    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
             }
         }
+
+        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
+            $null = $Excel.Workbooks.Open($xlsFile.FullName, $null, $true)
+            $Excel.ActiveWorkbook.SaveAs($xlsxPath, $xlFixedFormat)
+        }
         finally {
-            if ($null -ne $Excel) {
-                $Excel.Quit()
-                [System.Runtime.InteropServices.Marshal]::ReleaseComObject($Excel) | Out-Null
-                $Excel = $null
+            if ($null -ne $Excel.ActiveWorkbook) {
+                $Excel.ActiveWorkbook.Close()
             }
+            
+            $Excel.Quit()
         }
     }
 }
+