From 3527580e46159b2822cc1df0ba59cc8a65ed3d61 Mon Sep 17 00:00:00 2001 From: shuzhouhao Date: Fri, 24 Jun 2022 17:31:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=B3=BB=E7=BB=9F=20hap?= =?UTF-8?q?=20=E5=8C=85=20com.ohos.UserFile.ExternalFileManager?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shuzhouhao --- services/BUILD.gn | 35 +++ services/file_extension_hap/AppScope/app.json | 11 + .../resources/base/element/string.json | 8 + .../resources/base/media/app_icon.png | Bin 0 -> 6790 bytes .../file_extension_hap/build-profile.json5 | 40 +++ .../entry/build-profile.json5 | 24 ++ .../file_extension_hap/entry/hvigorfile.js | 2 + .../src/main/ets/Application/AbilityStage.ts | 20 ++ .../FileExtensionAbility.ts | 269 ++++++++++++++++++ .../ets/FileExtensionAbility/Subcriber.ts | 32 +++ .../ets/FileExtensionAbility/VolumeManager.ts | 66 +++++ .../entry/src/main/module.json | 33 +++ .../main/resources/base/element/string.json | 12 + .../src/main/resources/base/media/icon.png | Bin 0 -> 6790 bytes .../resources/base/profile/main_pages.json | 3 + services/file_extension_hap/hvigorfile.js | 2 + services/signature/fileextension.p7b | Bin 0 -> 3443 bytes 17 files changed, 557 insertions(+) create mode 100644 services/file_extension_hap/AppScope/app.json create mode 100644 services/file_extension_hap/AppScope/resources/base/element/string.json create mode 100644 services/file_extension_hap/AppScope/resources/base/media/app_icon.png create mode 100644 services/file_extension_hap/build-profile.json5 create mode 100644 services/file_extension_hap/entry/build-profile.json5 create mode 100644 services/file_extension_hap/entry/hvigorfile.js create mode 100644 services/file_extension_hap/entry/src/main/ets/Application/AbilityStage.ts create mode 100644 services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts create mode 100644 services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/Subcriber.ts create mode 100644 services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/VolumeManager.ts create mode 100644 services/file_extension_hap/entry/src/main/module.json create mode 100644 services/file_extension_hap/entry/src/main/resources/base/element/string.json create mode 100644 services/file_extension_hap/entry/src/main/resources/base/media/icon.png create mode 100644 services/file_extension_hap/entry/src/main/resources/base/profile/main_pages.json create mode 100644 services/file_extension_hap/hvigorfile.js create mode 100644 services/signature/fileextension.p7b diff --git a/services/BUILD.gn b/services/BUILD.gn index 263eb6dd..abd64600 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -19,6 +19,7 @@ group("fms") { deps = [ ":fms_server", ":fms_service.cfg", + ":external_file_manager_hap", ] } @@ -91,3 +92,37 @@ ohos_shared_library("fms_server") { "samgr_standard:samgr_proxy", ] } + +ohos_hap("external_file_manager_hap") { + hap_profile = "file_extension_hap/entry/src/main/module.json" + deps = [ + ":external_file_manager_js_assets", + ":external_file_manager_resources", + ] + certificate_profile = "signature/fileextension.p7b" + hap_name = "external_file_manager" + subsystem_name = "filemanagement" + part_name = "user_file_service" + module_install_dir = "app/com.ohos.UserFile.ExternalFileManager" +} + +ohos_js_assets("external_file_manager_js_assets") { + hap_profile = "file_extension_hap/entry/src/main/module.json" + ets2abc = true + source_dir = "file_extension_hap/entry/src/main/ets" +} + +ohos_app_scope("external_file_manager_app_profile") { + app_profile = "file_extension_hap/AppScope/app.json" + sources = [ "file_extension_hap/AppScope/resources" ] +} + +ohos_resources("external_file_manager_resources") { + sources = [ + "file_extension_hap/entry/src/main/resources", + ] + deps = [ + ":external_file_manager_app_profile", + ] + hap_profile = "file_extension_hap/entry/src/main/module.json" +} \ No newline at end of file diff --git a/services/file_extension_hap/AppScope/app.json b/services/file_extension_hap/AppScope/app.json new file mode 100644 index 00000000..9ed7e1ac --- /dev/null +++ b/services/file_extension_hap/AppScope/app.json @@ -0,0 +1,11 @@ +{ + "app": { + "bundleName": "com.ohos.UserFile.ExternalFileManager", + "versionCode": 100, + "versionName": "1.0.0", + "minAPIVersion": 9, + "targetAPIVersion": 9, + "icon": "$media:app_icon", + "label": "$string:app_name" + } +} diff --git a/services/file_extension_hap/AppScope/resources/base/element/string.json b/services/file_extension_hap/AppScope/resources/base/element/string.json new file mode 100644 index 00000000..bdb9ac36 --- /dev/null +++ b/services/file_extension_hap/AppScope/resources/base/element/string.json @@ -0,0 +1,8 @@ +{ + "string": [ + { + "name": "app_name", + "value": "ExternalFileManager" + } + ] +} diff --git a/services/file_extension_hap/AppScope/resources/base/media/app_icon.png b/services/file_extension_hap/AppScope/resources/base/media/app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c GIT binary patch literal 6790 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 0) { + path = path.replace(arr[1].split('/')[0], ''); + } + return path; + } + + genNewFileUri(uri, displayName) { + let arr = uri.split('/'); + let newFileUri = uri; + if (arr.pop() == '') { + newFileUri += displayName; + } else { + newFileUri += '/' + displayName; + } + return newFileUri; + } + + getFileName(uri) { + let arr = uri.split('/'); + let name = arr.pop(); + if (name == '') { + name = arr.pop(); + } + return name; + } + + renameUri(uri, displayName) { + let arr = uri.split('/'); + let newFileUri = ''; + if (arr.pop() == '') { + arr.pop(); + arr.push(displayName) + arr.push(''); + } else { + arr.push(displayName) + } + for (var index = 0; index < arr.length; index++) { + if (arr[index] == '') { + newFileUri += '/'; + } else if (index == arr.length - 1) { + newFileUri += arr[index]; + } else { + newFileUri += arr[index] + '/'; + } + } + return newFileUri; + } + + listDir(path, cb) { + try { + let stat = fileio.statSync(path); + if (stat.isDirectory()) { + let dir = fileio.opendirSync(path); + let hasNextFile = true; + while (hasNextFile) { + try { + let dirent = dir.readSync(); + this.listDir(path + '/' + dirent.name, cb); + } catch (e) { + hilog.debug(0x0001, 'jsserver', 'listDir dir.readSync catch' + e); + hasNextFile = false; + cb(path, true); + } + } + } else { + cb(path, false); + } + } catch (e) { + hilog.debug(0x0001, 'jsserver', 'listDir catch ' + e + ' ' + path); + cb(path, true); + } + } + + openFile(sourceFileUri, flags) { + let fd = 0; + try { + let path = this.getPath(sourceFileUri); + fd = fileio.openSync(path, flags, 0o666); + } catch (e) { + hilog.debug(0x0001, 'jsserver', 'openFile catch' + e); + fd = -1; + } + + return fd; + } + + closeFile(fd, uri) { + try { + fileio.closeSync(fd); + return true; + } catch (e) { + hilog.debug(0x0001, 'jsserver', 'closeFile catch' + e); + return false; + } + } + + createFile(parentUri, displayName) { + try { + let newFileUri = this.genNewFileUri(parentUri, displayName); + let path = this.getPath(newFileUri); + fileio.openSync(path, 0o100, 0o666); + return newFileUri; + } catch (e) { + hilog.debug(0x0001, 'jsserver', 'createFile catch' + e); + return ''; + } + } + + mkdir(parentUri, displayName) { + try { + let newFileUri = this.genNewFileUri(parentUri, displayName); + let path = this.getPath(newFileUri); + fileio.mkdirSync(path); + return newFileUri; + } catch (e) { + hilog.debug(0x0001, 'jsserver', 'mkdir catch' + e); + return ''; + } + } + + delete(selectFileUri) { + let path = this.getPath(selectFileUri); + let code = 0; + this.listDir(path, function (filePath, isDirectory) { + try { + if (isDirectory) { + fileio.rmdirSync(filePath); + } else { + fileio.unlinkSync(filePath); + } + } catch (e) { + hilog.debug(0x0001, 'jsserver', 'delete catch' + e); + code = -1; + } + }); + + return code; + } + + move(sourceFileUri, targetParentUri) { + try { + let displayName = this.getFileName(sourceFileUri); + let newFileUri = this.genNewFileUri(targetParentUri, displayName); + let oldPath = this.getPath(sourceFileUri); + let newPath = this.getPath(newFileUri); + fileio.renameSync(oldPath, newPath); + return newFileUri; + } catch (e) { + hilog.debug(0x0001, 'jsserver', 'rename catch' + e); + return ''; + } + } + + rename(sourceFileUri, displayName) { + try { + let newFileUri = this.renameUri(sourceFileUri, displayName); + let oldPath = this.getPath(sourceFileUri); + let newPath = this.getPath(newFileUri); + fileio.renameSync(oldPath, newPath); + return newFileUri; + } catch (e) { + hilog.debug(0x0001, 'jsserver', 'rename catch' + e); + return ''; + } + } + + query(sourceFileUri) { + try { + let path = this.getPath(sourceFileUri); + let stat = fileio.statSync(path); + return { + uri: sourceFileUri, + fileName: this.getFileName(sourceFileUri), + mode: '' + stat.mode, + size: stat.size, + mtime: stat.mtime, + mimeType: '', + }; + } catch (e) { + hilog.debug(0x0001, 'jsserver', 'query catch' + e); + return null; + } + } + + listFile(sourceFileUri) { + let infos = []; + try { + let path = this.getPath(sourceFileUri); + let dir = fileio.opendirSync(path); + let hasNextFile = true; + while (hasNextFile) { + try { + let dirent = dir.readSync(); + let stat = fileio.statSync(path + '/' + dirent.name); + infos.push({ + uri: this.genNewFileUri(sourceFileUri, dirent.name), + fileName: dirent.name, + mode: '' + stat.mode, + size: stat.size, + mtime: stat.mtime, + mimeType: '', + }); + } catch (e) { + hilog.debug(0x0001, 'jsserver', 'dir.readSync catch' + e); + hasNextFile = false; + } + } + } catch (e) { + hilog.debug(0x0001, 'jsserver', 'listFile catch' + e); + } + + return infos; + } + + getRoots() { + let roots = getVolumeInfoList().concat({ + uri: 'fileAccess:///data/storage/el1/bundle/storage_daemon', + displayName: 'storage_daemon', + deviceId: '', + flags: FLAG.SUPPORTS_WRITE | FLAG.SUPPORTS_DELETE | FLAG.SUPPORTS_RENAME | FLAG.SUPPORTS_COPY + | FLAG.SUPPORTS_MOVE | FLAG.SUPPORTS_REMOVE | FLAG.DIR_SUPPORTS_CREATE | FLAG.DIR_PREFERS_LAST_MODIFIED, + }); + return roots; + } +}; \ No newline at end of file diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/Subcriber.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/Subcriber.ts new file mode 100644 index 00000000..a2e8acec --- /dev/null +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/Subcriber.ts @@ -0,0 +1,32 @@ +/* +* Copyright (c) 2022 Huawei Device Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +import CommonEvent from '@ohos.commonevent' +async function onReceiveEvent(callBack) { + var subscribeInfo = { + events: [ + "usual.event.data.VOLUME_REMOVED", + "usual.event.data.VOLUME_UNMOUNTED", + "usual.event.data.VOLUME_MOUNTED", + "usual.event.data.VOLUME_BAD_REMOVAL", + "usual.event.data.VOLUME_EJECT" + ] + }; + let subscriber = await CommonEvent.createSubscriber(subscribeInfo); + CommonEvent.subscribe(subscriber, function (err, data) { + callBack(data) + }) +} + +export { onReceiveEvent } \ No newline at end of file diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/VolumeManager.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/VolumeManager.ts new file mode 100644 index 00000000..b127b2f5 --- /dev/null +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/VolumeManager.ts @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import volumeManager from '@ohos.volumeManager' +import hilog from '@ohos.hilog' +import fileExtensionInfo from "@ohos.fileExtensionInfo" +if (!globalThis.volumeInfoList) { + globalThis.volumeInfoList = []; +} + +const FLAG = fileExtensionInfo.FLAG; + +function init() { + try { + volumeManager.getAllVolumes().then((volumes) => { + let flags = FLAG.SUPPORTS_WRITE | FLAG.SUPPORTS_DELETE | FLAG.SUPPORTS_RENAME | FLAG.SUPPORTS_COPY + | FLAG.SUPPORTS_MOVE | FLAG.SUPPORTS_REMOVE | FLAG.DIR_SUPPORTS_CREATE | FLAG.DIR_PREFERS_LAST_MODIFIED; + for (let i = 0; i < volumes.length; i++) { + let volume = volumes[i]; + let volumeInfo = { + 'volumeId': volume.id, + 'fsUuid': volume.uuid, + 'path': volume.path, + 'uri': path2uri('', volume.path), + 'displayName': volume.id, + 'deviceId': '', + 'flags': flags, + 'type': 'SD' + } + globalThis.volumeInfoList.push(volumeInfo); + } + }); + + } catch (err) { + hilog.debug(0x0001, 'jsserver', "err============>" + err); + } +} + +function addVolumeInfo(volumeInfo) { + globalThis.volumeInfoList.push(volumeInfo); +} + +function path2uri(id, path) { + return `fileAccess://${id}${path}`; +} + +function delVolumeInfo(volumeId) { + globalThis.volumeInfoList = globalThis.volumeInfoList.filter((volume) => volume.volumeId !== volumeId); +} + +function getVolumeInfoList() { + return globalThis.volumeInfoList; +} + +export { init, addVolumeInfo, delVolumeInfo, getVolumeInfoList, path2uri } \ No newline at end of file diff --git a/services/file_extension_hap/entry/src/main/module.json b/services/file_extension_hap/entry/src/main/module.json new file mode 100644 index 00000000..3908c63b --- /dev/null +++ b/services/file_extension_hap/entry/src/main/module.json @@ -0,0 +1,33 @@ +{ + "module": { + "name": "entry", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "mainElement": "FileExtensionAbility", + "deviceTypes": [ + "phone", + "tablet" + ], + "deliveryWithInstall": true, + "installationFree": false, + "pages": "$profile:main_pages", + "uiSyntax": "ets", + "abilities": [], + "extensionAbilities": [ + { + "srcEntrance": "./ets/FileExtensionAbility/FileExtensionAbility.ts", + "name": "FileExtensionAbility", + "type": "fileAccess", + "visible": true + } + ], + "requestPermissions": [ + { + "name": "ohos.permission.CLEAN_BACKGROUND_PROCESSES" + }, + { + "name": "ohos.permission.STORAGE_MANAGER" + } + ] + } +} \ No newline at end of file diff --git a/services/file_extension_hap/entry/src/main/resources/base/element/string.json b/services/file_extension_hap/entry/src/main/resources/base/element/string.json new file mode 100644 index 00000000..c4e8611b --- /dev/null +++ b/services/file_extension_hap/entry/src/main/resources/base/element/string.json @@ -0,0 +1,12 @@ +{ + "string": [ + { + "name": "entry_desc", + "value": "description" + }, + { + "name": "description_serviceability", + "value": "description_serviceability" + } + ] +} \ No newline at end of file diff --git a/services/file_extension_hap/entry/src/main/resources/base/media/icon.png b/services/file_extension_hap/entry/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c GIT binary patch literal 6790 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 Date: Fri, 24 Jun 2022 17:46:07 +0800 Subject: [PATCH 2/3] format BUILD.gn Signed-off-by: shuzhouhao --- services/BUILD.gn | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/services/BUILD.gn b/services/BUILD.gn index abd64600..7cc0fe5f 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -17,9 +17,9 @@ FMS_BASE_DIR = "//foundation/filemanagement/user_file_service/services" group("fms") { deps = [ + ":external_file_manager_hap", ":fms_server", ":fms_service.cfg", - ":external_file_manager_hap", ] } @@ -95,7 +95,7 @@ ohos_shared_library("fms_server") { ohos_hap("external_file_manager_hap") { hap_profile = "file_extension_hap/entry/src/main/module.json" - deps = [ + deps = [ ":external_file_manager_js_assets", ":external_file_manager_resources", ] @@ -118,11 +118,7 @@ ohos_app_scope("external_file_manager_app_profile") { } ohos_resources("external_file_manager_resources") { - sources = [ - "file_extension_hap/entry/src/main/resources", - ] - deps = [ - ":external_file_manager_app_profile", - ] + sources = [ "file_extension_hap/entry/src/main/resources" ] + deps = [ ":external_file_manager_app_profile" ] hap_profile = "file_extension_hap/entry/src/main/module.json" -} \ No newline at end of file +} -- Gitee From 5745b81edba180a76b7dddc497b84ee060f939ae Mon Sep 17 00:00:00 2001 From: shuzhouhao Date: Mon, 27 Jun 2022 10:40:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=AE=E5=A4=8D=EF=BC=8C=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=B8=8D=E5=BF=85=E8=A6=81=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shuzhouhao --- .../FileExtensionAbility.ts | 24 ++++------- .../ets/FileExtensionAbility/VolumeManager.ts | 40 ++++++++----------- 2 files changed, 24 insertions(+), 40 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 6e771f49..667ec29c 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,6 @@ */ import Extension from '@ohos.application.FileAccessExtensionAbility' import fileio from '@ohos.fileio' -import hilog from '@ohos.hilog' import { init, delVolumeInfo, getVolumeInfoList } from './VolumeManager' import { onReceiveEvent } from './Subcriber' import fileExtensionInfo from "@ohos.fileExtensionInfo" @@ -22,6 +21,8 @@ import appManager from '@ohos.application.appManager'; const FLAG = fileExtensionInfo.FLAG; const BUNDLE_NAME = 'com.ohos.UserFile.ExternalFileManager'; +const DEFAULT_MODE = 0o666; +const CREATE_FILE_FLAGS = 0o100; export default class FileExtAbility extends Extension { onCreate(want) { @@ -101,7 +102,6 @@ export default class FileExtAbility extends Extension { let dirent = dir.readSync(); this.listDir(path + '/' + dirent.name, cb); } catch (e) { - hilog.debug(0x0001, 'jsserver', 'listDir dir.readSync catch' + e); hasNextFile = false; cb(path, true); } @@ -110,7 +110,6 @@ export default class FileExtAbility extends Extension { cb(path, false); } } catch (e) { - hilog.debug(0x0001, 'jsserver', 'listDir catch ' + e + ' ' + path); cb(path, true); } } @@ -119,9 +118,8 @@ export default class FileExtAbility extends Extension { let fd = 0; try { let path = this.getPath(sourceFileUri); - fd = fileio.openSync(path, flags, 0o666); + fd = fileio.openSync(path, flags, DEFAULT_MODE); } catch (e) { - hilog.debug(0x0001, 'jsserver', 'openFile catch' + e); fd = -1; } @@ -133,7 +131,6 @@ export default class FileExtAbility extends Extension { fileio.closeSync(fd); return true; } catch (e) { - hilog.debug(0x0001, 'jsserver', 'closeFile catch' + e); return false; } } @@ -142,10 +139,9 @@ export default class FileExtAbility extends Extension { try { let newFileUri = this.genNewFileUri(parentUri, displayName); let path = this.getPath(newFileUri); - fileio.openSync(path, 0o100, 0o666); + fileio.openSync(path, CREATE_FILE_FLAGS, DEFAULT_MODE); return newFileUri; } catch (e) { - hilog.debug(0x0001, 'jsserver', 'createFile catch' + e); return ''; } } @@ -157,7 +153,6 @@ export default class FileExtAbility extends Extension { fileio.mkdirSync(path); return newFileUri; } catch (e) { - hilog.debug(0x0001, 'jsserver', 'mkdir catch' + e); return ''; } } @@ -173,7 +168,6 @@ export default class FileExtAbility extends Extension { fileio.unlinkSync(filePath); } } catch (e) { - hilog.debug(0x0001, 'jsserver', 'delete catch' + e); code = -1; } }); @@ -190,7 +184,6 @@ export default class FileExtAbility extends Extension { fileio.renameSync(oldPath, newPath); return newFileUri; } catch (e) { - hilog.debug(0x0001, 'jsserver', 'rename catch' + e); return ''; } } @@ -203,7 +196,6 @@ export default class FileExtAbility extends Extension { fileio.renameSync(oldPath, newPath); return newFileUri; } catch (e) { - hilog.debug(0x0001, 'jsserver', 'rename catch' + e); return ''; } } @@ -221,7 +213,6 @@ export default class FileExtAbility extends Extension { mimeType: '', }; } catch (e) { - hilog.debug(0x0001, 'jsserver', 'query catch' + e); return null; } } @@ -245,12 +236,11 @@ export default class FileExtAbility extends Extension { mimeType: '', }); } catch (e) { - hilog.debug(0x0001, 'jsserver', 'dir.readSync catch' + e); hasNextFile = false; } } } catch (e) { - hilog.debug(0x0001, 'jsserver', 'listFile catch' + e); + infos = []; } return infos; @@ -261,8 +251,8 @@ export default class FileExtAbility extends Extension { uri: 'fileAccess:///data/storage/el1/bundle/storage_daemon', displayName: 'storage_daemon', deviceId: '', - flags: FLAG.SUPPORTS_WRITE | FLAG.SUPPORTS_DELETE | FLAG.SUPPORTS_RENAME | FLAG.SUPPORTS_COPY - | FLAG.SUPPORTS_MOVE | FLAG.SUPPORTS_REMOVE | FLAG.DIR_SUPPORTS_CREATE | FLAG.DIR_PREFERS_LAST_MODIFIED, + flags: FLAG.SUPPORTS_WRITE | FLAG.SUPPORTS_DELETE | FLAG.SUPPORTS_RENAME | FLAG.SUPPORTS_COPY | + FLAG.SUPPORTS_MOVE | FLAG.SUPPORTS_REMOVE | FLAG.DIR_SUPPORTS_CREATE | FLAG.DIR_PREFERS_LAST_MODIFIED, }); return roots; } diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/VolumeManager.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/VolumeManager.ts index b127b2f5..63c5bf91 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/VolumeManager.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/VolumeManager.ts @@ -13,7 +13,6 @@ * limitations under the License. */ import volumeManager from '@ohos.volumeManager' -import hilog from '@ohos.hilog' import fileExtensionInfo from "@ohos.fileExtensionInfo" if (!globalThis.volumeInfoList) { globalThis.volumeInfoList = []; @@ -22,29 +21,24 @@ if (!globalThis.volumeInfoList) { const FLAG = fileExtensionInfo.FLAG; function init() { - try { - volumeManager.getAllVolumes().then((volumes) => { - let flags = FLAG.SUPPORTS_WRITE | FLAG.SUPPORTS_DELETE | FLAG.SUPPORTS_RENAME | FLAG.SUPPORTS_COPY - | FLAG.SUPPORTS_MOVE | FLAG.SUPPORTS_REMOVE | FLAG.DIR_SUPPORTS_CREATE | FLAG.DIR_PREFERS_LAST_MODIFIED; - for (let i = 0; i < volumes.length; i++) { - let volume = volumes[i]; - let volumeInfo = { - 'volumeId': volume.id, - 'fsUuid': volume.uuid, - 'path': volume.path, - 'uri': path2uri('', volume.path), - 'displayName': volume.id, - 'deviceId': '', - 'flags': flags, - 'type': 'SD' - } - globalThis.volumeInfoList.push(volumeInfo); + volumeManager.getAllVolumes().then((volumes) => { + let flags = FLAG.SUPPORTS_WRITE | FLAG.SUPPORTS_DELETE | FLAG.SUPPORTS_RENAME | FLAG.SUPPORTS_COPY | + FLAG.SUPPORTS_MOVE | FLAG.SUPPORTS_REMOVE | FLAG.DIR_SUPPORTS_CREATE | FLAG.DIR_PREFERS_LAST_MODIFIED; + for (let i = 0; i < volumes.length; i++) { + let volume = volumes[i]; + let volumeInfo = { + 'volumeId': volume.id, + 'fsUuid': volume.uuid, + 'path': volume.path, + 'uri': path2uri('', volume.path), + 'displayName': volume.id, + 'deviceId': '', + 'flags': flags, + 'type': 'SD' } - }); - - } catch (err) { - hilog.debug(0x0001, 'jsserver', "err============>" + err); - } + globalThis.volumeInfoList.push(volumeInfo); + } + }); } function addVolumeInfo(volumeInfo) { -- Gitee