Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

src,fs: refactor duplicated code in fs.readdir #43204

Merged
merged 4 commits into from
Jul 29, 2022
Merged

src,fs: refactor duplicated code in fs.readdir #43204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
452f015
src,fs: refactor duplicated code in fs.readdir
daeyeon May 25, 2022
dca7ebd
fixup: rename function name
daeyeon May 25, 2022
9f7cd76
check: verify linting cc
daeyeon May 25, 2022
9506649
fixup: revert lint check
daeyeon May 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 25 additions & 57 deletions src/node_file.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,43 +772,6 @@ void AfterScanDir(uv_fs_t* req) {
FSReqBase* req_wrap = FSReqBase::from_req(req);
FSReqAfterScope after(req_wrap, req);

if (!after.Proceed()) {
return;
}
Environment* env = req_wrap->env();
Local<Value> error;
int r;
std::vector<Local<Value>> name_v;

for (;;) {
uv_dirent_t ent;

r = uv_fs_scandir_next(req, &ent);
if (r == UV_EOF)
break;
if (r != 0) {
return req_wrap->Reject(UVException(
env->isolate(), r, nullptr, req_wrap->syscall(), req->path));
}

MaybeLocal<Value> filename =
StringBytes::Encode(env->isolate(),
ent.name,
req_wrap->encoding(),
&error);
if (filename.IsEmpty())
return req_wrap->Reject(error);

name_v.push_back(filename.ToLocalChecked());
}

req_wrap->Resolve(Array::New(env->isolate(), name_v.data(), name_v.size()));
}

void AfterScanDirWithTypes(uv_fs_t* req) {
FSReqBase* req_wrap = FSReqBase::from_req(req);
FSReqAfterScope after(req_wrap, req);

if (!after.Proceed()) {
return;
}
Expand All @@ -821,6 +784,8 @@ void AfterScanDirWithTypes(uv_fs_t* req) {
std::vector<Local<Value>> name_v;
std::vector<Local<Value>> type_v;

const bool with_file_types = req_wrap->with_file_types();

for (;;) {
uv_dirent_t ent;

Expand All @@ -832,23 +797,23 @@ void AfterScanDirWithTypes(uv_fs_t* req) {
UVException(isolate, r, nullptr, req_wrap->syscall(), req->path));
}

MaybeLocal<Value> filename =
StringBytes::Encode(isolate,
ent.name,
req_wrap->encoding(),
&error);
if (filename.IsEmpty())
Local<Value> filename;
if (!StringBytes::Encode(isolate, ent.name, req_wrap->encoding(), &error)
.ToLocal(&filename)) {
return req_wrap->Reject(error);
}
name_v.push_back(filename);

name_v.push_back(filename.ToLocalChecked());
type_v.emplace_back(Integer::New(isolate, ent.type));
if (with_file_types) type_v.emplace_back(Integer::New(isolate, ent.type));
daeyeon marked this conversation as resolved.
Show resolved Hide resolved
}

Local<Value> result[] = {
Array::New(isolate, name_v.data(), name_v.size()),
Array::New(isolate, type_v.data(), type_v.size())
};
req_wrap->Resolve(Array::New(isolate, result, arraysize(result)));
if (with_file_types) {
Local<Value> result[] = {Array::New(isolate, name_v.data(), name_v.size()),
Array::New(isolate, type_v.data(), type_v.size())};
req_wrap->Resolve(Array::New(isolate, result, arraysize(result)));
} else {
req_wrap->Resolve(Array::New(isolate, name_v.data(), name_v.size()));
}
}

void Access(const FunctionCallbackInfo<Value>& args) {
Expand Down Expand Up @@ -1645,13 +1610,16 @@ static void ReadDir(const FunctionCallbackInfo<Value>& args) {

FSReqBase* req_wrap_async = GetReqWrap(args, 3);
if (req_wrap_async != nullptr) { // readdir(path, encoding, withTypes, req)
if (with_types) {
AsyncCall(env, req_wrap_async, args, "scandir", encoding,
AfterScanDirWithTypes, uv_fs_scandir, *path, 0 /*flags*/);
} else {
AsyncCall(env, req_wrap_async, args, "scandir", encoding,
AfterScanDir, uv_fs_scandir, *path, 0 /*flags*/);
}
req_wrap_async->set_with_file_types(with_types);
AsyncCall(env,
req_wrap_async,
args,
"scandir",
encoding,
AfterScanDir,
uv_fs_scandir,
*path,
0 /*flags*/);
} else { // readdir(path, encoding, withTypes, undefined, ctx)
CHECK_EQ(argc, 5);
FSReqWrapSync req_wrap_sync;
Expand Down
3 changes: 3 additions & 0 deletions src/node_file.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,10 @@ class FSReqBase : public ReqWrap<uv_fs_t> {
enum encoding encoding() const { return encoding_; }
bool use_bigint() const { return use_bigint_; }
bool is_plain_open() const { return is_plain_open_; }
bool with_file_types() const { return with_file_types_; }

void set_is_plain_open(bool value) { is_plain_open_ = value; }
void set_with_file_types(bool value) { with_file_types_ = value; }

FSContinuationData* continuation_data() const {
return continuation_data_.get();
Expand All @@ -116,6 +118,7 @@ class FSReqBase : public ReqWrap<uv_fs_t> {
bool has_data_ = false;
bool use_bigint_ = false;
bool is_plain_open_ = false;
bool with_file_types_ = false;
const char* syscall_ = nullptr;

BaseObjectPtr<BindingData> binding_data_;
Expand Down