openharmony/filemanagement_user_file_service
1
0
Fork 0
mirror of https://gitee.com/openharmony/filemanagement_user_file_service synced 2024-11-27 09:30:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!633 回收站listFile返回的字段ctime应记录文件进回收站的时间

Browse Source 
Merge pull request !633 from yangjingbo/ctime_fix
This commit is contained in:
openharmony_ci 2023-10-13 03:35:08 +00:00 committed by Gitee
commit 4d6ffc0843
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 45 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
interfaces/kits/native/trash/BUILD.gn
View File

@ -32,6 +32,7 @@ ohos_shared_library("trash") {
"access_token:libaccesstoken_sdk",
"access_token:libtokenid_sdk",
"app_file_service:fileuri_native",
"app_file_service:sandbox_helper_native",
"file_api:filemgmt_libhilog",
"file_api:filemgmt_libn",
"hilog:libhilog",
@ -43,4 +44,5 @@ ohos_shared_library("trash") {
relative_install_dir = "module/file"
subsystem_name = "filemanagement"
part_name = "user_file_service"
use_exceptions = true
}

1
interfaces/kits/native/trash/include/file_trash_n_exporter.h
View File

@ -21,6 +21,7 @@
#include "filemgmt_libn.h"
#include "napi/native_api.h"
#include "napi/native_node_api.h"
#include "sandbox_helper.h"
namespace OHOS {
namespace Trash {

81
interfaces/kits/native/trash/src/file_trash_n_exporter.cpp
View File

@ -341,42 +341,44 @@ static string GetToDeletePath(const string &toDeletePath, napi_env env)
return RecurCheckIfOnlyContentInDir(toDeletePath, realTimeDirPos, trashWithTimePath);
}
static vector<FileInfo> GenerateFileInfoEntities(vector<string> filterDirents)
static bool GenerateFileInfoEntity(FileInfo& fileInfoEntity, string filterDirent, string timeSlot)
{
vector<FileInfo> fileInfoList;
for (size_t k = 0; k < filterDirents.size(); k++) {
string filterDirent = filterDirents[k];
HILOG_INFO("ListFile: After filter dirent = %{public}s", filterDirent.c_str());
string realFilePath = FindSourceFilePath(filterDirent);
HILOG_INFO("ListFile: After filter realFilePath = %{public}s", realFilePath.c_str());
size_t lastSlashPos = filterDirent.find_last_of("/");
string fileName = filterDirent.substr(lastSlashPos + 1);
FileInfo fileInfoEntity;
fileInfoEntity.uri = URI_PATH_PREFIX + filterDirent;
fileInfoEntity.srcPath = realFilePath;
fileInfoEntity.fileName = fileName;
size_t uMode = SUPPORTS_READ | SUPPORTS_WRITE;
StatEntity statEntity;
if (GetStat(filterDirent, statEntity)) {
bool check = (statEntity.stat_.st_mode & S_IFMT) == S_IFDIR;
if (check) {
uMode |= REPRESENTS_DIR;
} else {
uMode |= REPRESENTS_FILE;
}
HILOG_DEBUG("ListFile: After filter mode = %{public}zu", uMode);
fileInfoEntity.mode = static_cast<int32_t>(uMode);
fileInfoEntity.size = static_cast<int64_t>(statEntity.stat_.st_size);
fileInfoEntity.mtime = static_cast<int64_t>(statEntity.stat_.st_mtim.tv_sec);
fileInfoEntity.ctime = static_cast<int64_t>(statEntity.stat_.st_ctim.tv_sec);
}
fileInfoList.emplace_back(fileInfoEntity);
string realFilePath = FindSourceFilePath(filterDirent);
size_t lastSlashPos = filterDirent.find_last_of("/");
if (lastSlashPos == string::npos) {
HILOG_ERROR("GenerateFileInfoEntity: invalid path");
return false;
}
return fileInfoList;
string fileName = filterDirent.substr(lastSlashPos + 1);
string encodedString = AppFileService::SandboxHelper::Encode(URI_PATH_PREFIX + filterDirent);
fileInfoEntity.uri = encodedString;
fileInfoEntity.srcPath = realFilePath;
fileInfoEntity.fileName = fileName;
size_t uMode = SUPPORTS_READ | SUPPORTS_WRITE;
StatEntity statEntity;
if (GetStat(filterDirent, statEntity)) {
bool check = (statEntity.stat_.st_mode & S_IFMT) == S_IFDIR;
if (check) {
uMode |= REPRESENTS_DIR;
} else {
uMode |= REPRESENTS_FILE;
}
HILOG_DEBUG("ListFile: After filter mode = %{public}zu", uMode);
fileInfoEntity.mode = static_cast<int32_t>(uMode);
fileInfoEntity.size = static_cast<int64_t>(statEntity.stat_.st_size);
fileInfoEntity.mtime = static_cast<int64_t>(statEntity.stat_.st_mtim.tv_sec);
try {
fileInfoEntity.ctime = static_cast<int64_t>(atoll(timeSlot.c_str()) / SECOND_TO_MILLISECOND);
} catch (...) {
HILOG_ERROR("GenerateFileInfoEntity: invalid timeSlot = %{public}s", timeSlot.c_str());
return false;
}
}
return true;
}
napi_value FileTrashNExporter::ListFile(napi_env env, napi_callback_info info)
@ -407,12 +409,10 @@ napi_value FileTrashNExporter::ListFile(napi_env env, napi_callback_info info)
return nullptr;
}
vector<string> filterDirents;
vector<FileInfo> fileInfoList;
size_t slashSize = 1;
for (size_t j = 0; j < dirents.size(); j++) {
string dirent = dirents[j];
HILOG_DEBUG("ListFile: After RecursiveFunc dirent = %{public}s", dirent.c_str());
string timeSlot = GetTimeSlotFromPath(dirent);
if (timeSlot.empty()) {
continue;
@ -421,12 +421,13 @@ napi_value FileTrashNExporter::ListFile(napi_env env, napi_callback_info info)
size_t pos = dirent.find(TRASH_SUB_DIR + timeSlot + "/");
if (pos != string::npos) {
string trashSubDir = TRASH_SUB_DIR + timeSlot;
if (dirent.find("/", pos + trashSubDir.length() + slashSize) == string::npos) {
filterDirents.emplace_back(dirent);
FileInfo info;
if ((dirent.find("/", pos + trashSubDir.length() + slashSize) == string::npos) &&
GenerateFileInfoEntity(info, dirent, timeSlot)) {
fileInfoList.emplace_back(info);
}
}
}
vector<FileInfo> fileInfoList = GenerateFileInfoEntities(filterDirents);
return CreateObjectArray(env, fileInfoList);
}

1
utils/file_util.h
View File

@ -35,6 +35,7 @@ constexpr int FILTER_MATCH = 1;
constexpr int FILTER_DISMATCH = 0;
constexpr int MODE_FORCE_MOVE = 0;
constexpr uint64_t TIME_CONVERT_BASE = 1000000000;
constexpr int SECOND_TO_MILLISECOND = 1000;
struct NameListArg {
struct dirent** namelist = { nullptr };