Commit

Author: dajimenezriv-internxt

dist/addon.node

@@ -6,7 +6,7 @@
 class Placeholders
 {
 public:
-    static void MaintainIdentity(std::wstring &fullPath, PCWSTR fileIdentity, bool isDirectory);
+    static void MaintainIdentity(const std::wstring &fullPath, PCWSTR fileIdentity, bool isDirectory);
     static void UpdateSyncStatus(const std::wstring &filePath, bool isDirectory);
     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

@@ -36,7 +36,7 @@ std::string cleanString(const std::string &str)
     return cleanedStr;
 }
 
-void Placeholders::MaintainIdentity(std::wstring &fullPath, PCWSTR itemIdentity, bool isDirectory)
+void Placeholders::MaintainIdentity(const std::wstring &fullPath, PCWSTR itemIdentity, bool isDirectory)
 {
     std::string identity = Placeholders::GetPlaceholderInfo(fullPath).placeholderId;
     if (!identity.empty())

native-src/placeholders_interface/Planceholders.cpp

@@ -2,6 +2,7 @@
 #include <windows.h>
 #include "stdafx.h"
 #include "napi_extract_args.h"
+#include "Placeholders.h"
 
 void convert_to_placeholder(const std::wstring &path, const std::wstring &placeholderId)
 {
@@ -30,8 +31,11 @@ void convert_to_placeholder(const std::wstring &path, const std::wstring &placeh
 
     HRESULT hr = CfConvertToPlaceholder(fileHandle.get(), idStrLPCVOID, idStrByteLength, convertFlags, &convertUsn, &overlapped);
 
-    // Only throw if it's not "already a placeholder" error
-    if (hr != 0x8007017C)
+    if (hr == 0x8007017C) // Already a placeholder
+    {
+        Placeholders::MaintainIdentity(path, placeholderId.c_str(), isDirectory);
+    }
+    else
     {
         winrt::check_hresult(hr);
     }

native-src/virtual_drive/convert_to_placeholder.cpp

@@ -18,7 +18,6 @@ napi_value create_file_placeholder_impl(napi_env env, napi_callback_info info)
     if (std::filesystem::exists(path))
     {
         convert_to_placeholder(path, placeholderId);
-        Placeholders::MaintainIdentity(path, placeholderId.c_str(), false);
         return nullptr;
     }
 

native-src/virtual_drive/create_file_placeholder.cpp

@@ -18,7 +18,6 @@ napi_value create_folder_placeholder_impl(napi_env env, napi_callback_info info)
     if (std::filesystem::exists(path))
     {
         convert_to_placeholder(path, placeholderId);
-        Placeholders::MaintainIdentity(path, placeholderId.c_str(), true);
         return nullptr;
     }