From c6cbde6e15281cd91d1165949f4c6041466db583 Mon Sep 17 00:00:00 2001
From: zhangkaixiang <zhangkaixiang5@huawei.com>
Date: Tue, 8 Aug 2023 21:07:22 +0800
Subject: [PATCH] fixed d31021f from
 https://gitee.com/zkx48/filemanagement_file_api/pulls/346 open twice when get
 a media uri

Signed-off-by: zhangkaixiang <zhangkaixiang5@huawei.com>
Change-Id: Ibd5082dae6f249fdf58cf235677ac54cdb580434
---
 .../kits/js/src/mod_fs/properties/open.cpp    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/interfaces/kits/js/src/mod_fs/properties/open.cpp b/interfaces/kits/js/src/mod_fs/properties/open.cpp
index 15b2c0dab..c1ec37711 100644
--- a/interfaces/kits/js/src/mod_fs/properties/open.cpp
+++ b/interfaces/kits/js/src/mod_fs/properties/open.cpp
@@ -161,18 +161,18 @@ napi_value Open::Sync(napi_env env, napi_callback_info info)
     string uriType = uri.GetScheme();
     string uriPath = uri.GetPath();
     if (uriType == SCHEME_FILE) {
-        if (bundleName == MEDIA && uriPath.find(".") == string::npos) {
-            int ret = OpenFileByDatashare(pathStr, mode);
+        AppFileService::ModuleFileUri::FileUri fileUri(pathStr);
+        pathStr = fileUri.GetRealPath();
+        if ((bundleName == MEDIA && pathStr.find(".") == string::npos) ||
+            access(pathStr.c_str(), F_OK) != 0) {
+            int ret = OpenFileByDatashare(uri.ToString(), mode);
             if (ret >= 0) {
-                auto file = InstantiateFile(env, ret, pathStr, true).val_;
+                auto file = InstantiateFile(env, ret, uri.ToString(), true).val_;
                 return file;
             }
             HILOGE("Failed to open file by Datashare");
             NError(-ret).ThrowErr(env);
             return nullptr;
-        } else {
-            AppFileService::ModuleFileUri::FileUri fileUri(pathStr);
-            pathStr = fileUri.GetRealPath();
         }
     } else if (uriType == DATASHARE) {
         // datashare:////#fdFromBinder=xx
@@ -221,7 +221,10 @@ static NError AsyncCbExec(shared_ptr<AsyncOpenFileArg> arg, string path, unsigne
     string uriType = uri.GetScheme();
     string uriPath = uri.GetPath();
     if (uriType == SCHEME_FILE) {
-        if (bundleName == MEDIA && uriPath.find(".") == string::npos) {
+        AppFileService::ModuleFileUri::FileUri fileUri(path);
+        pathStr = fileUri.GetRealPath();
+        if ((bundleName == MEDIA && pathStr.find(".") == string::npos) ||
+            access(pathStr.c_str(), F_OK) != 0) {
             int ret = OpenFileByDatashare(path, mode);
             if (ret >= 0) {
                 arg->fd = ret;
@@ -231,9 +234,6 @@ static NError AsyncCbExec(shared_ptr<AsyncOpenFileArg> arg, string path, unsigne
             }
             HILOGE("Failed to open file by Datashare");
             return NError(-ret);
-        } else {
-            AppFileService::ModuleFileUri::FileUri fileUri(path);
-            pathStr = fileUri.GetRealPath();
         }
     } else if (uriType == DATASHARE) {
         // datashare:////#fdFromBinder=xx
-- 
Gitee