fix(openvfs): fix loading of the plug-in and make it default on linux

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>

Author: mgallien

.clang-format

@@ -39,7 +39,7 @@ InsertBraces: true
 
 AllowShortEnumsOnASingleLine: false
 
-EnumTrailingComma: ETC_Insert
+EnumTrailingComma: Insert
 
 # CrlInstruction *a;
 PointerAlignment: Right

src/common/vfs.cpp

@@ -52,6 +52,10 @@ Optional<Vfs::Mode> Vfs::modeFromString(const QString &str)
         return WithSuffix;
     } else if (str == QLatin1String("wincfapi")) {
         return WindowsCfApi;
+    } else if (str == QLatin1String("xattr")) {
+        return XAttr;
+    } else if (str == QLatin1String("openvfs")) {
+        return OpenVFS;
     }
     return {};
 }
@@ -136,13 +140,20 @@ VfsOff::~VfsOff() = default;
 
 static QString modeToPluginName(Vfs::Mode mode)
 {
-    if (mode == Vfs::WithSuffix)
+    switch (mode) {
+    case Vfs::Off:
+        return {};
+    case Vfs::WithSuffix:
         return QStringLiteral("suffix");
-    if (mode == Vfs::WindowsCfApi)
+    case Vfs::WindowsCfApi:
         return QStringLiteral("cfapi");
-    if (mode == Vfs::XAttr)
+    case Vfs::XAttr:
         return QStringLiteral("xattr");
-    return QString();
+    case Vfs::OpenVFS:
+        return QStringLiteral("openvfs");
+    }
+
+    return {};
 }
 
 Q_LOGGING_CATEGORY(lcPlugin, "plugins", QtInfoMsg)
@@ -197,6 +208,10 @@ Vfs::Mode OCC::bestAvailableVfsMode()
         return Vfs::WindowsCfApi;
     }
 
+    if (isVfsPluginAvailable(Vfs::OpenVFS)) {
+        return Vfs::OpenVFS;
+    }
+
     if (isVfsPluginAvailable(Vfs::WithSuffix)) {
         return Vfs::WithSuffix;
     }
@@ -267,3 +282,8 @@ std::unique_ptr<Vfs> OCC::createVfsFromPlugin(Vfs::Mode mode)
     qCInfo(lcPlugin) << "Created VFS instance from plugin" << pluginPath;
     return vfs;
 }
+
+const FileSystem::Path &VfsSetupParams::root() const
+{
+    return rootPath;
+}

src/common/vfs.h

@@ -56,6 +56,7 @@ struct OCSYNC_EXPORT VfsSetupParams
      * Always ends with /.
      */
     QString filesystemPath;
+    FileSystem::Path rootPath;
 
     // Folder display name in Windows Explorer
     QString displayName;

src/gui/application.cpp

@@ -416,6 +416,10 @@ Application::Application(int &argc, char **argv)
         qCInfo(lcApplication) << "VFS suffix plugin is available";
     }
 
+    if (isVfsPluginAvailable(Vfs::OpenVFS)) {
+        qCInfo(lcApplication) << "VFS openvfs linux plugin is available";
+    }
+
     _theme->setSystrayUseMonoIcons(ConfigFile().monoIcons());
     connect(this, &Application::systemPaletteChanged,
             _theme, &Theme::systemPaletteHasChanged);

src/gui/folder.cpp

@@ -580,6 +580,7 @@ void Folder::startVfs()
     qCDebug(lcFolder) << "Display name for VFS folder will be:" << displayName;
     VfsSetupParams vfsParams;
     vfsParams.filesystemPath = path();
+    vfsParams.rootPath = FileSystem::Path{path()};
     vfsParams.displayName = displayName;
     vfsParams.alias = alias();
     vfsParams.navigationPaneClsid = navigationPaneClsid().toString();

src/libsync/syncfileitem.h

@@ -348,10 +348,10 @@ class OWNCLOUDSYNC_EXPORT SyncFileItem
     };
     FolderQuota _folderQuota;
 
-    QString _localName;
-
-    QString localName() const { return _localName; }
-    void setLocalName(const QString &newName) { _localName = newName; }
+    QString localName() const
+    {
+        return _file;
+    }
 };
 
 inline bool operator<(const SyncFileItemPtr &item1, const SyncFileItemPtr &item2)

src/libsync/theme.cpp

@@ -1019,7 +1019,7 @@ QPixmap Theme::createColorAwarePixmap(const QString &name)
 bool Theme::showVirtualFilesOption() const
 {
     const auto vfsMode = bestAvailableVfsMode();
-    return ConfigFile().showExperimentalOptions() || vfsMode == Vfs::WindowsCfApi;
+    return ConfigFile().showExperimentalOptions() || vfsMode == Vfs::WindowsCfApi || vfsMode == Vfs::OpenVFS;
 }
 
 bool Theme::enforceVirtualFilesSyncFolder() const

src/libsync/vfs/openvfs/vfs_openvfs.cpp

@@ -529,6 +529,40 @@ bool OpenVFS::isDehydratedPlaceholder(const QString &filePath)
     return false;
 }
 
+bool OpenVFS::statTypeVirtualFile(csync_file_stat_t *stat, void *statData)
+{
+    if (stat->type == ItemTypeDirectory) {
+        return false;
+    }
+
+    const auto parentPath = static_cast<QByteArray *>(statData);
+    Q_ASSERT(!parentPath->endsWith('/'));
+    Q_ASSERT(!stat->path.startsWith('/'));
+
+    const auto path = QByteArray(*parentPath + '/' + stat->path);
+    const auto pin = [=, this] {
+        const auto absolutePath = QString::fromUtf8(path);
+        Q_ASSERT(absolutePath.startsWith(params().filesystemPath.toUtf8()));
+        const auto folderPath = absolutePath.mid(params().filesystemPath.length());
+        return pinState(folderPath);
+    }();
+
+    if (stat->type == ItemTypeFile) {
+        const auto attribs = placeHolderAttributes(path);
+        if (attribs.state == ::OpenVFS::Constants::States::DeHydrated) {
+            stat->type = ItemTypeVirtualFile;
+            if (attribs.pinState == convertPinState(PinState::AlwaysLocal)) {
+                stat->type = ItemTypeVirtualFileDownload;
+            }
+        } else {
+            if (attribs.pinState == convertPinState(PinState::OnlineOnly)) {
+                stat->type = ItemTypeVirtualFileDehydration;
+            }
+        }
+    }
+    return false;
+}
+
 // LocalInfo OpenVFS::statTypeVirtualFile(const std::filesystem::directory_entry &path, ItemType type)
 // {
 //     if (type == ItemTypeFile) {

test/syncenginetestutils.cpp

@@ -1315,6 +1315,7 @@ void FakeFolder::switchToVfs(QSharedPointer<OCC::Vfs> vfs)
 
     OCC::VfsSetupParams vfsParams;
     vfsParams.filesystemPath = localPath();
+    vfsParams.rootPath = OCC::FileSystem::Path{localPath()};
     vfsParams.remotePath = _remotePath + u"/"_s;
     vfsParams.account = _account;
     vfsParams.journal = _journalDb.get();