Automatically remove duplicate conflicted notes.sqlite database files (…

…#1625)

CHANGELOG.md

@@ -1,5 +1,10 @@
 # QOwnNotes Changelog
 
+## 20.2.4
+- conflicted copies of the note folder database `notes.sqlite` are now
+  immediately deleted if they are not different to the current `notes.sqlite`
+  (for [#1625](https://github.com/pbek/QOwnNotes/issues/1625))
+
 ## 20.2.3
 - improved Setext-style headers highlighting with leading spaces
   (for [#101](https://github.com/pbek/qmarkdowntextedit/issues/101), thank you @Waqar144)

src/mainwindow.cpp

@@ -3251,9 +3251,28 @@ void MainWindow::removeConflictedNotesDatabaseCopies() {
     QDirIterator it(NoteFolder::currentLocalPath(), filter,
                     QDir::AllEntries | QDir::NoSymLinks | QDir::NoDotAndDotDot);
     auto files = QStringList();
+    const QSignalBlocker blocker(this->noteDirectoryWatcher);
+    Q_UNUSED(blocker)
+
+    // we try to fix problems with the blocker
+    directoryWatcherWorkaround(true);
 
     while (it.hasNext()) {
-        files << it.next();
+        const QString &file = it.next();
+
+        // check if conflicted database copy is the same as the current note
+        // folder database
+        if (Utils::Misc::isSameFile(
+                file, DatabaseService::getNoteFolderDatabasePath())) {
+            showStatusBarMessage(
+                tr(QFile::remove(file)
+                       ? "Removed duplicate conflicted database: %1"
+                       : "Could not remove duplicate conflicted database: %1")
+                    .arg(file),
+                4000);
+        } else {
+            files << file;
+        }
     }
 
     int count = files.count();
@@ -3276,12 +3295,6 @@ void MainWindow::removeConflictedNotesDatabaseCopies() {
         return;
     }
 
-    const QSignalBlocker blocker(this->noteDirectoryWatcher);
-    Q_UNUSED(blocker)
-
-    // we try to fix problems with the blocker
-    directoryWatcherWorkaround(true);
-
     count = 0;
 
     // remove the database files

src/services/databaseservice.cpp

@@ -835,3 +835,28 @@ QString DatabaseService::getAppData(const QString& name,
 
     return QString();
 }
+
+/**
+ * WIP
+ *
+ * @param path
+ * @return
+ */
+bool DatabaseService::mergeNoteFolderDatabase(QString path) {
+    QSqlDatabase mergeDB = QSqlDatabase::addDatabase(
+        QStringLiteral("QSQLITE"), QStringLiteral("note_folder_merge"));
+    mergeDB.setDatabaseName(path);
+
+    if (!mergeDB.open()) {
+        QMessageBox::critical(
+            nullptr, QWidget::tr("Cannot open database"),
+            QWidget::tr("Unable to establish a database connection with "
+                        "note folder database to merge '%1'.\nAre the folder "
+                        "and the file writeable?")
+                .arg(path),
+            QMessageBox::Ok);
+        return false;
+    }
+
+    return true;
+}

src/services/databaseservice.h

@@ -22,11 +22,12 @@ class DatabaseService {
     static QSqlDatabase getNoteFolderDatabase();
     static void closeDatabaseConnection(const QSqlDatabase& db,
                                         QSqlQuery& query);
+    static QString getNoteFolderDatabasePath();
 
    private:
-    static QString getNoteFolderDatabasePath();
     static bool createMemoryConnection();
     static bool createDiskConnection();
+    static bool mergeNoteFolderDatabase(QString path);
 };
 
 #endif    // DATABASESERVICE_H

src/utils/misc.cpp

@@ -1939,3 +1939,31 @@ QString Utils::Misc::localDictionariesPath() {
     dir.mkpath(path);
     return path;
 }
+
+/**
+ * Generates a SHA1 signature for a file
+ *
+ * @return
+ */
+QByteArray Utils::Misc::generateFileSha1Signature(const QString &path) {
+    QCryptographicHash hash(QCryptographicHash::Sha1);
+    QFile file(path);
+
+    if (file.open(QIODevice::ReadOnly)) {
+        hash.addData(file.readAll());
+    } else {
+        return QByteArray();
+    }
+
+    // retrieve the SHA1 signature of the file
+    return hash.result();
+}
+
+/**
+ * Checks if two files are the same
+ *
+ * @return
+ */
+bool Utils::Misc::isSameFile(const QString &path1, const QString &path2) {
+    return generateFileSha1Signature(path1) == generateFileSha1Signature(path2);
+}

src/utils/misc.h

@@ -128,6 +128,8 @@ QString remotePreviewImageTagToInlineImageTag(QString imageTag,
                                               int &imageWidth);
 QString createUuidString();
 QString localDictionariesPath();
+QByteArray generateFileSha1Signature(const QString &path);
+bool isSameFile(const QString &path1, const QString &path2);
 }    // namespace Misc
 }    // namespace Utils