refactor(migration): rename functions.

Signed-off-by: Camila Ayres <[email protected]>

Author: camilasan

src/gui/application.cpp

@@ -264,20 +264,21 @@ Application::Application(int &argc, char **argv)
     parseOptions(arguments());
 
     ConfigFile configFile;
-
     // First check if there is an existing config from a previous version
-    if (configFile.exists() && configVersionMigration()) {
+    if (const auto configExists = configFile.exists(); configExists && configVersionMigration()) {
         qCWarning(lcApplication) << "Config version migration was not possible.";
-    } else {
-        // check legacy location for existing config files
-        // if (const auto genericConfigLocation = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/" + APPLICATION_CONFIG_NAME;
-        //     !configFile.setupConfigFolderFromLegacyLocation(genericConfigLocation)) {
-        //     qCWarning(lcApplication) << "Setup of config folder and files from legacy location" << genericConfigLocation << "failed.";
-        // } else
-
-        if (const auto appDataLocation = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
-            !configFile.setupConfigFolderFromLegacyLocation(appDataLocation)) {
-            qCWarning(lcApplication) << "Setup of config folder and files from legacy location" << appDataLocation << "failed.";
+    } else if (!configExists) {
+        // look for previous used application name for config folder.
+        if (const auto genericConfigLocation = QString(QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/" + APPLICATION_CONFIG_NAME);
+            configFile.copyConfigFolderFromLegacyLocation(genericConfigLocation)) {
+            qCWarning(lcApplication) << "Copy of config folder and files from legacy location" << genericConfigLocation << "suceeded.";
+
+        // app data folder
+        } else if (const auto appDataLocation = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
+            configFile.copyConfigFolderFromLegacyLocation(genericConfigLocation)) {
+            qCWarning(lcApplication) << "Copy of config folder and files from legacy location" << appDataLocation << "suceeded.";
+        } else {
+            configFile.findLegacyClientConfigFile();
         }
     }
 

src/libsync/configfile.cpp

@@ -115,8 +115,8 @@ static constexpr int deleteFilesThresholdDefaultValue = 100;
 constexpr auto accountsC = "Accounts";
 constexpr auto legacyRelativeConfigLocationC = "/ownCloud/owncloud.cfg";
 constexpr auto legacyCfgFileNameC = "owncloud.cfg";
-constexpr auto unbrandedRelativeConfigLocationC = "/copyNextcloud/copyNextcloud.cfg";
-constexpr auto unbrandedCfgFileNameC = "copyNextcloud.cfg";
+constexpr auto unbrandedRelativeConfigLocationC = "/Nextcloud/nextcloud.cfg";
+constexpr auto unbrandedCfgFileNameC = "nextcloud.cfg";
 }
 
 namespace OCC {
@@ -1342,7 +1342,7 @@ void ConfigFile::setDiscoveredLegacyConfigFile(const QString &discoveredLegacyCo
     _discoveredLegacyConfigFile = discoveredLegacyConfigFile;
 }
 
-bool ConfigFile::setupConfigFolderFromLegacyLocation(const QString &legacyLocation) const
+bool ConfigFile::copyConfigFolderFromLegacyLocation(const QString &legacyLocation) const
 {
     // Migrate from version <= 2.4
     qApp->setApplicationName(Theme::instance()->appNameGUI());
@@ -1395,27 +1395,26 @@ QT_WARNING_POP
     return false;
 }
 
-QString ConfigFile::findLegacyClientConfigFile() const
+void ConfigFile::findLegacyClientConfigFile()
 {
     qCInfo(lcConfigFile) << "Migrate: restoreFromLegacySettings, checking settings group"
                           << Theme::instance()->appName();
 
     // try to open the correctly themed settings
     auto settings = ConfigFile::settingsWithGroup(Theme::instance()->appName());
 
-    QString validLegacyConfigFile;
     // if the settings file could not be opened, the childKeys list is empty
     // then try to load settings from a very old place
     if (settings->childKeys().isEmpty()) {
         // Legacy settings used QDesktopServices to get the location for the config folder in 2.4 and before
         const auto legacy2_4CfgSettingsLocation = QString(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/data"));
         const auto legacy2_4CfgFileParentFolder = legacy2_4CfgSettingsLocation.left(legacy2_4CfgSettingsLocation.lastIndexOf('/'));
 
-               // 2.5+ (rest of 2.x series)
+        // 2.5+ (rest of 2.x series)
         const auto legacy2_5CfgSettingsLocation = QStandardPaths::writableLocation(Utility::isWindows() ? QStandardPaths::AppDataLocation : QStandardPaths::AppConfigLocation);
         const auto legacy2_5CfgFileParentFolder = legacy2_5CfgSettingsLocation.left(legacy2_5CfgSettingsLocation.lastIndexOf('/'));
 
-               // Now try the locations we use today
+        // Now try the locations we use today
         const auto fullLegacyCfgFile = QDir::fromNativeSeparators(settings->fileName());
         const auto legacyCfgFileParentFolder = fullLegacyCfgFile.left(fullLegacyCfgFile.lastIndexOf('/'));
         const auto legacyCfgFileGrandParentFolder = legacyCfgFileParentFolder.left(legacyCfgFileParentFolder.lastIndexOf('/'));
@@ -1443,8 +1442,7 @@ QString ConfigFile::findLegacyClientConfigFile() const
 
             if (const QFileInfo configFileInfo(configFile);
                 configFileInfo.exists() && configFileInfo.isReadable()) {
-                qCInfo(lcConfigFile) << "Migrate: checking old config " << configFile;
-                validLegacyConfigFile = configFile;
+                qCInfo(lcConfigFile) << "Migrate: saving old config file" << configFile;
                 setDiscoveredLegacyConfigFile(configFileInfo.filePath());
                 setDiscoveredLegacyConfigPath(configFileInfo.canonicalPath());
                 break;
@@ -1453,7 +1451,5 @@ QString ConfigFile::findLegacyClientConfigFile() const
             }
         }
     }
-
-    return validLegacyConfigFile;
 }
 }

src/libsync/configfile.h

@@ -266,14 +266,14 @@ class OWNCLOUDSYNC_EXPORT ConfigFile
     static constexpr char showChatNotificationsC[] = "showChatNotifications";
     static constexpr char showInExplorerNavigationPaneC[] = "showInExplorerNavigationPane";
 
-    bool setupConfigFolderFromLegacyLocation(const QString &legacyLocation) const;
+    bool copyConfigFolderFromLegacyLocation(const QString &legacyLocation) const;
     /**
      * Looks for config files with different names from older client versions
      * in different locations
      *
      * Returns the found config file path found.
      */
-    [[nodiscard]] QString findLegacyClientConfigFile() const;
+    void findLegacyClientConfigFile();
 
 protected:
     [[nodiscard]] QVariant getPolicySetting(const QString &policy, const QVariant &defaultValue = QVariant()) const;