Pacman-dev June 2023

pacman-dev@lists.archlinux.org

3 participants
5 discussions

[PATCH v3] query: permit filter options with --owns
by Ronan Pigott 20 Aug '23

20 Aug '23

Signed-off-by: Ronan Pigott <ronan(a)rjp.ie> --- Changes in v2: - Use forward declarations - Drop the unnecessary error message Changes in v3: - Remove one unnecessary forward decl src/pacman/pacman.c | 1 - src/pacman/query.c | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index e5c6e4200932..320c7654e0a7 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -608,7 +608,6 @@ static void checkargs_query(void) } else if(config->op_q_owns) { invalid_opt(config->group, "--owns", "--groups"); checkargs_query_display_opts("--owns"); - checkargs_query_filter_opts("--owns"); } else if(config->group) { checkargs_query_display_opts("--groups"); } diff --git a/src/pacman/query.c b/src/pacman/query.c index d75c4c801be5..bcf948514ca3 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -135,6 +135,8 @@ cleanup: return (success ? resolved_path : NULL); } +static int filter(alpm_pkg_t *pkg); + static int query_fileowner(alpm_list_t *targets) { int ret = 0; @@ -210,6 +212,9 @@ static int query_fileowner(alpm_list_t *targets) } for(i = packages; i && (!found || is_dir); i = alpm_list_next(i)) { + if (!filter(i->data)) { + continue; + } if(alpm_filelist_contains(alpm_pkg_get_files(i->data), rel_path)) { print_query_fileowner(rpath, i->data); found = 1; -- 2.41.0

2 1

[PATCH] Leverage the U+EE00..U+EE05 unicode characters to make pretty progress bars
by Lénaïc Huard 17 Jun '23

17 Jun '23

Some unicode fonts are now implementing special glyph to render pretty progress bars. Here are some examples: * FiraCode [1] [2] * Iosevka [3] [4] [5] * JuliaMono [3] This change introduces a new parameter, `PrettyProgressBar` that triggers the use of those characters to render progress bars. Here is an example of how it renders with this new option and the FiraCode font: [6] [1] https://github.com/tonsky/FiraCode/releases/tag/6 [2] https://github.com/tonsky/FiraCode/issues/1182 [3] https://github.com/tonsky/FiraCode/issues/1182#issuecomment-1525953517 [4] https://github.com/be5invis/Iosevka/releases/tag/v11.2.0 [5] https://github.com/be5invis/Iosevka/issues/1327 [6] https://i2.paste.pics/OK03I.png Signed-off-by: Lénaïc Huard <lenaic(a)lhuard.fr> --- doc/pacman.conf.5.asciidoc | 3 + etc/pacman.conf.in | 1 + scripts/completion/zsh_completion.in | 1 + src/pacman/callback.c | 108 ++++++++++++++++----------- src/pacman/conf.c | 3 + src/pacman/conf.h | 2 + src/pacman/pacman-conf.c | 3 + 7 files changed, 76 insertions(+), 45 deletions(-) diff --git a/doc/pacman.conf.5.asciidoc b/doc/pacman.conf.5.asciidoc index 77a3907f..daab30d4 100644 --- a/doc/pacman.conf.5.asciidoc +++ b/doc/pacman.conf.5.asciidoc @@ -186,6 +186,9 @@ Options *Color*:: Automatically enable colors only when pacman's output is on a tty. +*PrettyProgressBar*:: + Use specific U+EE00..U+EE05 unicode characters to render pretty progress bars. + *NoProgressBar*:: Disables progress bars. This is useful for terminals which do not support escape characters. diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 1799efc7..9ce2b938 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -31,6 +31,7 @@ Architecture = auto # Misc options #UseSyslog #Color +#PrettyProgressBar #NoProgressBar CheckSpace #VerbosePkgLists diff --git a/scripts/completion/zsh_completion.in b/scripts/completion/zsh_completion.in index 5fd8aebc..e64a603e 100644 --- a/scripts/completion/zsh_completion.in +++ b/scripts/completion/zsh_completion.in @@ -514,6 +514,7 @@ _pacman_conf_general_directives=( 'CheckSpace' 'VerbosePkgLists' 'DisableDownloadTimeout' + 'PrettyProgressBar' 'NoProgressBar' 'ParallelDownloads' 'CleanMethod' diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 75c74f8b..f72a91cf 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -153,54 +153,72 @@ static int64_t get_update_timediff(int first_call) static void fill_progress(const int bar_percent, const int disp_percent, const int proglen) { - /* 8 = 1 space + 1 [ + 1 ] + 5 for percent */ - const int hashlen = proglen > 8 ? proglen - 8 : 0; - const int hash = bar_percent * hashlen / 100; - static int lasthash = 0, mouth = 0; int i; - if(bar_percent == 0) { - lasthash = 0; - mouth = 0; + /* if pretty progress bar enabled */ + if(config->pretty) { + /* 8 = 1 space + 1  + 1  + 5 for percent */ + const int hashlen = proglen > 8 ? proglen - 6 : 0; + const int hash = bar_percent * hashlen / 100; + + if(hashlen > 2) { + fputs(hash > 0 ? " " : " ", stdout); + for(i = hashlen - 1; i > 1; --i) { + fputs(i > hashlen - hash ? "" : "", stdout); + } + fputs(hash == hashlen ? "" : "", stdout); + } + + } else { + /* 8 = 1 space + 1 [ + 1 ] + 5 for percent */ + const int hashlen = proglen > 8 ? proglen - 8 : 0; + const int hash = bar_percent * hashlen / 100; + static int lasthash = 0, mouth = 0; + + if(bar_percent == 0) { + lasthash = 0; + mouth = 0; + } + + if(hashlen > 0) { + fputs(" [", stdout); + for(i = hashlen; i > 0; --i) { + /* if special progress bar enabled */ + if(config->chomp) { + if(i > hashlen - hash) { + putchar('-'); + } else if(i == hashlen - hash) { + if(lasthash == hash) { + if(mouth) { + fputs("\033[1;33mC\033[m", stdout); + } else { + fputs("\033[1;33mc\033[m", stdout); + } + } else { + lasthash = hash; + mouth = mouth == 1 ? 0 : 1; + if(mouth) { + fputs("\033[1;33mC\033[m", stdout); + } else { + fputs("\033[1;33mc\033[m", stdout); + } + } + } else if(i % 3 == 0) { + fputs("\033[0;37mo\033[m", stdout); + } else { + fputs("\033[0;37m \033[m", stdout); + } + } /* else regular progress bar */ + else if(i > hashlen - hash) { + putchar('#'); + } else { + putchar('-'); + } + } + putchar(']'); + } } - if(hashlen > 0) { - fputs(" [", stdout); - for(i = hashlen; i > 0; --i) { - /* if special progress bar enabled */ - if(config->chomp) { - if(i > hashlen - hash) { - putchar('-'); - } else if(i == hashlen - hash) { - if(lasthash == hash) { - if(mouth) { - fputs("\033[1;33mC\033[m", stdout); - } else { - fputs("\033[1;33mc\033[m", stdout); - } - } else { - lasthash = hash; - mouth = mouth == 1 ? 0 : 1; - if(mouth) { - fputs("\033[1;33mC\033[m", stdout); - } else { - fputs("\033[1;33mc\033[m", stdout); - } - } - } else if(i % 3 == 0) { - fputs("\033[0;37mo\033[m", stdout); - } else { - fputs("\033[0;37m \033[m", stdout); - } - } /* else regular progress bar */ - else if(i > hashlen - hash) { - putchar('#'); - } else { - putchar('-'); - } - } - putchar(']'); - } /* print display percent after progress bar */ /* 5 = 1 space + 3 digits + 1 % */ if(proglen >= 5) { @@ -252,7 +270,7 @@ void cb_event(void *ctx, alpm_event_t *event) 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, + digits, e->total, e->desc ? e->desc : e->name); } break; diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 12fee64c..fa38930c 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -604,6 +604,9 @@ static int _parse_options(const char *key, char *value, } else if(strcmp(key, "ILoveCandy") == 0) { config->chomp = 1; pm_printf(ALPM_LOG_DEBUG, "config: chomp\n"); + } else if(strcmp(key, "PrettyProgressBar") == 0 ) { + config->pretty = 1; + pm_printf(ALPM_LOG_DEBUG, "config: pretty\n"); } else if(strcmp(key, "VerbosePkgLists") == 0) { config->verbosepkglists = 1; pm_printf(ALPM_LOG_DEBUG, "config: verbosepkglists\n"); diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 04350d39..1ac6806f 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -111,6 +111,8 @@ typedef struct __config_t { /* conf file options */ /* I Love Candy! */ unsigned short chomp; + /* Pretty progress bar */ + unsigned short pretty; /* format target pkg lists as table */ unsigned short verbosepkglists; /* number of parallel download streams */ diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index 600f1622..3ea4816a 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -267,6 +267,7 @@ static void dump_config(void) show_bool("VerbosePkgLists", config->verbosepkglists); show_bool("DisableDownloadTimeout", config->disable_dl_timeout); show_bool("ILoveCandy", config->chomp); + show_bool("PrettyProgressBar", config->pretty); show_bool("NoProgressBar", config->noprogressbar); show_int("ParallelDownloads", config->parallel_downloads); @@ -379,6 +380,8 @@ static int list_directives(void) show_bool("DisableDownloadTimeout", config->disable_dl_timeout); } else if(strcasecmp(i->data, "ILoveCandy") == 0) { show_bool("ILoveCandy", config->chomp); + } else if(strcasecmp(i->data, "PrettyProgressBar") == 0) { + show_bool("PrettyProgressBar", config->pretty); } else if(strcasecmp(i->data, "NoProgressBar") == 0) { show_bool("NoProgressBar", config->noprogressbar); -- 2.40.1

1 0

Minor annoyance with paths
by Ronan Pigott 07 Jun '23

07 Jun '23

So I have a minor annoyance with pacman that $(pacman-conf CacheDir)/somefile evaluates to /var/cache/pacman/pkg//somefile, with two //. That's because the default value of CacheDir (and several other path-valued variables) ends with a trailing slash. The normalized path name is of course the same but I'd like it to look pretty. Would it be acceptable to either change the default values of these variables to drop the trailing slash or have pacman-conf silently drop them when printing?

1 0

[PATCH v2] query: permit filter options with --owns
by Ronan Pigott 02 Jun '23

02 Jun '23

Signed-off-by: Ronan Pigott <ronan(a)rjp.ie> --- Changes from v1: 1. Use forward declarations 2. Drop the unnecessary error message src/pacman/pacman.c | 1 - src/pacman/query.c | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index e5c6e4200932..320c7654e0a7 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -608,7 +608,6 @@ static void checkargs_query(void) } else if(config->op_q_owns) { invalid_opt(config->group, "--owns", "--groups"); checkargs_query_display_opts("--owns"); - checkargs_query_filter_opts("--owns"); } else if(config->group) { checkargs_query_display_opts("--groups"); } diff --git a/src/pacman/query.c b/src/pacman/query.c index d75c4c801be5..e79b956838a0 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -135,6 +135,9 @@ cleanup: return (success ? resolved_path : NULL); } +static int is_unrequired(alpm_pkg_t *pkg, unsigned short level); +static int filter(alpm_pkg_t *pkg); + static int query_fileowner(alpm_list_t *targets) { int ret = 0; @@ -210,6 +213,9 @@ static int query_fileowner(alpm_list_t *targets) } for(i = packages; i && (!found || is_dir); i = alpm_list_next(i)) { + if (!filter(i->data)) { + continue; + } if(alpm_filelist_contains(alpm_pkg_get_files(i->data), rel_path)) { print_query_fileowner(rpath, i->data); found = 1; -- 2.41.0

1 0

[PATCH 0/2] Permit query filter options with --owns
by Ronan Pigott 01 Jun '23

01 Jun '23

Recently I wanted to find foreign packages that own a path and found that pacman -Qmoq /my/path gives an error. I don't see any reason in principle why this should not be allowed, so I'd like to change it. Ronan Pigott (2): query: move declarations of filter related functions query: permit filter options with --owns src/pacman/pacman.c | 1 - src/pacman/query.c | 131 ++++++++++++++++++++++++-------------------- 2 files changed, 71 insertions(+), 61 deletions(-) -- 2.40.1

4 8

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Pacman-dev June 2023