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

pacsearch: removed redundant sorting

Browse source 
Package are processed in the same order as pacman output, so there is no real
need to sort. This makes the code simpler and faster.

The only difference is that local packages will always be printed at the
end. Previously, they were printed before multilib for instance.

Signed-off-by: Pierre Neidhardt <ambrevar@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Pierre Neidhardt 2014-02-09 19:41:41 +01:00 • committed by Allan McRae
parent fe961e6590
commit e2fe052576
1 changed files with 19 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
contrib/pacsearch.in
View file

@ -81,24 +81,25 @@ if ($ARGV[0] eq "--nocolor" || $ARGV[0] eq "-n") {
# localization # localization
my $LC_INSTALLED = `gettext pacman installed`; my $LC_INSTALLED = `gettext pacman installed`;
# Color a "repo/pkgname pkgver (groups) [installed]" line. # Print a "repo/pkgname pkgver (groups) [installed]" line.
# We try to stick to pacman colors. # We stick to pacman colors.
sub to_color { sub print_pkg {
my @v = @_; my @v = @_;
my $line = "$RESET$BOLD"; print "$RESET$BOLD";
if ( "$v[0]" eq "local" ) { if ( "$v[0]" eq "local" ) {
$line .= "$RED"; print "$RED";
} else { } else {
$line .= "$MAGENTA"; print "$MAGENTA";
} }
$line .= "$v[0]/$RESET$BOLD$v[1] $GREEN$v[2]"; print "$v[0]/$RESET$BOLD$v[1] $GREEN$v[2]";
$line .= " $BLUE$v[3]" if $v[3] ne ""; print " $BLUE$v[3]" if $v[3] ne "";
$line .= " $CYAN$v[4]" if $v[4] ne ""; print " $CYAN$v[4]" if $v[4] ne "";
$line .= " $RESET"; print " $RESET\n";
return $line; print " $v[5]\n";
} }
my %allpkgs = (); my %allpkgs = ();
my @pkglist = ();
my $syncout = `pacman -Ss '@ARGV'`; my $syncout = `pacman -Ss '@ARGV'`;
# split each sync search entry into its own array entry # split each sync search entry into its own array entry
@ -108,8 +109,6 @@ if ($#syncpkgs >= 0) {
chomp($syncpkgs[$#syncpkgs]); chomp($syncpkgs[$#syncpkgs]);
} }
# counter var for packages, used here and in the query loop too
my $cnt = 0;
foreach $_ (@syncpkgs) { foreach $_ (@syncpkgs) {
# we grab the following fields: repo, name, ver, group, installed, and desc # we grab the following fields: repo, name, ver, group, installed, and desc
my @pkgfields = /^(.*?)\/(.*?) (.*?) ?(\(.*?\))? ?(\[.*\])?\n(.*)$/s; my @pkgfields = /^(.*?)\/(.*?) (.*?) ?(\(.*?\))? ?(\[.*\])?\n(.*)$/s;
@ -121,10 +120,10 @@ foreach $_ (@syncpkgs) {
# since 'group' and 'installed' are optional, we should fill it in if necessary # since 'group' and 'installed' are optional, we should fill it in if necessary
$pkgfields[3] = "" if not defined $pkgfields[3]; $pkgfields[3] = "" if not defined $pkgfields[3];
$pkgfields[4] = "" if not defined $pkgfields[4]; $pkgfields[4] = "" if not defined $pkgfields[4];
# add a last field that indicates original order # Add each sync pkg by name/ver to a hash table.
push (@pkgfields, $cnt++); # Any value is good since we only check for existence.
# add each sync pkg by name/ver to a hash table for quick lookup $allpkgs{$pkgfields[1] . $pkgfields[2]} = 1;
$allpkgs{$pkgfields[1] . $pkgfields[2]} = [ @pkgfields ]; push (@pkglist, \@pkgfields);
} }
my $queryout = `pacman -Qs '@ARGV'`; my $queryout = `pacman -Qs '@ARGV'`;
@ -145,20 +144,12 @@ foreach $_ (@querypkgs) {
# since 'group' is optional, we should fill it in if necessary # since 'group' is optional, we should fill it in if necessary
$pkgfields[3] = "" if not defined $pkgfields[3]; $pkgfields[3] = "" if not defined $pkgfields[3];
$pkgfields[4] = "[$LC_INSTALLED]"; $pkgfields[4] = "[$LC_INSTALLED]";
# add a last field that indicates original order (after sync) push (@pkglist, \@pkgfields);
push (@pkgfields, $cnt++);
# add our local-only package to the hash
$allpkgs{$pkgfields[1] . $pkgfields[2]} = [ @pkgfields ];
} }
} }
# sort by original order (the last field) and print foreach (@pkglist) {
foreach $_ ( sort{ @{$allpkgs{$a}}[6] <=> @{$allpkgs{$b}}[6] } keys %allpkgs) { print_pkg (@{$_});
my @v = @{$allpkgs{$_}};
my $line = to_color(@v);
# print colorized "repo/pkgname pkgver ..." string with possible installed text
print "$line\n";
print "$v[5]\n";
} }
#vim: set noet: #vim: set noet: