From 093d7bcfdd41927d6d8e0558d58c492328ebebd2 Mon Sep 17 00:00:00 2001 From: zhaoyongjin1 Date: Thu, 23 Nov 2023 18:01:04 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=B0=83=E7=94=A8FAF=E5=88=9B=E5=BB=BA%?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BC=9A=E8=A6=86=E7=9B=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhaoyongjin1 --- .../ets/FileExtensionAbility/FileExtensionAbility.ts | 9 +++++++++ 1 file changed, 9 insertions(+) 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 9073dea1..a6b8914b 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,6 +198,15 @@ export default class FileExtAbility extends Extension { return uriReturnObject('', E_EXIST); } + fs.access(newFileUri, (err, res) => { + if (res) { + return uriReturnObject('', E_EXIST); + } else { + if (err) { + console.info("file no exists"); + } + } + }); let path = getPath(newFileUri); let file = fs.openSync(path, fs.OpenMode.CREATE); fs.closeSync(file); -- Gitee From 53a17a97a781142d1c93266f2b7b7a4aaaeca2d8 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 10:05:07 +0000 Subject: [PATCH 2/6] 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 | 4 ---- 1 file changed, 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 a6b8914b..6bbc0b9b 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,6 @@ 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(newFileUri, (err, res) => { if (res) { return uriReturnObject('', E_EXIST); -- Gitee From 8842830effd91c1595909b225ade7dd8fa5d99ce 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 11:47:15 +0000 Subject: [PATCH 3/6] 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 | 5 ++++- 1 file changed, 4 insertions(+), 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 6bbc0b9b..367ef3cc 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,10 @@ export default class FileExtAbility extends Extension { let newFileUri = this.genNewFileUri(parentUri, displayName); fs.access(newFileUri, (err, res) => { if (res) { - return uriReturnObject('', E_EXIST); + return { + results: [], + code: E_EXIST, + }; } else { if (err) { console.info("file no exists"); -- Gitee From 454712913e385294485955e54ed4565c9e6878a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=B0=B8=E9=94=A6?= Date: Fri, 24 Nov 2023 11:25:23 +0000 Subject: [PATCH 4/6] 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 367ef3cc..587914db 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 @@ -197,7 +197,7 @@ export default class FileExtAbility extends Extension { fs.access(newFileUri, (err, res) => { if (res) { return { - results: [], + results: '', code: E_EXIST, }; } else { -- Gitee From db8cd002955b2560906c5b034fab6888c8e9caf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=B0=B8=E9=94=A6?= Date: Mon, 27 Nov 2023 08:10:02 +0000 Subject: [PATCH 5/6] 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 | 1 + 1 file changed, 1 insertion(+) 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 587914db..1fb53388 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,6 +194,7 @@ export default class FileExtAbility extends Extension { try { hilog.info(DOMAIN_CODE, TAG, 'createFile, uri is ' + parentUri); let newFileUri = this.genNewFileUri(parentUri, displayName); + newFileUri = decodeUri(newFileUri); fs.access(newFileUri, (err, res) => { if (res) { return { -- Gitee From 8a895f85a304746fe1b5f01692cd8536f16b0e10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=B0=B8=E9=94=A6?= Date: Mon, 27 Nov 2023 10:35:03 +0000 Subject: [PATCH 6/6] 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 | 1 + 1 file changed, 1 insertion(+) 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 1fb53388..96e835f8 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 @@ -543,6 +543,7 @@ export default class FileExtAbility extends Extension { } } + access(sourceFileUri): {boolean, number} { sourceFileUri = decodeUri(sourceFileUri); if (sourceFileUri === '') { -- Gitee