bob/libscterm
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Add progress function which fraction directly

Browse Source
This commit is contained in:
Bob Polis
2025-05-20 18:02:34 +02:00
parent c90fcf68b5
commit 2e58983526
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/utils.cpp
View File

@ -34,6 +34,10 @@ void term::progress(int prefixlen,
double cur, double cur,
double total) const double total) const
{ {
progress(prefixlen, prefix, cur / total);
}
void term::progress(int prefixlen, const std::string& prefix, double fraction) const {
if (!_isatty) return; if (!_isatty) return;
// use unicode to make nice bar // use unicode to make nice bar
@ -41,12 +45,12 @@ void term::progress(int prefixlen,
u8"\u258F", u8"\u258E", u8"\u258D", u8"\u258C", u8"\u258F", u8"\u258E", u8"\u258D", u8"\u258C",
u8"\u258B", u8"\u258A", u8"\u2589", u8"\u2588" u8"\u258B", u8"\u258A", u8"\u2589", u8"\u2588"
}; };
if (cur > total) cur = total; if (fraction > 1) fraction = 1.0;
int perclen = 5; int perclen = 5;
int barwidth = cols() - perclen - prefixlen - 1; int barwidth = cols() - perclen - prefixlen - 1;
int maxsteps = barwidth * 8; int maxsteps = barwidth * 8;
int steps = round(cur * maxsteps / total); int steps = round(fraction * maxsteps);
int perc = round(100 * cur / total); int perc = round(100 * fraction);
int fill_len = barwidth - steps / 8; int fill_len = barwidth - steps / 8;
*_out << '\r' << std::setw(prefixlen) << prefix.substr(0, prefixlen) << ' ' << io::grayf(8); *_out << '\r' << std::setw(prefixlen) << prefix.substr(0, prefixlen) << ' ' << io::grayf(8);
for (int i = 0; i < steps / 8; ++i) { for (int i = 0; i < steps / 8; ++i) {

4
src/utils.hpp
View File

@ -25,6 +25,10 @@ namespace sc {
double cur, double cur,
double total) const; double total) const;
void progress(int prefixlen,
const std::string& prefix,
double fraction) const;
static bool has_truecolor(); static bool has_truecolor();
}; };