Import: allow CSV separator and quote to be passed from command line

mgrojo · mgrojo · commit 36c5b1baf447 · 2021-02-28T22:05:43.000+01:00
Support these settings from the command line: --option importcsv/separator=\, --option importcsv/quotecharacter=\' Since they are stored as string, they cannot convert to QChar unless manually converted. See issue #2589
diff --git a/src/ImportCsvDialog.cpp b/src/ImportCsvDialog.cpp
@@ -26,6 +26,18 @@
 #include <QElapsedTimer>
 #endif
 
+QChar ImportCsvDialog::getSettingsChar(const std::string& group, const std::string& name)
+{
+    QVariant value = Settings::getValue(group, name);
+    // QVariant is not able to return the character as a QChar when QString is stored.
+    // We do it manually, since it is versatile, when the option is passed from the command line,
+    // for example.
+    if(value.userType() == QMetaType::QString)
+        return value.toString().at(0);
+    else
+        return value.toChar();
+}
+
 ImportCsvDialog::ImportCsvDialog(const std::vector<QString>& filenames, DBBrowserDB* db, QWidget* parent)
     : QDialog(parent),
       ui(new Ui::ImportCsvDialog),
@@ -60,8 +72,8 @@ ImportCsvDialog::ImportCsvDialog(const std::vector<QString>& filenames, DBBrowse
     ui->checkBoxTrimFields->setChecked(Settings::getValue("importcsv", "trimfields").toBool());
     ui->checkBoxSeparateTables->setChecked(Settings::getValue("importcsv", "separatetables").toBool());
     ui->checkLocalConventions->setChecked(Settings::getValue("importcsv", "localconventions").toBool());
-    setSeparatorChar(Settings::getValue("importcsv", "separator").toChar());
-    setQuoteChar(Settings::getValue("importcsv", "quotecharacter").toChar());
+    setSeparatorChar(getSettingsChar("importcsv", "separator"));
+    setQuoteChar(getSettingsChar("importcsv", "quotecharacter"));
     setEncoding(Settings::getValue("importcsv", "encoding").toString());
 
     ui->checkboxHeader->blockSignals(false);
diff --git a/src/ImportCsvDialog.h b/src/ImportCsvDialog.h
@@ -62,6 +62,8 @@ private slots:
     std::string currentOnConflictStrategy() const;
 
     char32_t toUtf8(const QString& s) const;
+
+    static QChar getSettingsChar(const std::string& group, const std::string& name);
 };
 
 #endif
