From a699ec1aed69e2ad45c1b64ae596c346e8b29654 Mon Sep 17 00:00:00 2001 From: wangminmin Date: Thu, 23 Mar 2023 11:45:13 +0000 Subject: [PATCH] The old fileio interface replaces the new interface Signed-off-by: wangminmin --- .../FileExtensionAbility.ts | 54 +++++++++---------- 1 file changed, 24 insertions(+), 30 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 0954189d..37736a01 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 @@ -14,7 +14,7 @@ */ // @ts-nocheck import Extension from '@ohos.application.FileAccessExtensionAbility' -import fileio from '@ohos.fileio' +import fileIO from '@ohos.file.fs'; import { init, findVolumeInfo, delVolumeInfo, getVolumeInfoList, path2uri } from './VolumeManager' import { onReceiveEvent } from './Subcriber' import fileExtensionInfo from "@ohos.file.fileExtensionInfo" @@ -138,9 +138,9 @@ export default class FileExtAbility extends Extension { recurseDir(path, cb) { try { - let stat = fileio.statSync(path); + let stat = fileIO.statSync(path); if (stat.isDirectory()) { - let dir = fileio.opendirSync(path); + let dir = fileIO.opendirSync(path); let hasNextFile = true; cb(path, true, hasNextFile); while (hasNextFile) { @@ -183,7 +183,7 @@ export default class FileExtAbility extends Extension { let fd = 0; try { let path = this.getPath(sourceFileUri); - fd = fileio.openSync(path, flags, DEFAULT_MODE); + fd = fileIO.openSync(path, flags, DEFAULT_MODE); return { fd: fd, code: ERR_OK, @@ -213,8 +213,8 @@ export default class FileExtAbility extends Extension { }; } let path = this.getPath(newFileUri); - let fd = fileio.openSync(path, CREATE_FILE_FLAGS, DEFAULT_MODE); - fileio.closeSync(fd); + let fd = fileIO.openSync(path, CREATE_FILE_FLAGS, DEFAULT_MODE); + fileIO.closeSync(fd); return { uri: newFileUri, code: ERR_OK, @@ -238,7 +238,7 @@ export default class FileExtAbility extends Extension { try { let newFileUri = this.genNewFileUri(parentUri, displayName); let path = this.getPath(newFileUri); - fileio.mkdirSync(path); + fileIO.mkdirSync(path); return { uri: newFileUri, code: ERR_OK, @@ -262,17 +262,14 @@ export default class FileExtAbility extends Extension { try { if (isDirectory) { if (!hasNextFile) { - fileio.rmdirSync(filePath); + fileIO.rmdirSync(filePath); } } else { - fileio.unlinkSync(filePath); + fileIO.unlinkSync(filePath); } } catch (e) { hilog.error(DOMAIN_CODE, TAG, 'delete error ' + e.message); - // At present, the master libn has modified the interface exception throwing mechanism - // and the exception has no code attribute, which will lead to the failure of some faf use cases. - // In the later stage, the new file_api interfaces will be merged and modified in a unified way. - code = E_GETRESULT; + code: e.code; } }); return code; @@ -304,8 +301,8 @@ export default class FileExtAbility extends Extension { } try { // The source file does not exist or the destination is not a directory - fileio.accessSync(oldPath); - let stat = fileio.statSync(this.getPath(targetParentUri)); + fileIO.accessSync(oldPath); + let stat = fileIO.statSync(this.getPath(targetParentUri)); if (!stat || !stat.isDirectory()) { return { uri: '', @@ -314,7 +311,7 @@ export default class FileExtAbility extends Extension { } // If not across devices, use fileio.renameSync to move if (!this.isCrossDeviceLink(sourceFileUri, targetParentUri)) { - fileio.renameSync(oldPath, newPath); + fileIO.renameSync(oldPath, newPath); return { uri: newFileUri, code: ERR_OK, @@ -340,16 +337,16 @@ export default class FileExtAbility extends Extension { if (hasNextFile) { try { // If the target directory already has a directory with the same name, it will not be created - fileio.accessSync(newFilePath); + fileIO.accessSync(newFilePath); } catch (e) { - fileio.mkdirSync(newFilePath); + fileIO.mkdirSync(newFilePath); } } else { - fileio.rmdirSync(filePath); + fileIO.rmdirSync(filePath); } } else { - fileio.copyFileSync(filePath, newFilePath); - fileio.unlinkSync(filePath); + fileIO.copyFileSync(filePath, newFilePath); + fileIO.unlinkSync(filePath); } } catch (e) { hilog.error(DOMAIN_CODE, TAG, 'move error ' + e.message); @@ -376,7 +373,7 @@ export default class FileExtAbility extends Extension { let newFileUri = this.renameUri(sourceFileUri, displayName); let oldPath = this.getPath(sourceFileUri); let newPath = this.getPath(newFileUri); - fileio.renameSync(oldPath, newPath); + fileIO.renameSync(oldPath, newPath); return { uri: newFileUri, code: ERR_OK, @@ -400,7 +397,7 @@ export default class FileExtAbility extends Extension { } try { let path = this.getPath(sourceFileUri); - fileio.accessSync(path); + fileIO.accessSync(path); } catch (e) { hilog.error(DOMAIN_CODE, TAG, 'access error ' + e.message); if (e.message == 'No such file or directory') { @@ -430,13 +427,13 @@ export default class FileExtAbility extends Extension { let infos = []; try { let path = this.getPath(sourceFileUri); - let dir = fileio.opendirSync(path); + let dir = fileIO.opendirSync(path); let hasNextFile = true; let i = 0; while (hasNextFile) { try { let dirent = dir.readSync(); - let stat = fileio.statSync(path + '/' + dirent.name); + let stat = fileIO.statSync(path + '/' + dirent.name); let mode = DocumentFlag.SUPPORTS_READ | DocumentFlag.SUPPORTS_WRITE; if (stat.isDirectory()) { mode |= DocumentFlag.REPRESENTS_DIR; @@ -472,10 +469,7 @@ export default class FileExtAbility extends Extension { hilog.error(DOMAIN_CODE, TAG, 'listFile error ' + e.message); return { infos: [], - // At present, the master libn has modified the interface exception throwing mechanism - // and the exception has no code attribute, which will lead to the failure of some faf use cases. - // In the later stage, the new file_api interfaces will be merged and modified in a unified way. - code: E_GETRESULT, + code: e.code, }; } return { @@ -495,7 +489,7 @@ export default class FileExtAbility extends Extension { try { let path = this.getPath(selectFileUri); let fileName = this.getFileName(path); - let stat = fileio.statSync(path) + let stat = fileIO.statSync(path) let mode = DocumentFlag.SUPPORTS_READ | DocumentFlag.SUPPORTS_WRITE; if (stat.isDirectory()) { mode |= DocumentFlag.REPRESENTS_DIR; -- Gitee