feat: added support for barCompleteChar being an array of string plus others associated#144

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

Open
UnKnoWn-Consortium wants to merge 1 commit into
base:master
Choose a base branch
from
Open

feat: added support for barCompleteChar being an array of string plus others associated #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -250,9 +250,9 @@ The following options can be changed
- `stopOnComplete` (type:boolean) - automatically call `stop()` when the value reaches the total (default: false)
- `clearOnComplete` (type:boolean) - clear the progress bar on complete / `stop()` call (default: false)
- `barsize` (type:int) - the length of the progress bar in chars (default: 40)
- `align` (type:char) - position of the progress bar - 'left' (default), 'right' or 'center'
- `barCompleteChar` (type:char) - character to use as "complete" indicator in the bar (default: "=")
- `barIncompleteChar` (type:char) - character to use as "incomplete" indicator in the bar (default: "-")
- `align` (type:string) - position of the progress bar - 'left' (default), 'right' or 'center'
- `barCompleteChar` (type:string|string[]) - character to use as "complete" indicator in the bar (default: "=")
- `barIncompleteChar` (type:string) - character to use as "incomplete" indicator in the bar (default: "-")
- `hideCursor` (type:boolean) - hide the cursor during progress operation; restored on complete (default: false) - pass `null` to keep terminal settings
- `linewrap` (type:boolean) - disable line wrapping (default: false) - pass `null` to keep terminal settings; pass `true` to add linebreaks automatically (not recommended)
- `gracefulExit` (type:boolean) - stop the bars in case of `SIGINT` or `SIGTERM` - this restores most cursor settings before exiting (default: `false` - subjected to change)
Expand DownExpand Up@@ -450,7 +450,7 @@ The following presets are included by default
* **shades-classic** - Unicode background shades are used for the bar
* **shades-grey** - Unicode background shades with grey bar
* **rect** - Unicode Rectangles

* **braille-patterns** - Unicode Braille Pattern Dots

Compatibility
---------------------------------------------
Expand Down
30 changes: 14 additions & 16 deletions cli-progress.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
const _SingleBar = require('./lib/single-bar');
const _MultiBar = require('./lib/multi-bar');
const _Presets = require('./presets/index');
const _Formatter = require('./lib/formatter');
const _defaultFormatValue = require('./lib/format-value');
const _defaultFormatBar = require('./lib/format-bar');
const _defaultFormatTime = require('./lib/format-time');
const SingleBar = require('./lib/single-bar.js');
const MultiBar = require('./lib/multi-bar.js');
const Presets = require('./presets/index.js');
const Formatter = require('./lib/formatter.js');
const ValueFormat = require('./lib/format-value.js');
const BarFormat = require('./lib/format-bar.js');
const TimeFormat = require('./lib/format-time.js');

// sub-module access
module.exports = {
Bar: _SingleBar,
SingleBar: _SingleBar,
MultiBar: _MultiBar,
Presets: _Presets,
Bar: SingleBar,
SingleBar,
MultiBar,
Presets,
Format: {
Formatter: _Formatter,
BarFormat: _defaultFormatBar,
ValueFormat: _defaultFormatValue,
TimeFormat: _defaultFormatTime
Formatter,
BarFormat, ValueFormat, TimeFormat,
}
};
};
28 changes: 20 additions & 8 deletions lib/format-bar.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
// format bar
module.exports = function formatBar(progress, options){
// calculate barsize
const completeSize = Math.round(progress*options.barsize);
const incompleteSize = options.barsize-completeSize;

// generate bar string by stripping the pre-rendered strings
return options.barCompleteString.substr(0, completeSize) +
if (Array.isArray(options.barCompleteChar) && options.barCompleteChar.length > 1) {
const completeSize = Math.floor(progress * options.barsize);
const incompleteSize = Math.floor(options.barsize * (1 - progress));
const remainder = progress * options.barsize - completeSize;
const remainderChar = remainder > 0 ?
options.barCompleteChar[Math.round(remainder * options.barCompleteChar.length) - 1] :
"";
return options.barCompleteString.slice(0, completeSize) +
remainderChar +
options.barGlue +
options.barIncompleteString.substr(0, incompleteSize);
}
options.barIncompleteString.slice(0, incompleteSize);
}

// calculate barsize
const completeSize = Math.round(progress * options.barsize);
const incompleteSize = options.barsize - completeSize;
// generate bar string by stripping the pre-rendered strings
return options.barCompleteString.slice(0, completeSize) +
options.barGlue +
options.barIncompleteString.slice(0, incompleteSize);
}
28 changes: 14 additions & 14 deletions lib/generic-bar.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
const _ETA = require('./eta');
const _Terminal = require('./terminal');
const _formatter = require('./formatter');
const _options = require('./options');
const _EventEmitter = require('events');
const EventEmitter = require('node:events');

const ETA = require('./eta.js');
const Terminal = require('./terminal.js');
const formatter = require('./formatter.js');

// Progress-Bar constructor
module.exports = class GenericBar extends _EventEmitter{
module.exports = class GenericBar extends EventEmitter {

constructor(options){
constructor(options){
super();

// store options and assign derived ones (instance specific)
this.options = _options.assignDerivedOptions(options);
this.options = options;

// store terminal instance
this.terminal = (this.options.terminal) ? this.options.terminal : new _Terminal(this.options.stream);
this.terminal = (this.options.terminal) ? this.options.terminal : new Terminal(this.options.stream);

// the current bar value
this.value = 0;
Expand All@@ -38,7 +38,7 @@ module.exports = class GenericBar extends _EventEmitter{
this.lastRedraw = Date.now();

// default eta calculator (will be re-create on start)
this.eta = new _ETA(this.options.etaBufferLength, 0, 0);
this.eta = new ETA(this.options.etaBufferLength, 0, 0);

// payload data
this.payload = {};
Expand All@@ -47,7 +47,7 @@ module.exports = class GenericBar extends _EventEmitter{
this.isActive = false;

// use default formatter or custom one ?
this.formatter = (typeof this.options.format === 'function') ? this.options.format : _formatter;
this.formatter = (typeof this.options.format === 'function') ? this.options.format : formatter;
}

// internal render function
Expand DownExpand Up@@ -123,7 +123,7 @@ module.exports = class GenericBar extends _EventEmitter{
this.lastDrawnString = '';

// initialize eta buffer
this.eta = new _ETA(this.options.etaBufferLength, this.startTime, this.value);
this.eta = new ETA(this.options.etaBufferLength, this.startTime, this.value);

// set flag
this.isActive = true;
Expand All@@ -136,7 +136,7 @@ module.exports = class GenericBar extends _EventEmitter{
stop(){
// set flag
this.isActive = false;

// store stop timestamp to get total duration
this.stopTime = Date.now();

Expand DownExpand Up@@ -207,7 +207,7 @@ module.exports = class GenericBar extends _EventEmitter{
// handle the use case when `step` is omitted but payload is passed
if (typeof arg0 === 'object') {
this.update(this.value + 1, arg0);

// increment([step=1], [payload={}])
}else{
this.update(this.value + arg0, arg1);
Expand Down
43 changes: 22 additions & 21 deletions lib/multi-bar.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
const _Terminal = require('./terminal');
const _BarElement = require('./generic-bar');
const _options = require('./options');
const _EventEmitter = require('events');
const EventEmitter = require('node:events');

const Terminal = require('./terminal.js');
const BarElement = require('./generic-bar.js');
const { parse, } = require('./options.js');

// Progress-Bar constructor
module.exports = class MultiBar extends _EventEmitter{
module.exports = class MultiBar extends EventEmitter {

constructor(options, preset){
constructor(options, preset){
super();

// list of bars
this.bars = [];

// parse+store options
this.options = _options.parse(options, preset);
this.options = parse(options, preset);

// disable synchronous updates
this.options.synchronousUpdate = false;

// store terminal instance
this.terminal = (this.options.terminal) ? this.options.terminal : new _Terminal(this.options.stream);
this.terminal = (this.options.terminal) ? this.options.terminal : new Terminal(this.options.stream);

// the update timer
this.timer = null;
Expand All@@ -38,14 +39,14 @@ module.exports = class MultiBar extends _EventEmitter{
}

// add a new bar to the stack
create(total, startValue, payload, barOptions={}){
create(total, startValue, payload, barOptions={}){
// create new bar element and merge global options + overrides
// use the same global terminal instance for all instances
const bar = new _BarElement(Object.assign(
{},
const bar = new BarElement(Object.assign(
{},

// global options
this.options,
this.options,

// terminal instance
{
Expand All@@ -70,19 +71,19 @@ module.exports = class MultiBar extends _EventEmitter{
process.once('SIGINT', this.sigintCallback);
process.once('SIGTERM', this.sigintCallback);
}

// multiprogress already active ?
if (!this.isActive){
if (!this.isActive){
// hide the cursor ?
if (this.options.hideCursor === true){
if (this.options.hideCursor === true){
this.terminal.cursor(false);
}

// disable line wrapping ?
if (this.options.linewrap === false){
if (this.options.linewrap === false){
this.terminal.lineWrapping(false);
}

// initialize update timer
this.timer = setTimeout(this.update.bind(this), this.schedulingRate);
}
Expand All@@ -101,12 +102,12 @@ module.exports = class MultiBar extends _EventEmitter{
}

// remove a bar from the stack
remove(bar){
remove(bar){
// find element
const index = this.bars.indexOf(bar);

// element found ?
if (index < 0){
if (index < 0){
return false;
}

Expand All@@ -133,7 +134,7 @@ module.exports = class MultiBar extends _EventEmitter{

// trigger event
this.emit('update-pre');

// reset cursor
this.terminal.cursorRelativeReset();

Expand DownExpand Up@@ -218,7 +219,7 @@ module.exports = class MultiBar extends _EventEmitter{
if (this.options.clearOnComplete){
// clear all bars
this.terminal.clearBottom();

// or show final progress ?
}else{
// update each bar
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
feat: added support for barCompleteChar being an array of string plus others associated#144

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

 Open

UnKnoWn-Consortium
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


feat: added support for barCompleteChar being an array of string plus others associated
#144
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


8 changes: 4 additions & 4 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,9 +250,9 @@ The following options can be changed
- `stopOnComplete` (type:boolean) - automatically call `stop()` when the value reaches the total (default: false)
- `clearOnComplete` (type:boolean) - clear the progress bar on complete / `stop()` call (default: false)
- `barsize` (type:int) - the length of the progress bar in chars (default: 40)
- `align` (type:char) - position of the progress bar - 'left' (default), 'right' or 'center'
- `barCompleteChar` (type:char) - character to use as "complete" indicator in the bar (default: "=")
- `barIncompleteChar` (type:char) - character to use as "incomplete" indicator in the bar (default: "-")
- `align` (type:string) - position of the progress bar - 'left' (default), 'right' or 'center'
- `barCompleteChar` (type:string|string[]) - character to use as "complete" indicator in the bar (default: "=")
- `barIncompleteChar` (type:string) - character to use as "incomplete" indicator in the bar (default: "-")
- `hideCursor` (type:boolean) - hide the cursor during progress operation; restored on complete (default: false) - pass `null` to keep terminal settings
- `linewrap` (type:boolean) - disable line wrapping (default: false) - pass `null` to keep terminal settings; pass `true` to add linebreaks automatically (not recommended)
- `gracefulExit` (type:boolean) - stop the bars in case of `SIGINT` or `SIGTERM` - this restores most cursor settings before exiting (default: `false` - subjected to change)
Expand DownExpand Up@@ -450,7 +450,7 @@ The following presets are included by default
* **shades-classic** - Unicode background shades are used for the bar
* **shades-grey** - Unicode background shades with grey bar
* **rect** - Unicode Rectangles

* **braille-patterns** - Unicode Braille Pattern Dots

Compatibility
---------------------------------------------
Expand Down

30 changes: 14 additions & 16 deletions
cli-progress.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
const _SingleBar = require('./lib/single-bar');
const _MultiBar = require('./lib/multi-bar');
const _Presets = require('./presets/index');
const _Formatter = require('./lib/formatter');
const _defaultFormatValue = require('./lib/format-value');
const _defaultFormatBar = require('./lib/format-bar');
const _defaultFormatTime = require('./lib/format-time');
const SingleBar = require('./lib/single-bar.js');
const MultiBar = require('./lib/multi-bar.js');
const Presets = require('./presets/index.js');
const Formatter = require('./lib/formatter.js');
const ValueFormat = require('./lib/format-value.js');
const BarFormat = require('./lib/format-bar.js');
const TimeFormat = require('./lib/format-time.js');

// sub-module access
module.exports = {
 Bar: _SingleBar,
 SingleBar: _SingleBar,
 MultiBar: _MultiBar,
 Presets: _Presets,
 Bar: SingleBar,
 SingleBar,
 MultiBar,
 Presets,
 Format: {
 Formatter: _Formatter,
 BarFormat: _defaultFormatBar,
 ValueFormat: _defaultFormatValue,
 TimeFormat: _defaultFormatTime
 Formatter,
 BarFormat, ValueFormat, TimeFormat,
 }
};
};

28 changes: 20 additions & 8 deletions
lib/format-bar.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
// format bar
module.exports = function formatBar(progress, options){
 // calculate barsize
 const completeSize = Math.round(progress*options.barsize);
 const incompleteSize = options.barsize-completeSize;

 // generate bar string by stripping the pre-rendered strings
 return options.barCompleteString.substr(0, completeSize) +
 if (Array.isArray(options.barCompleteChar) && options.barCompleteChar.length > 1) {
 const completeSize = Math.floor(progress * options.barsize);
 const incompleteSize = Math.floor(options.barsize * (1 - progress));
 const remainder = progress * options.barsize - completeSize;
 const remainderChar = remainder > 0 ?
 options.barCompleteChar[Math.round(remainder * options.barCompleteChar.length) - 1] :
 "";
 return options.barCompleteString.slice(0, completeSize) +
 remainderChar +
 options.barGlue +
 options.barIncompleteString.substr(0, incompleteSize);
}
 options.barIncompleteString.slice(0, incompleteSize);
 }

 // calculate barsize
 const completeSize = Math.round(progress * options.barsize);
 const incompleteSize = options.barsize - completeSize;
 // generate bar string by stripping the pre-rendered strings
 return options.barCompleteString.slice(0, completeSize) +
 options.barGlue +
 options.barIncompleteString.slice(0, incompleteSize);
}

28 changes: 14 additions & 14 deletions
lib/generic-bar.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
const _ETA = require('./eta');
const _Terminal = require('./terminal');
const _formatter = require('./formatter');
const _options = require('./options');
const _EventEmitter = require('events');
const EventEmitter = require('node:events');

const ETA = require('./eta.js');
const Terminal = require('./terminal.js');
const formatter = require('./formatter.js');

// Progress-Bar constructor
module.exports = class GenericBar extends _EventEmitter{
module.exports = class GenericBar extends EventEmitter {

 constructor(options){
 constructor(options){
 super();

 // store options and assign derived ones (instance specific)
 this.options = _options.assignDerivedOptions(options);
 this.options = options;

 // store terminal instance
 this.terminal = (this.options.terminal) ? this.options.terminal : new _Terminal(this.options.stream);
 this.terminal = (this.options.terminal) ? this.options.terminal : new Terminal(this.options.stream);

 // the current bar value
 this.value = 0;
Expand All@@ -38,7 +38,7 @@ module.exports = class GenericBar extends _EventEmitter{
 this.lastRedraw = Date.now();

 // default eta calculator (will be re-create on start)
 this.eta = new _ETA(this.options.etaBufferLength, 0, 0);
 this.eta = new ETA(this.options.etaBufferLength, 0, 0);

 // payload data
 this.payload = {};
Expand All@@ -47,7 +47,7 @@ module.exports = class GenericBar extends _EventEmitter{
 this.isActive = false;

 // use default formatter or custom one ?
 this.formatter = (typeof this.options.format === 'function') ? this.options.format : _formatter;
 this.formatter = (typeof this.options.format === 'function') ? this.options.format : formatter;
 }

 // internal render function
Expand DownExpand Up@@ -123,7 +123,7 @@ module.exports = class GenericBar extends _EventEmitter{
 this.lastDrawnString = '';

 // initialize eta buffer
 this.eta = new _ETA(this.options.etaBufferLength, this.startTime, this.value);
 this.eta = new ETA(this.options.etaBufferLength, this.startTime, this.value);

 // set flag
 this.isActive = true;
Expand All@@ -136,7 +136,7 @@ module.exports = class GenericBar extends _EventEmitter{
 stop(){
 // set flag
 this.isActive = false;

 // store stop timestamp to get total duration
 this.stopTime = Date.now();

Expand DownExpand Up@@ -207,7 +207,7 @@ module.exports = class GenericBar extends _EventEmitter{
 // handle the use case when `step` is omitted but payload is passed
 if (typeof arg0 === 'object') {
 this.update(this.value + 1, arg0);

 // increment([step=1], [payload={}])
 }else{
 this.update(this.value + arg0, arg1);
Expand Down

43 changes: 22 additions & 21 deletions
lib/multi-bar.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
const _Terminal = require('./terminal');
const _BarElement = require('./generic-bar');
const _options = require('./options');
const _EventEmitter = require('events');
const EventEmitter = require('node:events');

const Terminal = require('./terminal.js');
const BarElement = require('./generic-bar.js');
const { parse, } = require('./options.js');

// Progress-Bar constructor
module.exports = class MultiBar extends _EventEmitter{
module.exports = class MultiBar extends EventEmitter {

 constructor(options, preset){
 constructor(options, preset){
 super();

 // list of bars
 this.bars = [];

 // parse+store options
 this.options = _options.parse(options, preset);
 this.options = parse(options, preset);

 // disable synchronous updates
 this.options.synchronousUpdate = false;

 // store terminal instance
 this.terminal = (this.options.terminal) ? this.options.terminal : new _Terminal(this.options.stream);
 this.terminal = (this.options.terminal) ? this.options.terminal : new Terminal(this.options.stream);

 // the update timer
 this.timer = null;
Expand All@@ -38,14 +39,14 @@ module.exports = class MultiBar extends _EventEmitter{
 }

 // add a new bar to the stack
 create(total, startValue, payload, barOptions={}){
 create(total, startValue, payload, barOptions={}){
 // create new bar element and merge global options + overrides
 // use the same global terminal instance for all instances
 const bar = new _BarElement(Object.assign(
 {},
 const bar = new BarElement(Object.assign(
 {},

 // global options
 this.options,
 this.options,

 // terminal instance
 {
Expand All@@ -70,19 +71,19 @@ module.exports = class MultiBar extends _EventEmitter{
 process.once('SIGINT', this.sigintCallback);
 process.once('SIGTERM', this.sigintCallback);
 }

 // multiprogress already active ?
 if (!this.isActive){
 if (!this.isActive){
 // hide the cursor ?
 if (this.options.hideCursor === true){
 if (this.options.hideCursor === true){
 this.terminal.cursor(false);
 }

 // disable line wrapping ?
 if (this.options.linewrap === false){
 if (this.options.linewrap === false){
 this.terminal.lineWrapping(false);
 }

 // initialize update timer
 this.timer = setTimeout(this.update.bind(this), this.schedulingRate);
 }
Expand All@@ -101,12 +102,12 @@ module.exports = class MultiBar extends _EventEmitter{
 }

 // remove a bar from the stack
 remove(bar){
 remove(bar){
 // find element
 const index = this.bars.indexOf(bar);

 // element found ?
 if (index < 0){
 if (index < 0){
 return false;
 }

Expand All@@ -133,7 +134,7 @@ module.exports = class MultiBar extends _EventEmitter{

 // trigger event
 this.emit('update-pre');

 // reset cursor
 this.terminal.cursorRelativeReset();

Expand DownExpand Up@@ -218,7 +219,7 @@ module.exports = class MultiBar extends _EventEmitter{
 if (this.options.clearOnComplete){
 // clear all bars
 this.terminal.clearBottom();

 // or show final progress ?
 }else{
 // update each bar
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: added support for barCompleteChar being an array of string plus others associated#144

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

 Open

UnKnoWn-Consortium
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


feat: added support for barCompleteChar being an array of string plus others associated
#144
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


8 changes: 4 additions & 4 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,9 +250,9 @@ The following options can be changed
- `stopOnComplete` (type:boolean) - automatically call `stop()` when the value reaches the total (default: false)
- `clearOnComplete` (type:boolean) - clear the progress bar on complete / `stop()` call (default: false)
- `barsize` (type:int) - the length of the progress bar in chars (default: 40)
- `align` (type:char) - position of the progress bar - 'left' (default), 'right' or 'center'
- `barCompleteChar` (type:char) - character to use as "complete" indicator in the bar (default: "=")
- `barIncompleteChar` (type:char) - character to use as "incomplete" indicator in the bar (default: "-")
- `align` (type:string) - position of the progress bar - 'left' (default), 'right' or 'center'
- `barCompleteChar` (type:string|string[]) - character to use as "complete" indicator in the bar (default: "=")
- `barIncompleteChar` (type:string) - character to use as "incomplete" indicator in the bar (default: "-")
- `hideCursor` (type:boolean) - hide the cursor during progress operation; restored on complete (default: false) - pass `null` to keep terminal settings
- `linewrap` (type:boolean) - disable line wrapping (default: false) - pass `null` to keep terminal settings; pass `true` to add linebreaks automatically (not recommended)
- `gracefulExit` (type:boolean) - stop the bars in case of `SIGINT` or `SIGTERM` - this restores most cursor settings before exiting (default: `false` - subjected to change)
Expand DownExpand Up@@ -450,7 +450,7 @@ The following presets are included by default
* **shades-classic** - Unicode background shades are used for the bar
* **shades-grey** - Unicode background shades with grey bar
* **rect** - Unicode Rectangles

* **braille-patterns** - Unicode Braille Pattern Dots

Compatibility
---------------------------------------------
Expand Down

30 changes: 14 additions & 16 deletions
cli-progress.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
const _SingleBar = require('./lib/single-bar');
const _MultiBar = require('./lib/multi-bar');
const _Presets = require('./presets/index');
const _Formatter = require('./lib/formatter');
const _defaultFormatValue = require('./lib/format-value');
const _defaultFormatBar = require('./lib/format-bar');
const _defaultFormatTime = require('./lib/format-time');
const SingleBar = require('./lib/single-bar.js');
const MultiBar = require('./lib/multi-bar.js');
const Presets = require('./presets/index.js');
const Formatter = require('./lib/formatter.js');
const ValueFormat = require('./lib/format-value.js');
const BarFormat = require('./lib/format-bar.js');
const TimeFormat = require('./lib/format-time.js');

// sub-module access
module.exports = {
 Bar: _SingleBar,
 SingleBar: _SingleBar,
 MultiBar: _MultiBar,
 Presets: _Presets,
 Bar: SingleBar,
 SingleBar,
 MultiBar,
 Presets,
 Format: {
 Formatter: _Formatter,
 BarFormat: _defaultFormatBar,
 ValueFormat: _defaultFormatValue,
 TimeFormat: _defaultFormatTime
 Formatter,
 BarFormat, ValueFormat, TimeFormat,
 }
};
};

28 changes: 20 additions & 8 deletions
lib/format-bar.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
// format bar
module.exports = function formatBar(progress, options){
 // calculate barsize
 const completeSize = Math.round(progress*options.barsize);
 const incompleteSize = options.barsize-completeSize;

 // generate bar string by stripping the pre-rendered strings
 return options.barCompleteString.substr(0, completeSize) +
 if (Array.isArray(options.barCompleteChar) && options.barCompleteChar.length > 1) {
 const completeSize = Math.floor(progress * options.barsize);
 const incompleteSize = Math.floor(options.barsize * (1 - progress));
 const remainder = progress * options.barsize - completeSize;
 const remainderChar = remainder > 0 ?
 options.barCompleteChar[Math.round(remainder * options.barCompleteChar.length) - 1] :
 "";
 return options.barCompleteString.slice(0, completeSize) +
 remainderChar +
 options.barGlue +
 options.barIncompleteString.substr(0, incompleteSize);
}
 options.barIncompleteString.slice(0, incompleteSize);
 }

 // calculate barsize
 const completeSize = Math.round(progress * options.barsize);
 const incompleteSize = options.barsize - completeSize;
 // generate bar string by stripping the pre-rendered strings
 return options.barCompleteString.slice(0, completeSize) +
 options.barGlue +
 options.barIncompleteString.slice(0, incompleteSize);
}

28 changes: 14 additions & 14 deletions
lib/generic-bar.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
const _ETA = require('./eta');
const _Terminal = require('./terminal');
const _formatter = require('./formatter');
const _options = require('./options');
const _EventEmitter = require('events');
const EventEmitter = require('node:events');

const ETA = require('./eta.js');
const Terminal = require('./terminal.js');
const formatter = require('./formatter.js');

// Progress-Bar constructor
module.exports = class GenericBar extends _EventEmitter{
module.exports = class GenericBar extends EventEmitter {

 constructor(options){
 constructor(options){
 super();

 // store options and assign derived ones (instance specific)
 this.options = _options.assignDerivedOptions(options);
 this.options = options;

 // store terminal instance
 this.terminal = (this.options.terminal) ? this.options.terminal : new _Terminal(this.options.stream);
 this.terminal = (this.options.terminal) ? this.options.terminal : new Terminal(this.options.stream);

 // the current bar value
 this.value = 0;
Expand All@@ -38,7 +38,7 @@ module.exports = class GenericBar extends _EventEmitter{
 this.lastRedraw = Date.now();

 // default eta calculator (will be re-create on start)
 this.eta = new _ETA(this.options.etaBufferLength, 0, 0);
 this.eta = new ETA(this.options.etaBufferLength, 0, 0);

 // payload data
 this.payload = {};
Expand All@@ -47,7 +47,7 @@ module.exports = class GenericBar extends _EventEmitter{
 this.isActive = false;

 // use default formatter or custom one ?
 this.formatter = (typeof this.options.format === 'function') ? this.options.format : _formatter;
 this.formatter = (typeof this.options.format === 'function') ? this.options.format : formatter;
 }

 // internal render function
Expand DownExpand Up@@ -123,7 +123,7 @@ module.exports = class GenericBar extends _EventEmitter{
 this.lastDrawnString = '';

 // initialize eta buffer
 this.eta = new _ETA(this.options.etaBufferLength, this.startTime, this.value);
 this.eta = new ETA(this.options.etaBufferLength, this.startTime, this.value);

 // set flag
 this.isActive = true;
Expand All@@ -136,7 +136,7 @@ module.exports = class GenericBar extends _EventEmitter{
 stop(){
 // set flag
 this.isActive = false;

 // store stop timestamp to get total duration
 this.stopTime = Date.now();

Expand DownExpand Up@@ -207,7 +207,7 @@ module.exports = class GenericBar extends _EventEmitter{
 // handle the use case when `step` is omitted but payload is passed
 if (typeof arg0 === 'object') {
 this.update(this.value + 1, arg0);

 // increment([step=1], [payload={}])
 }else{
 this.update(this.value + arg0, arg1);
Expand Down

43 changes: 22 additions & 21 deletions
lib/multi-bar.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
const _Terminal = require('./terminal');
const _BarElement = require('./generic-bar');
const _options = require('./options');
const _EventEmitter = require('events');
const EventEmitter = require('node:events');

const Terminal = require('./terminal.js');
const BarElement = require('./generic-bar.js');
const { parse, } = require('./options.js');

// Progress-Bar constructor
module.exports = class MultiBar extends _EventEmitter{
module.exports = class MultiBar extends EventEmitter {

 constructor(options, preset){
 constructor(options, preset){
 super();

 // list of bars
 this.bars = [];

 // parse+store options
 this.options = _options.parse(options, preset);
 this.options = parse(options, preset);

 // disable synchronous updates
 this.options.synchronousUpdate = false;

 // store terminal instance
 this.terminal = (this.options.terminal) ? this.options.terminal : new _Terminal(this.options.stream);
 this.terminal = (this.options.terminal) ? this.options.terminal : new Terminal(this.options.stream);

 // the update timer
 this.timer = null;
Expand All@@ -38,14 +39,14 @@ module.exports = class MultiBar extends _EventEmitter{
 }

 // add a new bar to the stack
 create(total, startValue, payload, barOptions={}){
 create(total, startValue, payload, barOptions={}){
 // create new bar element and merge global options + overrides
 // use the same global terminal instance for all instances
 const bar = new _BarElement(Object.assign(
 {},
 const bar = new BarElement(Object.assign(
 {},

 // global options
 this.options,
 this.options,

 // terminal instance
 {
Expand All@@ -70,19 +71,19 @@ module.exports = class MultiBar extends _EventEmitter{
 process.once('SIGINT', this.sigintCallback);
 process.once('SIGTERM', this.sigintCallback);
 }

 // multiprogress already active ?
 if (!this.isActive){
 if (!this.isActive){
 // hide the cursor ?
 if (this.options.hideCursor === true){
 if (this.options.hideCursor === true){
 this.terminal.cursor(false);
 }

 // disable line wrapping ?
 if (this.options.linewrap === false){
 if (this.options.linewrap === false){
 this.terminal.lineWrapping(false);
 }

 // initialize update timer
 this.timer = setTimeout(this.update.bind(this), this.schedulingRate);
 }
Expand All@@ -101,12 +102,12 @@ module.exports = class MultiBar extends _EventEmitter{
 }

 // remove a bar from the stack
 remove(bar){
 remove(bar){
 // find element
 const index = this.bars.indexOf(bar);

 // element found ?
 if (index < 0){
 if (index < 0){
 return false;
 }

Expand All@@ -133,7 +134,7 @@ module.exports = class MultiBar extends _EventEmitter{

 // trigger event
 this.emit('update-pre');

 // reset cursor
 this.terminal.cursorRelativeReset();

Expand DownExpand Up@@ -218,7 +219,7 @@ module.exports = class MultiBar extends _EventEmitter{
 if (this.options.clearOnComplete){
 // clear all bars
 this.terminal.clearBottom();

 // or show final progress ?
 }else{
 // update each bar
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: added support for barCompleteChar being an array of string plus others associated#144

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

 Open

UnKnoWn-Consortium
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


feat: added support for barCompleteChar being an array of string plus others associated
#144
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


8 changes: 4 additions & 4 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,9 +250,9 @@ The following options can be changed
- `stopOnComplete` (type:boolean) - automatically call `stop()` when the value reaches the total (default: false)
- `clearOnComplete` (type:boolean) - clear the progress bar on complete / `stop()` call (default: false)
- `barsize` (type:int) - the length of the progress bar in chars (default: 40)
- `align` (type:char) - position of the progress bar - 'left' (default), 'right' or 'center'
- `barCompleteChar` (type:char) - character to use as "complete" indicator in the bar (default: "=")
- `barIncompleteChar` (type:char) - character to use as "incomplete" indicator in the bar (default: "-")
- `align` (type:string) - position of the progress bar - 'left' (default), 'right' or 'center'
- `barCompleteChar` (type:string|string[]) - character to use as "complete" indicator in the bar (default: "=")
- `barIncompleteChar` (type:string) - character to use as "incomplete" indicator in the bar (default: "-")
- `hideCursor` (type:boolean) - hide the cursor during progress operation; restored on complete (default: false) - pass `null` to keep terminal settings
- `linewrap` (type:boolean) - disable line wrapping (default: false) - pass `null` to keep terminal settings; pass `true` to add linebreaks automatically (not recommended)
- `gracefulExit` (type:boolean) - stop the bars in case of `SIGINT` or `SIGTERM` - this restores most cursor settings before exiting (default: `false` - subjected to change)
Expand DownExpand Up@@ -450,7 +450,7 @@ The following presets are included by default
* **shades-classic** - Unicode background shades are used for the bar
* **shades-grey** - Unicode background shades with grey bar
* **rect** - Unicode Rectangles

* **braille-patterns** - Unicode Braille Pattern Dots

Compatibility
---------------------------------------------
Expand Down

30 changes: 14 additions & 16 deletions
cli-progress.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
const _SingleBar = require('./lib/single-bar');
const _MultiBar = require('./lib/multi-bar');
const _Presets = require('./presets/index');
const _Formatter = require('./lib/formatter');
const _defaultFormatValue = require('./lib/format-value');
const _defaultFormatBar = require('./lib/format-bar');
const _defaultFormatTime = require('./lib/format-time');
const SingleBar = require('./lib/single-bar.js');
const MultiBar = require('./lib/multi-bar.js');
const Presets = require('./presets/index.js');
const Formatter = require('./lib/formatter.js');
const ValueFormat = require('./lib/format-value.js');
const BarFormat = require('./lib/format-bar.js');
const TimeFormat = require('./lib/format-time.js');

// sub-module access
module.exports = {
 Bar: _SingleBar,
 SingleBar: _SingleBar,
 MultiBar: _MultiBar,
 Presets: _Presets,
 Bar: SingleBar,
 SingleBar,
 MultiBar,
 Presets,
 Format: {
 Formatter: _Formatter,
 BarFormat: _defaultFormatBar,
 ValueFormat: _defaultFormatValue,
 TimeFormat: _defaultFormatTime
 Formatter,
 BarFormat, ValueFormat, TimeFormat,
 }
};
};

28 changes: 20 additions & 8 deletions
lib/format-bar.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
// format bar
module.exports = function formatBar(progress, options){
 // calculate barsize
 const completeSize = Math.round(progress*options.barsize);
 const incompleteSize = options.barsize-completeSize;

 // generate bar string by stripping the pre-rendered strings
 return options.barCompleteString.substr(0, completeSize) +
 if (Array.isArray(options.barCompleteChar) && options.barCompleteChar.length > 1) {
 const completeSize = Math.floor(progress * options.barsize);
 const incompleteSize = Math.floor(options.barsize * (1 - progress));
 const remainder = progress * options.barsize - completeSize;
 const remainderChar = remainder > 0 ?
 options.barCompleteChar[Math.round(remainder * options.barCompleteChar.length) - 1] :
 "";
 return options.barCompleteString.slice(0, completeSize) +
 remainderChar +
 options.barGlue +
 options.barIncompleteString.substr(0, incompleteSize);
}
 options.barIncompleteString.slice(0, incompleteSize);
 }

 // calculate barsize
 const completeSize = Math.round(progress * options.barsize);
 const incompleteSize = options.barsize - completeSize;
 // generate bar string by stripping the pre-rendered strings
 return options.barCompleteString.slice(0, completeSize) +
 options.barGlue +
 options.barIncompleteString.slice(0, incompleteSize);
}

28 changes: 14 additions & 14 deletions
lib/generic-bar.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
const _ETA = require('./eta');
const _Terminal = require('./terminal');
const _formatter = require('./formatter');
const _options = require('./options');
const _EventEmitter = require('events');
const EventEmitter = require('node:events');

const ETA = require('./eta.js');
const Terminal = require('./terminal.js');
const formatter = require('./formatter.js');

// Progress-Bar constructor
module.exports = class GenericBar extends _EventEmitter{
module.exports = class GenericBar extends EventEmitter {

 constructor(options){
 constructor(options){
 super();

 // store options and assign derived ones (instance specific)
 this.options = _options.assignDerivedOptions(options);
 this.options = options;

 // store terminal instance
 this.terminal = (this.options.terminal) ? this.options.terminal : new _Terminal(this.options.stream);
 this.terminal = (this.options.terminal) ? this.options.terminal : new Terminal(this.options.stream);

 // the current bar value
 this.value = 0;
Expand All@@ -38,7 +38,7 @@ module.exports = class GenericBar extends _EventEmitter{
 this.lastRedraw = Date.now();

 // default eta calculator (will be re-create on start)
 this.eta = new _ETA(this.options.etaBufferLength, 0, 0);
 this.eta = new ETA(this.options.etaBufferLength, 0, 0);

 // payload data
 this.payload = {};
Expand All@@ -47,7 +47,7 @@ module.exports = class GenericBar extends _EventEmitter{
 this.isActive = false;

 // use default formatter or custom one ?
 this.formatter = (typeof this.options.format === 'function') ? this.options.format : _formatter;
 this.formatter = (typeof this.options.format === 'function') ? this.options.format : formatter;
 }

 // internal render function
Expand DownExpand Up@@ -123,7 +123,7 @@ module.exports = class GenericBar extends _EventEmitter{
 this.lastDrawnString = '';

 // initialize eta buffer
 this.eta = new _ETA(this.options.etaBufferLength, this.startTime, this.value);
 this.eta = new ETA(this.options.etaBufferLength, this.startTime, this.value);

 // set flag
 this.isActive = true;
Expand All@@ -136,7 +136,7 @@ module.exports = class GenericBar extends _EventEmitter{
 stop(){
 // set flag
 this.isActive = false;

 // store stop timestamp to get total duration
 this.stopTime = Date.now();

Expand DownExpand Up@@ -207,7 +207,7 @@ module.exports = class GenericBar extends _EventEmitter{
 // handle the use case when `step` is omitted but payload is passed
 if (typeof arg0 === 'object') {
 this.update(this.value + 1, arg0);

 // increment([step=1], [payload={}])
 }else{
 this.update(this.value + arg0, arg1);
Expand Down

43 changes: 22 additions & 21 deletions
lib/multi-bar.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
const _Terminal = require('./terminal');
const _BarElement = require('./generic-bar');
const _options = require('./options');
const _EventEmitter = require('events');
const EventEmitter = require('node:events');

const Terminal = require('./terminal.js');
const BarElement = require('./generic-bar.js');
const { parse, } = require('./options.js');

// Progress-Bar constructor
module.exports = class MultiBar extends _EventEmitter{
module.exports = class MultiBar extends EventEmitter {

 constructor(options, preset){
 constructor(options, preset){
 super();

 // list of bars
 this.bars = [];

 // parse+store options
 this.options = _options.parse(options, preset);
 this.options = parse(options, preset);

 // disable synchronous updates
 this.options.synchronousUpdate = false;

 // store terminal instance
 this.terminal = (this.options.terminal) ? this.options.terminal : new _Terminal(this.options.stream);
 this.terminal = (this.options.terminal) ? this.options.terminal : new Terminal(this.options.stream);

 // the update timer
 this.timer = null;
Expand All@@ -38,14 +39,14 @@ module.exports = class MultiBar extends _EventEmitter{
 }

 // add a new bar to the stack
 create(total, startValue, payload, barOptions={}){
 create(total, startValue, payload, barOptions={}){
 // create new bar element and merge global options + overrides
 // use the same global terminal instance for all instances
 const bar = new _BarElement(Object.assign(
 {},
 const bar = new BarElement(Object.assign(
 {},

 // global options
 this.options,
 this.options,

 // terminal instance
 {
Expand All@@ -70,19 +71,19 @@ module.exports = class MultiBar extends _EventEmitter{
 process.once('SIGINT', this.sigintCallback);
 process.once('SIGTERM', this.sigintCallback);
 }

 // multiprogress already active ?
 if (!this.isActive){
 if (!this.isActive){
 // hide the cursor ?
 if (this.options.hideCursor === true){
 if (this.options.hideCursor === true){
 this.terminal.cursor(false);
 }

 // disable line wrapping ?
 if (this.options.linewrap === false){
 if (this.options.linewrap === false){
 this.terminal.lineWrapping(false);
 }

 // initialize update timer
 this.timer = setTimeout(this.update.bind(this), this.schedulingRate);
 }
Expand All@@ -101,12 +102,12 @@ module.exports = class MultiBar extends _EventEmitter{
 }

 // remove a bar from the stack
 remove(bar){
 remove(bar){
 // find element
 const index = this.bars.indexOf(bar);

 // element found ?
 if (index < 0){
 if (index < 0){
 return false;
 }

Expand All@@ -133,7 +134,7 @@ module.exports = class MultiBar extends _EventEmitter{

 // trigger event
 this.emit('update-pre');

 // reset cursor
 this.terminal.cursorRelativeReset();

Expand DownExpand Up@@ -218,7 +219,7 @@ module.exports = class MultiBar extends _EventEmitter{
 if (this.options.clearOnComplete){
 // clear all bars
 this.terminal.clearBottom();

 // or show final progress ?
 }else{
 // update each bar
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
feat: added support for barCompleteChar being an array of string plus others associated#144

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

 Open

UnKnoWn-Consortium
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


feat: added support for barCompleteChar being an array of string plus others associated
#144
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


8 changes: 4 additions & 4 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,9 +250,9 @@ The following options can be changed
- `stopOnComplete` (type:boolean) - automatically call `stop()` when the value reaches the total (default: false)
- `clearOnComplete` (type:boolean) - clear the progress bar on complete / `stop()` call (default: false)
- `barsize` (type:int) - the length of the progress bar in chars (default: 40)
- `align` (type:char) - position of the progress bar - 'left' (default), 'right' or 'center'
- `barCompleteChar` (type:char) - character to use as "complete" indicator in the bar (default: "=")
- `barIncompleteChar` (type:char) - character to use as "incomplete" indicator in the bar (default: "-")
- `align` (type:string) - position of the progress bar - 'left' (default), 'right' or 'center'
- `barCompleteChar` (type:string|string[]) - character to use as "complete" indicator in the bar (default: "=")
- `barIncompleteChar` (type:string) - character to use as "incomplete" indicator in the bar (default: "-")
- `hideCursor` (type:boolean) - hide the cursor during progress operation; restored on complete (default: false) - pass `null` to keep terminal settings
- `linewrap` (type:boolean) - disable line wrapping (default: false) - pass `null` to keep terminal settings; pass `true` to add linebreaks automatically (not recommended)
- `gracefulExit` (type:boolean) - stop the bars in case of `SIGINT` or `SIGTERM` - this restores most cursor settings before exiting (default: `false` - subjected to change)
Expand DownExpand Up@@ -450,7 +450,7 @@ The following presets are included by default
* **shades-classic** - Unicode background shades are used for the bar
* **shades-grey** - Unicode background shades with grey bar
* **rect** - Unicode Rectangles

* **braille-patterns** - Unicode Braille Pattern Dots

Compatibility
---------------------------------------------
Expand Down

30 changes: 14 additions & 16 deletions
cli-progress.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
const _SingleBar = require('./lib/single-bar');
const _MultiBar = require('./lib/multi-bar');
const _Presets = require('./presets/index');
const _Formatter = require('./lib/formatter');
const _defaultFormatValue = require('./lib/format-value');
const _defaultFormatBar = require('./lib/format-bar');
const _defaultFormatTime = require('./lib/format-time');
const SingleBar = require('./lib/single-bar.js');
const MultiBar = require('./lib/multi-bar.js');
const Presets = require('./presets/index.js');
const Formatter = require('./lib/formatter.js');
const ValueFormat = require('./lib/format-value.js');
const BarFormat = require('./lib/format-bar.js');
const TimeFormat = require('./lib/format-time.js');

// sub-module access
module.exports = {
 Bar: _SingleBar,
 SingleBar: _SingleBar,
 MultiBar: _MultiBar,
 Presets: _Presets,
 Bar: SingleBar,
 SingleBar,
 MultiBar,
 Presets,
 Format: {
 Formatter: _Formatter,
 BarFormat: _defaultFormatBar,
 ValueFormat: _defaultFormatValue,
 TimeFormat: _defaultFormatTime
 Formatter,
 BarFormat, ValueFormat, TimeFormat,
 }
};
};

28 changes: 20 additions & 8 deletions
lib/format-bar.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
// format bar
module.exports = function formatBar(progress, options){
 // calculate barsize
 const completeSize = Math.round(progress*options.barsize);
 const incompleteSize = options.barsize-completeSize;

 // generate bar string by stripping the pre-rendered strings
 return options.barCompleteString.substr(0, completeSize) +
 if (Array.isArray(options.barCompleteChar) && options.barCompleteChar.length > 1) {
 const completeSize = Math.floor(progress * options.barsize);
 const incompleteSize = Math.floor(options.barsize * (1 - progress));
 const remainder = progress * options.barsize - completeSize;
 const remainderChar = remainder > 0 ?
 options.barCompleteChar[Math.round(remainder * options.barCompleteChar.length) - 1] :
 "";
 return options.barCompleteString.slice(0, completeSize) +
 remainderChar +
 options.barGlue +
 options.barIncompleteString.substr(0, incompleteSize);
}
 options.barIncompleteString.slice(0, incompleteSize);
 }

 // calculate barsize
 const completeSize = Math.round(progress * options.barsize);
 const incompleteSize = options.barsize - completeSize;
 // generate bar string by stripping the pre-rendered strings
 return options.barCompleteString.slice(0, completeSize) +
 options.barGlue +
 options.barIncompleteString.slice(0, incompleteSize);
}

28 changes: 14 additions & 14 deletions
lib/generic-bar.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
const _ETA = require('./eta');
const _Terminal = require('./terminal');
const _formatter = require('./formatter');
const _options = require('./options');
const _EventEmitter = require('events');
const EventEmitter = require('node:events');

const ETA = require('./eta.js');
const Terminal = require('./terminal.js');
const formatter = require('./formatter.js');

// Progress-Bar constructor
module.exports = class GenericBar extends _EventEmitter{
module.exports = class GenericBar extends EventEmitter {

 constructor(options){
 constructor(options){
 super();

 // store options and assign derived ones (instance specific)
 this.options = _options.assignDerivedOptions(options);
 this.options = options;

 // store terminal instance
 this.terminal = (this.options.terminal) ? this.options.terminal : new _Terminal(this.options.stream);
 this.terminal = (this.options.terminal) ? this.options.terminal : new Terminal(this.options.stream);

 // the current bar value
 this.value = 0;
Expand All@@ -38,7 +38,7 @@ module.exports = class GenericBar extends _EventEmitter{
 this.lastRedraw = Date.now();

 // default eta calculator (will be re-create on start)
 this.eta = new _ETA(this.options.etaBufferLength, 0, 0);
 this.eta = new ETA(this.options.etaBufferLength, 0, 0);

 // payload data
 this.payload = {};
Expand All@@ -47,7 +47,7 @@ module.exports = class GenericBar extends _EventEmitter{
 this.isActive = false;

 // use default formatter or custom one ?
 this.formatter = (typeof this.options.format === 'function') ? this.options.format : _formatter;
 this.formatter = (typeof this.options.format === 'function') ? this.options.format : formatter;
 }

 // internal render function
Expand DownExpand Up@@ -123,7 +123,7 @@ module.exports = class GenericBar extends _EventEmitter{
 this.lastDrawnString = '';

 // initialize eta buffer
 this.eta = new _ETA(this.options.etaBufferLength, this.startTime, this.value);
 this.eta = new ETA(this.options.etaBufferLength, this.startTime, this.value);

 // set flag
 this.isActive = true;
Expand All@@ -136,7 +136,7 @@ module.exports = class GenericBar extends _EventEmitter{
 stop(){
 // set flag
 this.isActive = false;

 // store stop timestamp to get total duration
 this.stopTime = Date.now();

Expand DownExpand Up@@ -207,7 +207,7 @@ module.exports = class GenericBar extends _EventEmitter{
 // handle the use case when `step` is omitted but payload is passed
 if (typeof arg0 === 'object') {
 this.update(this.value + 1, arg0);

 // increment([step=1], [payload={}])
 }else{
 this.update(this.value + arg0, arg1);
Expand Down

43 changes: 22 additions & 21 deletions
lib/multi-bar.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
const _Terminal = require('./terminal');
const _BarElement = require('./generic-bar');
const _options = require('./options');
const _EventEmitter = require('events');
const EventEmitter = require('node:events');

const Terminal = require('./terminal.js');
const BarElement = require('./generic-bar.js');
const { parse, } = require('./options.js');

// Progress-Bar constructor
module.exports = class MultiBar extends _EventEmitter{
module.exports = class MultiBar extends EventEmitter {

 constructor(options, preset){
 constructor(options, preset){
 super();

 // list of bars
 this.bars = [];

 // parse+store options
 this.options = _options.parse(options, preset);
 this.options = parse(options, preset);

 // disable synchronous updates
 this.options.synchronousUpdate = false;

 // store terminal instance
 this.terminal = (this.options.terminal) ? this.options.terminal : new _Terminal(this.options.stream);
 this.terminal = (this.options.terminal) ? this.options.terminal : new Terminal(this.options.stream);

 // the update timer
 this.timer = null;
Expand All@@ -38,14 +39,14 @@ module.exports = class MultiBar extends _EventEmitter{
 }

 // add a new bar to the stack
 create(total, startValue, payload, barOptions={}){
 create(total, startValue, payload, barOptions={}){
 // create new bar element and merge global options + overrides
 // use the same global terminal instance for all instances
 const bar = new _BarElement(Object.assign(
 {},
 const bar = new BarElement(Object.assign(
 {},

 // global options
 this.options,
 this.options,

 // terminal instance
 {
Expand All@@ -70,19 +71,19 @@ module.exports = class MultiBar extends _EventEmitter{
 process.once('SIGINT', this.sigintCallback);
 process.once('SIGTERM', this.sigintCallback);
 }

 // multiprogress already active ?
 if (!this.isActive){
 if (!this.isActive){
 // hide the cursor ?
 if (this.options.hideCursor === true){
 if (this.options.hideCursor === true){
 this.terminal.cursor(false);
 }

 // disable line wrapping ?
 if (this.options.linewrap === false){
 if (this.options.linewrap === false){
 this.terminal.lineWrapping(false);
 }

 // initialize update timer
 this.timer = setTimeout(this.update.bind(this), this.schedulingRate);
 }
Expand All@@ -101,12 +102,12 @@ module.exports = class MultiBar extends _EventEmitter{
 }

 // remove a bar from the stack
 remove(bar){
 remove(bar){
 // find element
 const index = this.bars.indexOf(bar);

 // element found ?
 if (index < 0){
 if (index < 0){
 return false;
 }

Expand All@@ -133,7 +134,7 @@ module.exports = class MultiBar extends _EventEmitter{

 // trigger event
 this.emit('update-pre');

 // reset cursor
 this.terminal.cursorRelativeReset();

Expand DownExpand Up@@ -218,7 +219,7 @@ module.exports = class MultiBar extends _EventEmitter{
 if (this.options.clearOnComplete){
 // clear all bars
 this.terminal.clearBottom();

 // or show final progress ?
 }else{
 // update each bar
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: added support for barCompleteChar being an array of string plus others associated#144

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

 Open

UnKnoWn-Consortium
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


feat: added support for barCompleteChar being an array of string plus others associated
#144
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


8 changes: 4 additions & 4 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,9 +250,9 @@ The following options can be changed
- `stopOnComplete` (type:boolean) - automatically call `stop()` when the value reaches the total (default: false)
- `clearOnComplete` (type:boolean) - clear the progress bar on complete / `stop()` call (default: false)
- `barsize` (type:int) - the length of the progress bar in chars (default: 40)
- `align` (type:char) - position of the progress bar - 'left' (default), 'right' or 'center'
- `barCompleteChar` (type:char) - character to use as "complete" indicator in the bar (default: "=")
- `barIncompleteChar` (type:char) - character to use as "incomplete" indicator in the bar (default: "-")
- `align` (type:string) - position of the progress bar - 'left' (default), 'right' or 'center'
- `barCompleteChar` (type:string|string[]) - character to use as "complete" indicator in the bar (default: "=")
- `barIncompleteChar` (type:string) - character to use as "incomplete" indicator in the bar (default: "-")
- `hideCursor` (type:boolean) - hide the cursor during progress operation; restored on complete (default: false) - pass `null` to keep terminal settings
- `linewrap` (type:boolean) - disable line wrapping (default: false) - pass `null` to keep terminal settings; pass `true` to add linebreaks automatically (not recommended)
- `gracefulExit` (type:boolean) - stop the bars in case of `SIGINT` or `SIGTERM` - this restores most cursor settings before exiting (default: `false` - subjected to change)
Expand DownExpand Up@@ -450,7 +450,7 @@ The following presets are included by default
* **shades-classic** - Unicode background shades are used for the bar
* **shades-grey** - Unicode background shades with grey bar
* **rect** - Unicode Rectangles

* **braille-patterns** - Unicode Braille Pattern Dots

Compatibility
---------------------------------------------
Expand Down

30 changes: 14 additions & 16 deletions
cli-progress.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
const _SingleBar = require('./lib/single-bar');
const _MultiBar = require('./lib/multi-bar');
const _Presets = require('./presets/index');
const _Formatter = require('./lib/formatter');
const _defaultFormatValue = require('./lib/format-value');
const _defaultFormatBar = require('./lib/format-bar');
const _defaultFormatTime = require('./lib/format-time');
const SingleBar = require('./lib/single-bar.js');
const MultiBar = require('./lib/multi-bar.js');
const Presets = require('./presets/index.js');
const Formatter = require('./lib/formatter.js');
const ValueFormat = require('./lib/format-value.js');
const BarFormat = require('./lib/format-bar.js');
const TimeFormat = require('./lib/format-time.js');

// sub-module access
module.exports = {
 Bar: _SingleBar,
 SingleBar: _SingleBar,
 MultiBar: _MultiBar,
 Presets: _Presets,
 Bar: SingleBar,
 SingleBar,
 MultiBar,
 Presets,
 Format: {
 Formatter: _Formatter,
 BarFormat: _defaultFormatBar,
 ValueFormat: _defaultFormatValue,
 TimeFormat: _defaultFormatTime
 Formatter,
 BarFormat, ValueFormat, TimeFormat,
 }
};
};

28 changes: 20 additions & 8 deletions
lib/format-bar.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
// format bar
module.exports = function formatBar(progress, options){
 // calculate barsize
 const completeSize = Math.round(progress*options.barsize);
 const incompleteSize = options.barsize-completeSize;

 // generate bar string by stripping the pre-rendered strings
 return options.barCompleteString.substr(0, completeSize) +
 if (Array.isArray(options.barCompleteChar) && options.barCompleteChar.length > 1) {
 const completeSize = Math.floor(progress * options.barsize);
 const incompleteSize = Math.floor(options.barsize * (1 - progress));
 const remainder = progress * options.barsize - completeSize;
 const remainderChar = remainder > 0 ?
 options.barCompleteChar[Math.round(remainder * options.barCompleteChar.length) - 1] :
 "";
 return options.barCompleteString.slice(0, completeSize) +
 remainderChar +
 options.barGlue +
 options.barIncompleteString.substr(0, incompleteSize);
}
 options.barIncompleteString.slice(0, incompleteSize);
 }

 // calculate barsize
 const completeSize = Math.round(progress * options.barsize);
 const incompleteSize = options.barsize - completeSize;
 // generate bar string by stripping the pre-rendered strings
 return options.barCompleteString.slice(0, completeSize) +
 options.barGlue +
 options.barIncompleteString.slice(0, incompleteSize);
}

28 changes: 14 additions & 14 deletions
lib/generic-bar.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
const _ETA = require('./eta');
const _Terminal = require('./terminal');
const _formatter = require('./formatter');
const _options = require('./options');
const _EventEmitter = require('events');
const EventEmitter = require('node:events');

const ETA = require('./eta.js');
const Terminal = require('./terminal.js');
const formatter = require('./formatter.js');

// Progress-Bar constructor
module.exports = class GenericBar extends _EventEmitter{
module.exports = class GenericBar extends EventEmitter {

 constructor(options){
 constructor(options){
 super();

 // store options and assign derived ones (instance specific)
 this.options = _options.assignDerivedOptions(options);
 this.options = options;

 // store terminal instance
 this.terminal = (this.options.terminal) ? this.options.terminal : new _Terminal(this.options.stream);
 this.terminal = (this.options.terminal) ? this.options.terminal : new Terminal(this.options.stream);

 // the current bar value
 this.value = 0;
Expand All@@ -38,7 +38,7 @@ module.exports = class GenericBar extends _EventEmitter{
 this.lastRedraw = Date.now();

 // default eta calculator (will be re-create on start)
 this.eta = new _ETA(this.options.etaBufferLength, 0, 0);
 this.eta = new ETA(this.options.etaBufferLength, 0, 0);

 // payload data
 this.payload = {};
Expand All@@ -47,7 +47,7 @@ module.exports = class GenericBar extends _EventEmitter{
 this.isActive = false;

 // use default formatter or custom one ?
 this.formatter = (typeof this.options.format === 'function') ? this.options.format : _formatter;
 this.formatter = (typeof this.options.format === 'function') ? this.options.format : formatter;
 }

 // internal render function
Expand DownExpand Up@@ -123,7 +123,7 @@ module.exports = class GenericBar extends _EventEmitter{
 this.lastDrawnString = '';

 // initialize eta buffer
 this.eta = new _ETA(this.options.etaBufferLength, this.startTime, this.value);
 this.eta = new ETA(this.options.etaBufferLength, this.startTime, this.value);

 // set flag
 this.isActive = true;
Expand All@@ -136,7 +136,7 @@ module.exports = class GenericBar extends _EventEmitter{
 stop(){
 // set flag
 this.isActive = false;

 // store stop timestamp to get total duration
 this.stopTime = Date.now();

Expand DownExpand Up@@ -207,7 +207,7 @@ module.exports = class GenericBar extends _EventEmitter{
 // handle the use case when `step` is omitted but payload is passed
 if (typeof arg0 === 'object') {
 this.update(this.value + 1, arg0);

 // increment([step=1], [payload={}])
 }else{
 this.update(this.value + arg0, arg1);
Expand Down

43 changes: 22 additions & 21 deletions
lib/multi-bar.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
const _Terminal = require('./terminal');
const _BarElement = require('./generic-bar');
const _options = require('./options');
const _EventEmitter = require('events');
const EventEmitter = require('node:events');

const Terminal = require('./terminal.js');
const BarElement = require('./generic-bar.js');
const { parse, } = require('./options.js');

// Progress-Bar constructor
module.exports = class MultiBar extends _EventEmitter{
module.exports = class MultiBar extends EventEmitter {

 constructor(options, preset){
 constructor(options, preset){
 super();

 // list of bars
 this.bars = [];

 // parse+store options
 this.options = _options.parse(options, preset);
 this.options = parse(options, preset);

 // disable synchronous updates
 this.options.synchronousUpdate = false;

 // store terminal instance
 this.terminal = (this.options.terminal) ? this.options.terminal : new _Terminal(this.options.stream);
 this.terminal = (this.options.terminal) ? this.options.terminal : new Terminal(this.options.stream);

 // the update timer
 this.timer = null;
Expand All@@ -38,14 +39,14 @@ module.exports = class MultiBar extends _EventEmitter{
 }

 // add a new bar to the stack
 create(total, startValue, payload, barOptions={}){
 create(total, startValue, payload, barOptions={}){
 // create new bar element and merge global options + overrides
 // use the same global terminal instance for all instances
 const bar = new _BarElement(Object.assign(
 {},
 const bar = new BarElement(Object.assign(
 {},

 // global options
 this.options,
 this.options,

 // terminal instance
 {
Expand All@@ -70,19 +71,19 @@ module.exports = class MultiBar extends _EventEmitter{
 process.once('SIGINT', this.sigintCallback);
 process.once('SIGTERM', this.sigintCallback);
 }

 // multiprogress already active ?
 if (!this.isActive){
 if (!this.isActive){
 // hide the cursor ?
 if (this.options.hideCursor === true){
 if (this.options.hideCursor === true){
 this.terminal.cursor(false);
 }

 // disable line wrapping ?
 if (this.options.linewrap === false){
 if (this.options.linewrap === false){
 this.terminal.lineWrapping(false);
 }

 // initialize update timer
 this.timer = setTimeout(this.update.bind(this), this.schedulingRate);
 }
Expand All@@ -101,12 +102,12 @@ module.exports = class MultiBar extends _EventEmitter{
 }

 // remove a bar from the stack
 remove(bar){
 remove(bar){
 // find element
 const index = this.bars.indexOf(bar);

 // element found ?
 if (index < 0){
 if (index < 0){
 return false;
 }

Expand All@@ -133,7 +134,7 @@ module.exports = class MultiBar extends _EventEmitter{

 // trigger event
 this.emit('update-pre');

 // reset cursor
 this.terminal.cursorRelativeReset();

Expand DownExpand Up@@ -218,7 +219,7 @@ module.exports = class MultiBar extends _EventEmitter{
 if (this.options.clearOnComplete){
 // clear all bars
 this.terminal.clearBottom();

 // or show final progress ?
 }else{
 // update each bar
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: added support for barCompleteChar being an array of string plus others associated#144

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

 Open

UnKnoWn-Consortium
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


feat: added support for barCompleteChar being an array of string plus others associated
#144
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


8 changes: 4 additions & 4 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,9 +250,9 @@ The following options can be changed
- `stopOnComplete` (type:boolean) - automatically call `stop()` when the value reaches the total (default: false)
- `clearOnComplete` (type:boolean) - clear the progress bar on complete / `stop()` call (default: false)
- `barsize` (type:int) - the length of the progress bar in chars (default: 40)
- `align` (type:char) - position of the progress bar - 'left' (default), 'right' or 'center'
- `barCompleteChar` (type:char) - character to use as "complete" indicator in the bar (default: "=")
- `barIncompleteChar` (type:char) - character to use as "incomplete" indicator in the bar (default: "-")
- `align` (type:string) - position of the progress bar - 'left' (default), 'right' or 'center'
- `barCompleteChar` (type:string|string[]) - character to use as "complete" indicator in the bar (default: "=")
- `barIncompleteChar` (type:string) - character to use as "incomplete" indicator in the bar (default: "-")
- `hideCursor` (type:boolean) - hide the cursor during progress operation; restored on complete (default: false) - pass `null` to keep terminal settings
- `linewrap` (type:boolean) - disable line wrapping (default: false) - pass `null` to keep terminal settings; pass `true` to add linebreaks automatically (not recommended)
- `gracefulExit` (type:boolean) - stop the bars in case of `SIGINT` or `SIGTERM` - this restores most cursor settings before exiting (default: `false` - subjected to change)
Expand DownExpand Up@@ -450,7 +450,7 @@ The following presets are included by default
* **shades-classic** - Unicode background shades are used for the bar
* **shades-grey** - Unicode background shades with grey bar
* **rect** - Unicode Rectangles

* **braille-patterns** - Unicode Braille Pattern Dots

Compatibility
---------------------------------------------
Expand Down

30 changes: 14 additions & 16 deletions
cli-progress.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
const _SingleBar = require('./lib/single-bar');
const _MultiBar = require('./lib/multi-bar');
const _Presets = require('./presets/index');
const _Formatter = require('./lib/formatter');
const _defaultFormatValue = require('./lib/format-value');
const _defaultFormatBar = require('./lib/format-bar');
const _defaultFormatTime = require('./lib/format-time');
const SingleBar = require('./lib/single-bar.js');
const MultiBar = require('./lib/multi-bar.js');
const Presets = require('./presets/index.js');
const Formatter = require('./lib/formatter.js');
const ValueFormat = require('./lib/format-value.js');
const BarFormat = require('./lib/format-bar.js');
const TimeFormat = require('./lib/format-time.js');

// sub-module access
module.exports = {
 Bar: _SingleBar,
 SingleBar: _SingleBar,
 MultiBar: _MultiBar,
 Presets: _Presets,
 Bar: SingleBar,
 SingleBar,
 MultiBar,
 Presets,
 Format: {
 Formatter: _Formatter,
 BarFormat: _defaultFormatBar,
 ValueFormat: _defaultFormatValue,
 TimeFormat: _defaultFormatTime
 Formatter,
 BarFormat, ValueFormat, TimeFormat,
 }
};
};

28 changes: 20 additions & 8 deletions
lib/format-bar.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
// format bar
module.exports = function formatBar(progress, options){
 // calculate barsize
 const completeSize = Math.round(progress*options.barsize);
 const incompleteSize = options.barsize-completeSize;

 // generate bar string by stripping the pre-rendered strings
 return options.barCompleteString.substr(0, completeSize) +
 if (Array.isArray(options.barCompleteChar) && options.barCompleteChar.length > 1) {
 const completeSize = Math.floor(progress * options.barsize);
 const incompleteSize = Math.floor(options.barsize * (1 - progress));
 const remainder = progress * options.barsize - completeSize;
 const remainderChar = remainder > 0 ?
 options.barCompleteChar[Math.round(remainder * options.barCompleteChar.length) - 1] :
 "";
 return options.barCompleteString.slice(0, completeSize) +
 remainderChar +
 options.barGlue +
 options.barIncompleteString.substr(0, incompleteSize);
}
 options.barIncompleteString.slice(0, incompleteSize);
 }

 // calculate barsize
 const completeSize = Math.round(progress * options.barsize);
 const incompleteSize = options.barsize - completeSize;
 // generate bar string by stripping the pre-rendered strings
 return options.barCompleteString.slice(0, completeSize) +
 options.barGlue +
 options.barIncompleteString.slice(0, incompleteSize);
}

28 changes: 14 additions & 14 deletions
lib/generic-bar.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
const _ETA = require('./eta');
const _Terminal = require('./terminal');
const _formatter = require('./formatter');
const _options = require('./options');
const _EventEmitter = require('events');
const EventEmitter = require('node:events');

const ETA = require('./eta.js');
const Terminal = require('./terminal.js');
const formatter = require('./formatter.js');

// Progress-Bar constructor
module.exports = class GenericBar extends _EventEmitter{
module.exports = class GenericBar extends EventEmitter {

 constructor(options){
 constructor(options){
 super();

 // store options and assign derived ones (instance specific)
 this.options = _options.assignDerivedOptions(options);
 this.options = options;

 // store terminal instance
 this.terminal = (this.options.terminal) ? this.options.terminal : new _Terminal(this.options.stream);
 this.terminal = (this.options.terminal) ? this.options.terminal : new Terminal(this.options.stream);

 // the current bar value
 this.value = 0;
Expand All@@ -38,7 +38,7 @@ module.exports = class GenericBar extends _EventEmitter{
 this.lastRedraw = Date.now();

 // default eta calculator (will be re-create on start)
 this.eta = new _ETA(this.options.etaBufferLength, 0, 0);
 this.eta = new ETA(this.options.etaBufferLength, 0, 0);

 // payload data
 this.payload = {};
Expand All@@ -47,7 +47,7 @@ module.exports = class GenericBar extends _EventEmitter{
 this.isActive = false;

 // use default formatter or custom one ?
 this.formatter = (typeof this.options.format === 'function') ? this.options.format : _formatter;
 this.formatter = (typeof this.options.format === 'function') ? this.options.format : formatter;
 }

 // internal render function
Expand DownExpand Up@@ -123,7 +123,7 @@ module.exports = class GenericBar extends _EventEmitter{
 this.lastDrawnString = '';

 // initialize eta buffer
 this.eta = new _ETA(this.options.etaBufferLength, this.startTime, this.value);
 this.eta = new ETA(this.options.etaBufferLength, this.startTime, this.value);

 // set flag
 this.isActive = true;
Expand All@@ -136,7 +136,7 @@ module.exports = class GenericBar extends _EventEmitter{
 stop(){
 // set flag
 this.isActive = false;

 // store stop timestamp to get total duration
 this.stopTime = Date.now();

Expand DownExpand Up@@ -207,7 +207,7 @@ module.exports = class GenericBar extends _EventEmitter{
 // handle the use case when `step` is omitted but payload is passed
 if (typeof arg0 === 'object') {
 this.update(this.value + 1, arg0);

 // increment([step=1], [payload={}])
 }else{
 this.update(this.value + arg0, arg1);
Expand Down

43 changes: 22 additions & 21 deletions
lib/multi-bar.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
const _Terminal = require('./terminal');
const _BarElement = require('./generic-bar');
const _options = require('./options');
const _EventEmitter = require('events');
const EventEmitter = require('node:events');

const Terminal = require('./terminal.js');
const BarElement = require('./generic-bar.js');
const { parse, } = require('./options.js');

// Progress-Bar constructor
module.exports = class MultiBar extends _EventEmitter{
module.exports = class MultiBar extends EventEmitter {

 constructor(options, preset){
 constructor(options, preset){
 super();

 // list of bars
 this.bars = [];

 // parse+store options
 this.options = _options.parse(options, preset);
 this.options = parse(options, preset);

 // disable synchronous updates
 this.options.synchronousUpdate = false;

 // store terminal instance
 this.terminal = (this.options.terminal) ? this.options.terminal : new _Terminal(this.options.stream);
 this.terminal = (this.options.terminal) ? this.options.terminal : new Terminal(this.options.stream);

 // the update timer
 this.timer = null;
Expand All@@ -38,14 +39,14 @@ module.exports = class MultiBar extends _EventEmitter{
 }

 // add a new bar to the stack
 create(total, startValue, payload, barOptions={}){
 create(total, startValue, payload, barOptions={}){
 // create new bar element and merge global options + overrides
 // use the same global terminal instance for all instances
 const bar = new _BarElement(Object.assign(
 {},
 const bar = new BarElement(Object.assign(
 {},

 // global options
 this.options,
 this.options,

 // terminal instance
 {
Expand All@@ -70,19 +71,19 @@ module.exports = class MultiBar extends _EventEmitter{
 process.once('SIGINT', this.sigintCallback);
 process.once('SIGTERM', this.sigintCallback);
 }

 // multiprogress already active ?
 if (!this.isActive){
 if (!this.isActive){
 // hide the cursor ?
 if (this.options.hideCursor === true){
 if (this.options.hideCursor === true){
 this.terminal.cursor(false);
 }

 // disable line wrapping ?
 if (this.options.linewrap === false){
 if (this.options.linewrap === false){
 this.terminal.lineWrapping(false);
 }

 // initialize update timer
 this.timer = setTimeout(this.update.bind(this), this.schedulingRate);
 }
Expand All@@ -101,12 +102,12 @@ module.exports = class MultiBar extends _EventEmitter{
 }

 // remove a bar from the stack
 remove(bar){
 remove(bar){
 // find element
 const index = this.bars.indexOf(bar);

 // element found ?
 if (index < 0){
 if (index < 0){
 return false;
 }

Expand All@@ -133,7 +134,7 @@ module.exports = class MultiBar extends _EventEmitter{

 // trigger event
 this.emit('update-pre');

 // reset cursor
 this.terminal.cursorRelativeReset();

Expand DownExpand Up@@ -218,7 +219,7 @@ module.exports = class MultiBar extends _EventEmitter{
 if (this.options.clearOnComplete){
 // clear all bars
 this.terminal.clearBottom();

 // or show final progress ?
 }else{
 // update each bar
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
feat: added support for barCompleteChar being an array of string plus others associated#144

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

 Open

UnKnoWn-Consortium
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


feat: added support for barCompleteChar being an array of string plus others associated
#144
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


8 changes: 4 additions & 4 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,9 +250,9 @@ The following options can be changed
- `stopOnComplete` (type:boolean) - automatically call `stop()` when the value reaches the total (default: false)
- `clearOnComplete` (type:boolean) - clear the progress bar on complete / `stop()` call (default: false)
- `barsize` (type:int) - the length of the progress bar in chars (default: 40)
- `align` (type:char) - position of the progress bar - 'left' (default), 'right' or 'center'
- `barCompleteChar` (type:char) - character to use as "complete" indicator in the bar (default: "=")
- `barIncompleteChar` (type:char) - character to use as "incomplete" indicator in the bar (default: "-")
- `align` (type:string) - position of the progress bar - 'left' (default), 'right' or 'center'
- `barCompleteChar` (type:string|string[]) - character to use as "complete" indicator in the bar (default: "=")
- `barIncompleteChar` (type:string) - character to use as "incomplete" indicator in the bar (default: "-")
- `hideCursor` (type:boolean) - hide the cursor during progress operation; restored on complete (default: false) - pass `null` to keep terminal settings
- `linewrap` (type:boolean) - disable line wrapping (default: false) - pass `null` to keep terminal settings; pass `true` to add linebreaks automatically (not recommended)
- `gracefulExit` (type:boolean) - stop the bars in case of `SIGINT` or `SIGTERM` - this restores most cursor settings before exiting (default: `false` - subjected to change)
Expand DownExpand Up@@ -450,7 +450,7 @@ The following presets are included by default
* **shades-classic** - Unicode background shades are used for the bar
* **shades-grey** - Unicode background shades with grey bar
* **rect** - Unicode Rectangles

* **braille-patterns** - Unicode Braille Pattern Dots

Compatibility
---------------------------------------------
Expand Down

30 changes: 14 additions & 16 deletions
cli-progress.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
const _SingleBar = require('./lib/single-bar');
const _MultiBar = require('./lib/multi-bar');
const _Presets = require('./presets/index');
const _Formatter = require('./lib/formatter');
const _defaultFormatValue = require('./lib/format-value');
const _defaultFormatBar = require('./lib/format-bar');
const _defaultFormatTime = require('./lib/format-time');
const SingleBar = require('./lib/single-bar.js');
const MultiBar = require('./lib/multi-bar.js');
const Presets = require('./presets/index.js');
const Formatter = require('./lib/formatter.js');
const ValueFormat = require('./lib/format-value.js');
const BarFormat = require('./lib/format-bar.js');
const TimeFormat = require('./lib/format-time.js');

// sub-module access
module.exports = {
 Bar: _SingleBar,
 SingleBar: _SingleBar,
 MultiBar: _MultiBar,
 Presets: _Presets,
 Bar: SingleBar,
 SingleBar,
 MultiBar,
 Presets,
 Format: {
 Formatter: _Formatter,
 BarFormat: _defaultFormatBar,
 ValueFormat: _defaultFormatValue,
 TimeFormat: _defaultFormatTime
 Formatter,
 BarFormat, ValueFormat, TimeFormat,
 }
};
};

28 changes: 20 additions & 8 deletions
lib/format-bar.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
// format bar
module.exports = function formatBar(progress, options){
 // calculate barsize
 const completeSize = Math.round(progress*options.barsize);
 const incompleteSize = options.barsize-completeSize;

 // generate bar string by stripping the pre-rendered strings
 return options.barCompleteString.substr(0, completeSize) +
 if (Array.isArray(options.barCompleteChar) && options.barCompleteChar.length > 1) {
 const completeSize = Math.floor(progress * options.barsize);
 const incompleteSize = Math.floor(options.barsize * (1 - progress));
 const remainder = progress * options.barsize - completeSize;
 const remainderChar = remainder > 0 ?
 options.barCompleteChar[Math.round(remainder * options.barCompleteChar.length) - 1] :
 "";
 return options.barCompleteString.slice(0, completeSize) +
 remainderChar +
 options.barGlue +
 options.barIncompleteString.substr(0, incompleteSize);
}
 options.barIncompleteString.slice(0, incompleteSize);
 }

 // calculate barsize
 const completeSize = Math.round(progress * options.barsize);
 const incompleteSize = options.barsize - completeSize;
 // generate bar string by stripping the pre-rendered strings
 return options.barCompleteString.slice(0, completeSize) +
 options.barGlue +
 options.barIncompleteString.slice(0, incompleteSize);
}

28 changes: 14 additions & 14 deletions
lib/generic-bar.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
const _ETA = require('./eta');
const _Terminal = require('./terminal');
const _formatter = require('./formatter');
const _options = require('./options');
const _EventEmitter = require('events');
const EventEmitter = require('node:events');

const ETA = require('./eta.js');
const Terminal = require('./terminal.js');
const formatter = require('./formatter.js');

// Progress-Bar constructor
module.exports = class GenericBar extends _EventEmitter{
module.exports = class GenericBar extends EventEmitter {

 constructor(options){
 constructor(options){
 super();

 // store options and assign derived ones (instance specific)
 this.options = _options.assignDerivedOptions(options);
 this.options = options;

 // store terminal instance
 this.terminal = (this.options.terminal) ? this.options.terminal : new _Terminal(this.options.stream);
 this.terminal = (this.options.terminal) ? this.options.terminal : new Terminal(this.options.stream);

 // the current bar value
 this.value = 0;
Expand All@@ -38,7 +38,7 @@ module.exports = class GenericBar extends _EventEmitter{
 this.lastRedraw = Date.now();

 // default eta calculator (will be re-create on start)
 this.eta = new _ETA(this.options.etaBufferLength, 0, 0);
 this.eta = new ETA(this.options.etaBufferLength, 0, 0);

 // payload data
 this.payload = {};
Expand All@@ -47,7 +47,7 @@ module.exports = class GenericBar extends _EventEmitter{
 this.isActive = false;

 // use default formatter or custom one ?
 this.formatter = (typeof this.options.format === 'function') ? this.options.format : _formatter;
 this.formatter = (typeof this.options.format === 'function') ? this.options.format : formatter;
 }

 // internal render function
Expand DownExpand Up@@ -123,7 +123,7 @@ module.exports = class GenericBar extends _EventEmitter{
 this.lastDrawnString = '';

 // initialize eta buffer
 this.eta = new _ETA(this.options.etaBufferLength, this.startTime, this.value);
 this.eta = new ETA(this.options.etaBufferLength, this.startTime, this.value);

 // set flag
 this.isActive = true;
Expand All@@ -136,7 +136,7 @@ module.exports = class GenericBar extends _EventEmitter{
 stop(){
 // set flag
 this.isActive = false;

 // store stop timestamp to get total duration
 this.stopTime = Date.now();

Expand DownExpand Up@@ -207,7 +207,7 @@ module.exports = class GenericBar extends _EventEmitter{
 // handle the use case when `step` is omitted but payload is passed
 if (typeof arg0 === 'object') {
 this.update(this.value + 1, arg0);

 // increment([step=1], [payload={}])
 }else{
 this.update(this.value + arg0, arg1);
Expand Down

43 changes: 22 additions & 21 deletions
lib/multi-bar.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
const _Terminal = require('./terminal');
const _BarElement = require('./generic-bar');
const _options = require('./options');
const _EventEmitter = require('events');
const EventEmitter = require('node:events');

const Terminal = require('./terminal.js');
const BarElement = require('./generic-bar.js');
const { parse, } = require('./options.js');

// Progress-Bar constructor
module.exports = class MultiBar extends _EventEmitter{
module.exports = class MultiBar extends EventEmitter {

 constructor(options, preset){
 constructor(options, preset){
 super();

 // list of bars
 this.bars = [];

 // parse+store options
 this.options = _options.parse(options, preset);
 this.options = parse(options, preset);

 // disable synchronous updates
 this.options.synchronousUpdate = false;

 // store terminal instance
 this.terminal = (this.options.terminal) ? this.options.terminal : new _Terminal(this.options.stream);
 this.terminal = (this.options.terminal) ? this.options.terminal : new Terminal(this.options.stream);

 // the update timer
 this.timer = null;
Expand All@@ -38,14 +39,14 @@ module.exports = class MultiBar extends _EventEmitter{
 }

 // add a new bar to the stack
 create(total, startValue, payload, barOptions={}){
 create(total, startValue, payload, barOptions={}){
 // create new bar element and merge global options + overrides
 // use the same global terminal instance for all instances
 const bar = new _BarElement(Object.assign(
 {},
 const bar = new BarElement(Object.assign(
 {},

 // global options
 this.options,
 this.options,

 // terminal instance
 {
Expand All@@ -70,19 +71,19 @@ module.exports = class MultiBar extends _EventEmitter{
 process.once('SIGINT', this.sigintCallback);
 process.once('SIGTERM', this.sigintCallback);
 }

 // multiprogress already active ?
 if (!this.isActive){
 if (!this.isActive){
 // hide the cursor ?
 if (this.options.hideCursor === true){
 if (this.options.hideCursor === true){
 this.terminal.cursor(false);
 }

 // disable line wrapping ?
 if (this.options.linewrap === false){
 if (this.options.linewrap === false){
 this.terminal.lineWrapping(false);
 }

 // initialize update timer
 this.timer = setTimeout(this.update.bind(this), this.schedulingRate);
 }
Expand All@@ -101,12 +102,12 @@ module.exports = class MultiBar extends _EventEmitter{
 }

 // remove a bar from the stack
 remove(bar){
 remove(bar){
 // find element
 const index = this.bars.indexOf(bar);

 // element found ?
 if (index < 0){
 if (index < 0){
 return false;
 }

Expand All@@ -133,7 +134,7 @@ module.exports = class MultiBar extends _EventEmitter{

 // trigger event
 this.emit('update-pre');

 // reset cursor
 this.terminal.cursorRelativeReset();

Expand DownExpand Up@@ -218,7 +219,7 @@ module.exports = class MultiBar extends _EventEmitter{
 if (this.options.clearOnComplete){
 // clear all bars
 this.terminal.clearBottom();

 // or show final progress ?
 }else{
 // update each bar
Expand Down
Loading