bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pacman: clean filename for downlaods

Browse source 
The progress bar already did this. But the init event and up to date
message printed the full file name.  Unify these for consistency.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
morganamilo 2021-01-01 16:57:45 +00:00 • committed by Allan McRae
parent 7cc8e0181f
commit bc1591a0b8
1 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/pacman/callback.c
View file

@ -749,18 +749,34 @@ static void init_total_progressbar(void)
totalbar->rate = 0.0; totalbar->rate = 0.0;
} }
static char *clean_filename(const char *filename)
{
int len = strlen(filename);
char *p;
char *fname = malloc(len + 1);
memcpy(fname, filename, len + 1);
/* strip package or DB extension for cleaner look */
if((p = strstr(fname, ".pkg")) || (p = strstr(fname, ".db")) || (p = strstr(fname, ".files"))) {
len = p - fname;
fname[len] = '\0';
}
return fname;
}
static void draw_pacman_progress_bar(struct pacman_progress_bar *bar) static void draw_pacman_progress_bar(struct pacman_progress_bar *bar)
{ {
int infolen; int infolen;
int filenamelen; int filenamelen;
char *fname, *p; char *fname;
/* used for wide character width determination and printing */ /* used for wide character width determination and printing */
int len, wclen, wcwid, padwid; int wclen, wcwid, padwid;
wchar_t *wcfname; wchar_t *wcfname;
unsigned int eta_h = 0, eta_m = 0, eta_s = bar->eta; unsigned int eta_h = 0, eta_m = 0, eta_s = bar->eta;
double rate_human, xfered_human; double rate_human, xfered_human;
const char *rate_label, *xfered_label; const char *rate_label, *xfered_label;
int file_percent = 0; int file_percent = 0;
int len = strlen(bar->filename);
const unsigned short cols = getcols(); const unsigned short cols = getcols();
@ -776,14 +792,8 @@ static void draw_pacman_progress_bar(struct pacman_progress_bar *bar)
eta_m = eta_s / 60; eta_m = eta_s / 60;
eta_s -= eta_m * 60; eta_s -= eta_m * 60;
len = strlen(bar->filename); fname = clean_filename(bar->filename);
fname = malloc(len + 1);
memcpy(fname, bar->filename, len + 1);
/* strip package or DB extension for cleaner look */
if((p = strstr(fname, ".pkg")) || (p = strstr(fname, ".db")) || (p = strstr(fname, ".files"))) {
len = p - fname;
fname[len] = '\0';
}
infolen = cols * 6 / 10; infolen = cols * 6 / 10;
if(infolen < 50) { if(infolen < 50) {
@ -859,7 +869,9 @@ static void dload_init_event(const char *filename, alpm_download_event_init_t *d
(void)data; (void)data;
if(!dload_progressbar_enabled()) { if(!dload_progressbar_enabled()) {
printf(_(" %s downloading...\n"), filename); char *cleaned_filename = clean_filename(filename);
printf(_(" %s downloading...\n"), cleaned_filename);
free(cleaned_filename);
return; return;
} }
@ -992,7 +1004,9 @@ static void dload_complete_event(const char *filename, alpm_download_event_compl
if(data->result == 1) { if(data->result == 1) {
console_cursor_goto_bar(index); console_cursor_goto_bar(index);
printf(_(" %s is up to date"), bar->filename); char *cleaned_filename = clean_filename(filename);
printf(_(" %s is up to date"), cleaned_filename);
free(cleaned_filename);
/* The line contains text from previous status. Erase these leftovers. */ /* The line contains text from previous status. Erase these leftovers. */
console_erase_line(); console_erase_line();
} else if(data->result == 0) { } else if(data->result == 0) {