From abb6a1cff4bf6a6e28a474778ad43f4ad70d15e8 Mon Sep 17 00:00:00 2001 From: tianp Date: Tue, 11 Feb 2025 18:45:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BD=BF=E7=94=A8filesystem=E5=AF=B9?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E6=8B=BC=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tianp --- .../kits/js/src/mod_fs/class_watcher/watcher_entity.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/interfaces/kits/js/src/mod_fs/class_watcher/watcher_entity.cpp b/interfaces/kits/js/src/mod_fs/class_watcher/watcher_entity.cpp index 2cdb84a7e..d6c411d59 100644 --- a/interfaces/kits/js/src/mod_fs/class_watcher/watcher_entity.cpp +++ b/interfaces/kits/js/src/mod_fs/class_watcher/watcher_entity.cpp @@ -311,7 +311,9 @@ void FileWatcher::NotifyEvent(const struct inotify_event *event, WatcherCallback continue; } if (event->len > 0) { - fileName += "/" + string(event->name); + std::filesystem::path fulName = fileName; + fulName /= event->name; + fileName = fulName.string(); } callback(iter->env, iter->nRef, fileName, event->mask & IN_ALL_EVENTS, event->cookie); } -- Gitee From 6e2995bfe1bb41f018eb8fecb5c852fefd25a0bc Mon Sep 17 00:00:00 2001 From: tianp Date: Tue, 11 Feb 2025 18:48:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BD=BF=E7=94=A8filesystem=E5=AF=B9?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E6=8B=BC=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tianp --- interfaces/kits/js/src/mod_fs/class_watcher/watcher_entity.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/interfaces/kits/js/src/mod_fs/class_watcher/watcher_entity.cpp b/interfaces/kits/js/src/mod_fs/class_watcher/watcher_entity.cpp index d6c411d59..023c206de 100644 --- a/interfaces/kits/js/src/mod_fs/class_watcher/watcher_entity.cpp +++ b/interfaces/kits/js/src/mod_fs/class_watcher/watcher_entity.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include "filemgmt_libhilog.h" #include "uv.h" -- Gitee From d289d34585b6257741dbc7ccf8c29a3d16832834 Mon Sep 17 00:00:00 2001 From: tianp Date: Wed, 12 Feb 2025 02:22:43 +0000 Subject: [PATCH 3/3] update interfaces/kits/js/src/mod_fs/class_watcher/watcher_entity.cpp. Signed-off-by: tianp --- .../kits/js/src/mod_fs/class_watcher/watcher_entity.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/interfaces/kits/js/src/mod_fs/class_watcher/watcher_entity.cpp b/interfaces/kits/js/src/mod_fs/class_watcher/watcher_entity.cpp index 023c206de..3e1ba26a2 100644 --- a/interfaces/kits/js/src/mod_fs/class_watcher/watcher_entity.cpp +++ b/interfaces/kits/js/src/mod_fs/class_watcher/watcher_entity.cpp @@ -312,9 +312,9 @@ void FileWatcher::NotifyEvent(const struct inotify_event *event, WatcherCallback continue; } if (event->len > 0) { - std::filesystem::path fulName = fileName; - fulName /= event->name; - fileName = fulName.string(); + std::filesystem::path fullName = fileName; + fullName /= event->name; + fileName = fullName.string(); } callback(iter->env, iter->nRef, fileName, event->mask & IN_ALL_EVENTS, event->cookie); } -- Gitee