From 46acece89c079a6aba3374e0355d93d47e63aa33 Mon Sep 17 00:00:00 2001
From: witzig <git.witzig@icloud.com>
Date: Fri, 29 Sep 2017 00:31:38 +0200
Subject: [PATCH] Improve CSV import error handling, closes #324

---
 routes/lists.js                     | 8 +++++++-
 views/lists/subscription/import.hbs | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/routes/lists.js b/routes/lists.js
index 799bf5b4..c725b2fb 100644
--- a/routes/lists.js
+++ b/routes/lists.js
@@ -636,8 +636,14 @@ function getPreview(path, size, delimiter, callback) {
                 fs.close(fd, () => {
                     // just ignore
                 });
+                if (err) {
+                    return callback(err);
+                }
                 if (!data || !data.length) {
-                    return callback(null, new Error(_('Empty file')));
+                    return callback(new Error(_('Empty file')));
+                }
+                if (data.length < 2) {
+                    return callback(new Error(_('Too few rows')));
                 }
                 callback(err, data);
             });
diff --git a/views/lists/subscription/import.hbs b/views/lists/subscription/import.hbs
index e0721457..e4e4da15 100644
--- a/views/lists/subscription/import.hbs
+++ b/views/lists/subscription/import.hbs
@@ -17,6 +17,7 @@
         <label for="listimport" class="col-sm-2 control-label">{{#translate}}CSV File{{/translate}}</label>
         <div class="col-sm-6">
             <input type="file" class="form-control" name="listimport" id="listimport" required>
+            <span class="help-block">{{#translate}}The first line must contain column headings{{/translate}}</span>
         </div>
     </div>