From 357faeed04c2d24c7c70449dc30f6e2d41c21f99 Mon Sep 17 00:00:00 2001
From: iKlsR <iklsr@outlook.com>
Date: Thu, 15 Jun 2017 01:16:50 -0500
Subject: [PATCH] Allow specifying unique table names for separate imports

---
 src/ImportCsvDialog.cpp | 37 ++++++++++++++++++++++++-------------
 src/ImportCsvDialog.h   |  2 +-
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/ImportCsvDialog.cpp b/src/ImportCsvDialog.cpp
index be6bbf22..2e8188b7 100644
--- a/src/ImportCsvDialog.cpp
+++ b/src/ImportCsvDialog.cpp
@@ -152,15 +152,12 @@ void ImportCsvDialog::accept()
     // Get all the selected files and start the import
     if (ui->filePickerBlock->isVisible())
     {
-        QStringList selectedFiles;
         for (int i = 0; i < ui->filePicker->count(); i++) {
             auto item = ui->filePicker->item(i);
-            if (item->checkState() == Qt::Checked)
-                selectedFiles.append(item->data(Qt::DisplayRole).toString());
+            if (item->checkState() == Qt::Checked) {
+                importCsv(item->data(Qt::DisplayRole).toString(), item->data(Qt::UserRole).toString());
+            }
         }
-
-        for (auto file : selectedFiles)
-            importCsv(file);
     }
     else
     {
@@ -242,16 +239,21 @@ void ImportCsvDialog::checkInput()
         allowImporting = !ui->editName->text().isEmpty();
     }
 
+    if (ui->filePicker->currentItem()) {
+        ui->filePicker->currentItem()->setData(Qt::UserRole, ui->editName->text());
+    }
+
     ui->matchSimilar->setEnabled(ui->filePicker->currentItem() != nullptr);
-    ui->editName->setEnabled(!ui->checkBoxSeparateTables->isChecked());
     ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(allowImporting);
 }
 
 void ImportCsvDialog::selectFiles()
 {
-    for (auto filename : csvFilenames) {
+    for (auto fileName : csvFilenames) {
+        auto fInfo = QFileInfo(fileName);
         auto item = new QListWidgetItem();
-        item->setText(filename);
+        item->setText(fileName);
+        item->setData(Qt::UserRole, fInfo.baseName());
         item->setCheckState(Qt::Checked);
         ui->filePicker->addItem(item);
     }
@@ -263,7 +265,11 @@ void ImportCsvDialog::updateSelectedFilePreview(QListWidgetItem* item)
 {
     selectedFile = item->data(Qt::DisplayRole).toString();
     QFileInfo fileInfo(selectedFile);
-    ui->editName->setText(fileInfo.baseName());
+    if (ui->checkBoxSeparateTables->isChecked()) {
+        ui->editName->setText(item->data(Qt::UserRole).toString());
+    } else {
+        ui->editName->setText(fileInfo.baseName());
+    }
     updatePreview();
     checkInput();
 }
@@ -363,12 +369,17 @@ sqlb::FieldVector ImportCsvDialog::generateFieldList(const CSVParser &parser)
     return fieldList;
 }
 
-void ImportCsvDialog::importCsv(const QString& fileName)
+void ImportCsvDialog::importCsv(const QString& fileName, const QString &name)
 {
     QString tableName;
+
     if (ui->checkBoxSeparateTables->isChecked()) {
-        QFileInfo fileInfo(fileName);
-        tableName = fileInfo.baseName();
+        if (name.isEmpty()) {
+            QFileInfo fileInfo(fileName);
+            tableName = fileInfo.baseName();
+        } else {
+            tableName = name;
+        }
     } else {
         tableName = ui->editName->text();
     }
diff --git a/src/ImportCsvDialog.h b/src/ImportCsvDialog.h
index 625ce5c2..b4e355fe 100644
--- a/src/ImportCsvDialog.h
+++ b/src/ImportCsvDialog.h
@@ -40,7 +40,7 @@ private:
     CSVParser parseCSV(const QString &f, qint64 count = -1);
     sqlb::FieldVector generateFieldList(const CSVParser& parser);
 
-    void importCsv(const QString& f);
+    void importCsv(const QString& f, const QString &n = QString());
 
     void setQuoteChar(const QChar& c);
     char currentQuoteChar() const;