Skip to content

Introducing option for endline character #55

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
pedro-walter wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Introducing option for endline character #55

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
10 changes: 10 additions & 0 deletions examples.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,16 @@ def example19():
for i in pbar([]):
pass
pbar.finish()

@example
def example20():
widgets = [FormatLabel('Processed: %(value)d/%(max)d items (in: %(elapsed)s)'),
' -=- ', Percentage(),
' -=- ', ETA()]
pbar = ProgressBar(maxval=15, widgets=widgets, endline_character='\n')
pbar.update_interval = 10
for i in pbar((i for i in range(15))):
time.sleep(0.7)

if __name__ == '__main__':
try:
Expand Down
7 changes: 4 additions & 3 deletions progressbar/progressbar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class ProgressBar(object):
- percentage(): progress in percent [0..100]
"""

__slots__ = ('currval', 'fd', 'finished', 'last_update_time',
__slots__ = ('currval', 'endline_character', 'fd', 'finished', 'last_update_time',
'left_justify', 'maxval', 'next_update', 'num_intervals',
'poll', 'seconds_elapsed', 'signal_set', 'start_time',
'term_width', 'update_interval', 'widgets', '_time_sensitive',
Expand All @@ -95,7 +95,7 @@ class ProgressBar(object):
_DEFAULT_WIDGETS = [widgets.Percentage(), ' ', widgets.Bar()]

def __init__(self, maxval=None, widgets=None, term_width=None, poll=1,
left_justify=True, fd=sys.stderr):
left_justify=True, fd=sys.stderr, endline_character='\r'):
"""Initializes a progress bar with sane defaults."""

# Don't share a reference with any other progress bars
Expand All @@ -106,6 +106,7 @@ def __init__(self, maxval=None, widgets=None, term_width=None, poll=1,
self.widgets = widgets
self.fd = fd
self.left_justify = left_justify
self.endline_character = endline_character

self.signal_set = False
if term_width is not None:
Expand Down Expand Up @@ -260,7 +261,7 @@ def update(self, value=None):
now = time.time()
self.seconds_elapsed = now - self.start_time
self.next_update = self.currval + self.update_interval
self.fd.write(self._format_line() + '\r')
self.fd.write(self._format_line() + self.endline_character)
self.fd.flush()
self.last_update_time = now

Expand Down