From 6ff43e8714c4f5a5b1127635fb3e96f052c7f254 Mon Sep 17 00:00:00 2001 From: zhaoyongjin1 Date: Fri, 17 Nov 2023 14:50:11 +0800 Subject: [PATCH 1/5] decode bugfix Signed-off-by: zhaoyongjin1 --- .../FileExtensionAbility/FileExtensionAbility.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts index 7273a351..94ef42da 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts @@ -194,10 +194,18 @@ export default class FileExtAbility extends Extension { try { hilog.info(DOMAIN_CODE, TAG, 'createFile, uri is ' + parentUri); let newFileUri = this.genNewFileUri(parentUri, displayName); - if (this.access(newFileUri).isExist) { - return uriReturnObject('', E_EXIST); - - } + fs.access(uri, (err, res) => { + if (err) { + return { + results: [], + code: E_NOEXIST, + }; + } else { + if (res) { + console.info("file exists"); + } + } + }); let path = getPath(newFileUri); let file = fs.openSync(path, fs.OpenMode.CREATE); fs.closeSync(file); -- Gitee From d4ea5bf16018953535cd386bf15cad35e14a49e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=B0=B8=E9=94=A6?= Date: Fri, 17 Nov 2023 06:54:12 +0000 Subject: [PATCH 2/5] update services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 赵永锦 --- .../src/main/ets/FileExtensionAbility/FileExtensionAbility.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts index 94ef42da..4090a6ed 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts @@ -194,7 +194,7 @@ export default class FileExtAbility extends Extension { try { hilog.info(DOMAIN_CODE, TAG, 'createFile, uri is ' + parentUri); let newFileUri = this.genNewFileUri(parentUri, displayName); - fs.access(uri, (err, res) => { + fs.access(newFileUri, (err, res) => { if (err) { return { results: [], -- Gitee From 645dcca3efc8eec047e2b38e916fba41286de866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=B0=B8=E9=94=A6?= Date: Wed, 22 Nov 2023 07:00:48 +0000 Subject: [PATCH 3/5] update services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 赵永锦 --- .../src/main/ets/FileExtensionAbility/FileExtensionAbility.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts index 4090a6ed..00dcbfca 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts @@ -198,7 +198,7 @@ export default class FileExtAbility extends Extension { if (err) { return { results: [], - code: E_NOEXIST, + code: E_EXIST, }; } else { if (res) { -- Gitee From 80707abf9a3f6e17ebd84aab9fd6475078579998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=B0=B8=E9=94=A6?= Date: Wed, 22 Nov 2023 09:05:09 +0000 Subject: [PATCH 4/5] update services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 赵永锦 --- .../main/ets/FileExtensionAbility/FileExtensionAbility.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts index 00dcbfca..dd6d7011 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts @@ -196,13 +196,11 @@ export default class FileExtAbility extends Extension { let newFileUri = this.genNewFileUri(parentUri, displayName); fs.access(newFileUri, (err, res) => { if (err) { - return { - results: [], - code: E_EXIST, - }; + return uriReturnObject('', E_NOEXIST); } else { if (res) { console.info("file exists"); + return uriReturnObject(newFileUri, ERR_OK); } } }); -- Gitee From 5cfd2a97935a8089a5fdc1b1a0d461e135c78e24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=B0=B8=E9=94=A6?= Date: Thu, 23 Nov 2023 06:16:25 +0000 Subject: [PATCH 5/5] update services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 赵永锦 --- .../src/main/ets/FileExtensionAbility/FileExtensionAbility.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts index dd6d7011..af11abc2 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts @@ -196,7 +196,7 @@ export default class FileExtAbility extends Extension { let newFileUri = this.genNewFileUri(parentUri, displayName); fs.access(newFileUri, (err, res) => { if (err) { - return uriReturnObject('', E_NOEXIST); + return uriReturnObject('', E_EXIST); } else { if (res) { console.info("file exists"); -- Gitee