Auto mount and unmount openvfs

TheOneRing · TheOneRing · commit 03d782f879a4 · 2026-02-04T16:56:24.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,7 +9,6 @@ include(FeatureSummary)
 find_package(ECM 6.0.0 REQUIRED NO_MODULE)
 
 set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules")
-feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH})
 
@@ -148,12 +147,12 @@ if(BUILD_TESTING)
     add_subdirectory(test)
 endif()
 
-feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
-
 if(ECM_VERSION VERSION_GREATER_EQUAL 5.79)
     message(STATUS "Suitable ECM ${ECM_VERSION} found, installing clang-format git hook")
     include(KDEGitCommitHooks)
     kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
 else()
     message(WARNING "ECM ${ECM_VERSION} too old, cannot install clang-format git hook")
 endif()
+
+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES INCLUDE_QUIET_PACKAGES)
diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
@@ -124,8 +124,6 @@ Folder::Folder(const FolderDefinition &definition, const AccountStatePtr &accoun
             }
         });
 
-        // Potentially upgrade suffix vfs to windows vfs
-        OC_ENFORCE(_vfs);
         // Initialize the vfs plugin. Do this after the UI is running, so we can show a dialog when something goes wrong.
         QTimer::singleShot(0, this, &Folder::startVfs);
     }
@@ -186,7 +184,12 @@ bool Folder::checkLocalPath()
                 error = pathLengthCheck.error();
             }
 
-            if (error.isEmpty()) {
+            // Potentially upgrade suffix vfs to windows vfs
+            OC_ENFORCE(_vfs);
+            const auto result = VfsPluginManager::instance().checkAvailability(path(), _vfs->mode());
+            if (!result) {
+                error = result.error();
+            } else if (error.isEmpty()) {
                 qCDebug(lcFolder) << u"Checked local path ok";
                 if (!_journal.open()) {
                     error = tr("Failed to open the database for »%1«.").arg(_definition.localPath());
@@ -518,13 +521,6 @@ void Folder::startVfs()
     OC_ENFORCE(_vfs);
     OC_ENFORCE(_vfs->mode() == _definition.virtualFilesMode);
 
-    const auto result = Vfs::checkAvailability(path(), _vfs->mode());
-    if (!result) {
-        _syncResult.appendErrorString(result.error());
-        setSyncState(SyncResult::SetupError);
-        return;
-    }
-
     VfsSetupParams vfsParams(_accountState->account(), webDavUrl(), _definition.spaceId(), displayName(), _engine.get());
     vfsParams.filesystemPath = path();
     vfsParams.journal = &_journal;
diff --git a/src/gui/folderdefinition.cpp b/src/gui/folderdefinition.cpp
@@ -106,7 +106,7 @@ FolderDefinition FolderDefinition::load(QSettings &settings)
     QString vfsModeString = settings.value("virtualFilesMode").toString();
 
     const auto vfs = Utility::isWindows() ? Vfs::Mode::WindowsCfApi : Vfs::Mode::XAttr;
-    if (auto result = Vfs::checkAvailability(folder.localPath(), vfs); result) {
+    if (auto result = VfsPluginManager::instance().checkAvailability(folder.localPath(), vfs); result) {
         vfsModeString = Utility::enumToString(vfs);
     } else {
         qCWarning(lcFolder) << u"Failed to upgrade" << folder.localPath() << u"to" << vfs << result.error();
diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
@@ -766,7 +766,7 @@ void FolderMan::slotReloadSyncOptions()
 
 bool FolderMan::checkVfsAvailability(const QString &path, Vfs::Mode mode) const
 {
-    return unsupportedConfiguration(path) && Vfs::checkAvailability(path, mode);
+    return unsupportedConfiguration(path) && VfsPluginManager::instance().checkAvailability(path, mode);
 }
 
 Folder *FolderMan::addFolderFromWizard(const AccountStatePtr &accountStatePtr, FolderDefinition &&folderDefinition, bool useVfs)
diff --git a/src/gui/folderwizard/folderwizardlocalpath.cpp b/src/gui/folderwizard/folderwizardlocalpath.cpp
@@ -64,7 +64,7 @@ bool FolderWizardLocalPath::isComplete() const
     auto accountUuid = folderWizardPrivate()->accountState()->account()->uuid();
     QString errorStr = FolderMan::instance()->checkPathValidityForNewFolder(localPath(), FolderMan::NewFolderType::SpacesSyncRoot, accountUuid);
     if (errorStr.isEmpty()) {
-        if (auto result = Vfs::checkAvailability(localPath(), VfsPluginManager::instance().bestAvailableVfsMode()); !result) {
+        if (auto result = VfsPluginManager::instance().checkAvailability(localPath(), VfsPluginManager::instance().bestAvailableVfsMode()); !result) {
             errorStr = result.error();
         }
     }
diff --git a/src/gui/newwizard/pages/accountconfiguredwizardpage.cpp b/src/gui/newwizard/pages/accountconfiguredwizardpage.cpp
@@ -38,7 +38,7 @@ AccountConfiguredWizardPage::AccountConfiguredWizardPage(const QString &defaultS
             // the directory chooser should guarantee that the directory exists
             Q_ASSERT(QDir(directory).exists());
 
-            if (auto result = Vfs::checkAvailability(directory, VfsPluginManager::instance().bestAvailableVfsMode()); !result) {
+            if (auto result = VfsPluginManager::instance().checkAvailability(directory, VfsPluginManager::instance().bestAvailableVfsMode()); !result) {
                 auto *box =
                     new FontIconMessageBox({Resources::FontIcon::DefaultGlyphes::Warning}, tr("Sync location not supported"), result.error(), QMessageBox::Ok, this);
                 box->setAttribute(Qt::WA_DeleteOnClose);
diff --git a/src/gui/newwizard/states/accountconfiguredsetupwizardstate.cpp b/src/gui/newwizard/states/accountconfiguredsetupwizardstate.cpp
@@ -58,7 +58,7 @@ void AccountConfiguredSetupWizardState::evaluatePage()
             return;
         }
 
-        if (auto result = Vfs::checkAvailability(syncTargetDir, VfsPluginManager::instance().bestAvailableVfsMode()); !result) {
+        if (auto result = VfsPluginManager::instance().checkAvailability(syncTargetDir, VfsPluginManager::instance().bestAvailableVfsMode()); !result) {
             emitEvaluationFailedError(result.error());
             return;
         }
diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt
@@ -1,8 +1,8 @@
 find_package(LibreGraphAPI 1.0.4 REQUIRED)
 set_package_properties(LibreGraphAPI PROPERTIES
         URL https://github.com/owncloud/libre-graph-api-cpp-qt-client.git
-        DESCRIPTION "Libre Graph is a free API for cloud collaboration inspired by the MS Graph API."
-        TYPE OPTIONAL
+        DESCRIPTION "Libre Graph is a free API for cloud collaboration inspired by the MS Graph API"
+        TYPE REQUIRED
 )
 
 configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
diff --git a/src/libsync/common/plugin.h b/src/libsync/common/plugin.h
@@ -18,7 +18,9 @@
 
 #pragma once
 
+#include "libsync/common/result.h"
 #include "libsync/opencloudsynclib.h"
+
 #include <QObject>
 
 namespace OCC {
@@ -28,6 +30,7 @@ class OPENCLOUD_SYNC_EXPORT PluginFactory
 public:
     virtual ~PluginFactory();
     virtual QObject *create(QObject *parent) = 0;
+    virtual Result<void, QString> checkAvailability(const QString &path) const = 0;
 };
 
 template <class PluginClass>
diff --git a/src/libsync/logger.cpp b/src/libsync/logger.cpp
@@ -160,7 +160,8 @@ void Logger::open(const QString &name)
     }
 
     if (!openSucceeded) {
-        std::cerr << "Failed to open the log file" << std::endl;
+        std::cerr << "Failed to open the log file: '" << qPrintable(_logFile.fileName()) << "' Error: '" << qPrintable(_logFile.errorString()) << "'"
+                  << std::endl;
         return;
     }
     _logstream.reset(new QTextStream(&_logFile));
diff --git a/src/libsync/vfs/vfs.cpp b/src/libsync/vfs/vfs.cpp
@@ -22,6 +22,7 @@
 #include "common/filesystembase.h"
 #include "common/version.h"
 
+#include <QApplication>
 #include <QCoreApplication>
 #include <QDir>
 #include <QLoggingCategory>
@@ -30,6 +31,7 @@
 #ifdef Q_OS_WIN
 #include <qt_windows.h>
 #endif
+
 using namespace OCC;
 using namespace Qt::Literals::StringLiterals;
 
@@ -73,41 +75,6 @@ QString Utility::enumToString(Vfs::Mode mode)
     Q_UNREACHABLE();
 }
 
-Result<void, QString> Vfs::checkAvailability(const QString &path, Vfs::Mode mode)
-{
-#ifdef Q_OS_WIN
-    const auto canonicalPath = [path] {
-        QFileInfo info(path);
-        if (info.exists()) {
-            return info.canonicalFilePath();
-        } else {
-            return info.absoluteFilePath();
-        }
-    }();
-    const auto fileSystem = FileSystem::fileSystemForPath(canonicalPath);
-    if (fileSystem.startsWith("ReFS"_L1, Qt::CaseInsensitive)) {
-        return tr("ReFS is currently not supported.");
-    }
-    if (mode == Mode::WindowsCfApi) {
-        if (QDir(canonicalPath).isRoot()) {
-            return tr("The Virtual filesystem feature does not support a drive as sync root");
-        }
-
-        if (!fileSystem.startsWith("NTFS"_L1, Qt::CaseInsensitive)) {
-            return tr("The Virtual filesystem feature requires a NTFS file system, %1 is using %2").arg(path, fileSystem);
-        }
-        const auto type = GetDriveTypeW(reinterpret_cast<const wchar_t *>(canonicalPath.mid(0, 3).utf16()));
-        if (type == DRIVE_REMOTE) {
-            return tr("The Virtual filesystem feature is not supported on network drives");
-        }
-    }
-#else
-    Q_UNUSED(mode);
-    Q_UNUSED(path);
-#endif
-    return {};
-}
-
 void Vfs::start(const VfsSetupParams &params)
 {
     _setupParams = std::make_unique<VfsSetupParams>(params);
@@ -219,39 +186,87 @@ Vfs::Mode OCC::VfsPluginManager::bestAvailableVfsMode() const
     Q_UNREACHABLE();
 }
 
-std::unique_ptr<Vfs> OCC::VfsPluginManager::createVfsFromPlugin(Vfs::Mode mode) const
+
+std::pair<QString, PluginFactory *> OCC::VfsPluginManager::createVfsPluginFactory(Vfs::Mode mode) const
 {
     auto name = Utility::enumToString(mode);
     if (name.isEmpty())
-        return nullptr;
+        return {};
     auto pluginPath = pluginFileName(QStringLiteral("vfs"), name);
 
     if (!isVfsPluginAvailable(mode)) {
         qCCritical(lcPlugin) << u"Could not load plugin: not existant or bad metadata" << pluginPath;
-        return nullptr;
+        return {pluginPath, nullptr};
     }
 
     QPluginLoader loader(pluginPath);
     auto plugin = loader.instance();
     if (!plugin) {
         qCCritical(lcPlugin) << u"Could not load plugin" << pluginPath << loader.errorString();
-        return nullptr;
+        return {pluginPath, nullptr};
     }
 
     auto factory = qobject_cast<PluginFactory *>(plugin);
     if (!factory) {
         qCCritical(lcPlugin) << u"Plugin" << loader.fileName() << u"does not implement PluginFactory";
-        return nullptr;
+        return {pluginPath, nullptr};
     }
+    return {pluginPath, factory};
+}
 
-    auto vfs = std::unique_ptr<Vfs>(qobject_cast<Vfs *>(factory->create(nullptr)));
-    if (!vfs) {
-        qCCritical(lcPlugin) << u"Plugin" << loader.fileName() << u"does not create a Vfs instance";
-        return nullptr;
+std::unique_ptr<Vfs> OCC::VfsPluginManager::createVfsFromPlugin(Vfs::Mode mode) const
+{
+    const auto [pluginPath, factory] = createVfsPluginFactory(mode);
+    if (factory) {
+        auto vfs = std::unique_ptr<Vfs>(qobject_cast<Vfs *>(factory->create(nullptr)));
+        if (!vfs) {
+            qCCritical(lcPlugin) << u"Plugin" << pluginPath << u"does not create a Vfs instance";
+            return nullptr;
+        }
+
+        qCInfo(lcPlugin) << u"Created VFS instance from plugin" << pluginPath;
+        return vfs;
+    }
+    return nullptr;
+}
+
+Result<void, QString> VfsPluginManager::checkAvailability(const QString &path, Vfs::Mode mode) const
+{
+#ifdef Q_OS_WIN
+    const auto canonicalPath = [path] {
+        QFileInfo info(path);
+        if (info.exists()) {
+            return info.canonicalFilePath();
+        } else {
+            return info.absoluteFilePath();
+        }
+    }();
+    const auto fileSystem = FileSystem::fileSystemForPath(canonicalPath);
+    if (fileSystem.startsWith("ReFS"_L1, Qt::CaseInsensitive)) {
+        return QApplication::translate("VfsPluginManager", "ReFS is currently not supported.");
+    }
+    if (mode == Vfs::Mode::WindowsCfApi) {
+        // TODO: move to plugin
+        if (QDir(canonicalPath).isRoot()) {
+            return QApplication::translate("VfsPluginManager", "The Virtual filesystem feature does not support a drive as sync root");
+        }
+
+        if (!fileSystem.startsWith("NTFS"_L1, Qt::CaseInsensitive)) {
+            return QApplication::translate("VfsPluginManager", "The Virtual filesystem feature requires a NTFS file system, %1 is using %2")
+                .arg(path, fileSystem);
+        }
+        const auto type = GetDriveTypeW(reinterpret_cast<const wchar_t *>(canonicalPath.mid(0, 3).utf16()));
+        if (type == DRIVE_REMOTE) {
+            return QApplication::translate("VfsPluginManager", "The Virtual filesystem feature is not supported on network drives");
+        }
+    }
+#endif
+    const auto [pluginPath, factory] = createVfsPluginFactory(mode);
+    if (factory) {
+        return factory->checkAvailability(path);
     }
 
-    qCInfo(lcPlugin) << u"Created VFS instance from plugin" << pluginPath;
-    return vfs;
+    return QApplication::translate("VfsPluginManager", "The Virtual filesystem %1 is not supported on this platform").arg(Utility::enumToString(mode));
 }
 
 const VfsPluginManager &VfsPluginManager::instance()
diff --git a/src/libsync/vfs/vfs.h b/src/libsync/vfs/vfs.h
@@ -105,8 +105,6 @@ class OPENCLOUD_SYNC_EXPORT Vfs : public QObject
 
     static Optional<Mode> modeFromString(const QString &str);
 
-    static Result<void, QString> checkAvailability(const QString &path, OCC::Vfs::Mode mode);
-
     enum class AvailabilityError : uint8_t {
         // Availability can't be retrieved due to db error
         DbError,
@@ -182,7 +180,7 @@ class OPENCLOUD_SYNC_EXPORT Vfs : public QObject
      * Usually backed by the db's effectivePinState() function but some vfs
      * plugins will override it to retrieve the state from elsewhere.
      *
-     * relFilePath is relative to the sync folder. Can be "" for root folder.
+     * relFilePath is relative to the sync folder. Can be "" for root folder.<
      *
      * Returns none on retrieval error.
      */
@@ -268,14 +266,17 @@ class OPENCLOUD_SYNC_EXPORT VfsPluginManager
 
     /// Return the best available VFS mode.
     Vfs::Mode bestAvailableVfsMode() const;
-
     /// Create a VFS instance for the mode, returns nullptr on failure.
     std::unique_ptr<Vfs> createVfsFromPlugin(Vfs::Mode mode) const;
 
+    Result<void, QString> checkAvailability(const QString &path, Vfs::Mode mode) const;
+
     static const VfsPluginManager &instance();
 
 protected:
     VfsPluginManager() = default;
+    std::pair<QString, class PluginFactory *> createVfsPluginFactory(Vfs::Mode mode) const;
+
 
 private:
     static VfsPluginManager *_instance;
diff --git a/src/plugins/vfs/CMakeLists.txt b/src/plugins/vfs/CMakeLists.txt
@@ -19,10 +19,14 @@ foreach(vfsPlugin ${VIRTUAL_FILE_SYSTEM_PLUGINS})
 
     add_subdirectory(${vfsPluginPath} ${vfsPluginPathOut})
 
+    if (TARGET vfs_${vfsPluginName})
     if(BUILD_TESTING AND IS_DIRECTORY "${vfsPluginPath}/test")
         add_subdirectory("${vfsPluginPath}/test" "${vfsPluginName}_test")
-        message(STATUS "Added vfsPlugin with tests: ${vfsPluginName}")
+        message(STATUS "Added VFSPlugin with tests: ${vfsPluginName}")
     else()
-        message(STATUS "Added vfsPlugin without tests: ${vfsPluginName}")
+        message(STATUS "Added VFSPlugin without tests: ${vfsPluginName}")
+    endif()
+    else()
+        message(STATUS "VFSPlugin ${vfsPluginName} was requested but not added to build")
     endif()
 endforeach()
diff --git a/src/plugins/vfs/cfapi/vfs_cfapi.h b/src/plugins/vfs/cfapi/vfs_cfapi.h
@@ -78,6 +78,8 @@ class CfApiVfsPluginFactory : public QObject, public DefaultPluginFactory<VfsCfA
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "eu.opencloud.PluginFactory" FILE "libsync/vfs/vfspluginmetadata.json")
     Q_INTERFACES(OCC::PluginFactory)
+public:
+    Result<void, QString> checkAvailability(const QString &path) const override;
 };
 
 } // namespace OCC
diff --git a/src/plugins/vfs/off/vfs_off.cpp b/src/plugins/vfs/off/vfs_off.cpp
@@ -80,6 +80,11 @@ void VfsOff::startImpl(const VfsSetupParams &)
     Q_EMIT started();
 }
 
+Result<void, QString> OffVfsPluginFactory::checkAvailability(const QString &) const
+{
+    return {};
+}
+
 Result<Vfs::ConvertToPlaceholderResult, QString> VfsOff::updateMetadata(const SyncFileItem &item, const QString &filePath, const QString &replacesFile)
 {
     Q_UNUSED(replacesFile)
diff --git a/src/plugins/vfs/off/vfs_off.h b/src/plugins/vfs/off/vfs_off.h
@@ -61,6 +61,8 @@ class OffVfsPluginFactory : public QObject, public DefaultPluginFactory<VfsOff>
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "eu.opencloud.PluginFactory" FILE "libsync/vfs/vfspluginmetadata.json")
     Q_INTERFACES(OCC::PluginFactory)
+public:
+    Result<void, QString> checkAvailability(const QString &path) const override;
 };
 
 } // namespace OCC
diff --git a/src/plugins/vfs/xattr/CMakeLists.txt b/src/plugins/vfs/xattr/CMakeLists.txt
diff --git a/src/plugins/vfs/xattr/vfs_xattr.cpp b/src/plugins/vfs/xattr/vfs_xattr.cpp
diff --git a/src/plugins/vfs/xattr/vfs_xattr.h b/src/plugins/vfs/xattr/vfs_xattr.h

Original file line number	Diff line number	Diff line change
`@@ -766,7 +766,7 @@ void FolderMan::slotReloadSyncOptions()`
`766`	`766`
`767`	`767`	`bool FolderMan::checkVfsAvailability(const QString &path, Vfs::Mode mode) const`
`768`	`768`	`{`
`769`		`- return unsupportedConfiguration(path) && Vfs::checkAvailability(path, mode);`
	`769`	`+ return unsupportedConfiguration(path) && VfsPluginManager::instance().checkAvailability(path, mode);`
`770`	`770`	`}`
`771`	`771`
`772`	`772`	`Folder *FolderMan::addFolderFromWizard(const AccountStatePtr &accountStatePtr, FolderDefinition &&folderDefinition, bool useVfs)`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ bool FolderWizardLocalPath::isComplete() const`
`64`	`64`	`auto accountUuid = folderWizardPrivate()->accountState()->account()->uuid();`
`65`	`65`	`QString errorStr = FolderMan::instance()->checkPathValidityForNewFolder(localPath(), FolderMan::NewFolderType::SpacesSyncRoot, accountUuid);`
`66`	`66`	`if (errorStr.isEmpty()) {`
`67`		`- if (auto result = Vfs::checkAvailability(localPath(), VfsPluginManager::instance().bestAvailableVfsMode()); !result) {`
	`67`	`+ if (auto result = VfsPluginManager::instance().checkAvailability(localPath(), VfsPluginManager::instance().bestAvailableVfsMode()); !result) {`
`68`	`68`	`errorStr = result.error();`
`69`	`69`	`}`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ void AccountConfiguredSetupWizardState::evaluatePage()`
`58`	`58`	`return;`
`59`	`59`	`}`
`60`	`60`
`61`		`- if (auto result = Vfs::checkAvailability(syncTargetDir, VfsPluginManager::instance().bestAvailableVfsMode()); !result) {`
	`61`	`+ if (auto result = VfsPluginManager::instance().checkAvailability(syncTargetDir, VfsPluginManager::instance().bestAvailableVfsMode()); !result) {`
`62`	`62`	`emitEvaluationFailedError(result.error());`
`63`	`63`	`return;`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,8 @@ void Logger::open(const QString &name)`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`if (!openSucceeded) {`
`163`		`- std::cerr << "Failed to open the log file" << std::endl;`
	`163`	`+ std::cerr << "Failed to open the log file: '" << qPrintable(_logFile.fileName()) << "' Error: '" << qPrintable(_logFile.errorString()) << "'"`
	`164`	`+ << std::endl;`
`164`	`165`	`return;`
`165`	`166`	`}`
`166`	`167`	`_logstream.reset(new QTextStream(&_logFile));`