From c0be41c4f0caad29ac0c569f0294b58890181597 Mon Sep 17 00:00:00 2001 From: Hannah von Reth Date: Mon, 26 Jan 2026 10:18:32 +0100 Subject: [PATCH] Use xattr backend by default --- src/gui/application.cpp | 3 +-- src/gui/folder.cpp | 2 +- src/gui/folderdefinition.cpp | 11 +++++------ src/gui/folderwizard/folderwizard.cpp | 9 ++------- .../newwizard/pages/accountconfiguredwizardpage.cpp | 4 +--- 5 files changed, 10 insertions(+), 19 deletions(-) diff --git a/src/gui/application.cpp b/src/gui/application.cpp index 5cdcdf5093..5dbd98882c 100644 --- a/src/gui/application.cpp +++ b/src/gui/application.cpp @@ -124,8 +124,7 @@ Application::Application(const QString &displayLanguage, bool debugMode) if (VfsPluginManager::instance().bestAvailableVfsMode() == Vfs::Off) { qCWarning(lcApplication) << u"Theme wants to show vfs mode, but no vfs plugins are available"; } - if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) - qCInfo(lcApplication) << u"VFS windows plugin is available"; + qCInfo(lcApplication) << VfsPluginManager::instance().bestAvailableVfsMode() << u"plugin is available"; ConfigFile cfg; diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp index 4b6419c958..760e44e0f9 100644 --- a/src/gui/folder.cpp +++ b/src/gui/folder.cpp @@ -544,7 +544,7 @@ void Folder::startVfs() _vfs->fileStatusChanged(stateDbFile + QStringLiteral("-shm"), SyncFileStatus::StatusExcluded); _engine->setSyncOptions(loadSyncOptions()); - if (_vfs->mode() == Vfs::WindowsCfApi) { + if (_vfs->mode() != Vfs::Off) { // diable ignorelist with vfs _engine->journal()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, {}); } diff --git a/src/gui/folderdefinition.cpp b/src/gui/folderdefinition.cpp index 7a0c3f6251..e0f21d944e 100644 --- a/src/gui/folderdefinition.cpp +++ b/src/gui/folderdefinition.cpp @@ -104,14 +104,13 @@ FolderDefinition FolderDefinition::load(QSettings &settings) folder.virtualFilesMode = Vfs::Off; QString vfsModeString = settings.value("virtualFilesMode").toString(); -#ifdef Q_OS_WIN - // we always use vfs on windows if available - if (auto result = Vfs::checkAvailability(folder.localPath(), Vfs::WindowsCfApi); result) { - vfsModeString = Utility::enumToString(Vfs::WindowsCfApi); + + const auto vfs = Utility::isWindows() ? Vfs::WindowsCfApi : Vfs::XAttr; + if (auto result = Vfs::checkAvailability(folder.localPath(), vfs); result) { + vfsModeString = Utility::enumToString(vfs); } else { - qCWarning(lcFolder) << u"Failed to upgrade" << folder.localPath() << u"to" << Vfs::WindowsCfApi << result.error(); + qCWarning(lcFolder) << u"Failed to upgrade" << folder.localPath() << u"to" << vfs << result.error(); } -#endif if (!vfsModeString.isEmpty()) { if (auto mode = Vfs::modeFromString(vfsModeString)) { folder.virtualFilesMode = *mode; diff --git a/src/gui/folderwizard/folderwizard.cpp b/src/gui/folderwizard/folderwizard.cpp index b9356d6976..f050ce692d 100644 --- a/src/gui/folderwizard/folderwizard.cpp +++ b/src/gui/folderwizard/folderwizard.cpp @@ -78,7 +78,7 @@ FolderWizardPrivate::FolderWizardPrivate(FolderWizard *q, const AccountStatePtr q->setPage(FolderWizard::Page_Space, _spacesPage); - if (VfsPluginManager::instance().bestAvailableVfsMode() != Vfs::WindowsCfApi) { + if (VfsPluginManager::instance().bestAvailableVfsMode() == Vfs::Off) { _folderWizardSelectiveSyncPage = new FolderWizardSelectiveSync(this); q->setPage(FolderWizard::Page_SelectiveSync, _folderWizardSelectiveSyncPage); } @@ -121,12 +121,7 @@ const AccountStatePtr &FolderWizardPrivate::accountState() bool FolderWizardPrivate::useVirtualFiles() const { -#ifdef Q_OS_WIN - return VfsPluginManager::instance().bestAvailableVfsMode() == Vfs::WindowsCfApi; -#elif defined(Q_OS_UNIX) && !defined(Q_OS_MAC) - return VfsPluginManager::instance().bestAvailableVfsMode() == Vfs::XAttr; -#endif - return false; + return VfsPluginManager::instance().bestAvailableVfsMode() != Vfs::Off; } FolderWizard::FolderWizard(const AccountStatePtr &account, QWidget *parent) diff --git a/src/gui/newwizard/pages/accountconfiguredwizardpage.cpp b/src/gui/newwizard/pages/accountconfiguredwizardpage.cpp index ade149381b..eb09686822 100644 --- a/src/gui/newwizard/pages/accountconfiguredwizardpage.cpp +++ b/src/gui/newwizard/pages/accountconfiguredwizardpage.cpp @@ -91,11 +91,9 @@ QString AccountConfiguredWizardPage::syncTargetDir() const SyncMode AccountConfiguredWizardPage::syncMode() const { if (_ui->syncEverythingRadioButton->isChecked()) { -#ifdef Q_OS_WIN - if (Vfs::checkAvailability(syncTargetDir(), Vfs::WindowsCfApi)) { + if (VfsPluginManager::instance().bestAvailableVfsMode() != Vfs::Off) { return SyncMode::UseVfs; } -#endif return SyncMode::SyncEverything; } if (_ui->configureSyncManuallyRadioButton->isChecked()) {