Skip to content

Commit

Permalink
check for .shp extension when opening file
Browse files Browse the repository at this point in the history
  • Loading branch information
icholy authored and fawick committed Apr 24, 2018
1 parent 5219fdf commit af2d0c9
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions reader.go
Expand Up @@ -6,6 +6,7 @@ import (
"io"
"math"
"os"
"path/filepath"
"strings"
)

Expand Down Expand Up @@ -39,12 +40,15 @@ type readSeekCloser interface {

// Open opens a Shapefile for reading.
func Open(filename string) (*Reader, error) {
filename = filename[0 : len(filename)-3]
shp, err := os.Open(filename + "shp")
ext := filepath.Ext(filename)
if strings.ToLower(ext) != ".shp" {
return nil, fmt.Errorf("Invalid file extension: %s", filename)
}
shp, err := os.Open(filename)
if err != nil {
return nil, err
}
s := &Reader{filename: filename, shp: shp}
s := &Reader{filename: strings.TrimSuffix(filename, ext), shp: shp}
s.readHeaders()
return s, nil
}
Expand Down Expand Up @@ -190,7 +194,7 @@ func (r *Reader) openDbf() (err error) {
return
}

r.dbf, err = os.Open(r.filename + "dbf")
r.dbf, err = os.Open(r.filename + ".dbf")
if err != nil {
return
}
Expand Down

0 comments on commit af2d0c9

Please sign in to comment.