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

Always enable TotalDownload

Browse source 
Previously TotalDownload would switch the % download from per package to
overall. Meaning you had a choice of which information to dispplay.

Now with parallel downloads TotalDownload adds an extra progress bar.
There's no reason to have this an off by default feature. Let's just
make it always on.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
morganamilo 2021-04-18 20:59:43 +01:00 • committed by Allan McRae
parent 63ad8b8b76
commit 41f9c50abf
8 changed files with 4 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README
View file

@ -194,8 +194,8 @@ remove.c and sync.c).
The frontend is using a configuration file, usually "/etc/pacman.conf". Some
of these options are only useful for the frontend only (mainly the ones used to
control the output like totaldownload, or the behavior with cleanmethod and
syncfirst). The rest is used to configure the library.
control the output like verbosepkglist, or the behavior with cleanmethod).
The rest is used to configure the library.
[UPGRADE/REMOVE/SYNC]

5
doc/pacman.conf.5.asciidoc
View file

@ -190,11 +190,6 @@ Options
Disables progress bars. This is useful for terminals which do
not support escape characters.
*TotalDownload*::
When downloading, display an extra progress bar with the amount downloaded,
download rate, ETA, and completed percentage of the entire download list.
This option won't work if XferCommand is used.
*CheckSpace*::
Performs an approximate check for adequate available disk space before
installing packages.

1
etc/pacman.conf.in
View file

@ -32,7 +32,6 @@ Architecture = auto
#UseSyslog
#Color
#NoProgressBar
#TotalDownload
CheckSpace
#VerbosePkgLists
ParallelDownloads = 5

1
scripts/completion/zsh_completion.in
View file

@ -511,7 +511,6 @@ _pacman_conf_general_directives=(
'XferCommand'
'UseSyslog'
'Color'
'TotalDownload'
'CheckSpace'
'VerbosePkgLists'
'DisableDownloadTimeout'

3
src/pacman/callback.c
View file

@ -340,7 +340,8 @@ void cb_event(alpm_event_t *event)
on_progress = 1;
list_total_pkgs = event->pkg_retrieve.num;
list_total = event->pkg_retrieve.total_size;
total_enabled = config->totaldownload && list_total && dload_progressbar_enabled();
total_enabled = list_total && dload_progressbar_enabled();
if(total_enabled) {
init_total_progressbar();
}

3
src/pacman/conf.c
View file

@ -605,9 +605,6 @@ static int _parse_options(const char *key, char *value,
} else if(strcmp(key, "VerbosePkgLists") == 0) {
config->verbosepkglists = 1;
pm_printf(ALPM_LOG_DEBUG, "config: verbosepkglists\n");
} else if(strcmp(key, "TotalDownload") == 0) {
config->totaldownload = 1;
pm_printf(ALPM_LOG_DEBUG, "config: totaldownload\n");
} else if(strcmp(key, "CheckSpace") == 0) {
config->checkspace = 1;
} else if(strcmp(key, "Color") == 0) {

3
src/pacman/conf.h
View file

@ -113,9 +113,6 @@ typedef struct __config_t {
unsigned short chomp;
/* format target pkg lists as table */
unsigned short verbosepkglists;
/* When downloading, display the amount downloaded, rate, ETA, and percent
* downloaded of the total download list */
unsigned short totaldownload;
/* number of parallel download streams */
unsigned int parallel_downloads;
/* select -Sc behavior */

3
src/pacman/pacman-conf.c
View file

@ -263,7 +263,6 @@ static void dump_config(void)
show_bool("UseSyslog", config->usesyslog);
show_bool("Color", config->color);
show_bool("TotalDownload", config->totaldownload);
show_bool("CheckSpace", config->checkspace);
show_bool("VerbosePkgLists", config->verbosepkglists);
show_bool("DisableDownloadTimeout", config->disable_dl_timeout);
@ -372,8 +371,6 @@ static int list_directives(void)
show_bool("UseSyslog", config->usesyslog);
} else if(strcasecmp(i->data, "Color") == 0) {
show_bool("Color", config->color);
} else if(strcasecmp(i->data, "TotalDownload") == 0) {
show_bool("TotalDownload", config->totaldownload);
} else if(strcasecmp(i->data, "CheckSpace") == 0) {
show_bool("CheckSpace", config->checkspace);
} else if(strcasecmp(i->data, "VerbosePkgLists") == 0) {