From 6cc89ed437643816833773d1590934e82da36077 Mon Sep 17 00:00:00 2001 From: lixiang Date: Mon, 9 Jun 2025 16:49:13 +0800 Subject: [PATCH 1/4] fix errcode --- interfaces/kits/js/src/mod_fs/properties/copy.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/interfaces/kits/js/src/mod_fs/properties/copy.cpp b/interfaces/kits/js/src/mod_fs/properties/copy.cpp index b3a8b5716..f76a2b5a0 100644 --- a/interfaces/kits/js/src/mod_fs/properties/copy.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/copy.cpp @@ -379,11 +379,13 @@ napi_value Copy::Async(napi_env env, napi_callback_info info) return nullptr; } auto cbExec = [infos, callback]() -> NError { - std::function processListener = - [infos, callback](uint64_t processSize, uint64_t totalSize) -> void { - callback->progressSize = processSize; - callback->totalSize = totalSize; - OnFileReceive(infos); + Storage::DistributedFile::ProcessCallback processListener; + if (infos->hasListener) { + processListener = [infos, callback](uint64_t processSize, uint64_t totalSize) -> void { + callback->progressSize = processSize; + callback->totalSize = totalSize; + OnFileReceive(infos); + } }; if (infos->taskSignal != nullptr) { infos->taskSignal->MarkDfsTask(); -- Gitee From 6a142a2228b0750a352d9318b5b46742d09c5f18 Mon Sep 17 00:00:00 2001 From: lixiang Date: Mon, 9 Jun 2025 16:49:13 +0800 Subject: [PATCH 2/4] fix errcode Signed-off-by: lixiang --- interfaces/kits/js/src/mod_fs/properties/copy.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/interfaces/kits/js/src/mod_fs/properties/copy.cpp b/interfaces/kits/js/src/mod_fs/properties/copy.cpp index b3a8b5716..f76a2b5a0 100644 --- a/interfaces/kits/js/src/mod_fs/properties/copy.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/copy.cpp @@ -379,11 +379,13 @@ napi_value Copy::Async(napi_env env, napi_callback_info info) return nullptr; } auto cbExec = [infos, callback]() -> NError { - std::function processListener = - [infos, callback](uint64_t processSize, uint64_t totalSize) -> void { - callback->progressSize = processSize; - callback->totalSize = totalSize; - OnFileReceive(infos); + Storage::DistributedFile::ProcessCallback processListener; + if (infos->hasListener) { + processListener = [infos, callback](uint64_t processSize, uint64_t totalSize) -> void { + callback->progressSize = processSize; + callback->totalSize = totalSize; + OnFileReceive(infos); + } }; if (infos->taskSignal != nullptr) { infos->taskSignal->MarkDfsTask(); -- Gitee From 6d54af5270b379e85c7ed5cfdd6b63cac6a236c4 Mon Sep 17 00:00:00 2001 From: lixiang Date: Mon, 9 Jun 2025 17:01:18 +0800 Subject: [PATCH 3/4] fix errcode Signed-off-by: lixiang --- interfaces/kits/js/src/mod_fs/properties/copy.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/interfaces/kits/js/src/mod_fs/properties/copy.cpp b/interfaces/kits/js/src/mod_fs/properties/copy.cpp index f76a2b5a0..55589009d 100644 --- a/interfaces/kits/js/src/mod_fs/properties/copy.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/copy.cpp @@ -380,6 +380,7 @@ napi_value Copy::Async(napi_env env, napi_callback_info info) } auto cbExec = [infos, callback]() -> NError { Storage::DistributedFile::ProcessCallback processListener; + if (infos->hasListener) { processListener = [infos, callback](uint64_t processSize, uint64_t totalSize) -> void { callback->progressSize = processSize; -- Gitee From 405c49372886d1a069246e5d75898d1f8151adc7 Mon Sep 17 00:00:00 2001 From: lixiang Date: Mon, 9 Jun 2025 17:08:33 +0800 Subject: [PATCH 4/4] fix errcode Signed-off-by: lixiang --- interfaces/kits/js/src/mod_fs/properties/copy.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/interfaces/kits/js/src/mod_fs/properties/copy.cpp b/interfaces/kits/js/src/mod_fs/properties/copy.cpp index 55589009d..f6cfdad11 100644 --- a/interfaces/kits/js/src/mod_fs/properties/copy.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/copy.cpp @@ -380,14 +380,13 @@ napi_value Copy::Async(napi_env env, napi_callback_info info) } auto cbExec = [infos, callback]() -> NError { Storage::DistributedFile::ProcessCallback processListener; - if (infos->hasListener) { processListener = [infos, callback](uint64_t processSize, uint64_t totalSize) -> void { callback->progressSize = processSize; callback->totalSize = totalSize; OnFileReceive(infos); - } - }; + }; + } if (infos->taskSignal != nullptr) { infos->taskSignal->MarkDfsTask(); infos->taskSignal->SetCopyTaskUri(infos->srcUri, infos->destUri); -- Gitee