Commit

Author: dajimenezriv-internxt

dist/addon.node

@@ -10,7 +10,6 @@ class Placeholders
     static void ForceShellRefresh(const std::wstring &path);
     static void UpdateSyncStatus(const std::wstring &filePath, bool syncState, bool isDirectory);
     static HRESULT UpdatePinState(const std::wstring &path, const PinState state);
-    static void ConvertToPlaceholder(const std::wstring &path, const std::wstring &placeholderId);
     static std::string GetFileIdentity(const std::wstring &filePath);
     static void UpdateFileIdentity(const std::wstring &filePath, const std::wstring &fileIdentity, bool isDirectory);
     static FileState GetPlaceholderInfo(const std::wstring &directoryPath);

include/placeholders_interface/Placeholders.h

@@ -2,4 +2,5 @@
 
 #include <node_api.h>
 
-napi_value convert_to_placeholder_impl(napi_env env, napi_callback_info args);
+napi_value convert_to_placeholder_wrapper(napi_env env, napi_callback_info args);
+void convert_to_placeholder(const std::wstring &path, const std::wstring &placeholderId);

include/virtual_drive/convert_to_placeholder.h

@@ -15,6 +15,7 @@
 #include <cctype>
 #include <windows.h>
 #include <shlobj.h>
+#include "convert_to_placeholder.h"
 
 using namespace std;
 
@@ -61,40 +62,6 @@ void Placeholders::MaintainIdentity(std::wstring &fullPath, PCWSTR itemIdentity,
     }
 }
 
-void Placeholders::ConvertToPlaceholder(const std::wstring &path, const std::wstring &placeholderId)
-{
-    bool isDirectory = fs::is_directory(path);
-
-    winrt::file_handle fileHandle{CreateFileW(
-        path.c_str(),
-        FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES,
-        FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
-        nullptr,
-        OPEN_EXISTING,
-        isDirectory ? FILE_FLAG_BACKUP_SEMANTICS : 0,
-        nullptr)};
-
-    if (!fileHandle)
-    {
-        throw std::runtime_error("Failed to open file: " + std::to_string(GetLastError()));
-    }
-
-    CF_CONVERT_FLAGS convertFlags = CF_CONVERT_FLAG_MARK_IN_SYNC;
-    USN convertUsn;
-    OVERLAPPED overlapped = {};
-
-    LPCVOID idStrLPCVOID = static_cast<LPCVOID>(placeholderId.c_str());
-    DWORD idStrByteLength = static_cast<DWORD>(placeholderId.size() * sizeof(wchar_t));
-
-    HRESULT hr = CfConvertToPlaceholder(fileHandle.get(), idStrLPCVOID, idStrByteLength, convertFlags, &convertUsn, &overlapped);
-
-    // Only throw if it's not "already a placeholder" error
-    if (hr != 0x8007017C)
-    {
-        winrt::check_hresult(hr);
-    }
-}
-
 /**
  * @brief Mark a file or directory as synchronized
  * @param filePath path to the file or directory
@@ -147,7 +114,7 @@ void Placeholders::UpdateSyncStatus(const std::wstring &filePath,
             break;
 
         case ERROR_CLOUD_FILE_NOT_IN_SYNC:
-            ConvertToPlaceholder(filePath, L"temp_identity");
+            convert_to_placeholder(filePath, L"temp_identity");
             hr = CfSetInSyncState(h, sync, CF_SET_IN_SYNC_FLAG_NONE, nullptr);
             wprintf(L"[UpdateSyncStatus] Retry CfSetInSyncState\n");
             break;

native-src/placeholders_interface/Planceholders.cpp

@@ -104,7 +104,7 @@ napi_value GetPlaceholderStateWrapper(napi_env env, napi_callback_info args) {
 }
 
 napi_value ConvertToPlaceholderWrapper(napi_env env, napi_callback_info args) {
-    return NAPI_SAFE_WRAP(env, args, convert_to_placeholder_impl);
+    return NAPI_SAFE_WRAP(env, args, convert_to_placeholder_wrapper);
 }
 
 napi_value HydrateFileWrapper(napi_env env, napi_callback_info args) {

native-src/virtual_drive/Wrappers.cpp

@@ -1,11 +1,47 @@
-#include <Windows.h>
+#include <filesystem>
+#include <windows.h>
+#include "stdafx.h"
 #include "napi_extract_args.h"
-#include "Placeholders.h"
 
-napi_value convert_to_placeholder_impl(napi_env env, napi_callback_info info) {
+void convert_to_placeholder(const std::wstring &path, const std::wstring &placeholderId)
+{
+    bool isDirectory = std::filesystem::is_directory(path);
+
+    winrt::file_handle fileHandle{CreateFileW(
+        path.c_str(),
+        FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES,
+        FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+        nullptr,
+        OPEN_EXISTING,
+        isDirectory ? FILE_FLAG_BACKUP_SEMANTICS : 0,
+        nullptr)};
+
+    if (!fileHandle)
+    {
+        throw std::runtime_error("Failed to open item: " + std::to_string(GetLastError()));
+    }
+
+    CF_CONVERT_FLAGS convertFlags = CF_CONVERT_FLAG_MARK_IN_SYNC;
+    USN convertUsn;
+    OVERLAPPED overlapped = {};
+
+    LPCVOID idStrLPCVOID = static_cast<LPCVOID>(placeholderId.c_str());
+    DWORD idStrByteLength = static_cast<DWORD>(placeholderId.size() * sizeof(wchar_t));
+
+    HRESULT hr = CfConvertToPlaceholder(fileHandle.get(), idStrLPCVOID, idStrByteLength, convertFlags, &convertUsn, &overlapped);
+
+    // Only throw if it's not "already a placeholder" error
+    if (hr != 0x8007017C)
+    {
+        winrt::check_hresult(hr);
+    }
+}
+
+napi_value convert_to_placeholder_wrapper(napi_env env, napi_callback_info info)
+{
     auto [path, placeholderId] = napi_extract_args<std::wstring, std::wstring>(env, info);
 
-    Placeholders::ConvertToPlaceholder(path.c_str(), placeholderId.c_str());
+    convert_to_placeholder(path.c_str(), placeholderId.c_str());
 
     return nullptr;
 }

native-src/virtual_drive/convert_to_placeholder.cpp

@@ -1,6 +1,7 @@
 #include <filesystem>
 #include <windows.h>
 #include "Placeholders.h"
+#include "convert_to_placeholder.h"
 #include "Utilities.h"
 #include "napi_extract_args.h"
 
@@ -17,7 +18,7 @@ napi_value create_file_placeholder_impl(napi_env env, napi_callback_info info)
 
     if (std::filesystem::exists(path))
     {
-        Placeholders::ConvertToPlaceholder(path, placeholderId);
+        convert_to_placeholder(path, placeholderId);
         Placeholders::MaintainIdentity(path, placeholderId.c_str(), false);
         return nullptr;
     }

native-src/virtual_drive/create_file_placeholder.cpp

@@ -1,6 +1,7 @@
 #include <filesystem>
 #include <windows.h>
 #include "Placeholders.h"
+#include "convert_to_placeholder.h"
 #include "Utilities.h"
 #include "napi_extract_args.h"
 
@@ -17,7 +18,7 @@ napi_value create_folder_placeholder_impl(napi_env env, napi_callback_info info)
 
     if (std::filesystem::exists(path))
     {
-        Placeholders::ConvertToPlaceholder(path, placeholderId);
+        convert_to_placeholder(path, placeholderId);
         Placeholders::MaintainIdentity(path, placeholderId.c_str(), true);
         return nullptr;
     }