[pacman-dev] [PATCH] Added better colourisation support for the "-{F, Q}o" operation.

[Allan McRae]

On 28/03/16 10:54, xavion.0 at gmail.com wrote:
> From: Xavion <Xavion (dot) 0 (at) Gmail (dot) com>
> 
> Specifically, the following changes have been made:
> * The repository is in 'magenta'
> * The package name is in 'bold'
> * The version is in 'green'
> 
> Signed-off-by: Xavion <Xavion (dot) 0 (at) Gmail (dot) com>
> ---
>  src/pacman/files.c | 6 ++++--
>  src/pacman/query.c | 5 +++--
>  2 files changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/src/pacman/files.c b/src/pacman/files.c
> index 5240c07..692fcd5 100644
> --- a/src/pacman/files.c
> +++ b/src/pacman/files.c
> @@ -77,8 +77,10 @@ static int files_fileowner(alpm_list_t *syncs, alpm_list_t *targets) {
>  					if(config->op_f_machinereadable) {
>  						print_line_machinereadable(repo, pkg, filename);
>  					} else if(!config->quiet) {
> -						printf(_("%s is owned by %s/%s %s\n"), filename,
> -								alpm_db_get_name(repo), alpm_pkg_get_name(pkg),
> +						const colstr_t *colstr = &config->colstr;
> +						printf(_("%s is owned by %s%s/%s%s %s%s\n"), filename,
> +								colstr->repo, alpm_db_get_name(repo), colstr->title,
> +								alpm_pkg_get_name(pkg), colstr->version,
>  								alpm_pkg_get_version(pkg));

Should the '/' between the repo and package names be magenta?

>  					} else {
>  						printf("%s/%s\n", alpm_db_get_name(repo), alpm_pkg_get_name(pkg));
> diff --git a/src/pacman/query.c b/src/pacman/query.c
> index 0cc12e6..496eefe 100644
> --- a/src/pacman/query.c
> +++ b/src/pacman/query.c
> @@ -83,8 +83,9 @@ static int search_path(char **filename, struct stat *bufptr)
>  static void print_query_fileowner(const char *filename, alpm_pkg_t *info)
>  {
>  	if(!config->quiet) {
> -		printf(_("%s is owned by %s %s\n"), filename,
> -				alpm_pkg_get_name(info), alpm_pkg_get_version(info));
> +		const colstr_t *colstr = &config->colstr;
> +		printf(_("%s is owned by %s%s %s%s\n"), filename, colstr->title,
> +				alpm_pkg_get_name(info), colstr->version, alpm_pkg_get_version(info));
>  	} else {
>  		printf("%s\n", alpm_pkg_get_name(info));
>  	}
>