TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-18 17:00:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move progress contexts to bottom of output

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2023-09-04 18:48:34 +02:00
parent 5f3209028d
commit 54e5723f01
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/dwarfs/console_writer.cpp
View File

@ -240,20 +240,6 @@ void console_writer::update(progress& p, bool last) {
<< newline; << newline;
} }
if (fancy) {
auto w = width.get();
if (w >= 60) {
ctxs = p.get_active_contexts();
}
for (auto const& c : ctxs) {
output_context_line(oss, *c, w, pg_mode_ == UNICODE,
log_is_colored());
oss << newline;
}
}
oss << p.dirs_scanned << " dirs, " << p.symlinks_scanned << "/" oss << p.dirs_scanned << " dirs, " << p.symlinks_scanned << "/"
<< p.hardlinks << " soft/hard links, " << p.files_scanned << "/" << p.hardlinks << " soft/hard links, " << p.files_scanned << "/"
<< p.files_found << " files, " << p.specials_found << " other" << p.files_found << " files, " << p.specials_found << " other"
@ -340,12 +326,23 @@ void console_writer::update(progress& p, bool last) {
log_stream() << oss.str(); log_stream() << oss.str();
} }
} else { } else {
oss << progress_bar(width.get() - 6, frac_, pg_mode_ == UNICODE) auto w = width.get();
oss << progress_bar(w - 6, frac_, pg_mode_ == UNICODE)
<< fmt::format("{:3.0f}% ", 100 * frac_) << "-\\|/"[counter_ % 4] << fmt::format("{:3.0f}% ", 100 * frac_) << "-\\|/"[counter_ % 4]
<< '\n'; << '\n';
++counter_; ++counter_;
if (w >= 60) {
ctxs = p.get_active_contexts();
}
for (auto const& c : ctxs) {
output_context_line(oss, *c, w, pg_mode_ == UNICODE, log_is_colored());
oss << newline;
}
std::lock_guard lock(log_mutex()); std::lock_guard lock(log_mutex());
rewind(8 + ctxs.size()); rewind(8 + ctxs.size());