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

feat: fancy spinner, plus some refactoring

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2024-01-20 21:32:43 +01:00
parent cb737a5a58
commit 4c52178626
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/dwarfs/console_writer.cpp
View File

@ -21,6 +21,7 @@
#include <cstring>
#include <sstream>
#include <string_view>
#include <fmt/format.h>
@ -38,11 +39,20 @@ namespace dwarfs {
namespace {
constexpr std::array<char const*, 8> asc_bar{
constexpr std::array<std::string_view, 8> asc_bar{
{"=", "=", "=", "=", "=", "=", "=", "="}};
constexpr std::array<char const*, 8> uni_bar{
constexpr std::array<std::string_view, 8> uni_bar{
{"▏", "▎", "▍", "▌", "▋", "▊", "▉", "█"}};
constexpr std::array<std::string_view, 4> asc_spinner_def{
{"-", "\\", "|", "/"}};
constexpr std::array<std::string_view, 8> uni_spinner_def{
{"🌑", "🌒", "🌓", "🌔", "🌕", "🌖", "🌗", "🌘"}};
constexpr std::span<std::string_view const> asc_spinner{asc_spinner_def};
constexpr std::span<std::string_view const> uni_spinner{uni_spinner_def};
std::string progress_bar(size_t width, double frac, bool unicode) {
size_t barlen = 8 * width * frac;
size_t w = barlen / 8;
@ -318,10 +328,11 @@ void console_writer::update(progress& p, bool last) {
}
} else {
auto w = width.get();
auto spinner{pg_mode_ == UNICODE ? uni_spinner : asc_spinner};
oss << progress_bar(w - 6, frac_, pg_mode_ == UNICODE)
<< fmt::format("{:3.0f}% ", 100 * frac_) << "-\\|/"[counter_ % 4]
<< '\n';
oss << progress_bar(w - 8, frac_, pg_mode_ == UNICODE)
<< fmt::format("{:3.0f}% ", 100 * frac_)
<< spinner[counter_ % spinner.size()] << '\n';
++counter_;