beenull/listmonk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix incorrect record count in the importer

Browse source
This commit is contained in:
Kailash Nadh 2020-07-05 19:39:42 +05:30
parent e7da8fa668
commit b45a2a0f89
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/views/Import.vue
View file

@ -284,7 +284,7 @@ export default Vue.extend({
// Import progress bar value.
progress() {
if (!this.status) {
if (!this.status || !this.status.total > 0) {
return 0;
}
return Math.ceil((this.status.imported / this.status.total) * 100);

8
internal/subimporter/importer.go
View file

@ -432,8 +432,14 @@ func (s *Session) LoadCSV(srcPath string, delim rune) error {
s.log.Printf("error counting lines in '%s': '%v'", srcPath, err)
return err
}
if numLines == 0 {
return errors.New("empty file")
}
s.im.Lock()
s.im.status.Total = numLines
// Exclude the header from count.
s.im.status.Total = numLines - 1
s.im.Unlock()
// Rewind, now that we've done a linecount on the same handler.