openharmony/account_os_account
1
0
Fork 0
mirror of https://gitee.com/openharmony/account_os_account synced 2024-11-26 19:50:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!2250 增加待返回值的IsExistFile方法

Browse Source 
Merge pull request !2250 from xuqian0131/addMethod
This commit is contained in:
openharmony_ci 2024-11-16 14:42:14 +00:00 committed by Gitee
commit cff7f9c538
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frameworks/common/file_operator/include/account_file_operator.h
View File

@ -41,6 +41,7 @@ public:
bool IsJsonFormat(const std::string &path);
bool IsJsonFileReady(const std::string &path);
bool IsExistDir(const std::string &path);
ErrCode CheckFileExistence(const std::string &path);
bool GetValidDeleteFileOperationFlag(const std::string &fileName);
void SetValidDeleteFileOperationFlag(const std::string &fileName, bool flag);
bool GetValidModifyFileOperationFlag(const std::string &fileName);

29
frameworks/common/file_operator/src/account_file_operator.cpp
View File

@ -329,6 +329,35 @@ bool AccountFileOperator::IsExistFile(const std::string &path)
return false;
}
ErrCode AccountFileOperator::CheckFileExistence(const std::string &path)
{
if (path.empty()) {
ACCOUNT_LOGE("Path is empty.");
return ERR_ACCOUNT_COMMON_INVALID_PARAMETER;
}
std::shared_lock<std::shared_timed_mutex> lock(fileLock_);
uint32_t retryCount = 0;
while (retryCount < RETRY_TIMES) {
struct stat buf = {};
if (stat(path.c_str(), &buf) == 0) {
if (S_ISREG(buf.st_mode)) {
return ERR_OK;
}
ACCOUNT_LOGE("S_ISREG failed, errno=%{public}d.", errno);
return ERR_ACCOUNT_COMMON_FILE_OTHER_ERROR;
}
if (errno != ENOENT) {
ACCOUNT_LOGE("Stat %{public}s failed, errno=%{public}d. Retrying...", path.c_str(), errno);
std::this_thread::sleep_for(std::chrono::milliseconds(RETRY_SLEEP_MS));
retryCount++;
} else {
ACCOUNT_LOGE("Stat %{public}s failed, errno=%{public}d.", path.c_str(), errno);
return ERR_ACCOUNT_COMMON_FILE_NOT_EXIST;
}
}
return ERR_ACCOUNT_COMMON_FILE_OTHER_ERROR;
}
bool AccountFileOperator::IsJsonFormat(const std::string &path)
{
std::string content;

2
interfaces/innerkits/common/include/account_error_no.h
View File

@ -64,6 +64,8 @@ enum {
ERR_ACCOUNT_COMMON_FILE_OPEN_FAILED,
ERR_ACCOUNT_COMMON_FILE_WRITE_FAILED,
ERR_ACCOUNT_COMMON_FILE_READ_FAILED,
ERR_ACCOUNT_COMMON_FILE_NOT_EXIST,
ERR_ACCOUNT_COMMON_FILE_OTHER_ERROR,
ERR_ACCOUNT_COMMON_ACCOUNT_NOT_EXIST_ERROR,
ERR_ACCOUNT_COMMON_OPERATION_TIMEOUT,
ERR_ACCOUNT_COMMON_NOT_AUTHENTICATED,

12
services/accountmgr/src/osaccount/os_account_control_file_manager.cpp
View File

@ -525,17 +525,15 @@ ErrCode OsAccountControlFileManager::GetOsAccountInfoById(const int id, OsAccoun
{
std::string path = Constants::USER_INFO_BASE + Constants::PATH_SEPARATOR + std::to_string(id) +
Constants::PATH_SEPARATOR + Constants::USER_INFO_FILE_NAME;
ErrCode err = ERR_ACCOUNT_COMMON_FILE_READ_FAILED;
if (!accountFileOperator_->IsExistFile(path)) {
if (errno == ENOENT) {
err = ERR_ACCOUNT_COMMON_ACCOUNT_NOT_EXIST_ERROR;
}
ACCOUNT_LOGE("file %{public}s does not exist err", path.c_str());
ErrCode err = accountFileOperator_->CheckFileExistence(path);
if (err != ERR_OK) {
ACCOUNT_LOGE("file %{public}s does not exist err, errcode=%{public}d", path.c_str(), err);
if (GetOsAccountFromDatabase("", id, osAccountInfo) == ERR_OK) {
InsertOsAccount(osAccountInfo);
return ERR_OK;
}
return err;
return err == ERR_ACCOUNT_COMMON_FILE_NOT_EXIST ?
ERR_ACCOUNT_COMMON_ACCOUNT_NOT_EXIST_ERROR : ERR_ACCOUNT_COMMON_FILE_READ_FAILED;
}
std::string accountInfoStr;
if (accountFileOperator_->GetFileContentByPath(path, accountInfoStr) != ERR_OK) {