Merge pull request #321 from asashnov/318-odd-export-behavior

318 odd export behavior

src/DbBackupsTracker.cpp

@@ -183,7 +183,7 @@ QString DbBackupsTracker::getTrackedBackupFileFormat()
         return "none";
 
     if (isAnEncryptedBackup(d))
-        return "SympleCrypt";
+        return "SimpleCrypt";
 
     return "none";
 }

src/DbBackupsTracker.h

@@ -53,7 +53,7 @@ class DbBackupsTracker : public QObject
 
     /**
      * Guess the current tracked backup file format,
-     * currently suported: "none" and "SympleCrypt"
+     * currently suported: "none" and "SimpleCrypt"
      * throws: DbBackupsTrackerNoBackupFileSet
      */
     QString getTrackedBackupFileFormat();

src/DbBackupsTrackerController.cpp

@@ -160,18 +160,13 @@ void DbBackupsTrackerController::askForExportBackup()
 
 void DbBackupsTrackerController::exportDbBackup()
 {
-    QString format;
-    try
-    {
-        format = dbBackupsTracker.getTrackedBackupFileFormat();
-    }
-    catch (DbBackupsTrackerNoBackupFileSet)
-    {
-        format = "SympleCrypt";
-    }
-
+    QString format = "SimpleCrypt";
 
     window->wantExportDatabase();
+
+    // one-time connection, must be disconected immediately in the slot
+    connect(wsClient, &WSClient::dbExported, this, &DbBackupsTrackerController::handleExportDbResult);
+
     wsClient->exportDbFile(format);
 }
 
@@ -202,17 +197,23 @@ void DbBackupsTrackerController::clearTrackerCardInfo()
 
 void DbBackupsTrackerController::handleExportDbResult(const QByteArray &d, bool success)
 {
-    if (success)
-    {
-        QString file = getBackupFilePath();
-        writeDbBackup(file, d);
+    // one-time connection
+    disconnect(wsClient, &WSClient::dbExported, this, &DbBackupsTrackerController::handleExportDbResult);
 
-        window->handleBackupExported();
-    }
-    else
+    if (! success)
     {
         QMessageBox::warning(window, tr("Error"), tr(d));
+        return;
     }
+
+    QString file = getBackupFilePath();
+    if (file.isEmpty())
+        return;
+
+    writeDbBackup(file, d);
+
+    if (window)
+        window->handleBackupExported();
 }
 
 void DbBackupsTrackerController::handleNewTrack(const QString &cardId, const QString &path)

src/DbExportsRegistryController.cpp

@@ -41,6 +41,7 @@ void DbExportsRegistryController::setWSClient(WSClient *wsClient)
 {
     DbExportsRegistryController::wsClient = wsClient;
     dbExportsRegistry->setCurrentCardDbMetadata(wsClient->get_cardId(), wsClient->get_credentialsDbChangeNumber(), wsClient->get_dataDbChangeNumber());
+    connect(wsClient, &WSClient::dbExported, this, &DbExportsRegistryController::registerDbExported, Qt::UniqueConnection);
 }
 
 void DbExportsRegistryController::hidePrompt()
@@ -62,6 +63,17 @@ void DbExportsRegistryController::handleCardIdChanged(QString cardId, int creden
         dbExportsRegistry->setCurrentCardDbMetadata(QString(), -1, -1);
 }
 
+/**! Register the last export time by any reason.
+ *  This method will be called every time WSClient::dbExported signal is fired.
+ *
+ * The reason export was done may be:
+ *  - user clicked 'Export to File' button;
+ *  - monitored backup file was updated
+ *  - periodic backup was done
+ *
+ * FIXME: the fact daemon sent a backup doesn't mean it was actually
+ * written to file.
+ */
 void DbExportsRegistryController::registerDbExported(const QByteArray &, bool success)
 {
     if (success)
@@ -107,22 +119,24 @@ void DbExportsRegistryController::handleDbExportRecommended()
 
 void DbExportsRegistryController::handleExportDbResult(const QByteArray &d, bool success)
 {
-    if (! handleExportResultEnabled)
-        return;
-    handleExportResultEnabled = false;
+    // one-time connection
+    disconnect(wsClient, &WSClient::dbExported, this, &DbExportsRegistryController::handleExportDbResult);
 
     if (window)
         window->handleBackupExported();
 
-    if (success)
+    if (! success)
     {
-        QString fname = QFileDialog::getSaveFileName(window, tr("Save database export..."), QString(),
-                                                     "Memory exports (*.bin);;All files (*.*)");
-        if (!fname.isEmpty())
-            writeDbToFile(d, fname);
-    }
-    else
         QMessageBox::warning(window, tr("Error"), tr(d));
+        return;
+    }
+
+    QString fname = QFileDialog::getSaveFileName(window, tr("Save database export..."), QString(),
+                                                 "Memory exports (*.bin);;All files (*.*)");
+    if (fname.isEmpty())
+        return;
+
+    writeDbToFile(d, fname);
 }
 
 void DbExportsRegistryController::handleDeviceStatusChanged(const Common::MPStatus &status)
@@ -150,9 +164,13 @@ void DbExportsRegistryController::exportDbBackup()
 {
     handleExportResultEnabled = true;
 
-    QString format = "SympleCrypt";
+    QString format = "SimpleCrypt";
 
     if (window)
         window->wantExportDatabase();
+
+    // one-time connection, must be disconected immediately in the slot
+    connect(wsClient, &WSClient::dbExported, this, &DbExportsRegistryController::handleExportDbResult);
+
     wsClient->exportDbFile(format);
 }

src/DbMasterController.cpp

@@ -34,7 +34,6 @@ void DbMasterController::setWSClient(WSClient *client)
     connect(wsClient, &WSClient::cardDbMetadataChanged, this, &DbMasterController::handleCardIdChanged);
     connect(wsClient, &WSClient::statusChanged, this, &DbMasterController::handleDeviceStatusChanged);
     connect(wsClient, &WSClient::connectedChanged, this, &DbMasterController::handleDeviceConnectedChanged);
-    connect(wsClient, &WSClient::dbExported, this, &DbMasterController::registerDbExported);
 
     dbExportsRegistryController->setWSClient(wsClient);
 }
@@ -85,15 +84,3 @@ void DbMasterController::handleDeviceConnectedChanged(const bool &connected)
 
     dbExportsRegistryController->handleDeviceConnectedChanged(connected);
 }
-
-void DbMasterController::registerDbExported(const QByteArray &data, bool success)
-{
-    if (dbBackupsTrackerController) {
-        dbBackupsTrackerController->handleExportDbResult(data, success);
-        if (! dbBackupsTrackerController->getBackupFilePath().isEmpty())
-            return;
-    }
-
-    dbExportsRegistryController->registerDbExported(data, success);
-    dbExportsRegistryController->handleExportDbResult(data, success);
-}

src/DbMasterController.h

@@ -44,7 +44,6 @@ private slots:
     void handleCardIdChanged(QString cardId, int credentialsDbChangeNumber, int dataDbChangeNumber);
     void handleDeviceStatusChanged(const Common::MPStatus &status);
     void handleDeviceConnectedChanged(const bool &connected);
-    void registerDbExported(const QByteArray &data, bool success);
 
 private:
     MainWindow *window = nullptr;

src/MainWindow.cpp

@@ -1168,8 +1168,9 @@ void MainWindow::on_pushButtonExportFile_clicked()
     else
         wsClient->exportDbFile("SimpleCrypt");
 
-
+    // one-time connection, must be disconected immediately in the slot
     connect(wsClient, &WSClient::dbExported, this, &MainWindow::dbExported);
+
     wantExportDatabase();
 }
 
@@ -1194,8 +1195,10 @@ void MainWindow::on_pushButtonImportFile_clicked()
 
 void MainWindow::dbExported(const QByteArray &d, bool success)
 {
-    ui->widgetHeader->setEnabled(true);
+    // one-time connection
     disconnect(wsClient, &WSClient::dbExported, this, &MainWindow::dbExported);
+
+    ui->widgetHeader->setEnabled(true);
     if (!success)
         QMessageBox::warning(this, tr("Error"), tr(d));
     else

tests/DbBackupsTrackerTests.cpp

@@ -323,13 +323,13 @@ void DbBackupsTrackerTests::getFileFormatLegacy()
     t->deleteLater();
 }
 
-void DbBackupsTrackerTests::getFileFormatSympleCrypt()
+void DbBackupsTrackerTests::getFileFormatSimpleCrypt()
 {
     DbBackupsTracker* t = new DbBackupsTracker("/tmp/test_db_backups_tracker.info");
     t->setCardId("00000");
     QString file = getTestsDataDirPath() + "tests_backup";
     t->track(file);
 
-    QCOMPARE(QString("SympleCrypt"), t->getTrackedBackupFileFormat());
+    QCOMPARE(QString("SimpleCrypt"), t->getTrackedBackupFileFormat());
     t->deleteLater();
 }

tests/DbBackupsTrackerTests.h

@@ -30,7 +30,7 @@ private slots:
     void credentialChangenumberWrapOver();
 
     void getFileFormatLegacy();
-    void getFileFormatSympleCrypt();
+    void getFileFormatSimpleCrypt();
 
 private:
     DbBackupsTracker tracker;