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

pacsearch: Explicitly extract group information

Browse source 
Also store pkgname and pkgver separately.

Signed-off-by: Pierre Neidhardt <ambrevar@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Pierre Neidhardt 2014-01-23 00:07:06 +01:00 • committed by Allan McRae
parent 135d862eb6
commit 15f4144e12
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
contrib/pacsearch.in
View file

@ -99,16 +99,17 @@ if ($#syncpkgs >= 0) {
# counter var for packages, used here and in the query loop too # counter var for packages, used here and in the query loop too
my $cnt = 0; my $cnt = 0;
foreach $_ (@syncpkgs) { foreach $_ (@syncpkgs) {
# we grab 4 fields here: repo, name/ver, installed, and desc # we grab the following fields: repo, name, ver, group, installed, and desc
my @pkgfields = /^(.*?)\/(.*?) ?(\[.*\])?\n(.*)$/s; my @pkgfields = /^(.*?)\/(.*?) (.*?) ?(\(.*?\))? ?(\[.*\])?\n(.*)$/s;
if(not @pkgfields) { if(not @pkgfields) {
# skip any non-matching line and just print it for the user # skip any non-matching line and just print it for the user
print $_, "\n"; print $_, "\n";
next; next;
} }
# since installed is optional, we should fill it in if necessary # since 'group' and 'installed' are optional, we should fill it in if necessary
$pkgfields[2] = "" if not defined $pkgfields[2]; $pkgfields[3] = "" if not defined $pkgfields[3];
# add a fifth field that indicates original order $pkgfields[4] = "" if not defined $pkgfields[4];
# add a last field that indicates original order
push (@pkgfields, $cnt++); push (@pkgfields, $cnt++);
# add each sync pkg by name/ver to a hash table for quick lookup # add each sync pkg by name/ver to a hash table for quick lookup
$allpkgs{$pkgfields[1]} = [ @pkgfields ]; $allpkgs{$pkgfields[1]} = [ @pkgfields ];
@ -123,30 +124,33 @@ if ($#querypkgs >= 0) {
} }
foreach $_ (@querypkgs) { foreach $_ (@querypkgs) {
# we grab 4 fields here: repo, name/ver, installed, and desc # we grab the following fields: repo, name, ver, group, installed, and desc
my @pkgfields = /^(.*?)\/(.*?) ?(\[.*\])?\n(.*)$/s; my @pkgfields = /^(.*?)\/(.*?) (.*?) ?(\(.*?\))? ?(\[.*\])?\n(.*)$/s;
# my @pkgfields = /^(.*?)\/(.*?) ?(\[.*\])?\n(.*)$/s;
# skip any non-matching line # skip any non-matching line
next if not defined $pkgfields[1]; next if not defined $pkgfields[1];
# since installed is optional, we should fill it in if necessary
$pkgfields[2] = "" if not defined $pkgfields[2];
# check if the package was listed in the sync out # check if the package was listed in the sync out
if (not exists $allpkgs{$pkgfields[1]}) { if (not exists $allpkgs{$pkgfields[1]}) {
$pkgfields[2] = "[$LC_INSTALLED]"; # since 'group' is optional, we should fill it in if necessary
# add a fifth field that indicates original order (after sync) $pkgfields[3] = "" if not defined $pkgfields[3];
$pkgfields[4] = "[$LC_INSTALLED]";
# add a last field that indicates original order (after sync)
push (@pkgfields, $cnt++); push (@pkgfields, $cnt++);
# add our local-only package to the hash # add our local-only package to the hash
$allpkgs{$pkgfields[1]} = [ @pkgfields ]; $allpkgs{$pkgfields[1]} = [ @pkgfields ];
} }
} }
# sort by original order (the fifth field) and print # sort by original order (the last field) and print
foreach $_ ( sort{ @{$allpkgs{$a}}[4] <=> @{$allpkgs{$b}}[4] } keys %allpkgs) { foreach $_ ( sort{ @{$allpkgs{$a}}[6] <=> @{$allpkgs{$b}}[6] } keys %allpkgs) {
my @v = @{$allpkgs{$_}}; my @v = @{$allpkgs{$_}};
my $line = "$v[0]/$v[1] $v[2]"; my $line = "$v[0]/$v[1] $v[2]";
$line .= " $v[3]" if $v[3] ne "";
$line .= " $v[4]" if $v[4] ne "";
$line = to_color($line); $line = to_color($line);
# print colorized "repo/pkgname pkgver" string with possible installed text # print colorized "repo/pkgname pkgver ..." string with possible installed text
print "$line\n"; print "$line\n";
print "$v[3]\n"; print "$v[5]\n";
} }
#vim: set noet: #vim: set noet: