mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more compact progress display

Browse Source 
Each progress can be on a single line instead of two.

[sp: Changed "Checking files out" to "Checking out files" at
     Johannes Sixt's suggestion as it better explains the
	 action that is taking place]

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Nicolas Pitre
2007-10-16 21:55:45 -04:00
committed by Shawn O. Pearce
parent 207f1a75e7
commit 42e18fbf5f
6 changed files with 39 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
progress.c
View File

@ -35,10 +35,11 @@ static void clear_progress_signal(void)
progress_update = 0;
}
int display_progress(struct progress *progress, unsigned n)
static int display(struct progress *progress, unsigned n, int done)
{
char *eol;
if (progress->delay) {
char buf[80];
if (!progress_update || --progress->delay)
return 0;
if (progress->total) {
@ -51,60 +52,56 @@ int display_progress(struct progress *progress, unsigned n)
return 0;
}
}
if (snprintf(buf, sizeof(buf),
progress->delayed_title, progress->total))
fprintf(stderr, "%s\n", buf);
}
progress->last_value = n;
eol = done ? ", done. \n" : " \r";
if (progress->total) {
unsigned percent = n * 100 / progress->total;
if (percent != progress->last_percent || progress_update) {
progress->last_percent = percent;
fprintf(stderr, "%s%4u%% (%u/%u) done\r",
progress->prefix, percent, n, progress->total);
fprintf(stderr, "%s: %3u%% (%u/%u)%s", progress->title,
percent, n, progress->total, eol);
progress_update = 0;
progress->need_lf = 1;
return 1;
}
} else if (progress_update) {
fprintf(stderr, "%s%u\r", progress->prefix, n);
fprintf(stderr, "%s: %u%s", progress->title, n, eol);
progress_update = 0;
progress->need_lf = 1;
return 1;
}
return 0;
}
void start_progress(struct progress *progress, const char *title,
const char *prefix, unsigned total)
int display_progress(struct progress *progress, unsigned n)
{
char buf[80];
progress->prefix = prefix;
progress->total = total;
progress->last_percent = -1;
progress->delay = 0;
progress->need_lf = 0;
if (snprintf(buf, sizeof(buf), title, total))
fprintf(stderr, "%s\n", buf);
set_progress_signal();
return display(progress, n, 0);
}
void start_progress_delay(struct progress *progress, const char *title,
const char *prefix, unsigned total,
unsigned percent_treshold, unsigned delay)
unsigned total, unsigned percent_treshold, unsigned delay)
{
progress->prefix = prefix;
progress->title = title;
progress->total = total;
progress->last_value = -1;
progress->last_percent = -1;
progress->delayed_percent_treshold = percent_treshold;
progress->delayed_title = title;
progress->delay = delay;
progress->need_lf = 0;
set_progress_signal();
}
void start_progress(struct progress *progress, const char *title, unsigned total)
{
start_progress_delay(progress, title, total, 0, 0);
}
void stop_progress(struct progress *progress)
{
if (progress->last_value != -1) {
/* Force the last update */
progress_update = 1;
display(progress, progress->last_value, 1);
}
clear_progress_signal();
if (progress->need_lf)
fputc('\n', stderr);
}