Fix incorrect record count in the importer

knadh · Jul 5, 2020 · b45a2a0 · b45a2a0
1 parent e7da8fa
commit b45a2a0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/frontend/src/views/Import.vue b/frontend/src/views/Import.vue
@@ -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);

diff --git a/internal/subimporter/importer.go b/internal/subimporter/importer.go
@@ -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.