From: Camila <hello@camila.codes>
Date: Mon, 23 Jan 2023 16:30:59 +0000 (+0000)
Subject: Address PR comments.
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~11^2~23^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a3e08aae3b6b9ac0e198ce8523f113c0a4959219;p=nextcloud-desktop.git

Address PR comments.

Signed-off-by: Camila <hello@camila.codes>
---

diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index a6a2c281b..b20a60117 100644
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -145,29 +145,28 @@ bool Application::configVersionMigration()
 
     // We want to message the user either for destructive changes,
     // or if we're ignoring something and the client version changed.
-    auto warningMessage = !deleteKeys.isEmpty() || (!ignoreKeys.isEmpty() && versionChanged);
+    const auto showWarning = !deleteKeys.isEmpty() || (!ignoreKeys.isEmpty() && versionChanged);
 
-    if (!versionChanged && !warningMessage) {
+    if (!versionChanged && !showWarning) {
         return true;
     }
 
     // back up all old config file
     QStringList backupFilesList;
-    QDir directory(configFile.configPath());
-    const auto anyConfigFileList = directory.entryInfoList({"*.cfg"}, QDir::Files);
-    for (const auto &file : anyConfigFileList) {
-        const auto fileName = file.fileName();
-        backupFilesList.append(configFile.backup(fileName));
-        if (file.baseName() != APPLICATION_CONFIG_NAME) {
-            const auto newConfig = configFile.configFile();
-            const auto oldConfig = file.filePath();
-            if (!QFile::rename(oldConfig, newConfig)) {
-                qCWarning(lcApplication) << "Failed to rename configuration file from" << oldConfig << "to" << newConfig;
+    QDir configDir(configFile.configPath());
+    const auto anyConfigFileNameList = configDir.entryInfoList({"*.cfg"}, QDir::Files);
+    for (const auto &oldConfig : anyConfigFileNameList) {
+        const auto oldConfigFileName = oldConfig.fileName();
+        const auto newConfigFileName = configFile.configFile();
+        backupFilesList.append(configFile.backup(oldConfigFileName));
+        if (oldConfigFileName != newConfigFileName) {
+            if (!QFile::rename(oldConfig.filePath(), newConfigFileName)) {
+                qCWarning(lcApplication) << "Failed to rename configuration file from" << oldConfigFileName << "to" << newConfigFileName;
             }
         }
     }
 
-    if (warningMessage || backupFilesList.count() > 0) {
+    if (showWarning || backupFilesList.count() > 0) {
         QString boldMessage;
         if (!deleteKeys.isEmpty()) {
             boldMessage = tr("Continuing will mean <b>deleting these settings</b>.");
diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp
index 631551a5e..529dabf77 100644
--- a/src/libsync/configfile.cpp
+++ b/src/libsync/configfile.cpp
@@ -430,9 +430,9 @@ QString ConfigFile::excludeFileFromSystem()
     return fi.absoluteFilePath();
 }
 
-QString ConfigFile::backup(const QString fileName) const
+QString ConfigFile::backup(const QString &fileName) const
 {
-    QString baseFile = configPath() + fileName;
+    const QString baseFilePath = configPath() + fileName;
     auto versionString = clientVersionString();
 
     if (!versionString.isEmpty()) {
@@ -441,18 +441,16 @@ QString ConfigFile::backup(const QString fileName) const
 
     QString backupFile =
         QString("%1.backup_%2%3")
-            .arg(baseFile)
+            .arg(baseFilePath)
             .arg(QDateTime::currentDateTime().toString("yyyyMMdd_HHmmss"))
             .arg(versionString);
 
     // If this exact file already exists it's most likely that a backup was
     // already done. (two backup calls directly after each other, potentially
     // even with source alterations in between!)
-    QFile f(baseFile);
-
-    // QFile does not overwrite it
-    if(!f.copy(backupFile)) {
-        qCWarning(lcConfigFile) << "Failed to create a backup of the config file" << baseFile;
+    // QFile does not overwrite backupFile
+    if(!QFile::copy(baseFilePath, backupFile)) {
+        qCWarning(lcConfigFile) << "Failed to create a backup of the config file" << baseFilePath;
     }
 
     return backupFile;
diff --git a/src/libsync/configfile.h b/src/libsync/configfile.h
index c0f126736..a0c7f8b6d 100644
--- a/src/libsync/configfile.h
+++ b/src/libsync/configfile.h
@@ -53,7 +53,7 @@ public:
      *
      * Returns the path of the new backup.
      */
-    [[nodiscard]] QString backup(const QString fileName) const;
+    [[nodiscard]] QString backup(const QString &fileName) const;
 
     bool exists();