jgaunt/ImportExcel
1
0
Fork 0
mirror of https://github.com/dfinke/ImportExcel.git synced 2025-12-15 07:43:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add extension test back in

Browse Source
This commit is contained in:
dfinke
2019-07-04 12:16:44 -04:00
parent 5ded5111b4
commit e87a6bdaf5
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ImportExcel.psm1
View File

@@ -348,6 +348,13 @@ function Import-Excel {
process { process {
if ($path) { if ($path) {
if (!$firstTimeThru) {
# '.xls$|.xlsx$|.xlsm$'
$extension = [System.IO.Path]::GetExtension($Path)
if ($extension -notmatch '.xlsx$|.xlsm$') {
throw "Import-Excel does not support reading this extension type $($extension)"
}
# $Path = (Resolve-Path $Path).ProviderPath # $Path = (Resolve-Path $Path).ProviderPath
$resolvedPath = (Resolve-Path $Path -ErrorAction SilentlyContinue) $resolvedPath = (Resolve-Path $Path -ErrorAction SilentlyContinue)
if ($resolvedPath) { if ($resolvedPath) {
@@ -356,6 +363,8 @@ function Import-Excel {
else { else {
throw "'$($Path)' file not found" throw "'$($Path)' file not found"
} }
$firstTimeThru = $true
}
$stream = New-Object -TypeName System.IO.FileStream -ArgumentList $Path, 'Open', 'Read', 'ReadWrite' $stream = New-Object -TypeName System.IO.FileStream -ArgumentList $Path, 'Open', 'Read', 'ReadWrite'
if ($Password) { $ExcelPackage = New-Object -TypeName OfficeOpenXml.ExcelPackage -ArgumentList $stream , $Password } if ($Password) { $ExcelPackage = New-Object -TypeName OfficeOpenXml.ExcelPackage -ArgumentList $stream , $Password }