From e43df6748ab45b205f7315712146199264346770 Mon Sep 17 00:00:00 2001 From: zhangkaixiang Date: Fri, 12 May 2023 14:22:52 +0800 Subject: [PATCH] support fuse and distributedfiles dir to share Signed-off-by: zhangkaixiang --- .../innerkits/native/file_share/include/file_share.h | 8 ++++++-- interfaces/innerkits/native/file_share/src/file_share.cpp | 6 +----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/interfaces/innerkits/native/file_share/include/file_share.h b/interfaces/innerkits/native/file_share/include/file_share.h index 61117c606..61973fe0b 100644 --- a/interfaces/innerkits/native/file_share/include/file_share.h +++ b/interfaces/innerkits/native/file_share/include/file_share.h @@ -48,7 +48,9 @@ const vector SANDBOX_PATH = { "/data/storage/el2/database", "/data/storage/el1/base", "/data/storage/ark-cache", - "/data/storage/ark-profile" + "/data/storage/ark-profile", + "/data/storage/el2/distributedfiles", + "/data/fuse" }; const vector LOWER_PATH = { @@ -58,7 +60,9 @@ const vector LOWER_PATH = { "/data/app/el2//database/", "/data/app/el1//base/", "/data/local/ark-cache/", - "/data/local/ark-profile//" + "/data/local/ark-profile//", + "/mnt/hmdfs//account/merge_view/data/", + "/mnt/sandbox//data/fuse" }; } diff --git a/interfaces/innerkits/native/file_share/src/file_share.cpp b/interfaces/innerkits/native/file_share/src/file_share.cpp index 52109e700..71159d61a 100644 --- a/interfaces/innerkits/native/file_share/src/file_share.cpp +++ b/interfaces/innerkits/native/file_share/src/file_share.cpp @@ -103,13 +103,9 @@ static int32_t GetProviderPath(const string &uriStr, FileShareInfo &info) { Uri uri(uriStr); string pathInProvider = uri.GetPath(); - string::size_type pos = pathInProvider.find(DATA_STORAGE_PATH); - if (pos == string::npos) { - return -EINVAL; - } - size_t num = SANDBOX_PATH.size(); string lowerPathTail = "", lowerPathHead = ""; + for (size_t i = 0; i < num; i++) { if (pathInProvider.length() >= SANDBOX_PATH[i].length()) { string sandboxPathTemp = pathInProvider.substr(0, SANDBOX_PATH[i].length()); -- Gitee