refactor(migration): move backup config files logic from Application to ConfigFile.

Signed-off-by: Camila Ayres <hello@camilasan.com>

Author: camilasan

src/gui/application.cpp

@@ -153,25 +153,9 @@ bool Application::configVersionMigration()
     // default is now off to displaying dialog warning user of too many files deletion
     configFile.setPromptDeleteFiles(false);
 
-    // back up all old config files
-    QStringList backupFilesList;
-    QDir configDir(configFile.configPath());
-    const auto anyConfigFileNameList = configDir.entryInfoList({"*.cfg"}, QDir::Files);
-    for (const auto &oldConfig : anyConfigFileNameList) {
-        const auto oldConfigFileName = oldConfig.fileName();
-        const auto oldConfigFilePath = oldConfig.filePath();
-        const auto newConfigFileName = configFile.configFile();
-        backupFilesList.append(configFile.backup(oldConfigFileName));
-        if (oldConfigFilePath != newConfigFileName) {
-            if (!QFile::rename(oldConfigFilePath, newConfigFileName)) {
-                qCWarning(lcApplication) << "Failed to rename configuration file from" << oldConfigFilePath << "to" << newConfigFileName;
-            }
-        }
-    }
-
-    // We want to message the user either for destructive changes,
+    // back up all old config files and message the user either for destructive changes,
     // or if we're ignoring something and the client version changed.
-    if (configFile.showConfigBackupWarning() && backupFilesList.count() > 0) {
+    if (const auto backupFilesList = configFile.backupConfigFiles(); configFile.showConfigBackupWarning() && backupFilesList.count() > 0) {
         QMessageBox box(
             QMessageBox::Warning,
             APPLICATION_SHORTNAME,
@@ -181,7 +165,7 @@ bool Application::configVersionMigration()
                "Continuing will mean <b>%2 these settings</b>.<br>"
                "<br>"
                "The current configuration file was already backed up to <i>%3</i>.")
-                .arg((Migration().isDowngrade() ? tr("newer", "newer software version") : tr("older", "older software version")),
+                .arg((configFile.migration().isDowngrade() ? tr("newer", "newer software version") : tr("older", "older software version")),
                      deleteKeys.isEmpty()? tr("ignoring") : tr("deleting"),
                      backupFilesList.join("<br>")));
         box.addButton(tr("Quit"), QMessageBox::AcceptRole);

src/libsync/configfile.cpp

@@ -92,7 +92,6 @@ namespace chrono = std::chrono;
 Q_LOGGING_CATEGORY(lcConfigFile, "nextcloud.sync.configfile", QtInfoMsg)
 
 QString ConfigFile::_confDir = {};
-QString ConfigFile::_discoveredLegacyConfigPath = {};
 Migration ConfigFile::_migration = Migration{};
 
 static chrono::milliseconds millisecondsValue(const QSettings &setting, const char *key,
@@ -382,7 +381,7 @@ QString ConfigFile::excludeFile(Scope scope) const
         return ConfigFile::excludeFileFromSystem();
     }
 
-    const auto excludeFilePath = scope == LegacyScope ? discoveredLegacyConfigPath() : configPath();
+    const auto excludeFilePath = scope == LegacyScope ? _migration.discoveredLegacyConfigPath() : configPath();
 
     // prefer sync-exclude.lst, but if it does not exist, check for exclude.lst
     QFileInfo exclFileInfo(excludeFilePath, syncExclFile);
@@ -1302,20 +1301,6 @@ void ConfigFile::setupDefaultExcludeFilePaths(ExcludedFiles &excludedFiles)
     excludedFiles.addExcludeFilePath(userList);
 }
 
-QString ConfigFile::discoveredLegacyConfigPath()
-{
-    return _discoveredLegacyConfigPath;
-}
-
-void ConfigFile::setDiscoveredLegacyConfigPath(const QString &discoveredLegacyConfigPath)
-{
-    if (_discoveredLegacyConfigPath == discoveredLegacyConfigPath) {
-        return;
-    }
-
-    _discoveredLegacyConfigPath = discoveredLegacyConfigPath;
-}
-
 void ConfigFile::removeFileProviderDomainMapping()
 {
     QSettings settings(configFile(), QSettings::IniFormat);
@@ -1336,6 +1321,35 @@ void ConfigFile::setFileProviderDomainsAppSandboxMigrationCompleted(const bool c
     settings.setValue(fileProviderDomainsAppSandboxMigrationCompletedC, completed);
 }
 
+QStringList ConfigFile::backupConfigFiles() const
+{
+    // 'Launch on system startup' defaults to true > 3.11.x
+    const auto theme = Theme::instance();
+    ConfigFile().setLaunchOnSystemStartup(ConfigFile().launchOnSystemStartup());
+    Utility::setLaunchOnStartup(theme->appName(), theme->appNameGUI(), ConfigFile().launchOnSystemStartup());
+
+    // default is now off to displaying dialog warning user of too many files deletion
+    ConfigFile().setPromptDeleteFiles(false);
+
+    // back up all old config files
+    QStringList backupFilesList;
+    QDir configDir(ConfigFile().configPath());
+    const auto anyConfigFileNameList = configDir.entryInfoList({"*.cfg"}, QDir::Files);
+    for (const auto &oldConfig : anyConfigFileNameList) {
+        const auto oldConfigFileName = oldConfig.fileName();
+        const auto oldConfigFilePath = oldConfig.filePath();
+        const auto newConfigFileName = ConfigFile().configFile();
+        backupFilesList.append(backup(oldConfigFileName));
+        if (oldConfigFilePath != newConfigFileName) {
+            if (!QFile::rename(oldConfigFilePath, newConfigFileName)) {
+                qCWarning(lcConfigFile) << "Failed to rename configuration file from" << oldConfigFilePath << "to" << newConfigFileName;
+            }
+        }
+    }
+
+    return backupFilesList;
+}
+
 Migration &ConfigFile::migration() {
     return _migration;
 }

src/libsync/configfile.h

@@ -254,10 +254,6 @@ class OWNCLOUDSYNC_EXPORT ConfigFile
     /// Add the system and user exclude file path to the ExcludedFiles instance.
     static void setupDefaultExcludeFilePaths(ExcludedFiles &excludedFiles);
 
-    /// Set during first time migration of legacy accounts in AccountManager
-    [[nodiscard]] static QString discoveredLegacyConfigPath();
-    static void setDiscoveredLegacyConfigPath(const QString &discoveredLegacyConfigPath);
-
     /// File Provider Domain UUID to Account ID mapping
 
     /**
@@ -268,7 +264,9 @@ class OWNCLOUDSYNC_EXPORT ConfigFile
     /// File Provider app sandbox migration flag
     [[nodiscard]] bool fileProviderDomainsAppSandboxMigrationCompleted() const;
     void setFileProviderDomainsAppSandboxMigrationCompleted(bool completed);
+
     [[nodiscard]] static Migration &migration();
+    [[nodiscard]] QStringList backupConfigFiles() const;
 
     static constexpr char unbrandedAppName[] = "Nextcloud";
     static constexpr char legacyAppName[] = "Owncloud";
@@ -314,7 +312,6 @@ class OWNCLOUDSYNC_EXPORT ConfigFile
     using SharedCreds = QSharedPointer<AbstractCredentials>;
 
     static QString _confDir;
-    static QString _discoveredLegacyConfigPath;
     static Migration _migration;
 };
 }