RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 07:47:37 +00:00
Code Issues Activity Actions

SpaceAnalyzer: Migrate to Core::Directory::for_each_entry()

Browse source
This commit is contained in:
Sam Atkins 2023-03-17 16:19:29 +00:00 • committed by Andrew Kaster
parent da8da79e62
commit a5aabb7940
1 changed files with 26 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Userland/Applications/SpaceAnalyzer/Tree.cpp
View file

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2022, the SerenityOS developers. * Copyright (c) 2022, the SerenityOS developers.
* Copyright (c) 2023, Sam Atkins <atkinssj@serenityos.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -9,7 +10,7 @@
#include <AK/HashMap.h> #include <AK/HashMap.h>
#include <AK/Queue.h> #include <AK/Queue.h>
#include <AK/QuickSort.h> #include <AK/QuickSort.h>
#include <LibCore/DirIterator.h> #include <LibCore/Directory.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -71,6 +72,12 @@ HashMap<int, int> TreeNode::populate_filesize_tree(Vector<MountInfo>& mounts, Fu
size_t files_encountered_count = 0; size_t files_encountered_count = 0;
HashMap<int, int> error_accumulator; HashMap<int, int> error_accumulator;
auto log_error = [&](Error& error) {
auto error_code = error.code();
int error_sum = error_accumulator.get(error_code).value_or(0);
error_accumulator.set(error_code, error_sum + 1);
};
StringBuilder builder = StringBuilder(); StringBuilder builder = StringBuilder();
builder.append(m_name); builder.append(m_name);
builder.append('/'); builder.append('/');
@ -90,37 +97,38 @@ HashMap<int, int> TreeNode::populate_filesize_tree(Vector<MountInfo>& mounts, Fu
continue; continue;
} }
Core::DirIterator dir_iterator(builder.to_deprecated_string(), Core::DirIterator::SkipParentAndBaseDir); auto directory_or_error = Core::Directory::create(builder.string_view(), Core::Directory::CreateDirectories::No);
if (dir_iterator.has_error()) { if (directory_or_error.is_error()) {
auto error_code = dir_iterator.error().code(); log_error(directory_or_error.error());
int error_sum = error_accumulator.get(error_code).value_or(0);
error_accumulator.set(error_code, error_sum + 1);
} else { } else {
auto directory = directory_or_error.release_value();
queue_entry.node->m_children = make<Vector<TreeNode>>(); queue_entry.node->m_children = make<Vector<TreeNode>>();
while (dir_iterator.has_next()) {
queue_entry.node->m_children->append(TreeNode(dir_iterator.next_path())); auto iteration_result = Core::Directory::for_each_entry(builder.string_view(), Core::DirIterator::SkipParentAndBaseDir, [&](auto& entry, auto&) -> ErrorOr<IterationDecision> {
} TRY(queue_entry.node->m_children->try_append(TreeNode(entry.name)));
return IterationDecision::Continue;
});
if (iteration_result.is_error())
log_error(iteration_result.error());
for (auto& child : *queue_entry.node->m_children) { for (auto& child : *queue_entry.node->m_children) {
files_encountered_count += 1; files_encountered_count += 1;
if (!(files_encountered_count % FILES_ENCOUNTERED_UPDATE_STEP_SIZE)) if (!(files_encountered_count % FILES_ENCOUNTERED_UPDATE_STEP_SIZE))
on_progress(files_encountered_count); on_progress(files_encountered_count);
DeprecatedString& name = child.m_name; builder.append(child.m_name);
int name_len = name.length(); auto st_or_error = directory.stat(child.m_name, AT_SYMLINK_NOFOLLOW);
builder.append(name); if (st_or_error.is_error()) {
struct stat st; log_error(st_or_error.error());
int stat_result = fstatat(dir_iterator.fd(), name.characters(), &st, AT_SYMLINK_NOFOLLOW);
if (stat_result < 0) {
int error_sum = error_accumulator.get(errno).value_or(0);
error_accumulator.set(errno, error_sum + 1);
} else { } else {
auto st = st_or_error.release_value();
if (S_ISDIR(st.st_mode)) { if (S_ISDIR(st.st_mode)) {
queue.enqueue(QueueEntry(builder.to_deprecated_string(), &child)); queue.enqueue(QueueEntry(builder.to_deprecated_string(), &child));
} else { } else {
child.m_area = st.st_size; child.m_area = st.st_size;
} }
} }
builder.trim(name_len); builder.trim(child.m_name.length());
} }
} }
} }