OpenVFS api changes

CMakeLists.txt

@@ -102,7 +102,7 @@ add_feature_info(AppImageUpdate WITH_APPIMAGEUPDATER "Built-in libappimageupdate
 option(WITH_EXTERNAL_BRANDING "A URL to an external branding repo" "")
 
 # specify additional vfs plugins
-set(VIRTUAL_FILE_SYSTEM_PLUGINS off cfapi xattr CACHE STRING "Name of internal plugin in src/libsync/vfs or the locations of virtual file plugins")
+set(VIRTUAL_FILE_SYSTEM_PLUGINS off cfapi openvfs CACHE STRING "Name of internal plugin in src/libsync/vfs or the locations of virtual file plugins")
 
 if(APPLE)
   set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (including a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit" )

src/gui/folderdefinition.cpp

@@ -105,7 +105,7 @@ FolderDefinition FolderDefinition::load(QSettings &settings)
 
     QString vfsModeString = settings.value("virtualFilesMode").toString();
 
-    const auto vfs = Utility::isWindows() ? Vfs::Mode::WindowsCfApi : Vfs::Mode::XAttr;
+    const auto vfs = Utility::isWindows() ? Vfs::Mode::WindowsCfApi : Vfs::Mode::OpenVFS;
     if (auto result = VfsPluginManager::instance().prepare(folder.localPath(), folder.accountUUID(), vfs); result) {
         vfsModeString = Utility::enumToString(vfs);
     } else {

src/libsync/vfs/vfs.cpp

@@ -55,8 +55,8 @@ Optional<Vfs::Mode> Vfs::modeFromString(const QString &str)
         return Mode::Off;
     } else if (str == QLatin1String("cfapi")) {
         return Mode::WindowsCfApi;
-    } else if (str == QLatin1String("xattr")) {
-        return Mode::XAttr;
+    } else if (str == QLatin1String("openvfs")) {
+        return Mode::OpenVFS;
     }
     return {};
 }
@@ -71,8 +71,8 @@ QString Utility::enumToString(Vfs::Mode mode)
         return QStringLiteral("cfapi");
     case Vfs::Mode::Off:
         return QStringLiteral("off");
-    case Vfs::Mode::XAttr:
-        return QStringLiteral("xattr");
+    case Vfs::Mode::OpenVFS:
+        return QStringLiteral("openvfs");
     }
     Q_UNREACHABLE();
 }
@@ -136,8 +136,8 @@ Vfs::Mode OCC::VfsPluginManager::bestAvailableVfsMode() const
 {
     if (isVfsPluginAvailable(Vfs::Mode::WindowsCfApi)) {
         return Vfs::Mode::WindowsCfApi;
-    } else if (isVfsPluginAvailable(Vfs::Mode::XAttr)) {
-        return Vfs::Mode::XAttr;
+    } else if (isVfsPluginAvailable(Vfs::Mode::OpenVFS)) {
+        return Vfs::Mode::OpenVFS;
     } else if (isVfsPluginAvailable(Vfs::Mode::Off)) {
         return Vfs::Mode::Off;
     }

src/libsync/vfs/vfs.h

@@ -99,7 +99,7 @@ class OPENCLOUD_SYNC_EXPORT Vfs : public QObject
      * Currently plugins and modes are one-to-one but that's not required.
      * The raw integer values are used in Qml
      */
-    enum class Mode : uint8_t { Off = 0, WindowsCfApi = 1, XAttr = 2 };
+    enum class Mode : uint8_t { Off = 0, WindowsCfApi = 1, OpenVFS = 2 };
     Q_ENUM(Mode)
     enum class ConvertToPlaceholderResult : uint8_t { Ok, Locked };
     Q_ENUM(ConvertToPlaceholderResult)

src/plugins/vfs/xattr/CMakeLists.txt → src/plugins/vfs/openvfs/CMakeLists.txt

@@ -1,19 +1,19 @@
 if (NOT WIN32)
-    find_package(OpenVFS QUIET  )
+    find_package(OpenVFS 0.1.0 QUIET)
     set_package_properties(OpenVFS PROPERTIES TYPE OPTIONAL
             DESCRIPTION "A Virtual Filesystem Layer for cloud storages for the free desktop"
-            URL "https://github.com/dragotin/openvfs")
+            URL "https://github.com/opencloud-eu/openvfs/")
 
     if(TARGET OpenVFS::OpenVFS)
         get_target_property (OPEN_VFS_CONFIG OpenVFS::OpenVFS IMPORTED_CONFIGURATIONS)
         get_target_property (OPEN_VFS_PATH OpenVFS::OpenVFS IMPORTED_LOCATION_${OPEN_VFS_CONFIG})
         message(STATUS "Using OpenVFS ${OPEN_VFS_CONFIG} (${OPEN_VFS_PATH})")
-        add_vfs_plugin(NAME xattr
+        add_vfs_plugin(NAME openvfs
                 SRC
-                vfs_xattr.cpp
+                vfs_openvfs.cpp
                 LIBS
                 OpenVFS::LibOpenVFS
         )
-        target_compile_definitions(vfs_xattr PRIVATE OPENVFS_EXE=\"${OPEN_VFS_PATH}\")
+        target_compile_definitions(vfs_openvfs PRIVATE OPENVFS_EXE=\"${OPEN_VFS_PATH}\")
     endif()
 endif()