Reverse order of migrations (#9226)

* Reverse order of paths to migrate

This way, we won't accidentally migrate an older configuration if a newer one is available.

* Add log prefix for non-legacy migration code as well

* Also break if file-based migration works

* Add stripTrailingSlash to Utility

* Simplify code

* Make configLocationsToMigrate const

Co-authored-by: Hannah von Reth <hannah.vonreth@owncloud.com>

1 files changed, 8 insertions, 0 deletions

diff --git a/src/common/utility.h b/src/common/utility.h
index fb3c22a5a..6f23d9d31 100644
--- a/src/common/utility.h
+++ b/src/common/utility.h
@@ -147,6 +147,14 @@ OCSYNC_EXPORT Q_DECLARE_LOGGING_CATEGORY(lcUtility)
     // case sensitivity.
     OCSYNC_EXPORT bool fileNamesEqual(const QString &fn1, const QString &fn2);
 
+    inline auto stripTrailingSlash(QStringView s)
+    {
+        if (s.endsWith(QLatin1Char('/'))) {
+            s.chop(1);
+        }
+        return s.toString();
+    }
+
     // Call the given command with the switch --version and rerun the first line
     // of the output.
     // If command is empty, the function calls the running application which, on