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

Jump to bottom

Account for size of token replacements when sizing the bar #190

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Account for size of token replacements when sizing the bar #190

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b1b48a
Account for size of token replacements when sizing the bar
FremyCompany Mar 29, 2019
7ed3b76
Allow replacements to borrow length from each other
FremyCompany Mar 29, 2019
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
17 changes: 16 additions & 1 deletion lib/node-progress.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ function ProgressBar(fmt, options) {
this.lastRender = -Infinity;
this.callback = options.callback || function () {};
this.tokens = {};
this.spaceRequiredForTokens = 0;
this.lastDraw = '';
}

Expand Down Expand Up @@ -147,8 +148,22 @@ ProgressBar.prototype.render = function (tokens, force) {
.replace(':percent', percent.toFixed(0) + '%')
.replace(':rate', Math.round(rate));

/* account for the replacement of the extra tokens */
var spaceRequiredForTokens = 0;
if (this.tokens) for (var key in this.tokens) {
if(str.indexOf(":"+key) == -1) continue;
spaceRequiredForTokens += this.tokens[key].length - (key.length+1)
};

/* ensure spaceRequiredForTokens is at least 0, and is consistent accross ticks */
if(spaceRequiredForTokens > this.spaceRequiredForTokens) {
this.spaceRequiredForTokens = spaceRequiredForTokens;
} else {
spaceRequiredForTokens = this.spaceRequiredForTokens;
}

/* compute the available space (non-zero) for the bar */
var availableSpace = Math.max(0, this.stream.columns - str.replace(':bar', '').length);
var availableSpace = Math.max(0, this.stream.columns - spaceRequiredForTokens - str.replace(':bar', '').length);
if(availableSpace && process.platform === 'win32'){
availableSpace = availableSpace - 1;
}
Expand Down