From b6f04e74543a26b0278627078a0a7b5ea081d4fa Mon Sep 17 00:00:00 2001 From: zhouoaoteng Date: Fri, 13 Sep 2024 16:40:56 +0800 Subject: [PATCH] fix:code Signed-off-by: zhouoaoteng --- interfaces/inner_api/file_access/BUILD.gn | 1 + .../inner_api/file_access/src/file_access_ext_proxy.cpp | 8 ++++---- .../entry/src/main/ets/FileExtensionAbility/Common.ts | 2 +- .../main/ets/FileExtensionAbility/FileExtensionAbility.ts | 3 ++- .../src/main/ets/FileExtensionAbility/ListScanFileInfo.ts | 5 +++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/interfaces/inner_api/file_access/BUILD.gn b/interfaces/inner_api/file_access/BUILD.gn index 4cb4a40e..6ea6a1fc 100644 --- a/interfaces/inner_api/file_access/BUILD.gn +++ b/interfaces/inner_api/file_access/BUILD.gn @@ -87,6 +87,7 @@ ohos_shared_library("file_access_extension_ability_kit") { "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", + "c_utils:utilsbase", "file_api:filemgmt_libn", "hilog:libhilog", "hitrace:hitrace_meter", diff --git a/interfaces/inner_api/file_access/src/file_access_ext_proxy.cpp b/interfaces/inner_api/file_access/src/file_access_ext_proxy.cpp index d6efb180..09273855 100644 --- a/interfaces/inner_api/file_access/src/file_access_ext_proxy.cpp +++ b/interfaces/inner_api/file_access/src/file_access_ext_proxy.cpp @@ -572,8 +572,8 @@ static int ReadFileFilterResults(MessageParcel &reply, SharedMemoryInfo &memInfo return ERR_OK; } -int FileAccessExtProxy::ListFile(const FileInfo &fileInfo, const int64_t offset, const FileFilter &filter, - SharedMemoryInfo &memInfo) +int FileAccessExtProxy::ListFile(const FileInfo &fileInfo, const int64_t offset, + const FileFilter &filter, SharedMemoryInfo &memInfo) { UserAccessTracer trace; trace.Start("ListFile"); @@ -700,12 +700,12 @@ int FileAccessExtProxy::Query(const Uri &uri, std::vector &columns, HILOG_ERROR("fail to WriteParcelable sourceFile"); return E_IPCS; } - int64_t count = columns.size(); + size_t count = columns.size(); if (!data.WriteInt64(count)) { HILOG_ERROR("Parameter Query fail to WriteInt64 count"); return E_IPCS; } - if (static_cast(count) > FILE_RESULT_TYPE.size()) { + if (count > FILE_RESULT_TYPE.size()) { HILOG_ERROR(" The number of query operations exceeds %{public}zu ", FILE_RESULT_TYPE.size()); return EINVAL; } diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/Common.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/Common.ts index d8e2c59d..6c9ef15d 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/Common.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/Common.ts @@ -128,7 +128,7 @@ function encodePathOfUri(uri): string { } return uri; } - + function decodeUri(uri): string { try { uri = decodeURIComponent(uri); 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 00e2a039..0a528306 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 @@ -769,6 +769,7 @@ export default class FileExtAbility extends Extension { deviceType: deviceType.DEVICE_SHARED_TERMINAL, deviceFlags: deviceFlag.SUPPORTS_READ | deviceFlag.SUPPORTS_WRITE, }; + hilog.info(DOMAIN_CODE, TAG, `df count: ${hmdfsInfo.length}`); hmdfsInfoList.push(hmdfsInfo); } return hmdfsInfoList; @@ -806,7 +807,7 @@ export default class FileExtAbility extends Extension { volumeInfoList.push(volumeInfo); } roots = roots.concat(volumeInfoList); - + hilog.info(DOMAIN_CODE, TAG, `External file count: ${volumeInfoList.length}`); try { roots = roots.concat(getHmdfsPath()); } catch (e) { diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/ListScanFileInfo.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/ListScanFileInfo.ts index b7c5e7d0..03db99f8 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/ListScanFileInfo.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/ListScanFileInfo.ts @@ -23,6 +23,7 @@ const documentFlag = fileExtensionInfo.DocumentFlag; const ERR_OK = 0; const E_GETRESULT = 14300004; const APP_DATA = 'appdata'; +const BACKUP_DIR = '.backup'; const CURRENT_USER_PATH = '/storage/Users/currentUser'; function hasFilter(filter: Filter) : boolean { @@ -152,8 +153,8 @@ function getListFileInfos(sourceFileUri: string, offset: number, count: number, if (i === listNum) { break; } - if (path === CURRENT_USER_PATH && fileNameList[i] === APP_DATA) { - hilog.info(DOMAIN_CODE, TAG, `filter appdata doc`); + if (path === CURRENT_USER_PATH && (fileNameList[i] === APP_DATA || fileNameList[i] === BACKUP_DIR)) { + hilog.info(DOMAIN_CODE, TAG, `filter appdata doc or backup dir`); continue; } let mode = documentFlag.SUPPORTS_READ | documentFlag.SUPPORTS_WRITE; -- Gitee