Match initial download message with progress message

When initially downloading a package, pacman will display a message
like:
	wine-6.6-1-x86_64.pkg.tar.zst downloading...

Then when the download progresses the message will change to:
	wine-6.6-1-x86_64.pkg.tar.zst

So instead lets match the progress message so there's no sudden change.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
morganamilo 2021-04-18 20:59:45 +01:00 committed by Allan McRae
parent ef14c3380d
commit 31c42c338b

View file

@ -878,9 +878,9 @@ static void draw_pacman_progress_bar(struct pacman_progress_bar *bar)
static void dload_init_event(const char *filename, alpm_download_event_init_t *data) static void dload_init_event(const char *filename, alpm_download_event_init_t *data)
{ {
(void)data; (void)data;
char *cleaned_filename = clean_filename(filename);
if(!dload_progressbar_enabled()) { if(!dload_progressbar_enabled()) {
char *cleaned_filename = clean_filename(filename);
printf(_(" %s downloading...\n"), cleaned_filename); printf(_(" %s downloading...\n"), cleaned_filename);
free(cleaned_filename); free(cleaned_filename);
return; return;
@ -894,7 +894,7 @@ static void dload_init_event(const char *filename, alpm_download_event_init_t *d
multibar_ui.active_downloads = alpm_list_add(multibar_ui.active_downloads, bar); multibar_ui.active_downloads = alpm_list_add(multibar_ui.active_downloads, bar);
console_cursor_move_end(); console_cursor_move_end();
printf(_(" %s downloading...\n"), filename); printf(" %s\n", cleaned_filename);
multibar_ui.cursor_lineno++; multibar_ui.cursor_lineno++;
multibar_ui.active_downloads_num++; multibar_ui.active_downloads_num++;