Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions fileutil/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ import (
"strings"
"sync"

"github.com/duke-git/lancet/v2/validator"
"golang.org/x/text/encoding/simplifiedchinese"
"golang.org/x/text/transform"

"github.com/duke-git/lancet/v2/validator"
)

// FileReader is a reader supporting offset seeking and reading one
Expand Down Expand Up @@ -283,21 +284,18 @@ func ReadFileByLine(path string) ([]string, error) {
}
defer f.Close()

scanner := bufio.NewScanner(f)
result := make([]string, 0)
buf := bufio.NewReader(f)

for {
line, _, err := buf.ReadLine()
l := string(line)
if err == io.EOF {
break
}
if err != nil {
continue
}
for scanner.Scan() {
l := scanner.Text()
result = append(result, l)
}

if err := scanner.Err(); err != nil {
return nil, err
}

return result, nil
}

Expand Down