mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-01-20 02:50:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Allow specifying unique table names for separate imports

Browse Source
This commit is contained in:
iKlsR
2017-06-15 01:16:50 -05:00
committed by Martin Kleusberg
parent 97b4261190
commit 357faeed04
2 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/ImportCsvDialog.cpp
View File

@@ -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();
}

2
src/ImportCsvDialog.h
View File

@@ -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;