diff options
| author | Allan McRae <allan@archlinux.org> | 2015-12-14 15:48:44 +1000 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2015-12-15 20:12:23 +1000 |
| commit | 760bea543211673884c254b7e0c44e0f70fe2257 (patch) | |
| tree | 6ac940877290cc5a62919a4f92f9fdc715c0d066 /src | |
| parent | 8d3bd4ec13940da70f946e6e63d59a05c89cbb50 (diff) | |
Show progress processing hooks
Introduces the ALPM_EVENT_HOOK_RUN_{START,DONE} events that are triggered
at the start and end of running an individual hook.
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/pacman/callback.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/src/pacman/callback.c b/src/pacman/callback.c index a71d94ba..83939509 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -160,6 +160,16 @@ static void fill_progress(const int bar_percent, const int disp_percent, fflush(stdout); } +static int number_length(size_t n) +{ + int digits = 1; + while((n /= 10)) { + ++digits; + } + + return digits; +} + /* callback to handle messages/notifications from libalpm transactions */ void cb_event(alpm_event_t *event) { @@ -174,6 +184,14 @@ void cb_event(alpm_event_t *event) colon_printf(_("Running post-transaction hooks...\n")); } break; + case ALPM_EVENT_HOOK_RUN_START: + { + alpm_event_hook_run_t *e = &event->hook_run; + int digits = number_length(e->total); + printf("(%*zu/%*zu) %s\n", digits, e->position, + digits, e->total, e->name); + } + break; case ALPM_EVENT_CHECKDEPS_START: printf(_("checking dependencies...\n")); break; @@ -341,6 +359,7 @@ void cb_event(alpm_event_t *event) case ALPM_EVENT_RETRIEVE_DONE: case ALPM_EVENT_RETRIEVE_FAILED: case ALPM_EVENT_HOOK_DONE: + case ALPM_EVENT_HOOK_RUN_DONE: /* we can safely ignore those as well */ case ALPM_EVENT_PKGDOWNLOAD_START: case ALPM_EVENT_PKGDOWNLOAD_DONE: @@ -481,7 +500,6 @@ void cb_progress(alpm_progress_t event, const char *pkgname, int percent, /* size of line to allocate for text printing (e.g. not progressbar) */ int infolen; int digits, textlen; - size_t tmp; char *opr = NULL; /* used for wide character width determination and printing */ int len, wclen, wcwid, padwid; @@ -557,11 +575,8 @@ void cb_progress(alpm_progress_t event, const char *pkgname, int percent, } /* find # of digits in package counts to scale output */ - digits = 1; - tmp = howmany; - while((tmp /= 10)) { - ++digits; - } + digits = number_length(howmany); + /* determine room left for non-digits text [not ( 1/12) part] */ textlen = infolen - 3 /* (/) */ - (2 * digits) - 1 /* space */; |