From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Date: Sat, 11 Jul 2020 22:08:46 +0000 (+0200)
Subject: Move existing syncjournal db files from client ver <2.7
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~73^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4656748130bdca41e03cc1dc1b402277e55d6b8c;p=nextcloud-desktop.git

Move existing syncjournal db files from client ver <2.7

Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
---

diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
index 2cfaa5bba..d9cb19889 100644
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@ -218,13 +218,20 @@ void FolderMan::setupFoldersHelper(QSettings &settings, AccountStatePtr account,
                 socketApi()->slotUnregisterPath(folderAlias);
                 auto settings = account->settings();
 
+                auto journalFileMoveSuccess = true;
+                journalFileMoveSuccess = oldJournal.rename(folderDefinition.journalPath);
+                journalFileMoveSuccess = oldJournalShm.rename(folderDefinition.journalPath.append("-shm"));
+                journalFileMoveSuccess = oldJournalWal.rename(folderDefinition.journalPath.append("-wal"));
+
+                if (!journalFileMoveSuccess) {
+                    qCWarning(lcFolderMan) << "Wasn't able to move pre-2.7 syncjournal databse files to new location. One-time loss off sync settings possible.";
+                } else {
+                    qCInfo(lcFolderMan) << "Successfully migrated syncjournal database.";
+                }
+
                 Folder *f = addFolderInternal(folderDefinition, account.data());
                 f->saveToSettings();
 
-                oldJournal.remove();
-                oldJournalShm.remove();
-                oldJournalWal.remove();
-
                 return;
             }