X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bin%2Fwanna-build;h=1d87779ebea538a579f5c962c8369d4c63ff6501;hb=09f13aba8cee37e89ff5df9ca10e72c9073d91d4;hp=ddd47416103e741c7491d43bc64ba5d15824c642;hpb=429d1d28e57f8d0a4de61743f52c28790c1378a5;p=wannabuild.git

diff --git a/bin/wanna-build b/bin/wanna-build
index ddd4741..1d87779 100755
--- a/bin/wanna-build
+++ b/bin/wanna-build
@@ -41,6 +41,11 @@ use File::Copy;
 use DBI;
 use lib '/org/wanna-build/bin';
 use WannaBuild;
+use YAML::Tiny;
+use Data::Dumper;
+use Hash::Merge qw ( merge );
+use String::Format;
+use Date::Parse;
 
 our ($verbose, $mail_logs, $list_order, $list_state,
     $curr_date, $op_mode, $user, $real_user, $distribution,
@@ -49,10 +54,13 @@ our ($verbose, $mail_logs, $list_order, $list_state,
     $info_all_dists, $arch,
     $category, %catval, %short_category,
     $short_date, $list_min_age, $dbbase, @curr_time,
-    $build_priority, %new_vers, $binNMUver, %merge_srcvers, %merge_binsrc);
+    $build_priority, %new_vers, $binNMUver, %merge_srcvers, %merge_binsrc,
+    $printformat, $ownprintformat
+    );
 
 # global vars
 $ENV{'PATH'} = "/bin:/usr/bin:/usr/local/bin:/org/wanna-build/bin/";
+$ENV{'LC_ALL'} = 'C';
 $verbose = 0;
 $mail_logs = "";
 @curr_time = gmtime;
@@ -181,6 +189,8 @@ my %options =
 								 if $list_min_age == 0;
 							 $list_min_age *= -1;
 						 } },
+         "format"       => { arg => \$printformat },
+         "own-format"       => { arg => \$ownprintformat },
 	 # special actions
 	 export         => { arg => \$export_to, mode => "export" },
 	 import         => { arg => \$import_from, mode => "import" },
@@ -230,8 +240,6 @@ while( @ARGV && $ARGV[0] =~ /^-/ ) {
 
 $op_mode = $category ? "set-failed" : "set-building"
 	if !$op_mode; # default operation
-$list_order = $list_state eq "failed" ? 'fPcpsn' : 'PScpsn'
-	if !$list_order and $list_state;
 $distribution ||= "unstable";
 die "Bad distribution '$distribution'\n"
 	if !isin($distribution, keys %conf::distributions);
@@ -294,6 +302,26 @@ if (!$fail_reason) {
 	}
 }
 
+my $yamlmap = ();
+my $yamldir = "/org/wanna-build/etc/yaml";
+my @files = ('wanna-build.yaml');
+if ((getpwuid($>))[7]) { push (@files, ((getpwuid($>))[7])."/.wanna-build.yaml"); }
+if ($user =~ /(buildd.*)-/) { push (@files, "$1.yaml") };
+if ($user) { push ( @files, "$user.yaml"); }
+foreach my $file (@files) {
+        my $cfile = File::Spec->rel2abs( $file, $yamldir );
+	if ($verbose >= 2) { print "Trying to read $file ($cfile) ...\n"; }
+	next unless -f $cfile;
+	if ($verbose >= 2) { print "Read $file ($cfile) ...\n"; }
+	my $m = YAML::Tiny->read( $cfile )->[0];
+	$yamlmap = merge($m, $yamlmap);
+}
+if (not $yamlmap) {
+	die "FATAL: no configuration found\n";
+}
+$list_order = $yamlmap->{"list-order"}{$list_state} if !$list_order and $list_state;
+$list_order ||= $yamlmap->{"list-order"}{'default'};
+
 my $dbh;
 
 END {
@@ -1740,102 +1768,44 @@ BEGIN {
 }
 
 sub sort_list_func {
-	my( $letter, $x, $ax, $bx );
-
-	foreach $letter (split( "", $list_order )) {
-	  SWITCH: foreach ($letter) {
-		  /C/ && do {
-			$x = $b->{'calprio'} <=> $a->{'calprio'};
-			return $x if $x != 0;
-			last SWITCH;
-		  };
-		  /W/ && do {
-			$x = $b->{'waiting_days'} <=> $a->{'waiting_days'};
-			return $x if $x != 0;
-			last SWITCH;
-		  };
-		  /P/ && do {
-			$x = $b->{'buildpri'} <=> $a->{'buildpri'};
-			return $x if $x != 0;
-			last SWITCH;
-		  };
-		  /p/ && do {
-			  $x = $prioval{$a->{'priority'}} <=> $prioval{$b->{'priority'}};
-			  return $x if $x != 0;
-			  last SWITCH;
-		  };
-		  /s/ && do {
-			  $x = $sectval{$a->{'section'}} <=> $sectval{$b->{'section'}};
-			  return $x if $x != 0;
-			  last SWITCH;
-		  };
-		  /n/ && do {
-			  $x = $a->{'package'} cmp $b->{'package'};
-			  return $x if $x != 0;
-			  last SWITCH;
-		  };
-		  /b/ && do {
-			  $x = $a->{'builder'} cmp $b->{'builder'};
-			  return $x if $x != 0;
-			  last SWITCH;
-		  };
-		  /c/ && do {
-			  $ax = ($a->{'notes'} =~ /^(out-of-date|partial)/) ? 0 :
-				    ($a->{'notes'} =~ /^uncompiled/) ? 2 : 1;
-			  $bx = ($b->{'notes'} =~ /^(out-of-date|partial)/) ? 0 :
-				    ($b->{'notes'} =~ /^uncompiled/) ? 2 : 1;
-			  $x = $ax <=> $bx;
-			  return $x if $x != 0;
-			  last SWITCH;
-		  };
-		  /f/ && do {
-			  my $ca = defined $a->{'failed_category'} ?
-				  $a->{'failed_category'} : "none";
-			  my $cb = defined $b->{'failed_category'} ?
-				  $b->{'failed_category'} : "none";
-			  $x = $catval{$ca} <=> $catval{$cb};
-			  return $x if $x != 0;
-			  last SWITCH;
-		  };
-		  /S/ && do {
-			  my $pa = $prioval{$a->{'priority'}} >
-				  $prioval{'standard'};
-			  my $pb = $prioval{$b->{'priority'}} >
-				  $prioval{'standard'};
-			  $x = $pa <=> $pb;
-			  return $x if $x != 0;
-			  last SWITCH;
-		  };
-	  }
+    my $map_funcs = {
+        'C' => ['<=>', sub { return (-1) * $_[0]->{'calprio'}; }],
+        'W' => ['<=>', sub { return (-1) * $_[0]->{'state_days'}; }],
+        'P' => ['<=>', sub { return (-1) * $_[0]->{'buildpri'}; }],
+        'p' => ['<=>', sub { return $prioval{$_[0]->{'priority'}}; }],
+        's' => ['<=>', sub { return $sectval{$_[0]->{'section'}}; }],
+        'n' => ['cmp', sub { return $_[0]->{'package'}; }],
+        'b' => ['cmp', sub { return $_[0]->{'builder'}; }],
+        'c' => ['<=>', sub { return ($_[0]->{'notes'} =~ /^(out-of-date|partial)/) ? 0: ($_[0]->{'notes'} =~ /^uncompiled/) ? 2 : 1; }],
+        'f' => ['<=>', sub { return $catval{ $_[0]->{'failed_category'} ? $_[0]->{'failed_category'}: "none" }; }],
+        'S' => ['<=>', sub { return $prioval{$_[0]->{'priority'}} > $prioval{'standard'}; }],
+    };
+
+	foreach my $letter (split( //, $list_order )) {
+            my $r;
+            $r = &{$map_funcs->{$letter}[1]}($a) <=> &{$map_funcs->{$letter}[1]}($b) if $map_funcs->{$letter}[0] eq '<=>';
+            $r = &{$map_funcs->{$letter}[1]}($a) cmp &{$map_funcs->{$letter}[1]}($b) if $map_funcs->{$letter}[0] eq 'cmp';
+            return $r if $r != 0;
 	}
 	return 0;
 }
 
 sub calculate_prio {
-######################
-# priority: required = 50, important = 40, standard = 30, optional = 5
-# section: libs = 4, devel = 2
-# component: contrib = -10, non-free = -20
-# never built = -20
-# max(floor(waitingdays),6)
-
-	my $priomap;
-	$priomap->{'priority'} = { 'required' => 50, 'important' => 40, 'standard' => 30, 'optional' => 5 };
-	$priomap->{'section'} = { 'libs' => 4, 'devel' => 2 };
-	$priomap->{'component'} = { 'contrib' => -10, 'non-free' => -20 };
-	$priomap->{'notes'} = { 'uncompiled' => 20, 'out-of-date' => 40, 'partial' => 40 };
-	$priomap->{'waitingdays'} = { 'min' => 0, 'max' => 6, scale => 2 };
+	my $priomap = $yamlmap->{priority};
 	my $pkg = shift;
+        my @s=split("/", $pkg->{'section'});
+        $pkg->{'component'} = $s[0] if $s[1];
+        $pkg->{'component'} ||= 'main';
 	$pkg->{'calprio'} = 0;
-	foreach my $k (keys %$priomap) {
-		$pkg->{'calprio'} += $priomap->{$k}{$pkg->{$k}} if $pkg->{$k} and $priomap->{$k}{$pkg->{$k}};
+	foreach my $k (keys %{$priomap->{keys}}) {
+		$pkg->{'calprio'} += $priomap->{keys}->{$k}{$pkg->{$k}} if $pkg->{$k} and $priomap->{keys}->{$k}{$pkg->{$k}};
 	}
 
-	my $wd = $pkg->{'waiting_days'};
-	$wd = $priomap->{'waitingdays'}->{'min'} if $priomap->{'waitingdays'}->{'min'} and $wd < $priomap->{'waitingdays'}->{'min'};
-	$wd = $priomap->{'waitingdays'}->{'max'} if $priomap->{'waitingdays'}->{'max'} and $wd > $priomap->{'waitingdays'}->{'max'};
+	my $days = $pkg->{'state_days'};
+	$days = $priomap->{'waitingdays'}->{'min'} if $priomap->{'waitingdays'}->{'min'} and $days < $priomap->{'waitingdays'}->{'min'};
+	$days = $priomap->{'waitingdays'}->{'max'} if $priomap->{'waitingdays'}->{'max'} and $days > $priomap->{'waitingdays'}->{'max'};
 	my $scale = $priomap->{'waitingdays'}->{'scale'} || 1;
-	$pkg->{'calprio'} += $wd * $scale;
+	$pkg->{'calprio'} += $days * $scale;
 
 	$pkg->{'calprio'} += $pkg->{'permbuildpri'} if  $pkg->{'permbuildpri'};
 	$pkg->{'calprio'} += $pkg->{'buildpri'} if  $pkg->{'buildpri'};
@@ -1844,6 +1814,102 @@ sub calculate_prio {
 }
 
 
+sub use_fmt {
+    my $r;
+
+    if (ref($_[0]) eq 'CODE') {
+        $r = &{$_[0]};
+    } else {
+        $r = $_[0];
+    }
+
+    shift;
+    my $t = shift;
+
+    $r ||= "";
+    return $r unless $t;
+
+    my $pkg = shift;
+    my $var = shift;
+    if (substr($t,0,1) eq '!') {
+        $t = substr($t,1);
+        return "" if $r;
+    } else {
+        return "" unless $r;
+    }
+    if ($t =~ /%/) {
+        return print_format($t, $pkg, $var);
+    }
+    return $t;
+}
+sub make_fmt { my $c = shift; my $pkg = shift; my $var = shift; return sub { use_fmt($c, $_[0], $pkg, $var); } };
+
+sub print_format {
+    my $printfmt = shift;
+    my $pkg = shift;
+    my $var = shift;
+=pod
+Within an format string, the following values are allowed (need to be preceded by %).
+This can be combined to e.g.
+wanna-build --format='wanna-build -A %a --give-back %p_%v' -A mipsel --list=failed
+
+a Architecture
+c section (e.g. libs or utils)
+D in case of BD-Uninstallable the reason for the uninstallability
+d distribution
+E in case of Dep-Wait the packages being waited on, in case of Needs-Build the number in the queue
+F in case of Failed the fail reason
+P previous state
+p Package name
+S Package state
+s Time in this state in full seconds since epoch
+t time of state change
+u Builder (e.g. buildd_mipsel-rem)
+v Package version
+V full Package version (i.e. with +b.., = %v%{+b}B%B
+X the string normally between [], e.g. optional:out-of-date:calprio{61}:days{25}
+
+%{Text}?  print Text in case ? is not empty; ? is never printed
+%{!Text}? print Text in case ? is empty; ? is never printed
+Text could contain further %. To start with !, use %!
+
+=cut
+    return stringf($printfmt, (
+        'p' => make_fmt( $pkg->{'package'}, $pkg, $var),
+        'a' => make_fmt( $arch, $pkg, $var),
+        's' => make_fmt( sub { return floor(str2time($pkg->{'state_change'})); }, $pkg, $var),
+        'v' => make_fmt( $pkg->{'version'}, $pkg, $var),
+        'V' => make_fmt( sub { $pkg->{'binary_nmu_version'} ? $pkg->{'version'}."+b".$pkg->{'binary_nmu_version'} : $pkg->{'version'} }, $pkg, $var),
+        'S' => make_fmt( $pkg->{'state'}, $pkg, $var),
+        'u' => make_fmt( $pkg->{'builder'}, $pkg, $var),
+        'X' => make_fmt( sub {
+            my $c = "$pkg->{'priority'}:$pkg->{'notes'}";
+            $c .= ":PREV-FAILED" if $pkg->{'previous_state'} =~ /^Failed/;
+            $c .= ":bp{" . $pkg->{'buildpri'} . "}" if defined $pkg->{'buildpri'};
+            $c .= ":binNMU{" . $pkg->{'binary_nmu_version'} . "}" if defined $pkg->{'binary_nmu_version'};
+            $c .= ":calprio{". $pkg->{'calprio'}."}";
+            $c .= ":days{". $pkg->{'state_days'}."}";
+            return $c;
+            }, $pkg, $var),
+        'c' => make_fmt( $pkg->{'section'}, $pkg, $var),
+        'P' => make_fmt( $pkg->{'previous_state'} || "unknwon", $pkg, $var),
+        'E' => make_fmt( sub { return $pkg->{'depends'} if $pkg->{'state'} eq "Dep-Wait";
+            return $var->{scnt}{'Needs-Build'} + 1 if $pkg->{'state'} eq 'Needs-Build';
+            return ""; }, $pkg, $var),
+	'F' => make_fmt( sub { return "" unless $pkg->{'failed'};
+	    my $failed = $pkg->{'failed'};
+	    $failed =~ s/\\/\\\\/g;
+            return $pkg->{'package'}."#".$arch."-failure\n ".
+	    join("\\0a",split("\n",$failed))."\\0a\n"; }, $pkg, $var),
+        'D' => make_fmt( sub { return "" unless $pkg->{'bd_problem'};
+            return $pkg->{'package'}."#".$arch."-bd-problem\n".
+            join("\\0a",split("\n",$pkg->{'bd_problem'}))."\\0a\n"; }, $pkg, $var),
+        'B' => make_fmt( sub { return $pkg->{'binary_nmu_version'} if defined $pkg->{'binary_nmu_version'}; }, $pkg, $var),
+        'd' => make_fmt( $distribution, $pkg, $var),
+        't' => make_fmt( $pkg->{'state_change'}, $pkg, $var),
+    ));
+}
+
 sub list_packages {
 	my $state = shift;
 	my( $name, $pkg, @list );
@@ -1857,22 +1923,28 @@ sub list_packages {
 		push @list, calculate_prio($db->{$name});
 	}
 
+        # filter components
+        @list = grep { my $i = $_->{'component'}; grep { $i eq $_ } split /[, ]+/, $yamlmap->{"restrict"}{'component'} } @list;
+
+        # first adjust ownprintformat, then set printformat accordingly
+        $printformat ||= $yamlmap->{"format"}{$ownprintformat};
+        $printformat ||= $yamlmap->{"format"}{"default"}{$state};
+        $printformat ||= $yamlmap->{"format"}{"default"}{"default"};
+        undef $printformat if ($ownprintformat eq 'none');
+
 	foreach $pkg (sort sort_list_func @list) {
-		print "$pkg->{'section'}/$pkg->{'package'}_$pkg->{'version'}";
-		print ": $pkg->{'state'}"
+                if ($printformat) {
+                    print print_format($printformat, $pkg, {'cnt' => $cnt, 'scnt' => \%scnt})."\n";
+		    ++$cnt;
+		    $scnt{$pkg->{'state'}}++;
+                    next;
+                }
+		print print_format("%c/%p_%v", $pkg, {});
+		print print_format(": %S", $pkg, {})
 			if $state eq "all";
-		print " by $pkg->{'builder'}"
-			if $pkg->{'state'} ne "Needs-Build" && $pkg->{'builder'};
-		print " [$pkg->{'priority'}:$pkg->{'notes'}";
-		print ":PREV-FAILED"
-			if $pkg->{'previous_state'} =~ /^Failed/;
-		print ":bp{" . $pkg->{'buildpri'} . "}"
-			if defined $pkg->{'buildpri'};
-		print ":binNMU{" . $pkg->{'binary_nmu_version'} . "}"
-			if defined $pkg->{'binary_nmu_version'};
-		print ":calprio{". $pkg->{'calprio'}."}";
-		print ":wd{". $pkg->{'waiting_days'}."}";
-		print "]\n";
+		print print_format("%{ by }u%u", $pkg, {})
+			if $pkg->{'state'} ne "Needs-Build";
+		print print_format(" [%X]\n", $pkg, {});
 		print "  Reasons for failing:\n",
 			  "    [Category: ",
 			  defined $pkg->{'failed_category'} ? $pkg->{'failed_category'} : "none",
@@ -1884,23 +1956,26 @@ sub list_packages {
 		print "  Reasons for BD-Uninstallable:\n    ",
 		          join("\n    ",split("\n",$pkg->{'bd_problem'})), "\n"
 			if $pkg->{'state'} eq "BD-Uninstallable";
-		print "  Previous state was $pkg->{'previous_state'} until ",
-			  "$pkg->{'state_change'}\n"
+		print "  Previous state was $pkg->{'previous_state'}\n"
 			if $verbose && $pkg->{'previous_state'};
 		print "  No previous state recorded\n"
 			if $verbose && !$pkg->{'previous_state'};
+		print "  State changed at $pkg->{'state_change'}\n"
+			if $verbose && $pkg->{'state_change'};
+		print "  Previous state $pkg->{'previous_state'} left $pkg->{'state_time'} ago\n"
+			if $verbose && $pkg->{'previous_state'};
 		print "  Previous failing reasons:\n    ",
 		      join("\n    ",split("\n",$pkg->{'old_failed'})), "\n"
 			if $verbose && $pkg->{'old_failed'};
 		++$cnt;
 		$scnt{$pkg->{'state'}}++ if $state eq "all";
 	}
-	if ($state eq "all") {
+	if ($state eq "all" && !$printformat) {
 		foreach (sort keys %scnt) {
 			print "Total $scnt{$_} package(s) in state $_.\n";
 		}
 	}
-	print "Total $cnt package(s)\n";
+	print "Total $cnt package(s)\n" unless $printformat;
 	
 }
 
@@ -1919,7 +1994,7 @@ sub info_packages {
 		'failed_category' => 'Failed-Category', 'notes' => 'Notes',
 		'distribution' => 'Distribution', 'old_failed' => 'Old-Failed',
 		'permbuildpri' => 'PermBuildPri', 'rel' => 'Rel',
-		'calprio' => 'CalculatedPri', 'waiting_days' => 'Waiting-Days'
+		'calprio' => 'CalculatedPri', 'state_days' => 'State-Days'
 			 );
 	
 	foreach $name (@_) {
@@ -2396,7 +2471,7 @@ sub transactions_table_name {
 sub get_readonly_source_info {
 	my $name = shift;
 	# SELECT FLOOR(EXTRACT('epoch' FROM age(localtimestamp, '2010-01-22  23:45')) / 86400) -- change to that?
-	my $pkg = $dbh->selectrow_hashref('SELECT *, extract(days from date_trunc(\'days\', now() - state_change::timestamp)) as waiting_days FROM ' . 
+	my $pkg = $dbh->selectrow_hashref('SELECT *, extract(days from date_trunc(\'days\', now() - state_change)) as state_days FROM ' . 
 		table_name() . ' WHERE package = ? AND distribution = ?',
 		undef, $name, $distribution);
 	return $pkg;
@@ -2404,7 +2479,7 @@ sub get_readonly_source_info {
 
 sub get_source_info {
 	my $name = shift;
-	my $pkg = $dbh->selectrow_hashref('SELECT *, extract(days from date_trunc(\'days\', now() - state_change::timestamp)) as waiting_days FROM ' . 
+	my $pkg = $dbh->selectrow_hashref('SELECT *, extract(days from date_trunc(\'days\', now() - state_change)) as state_days FROM ' . 
 		table_name() . ' WHERE package = ? AND distribution = ?' .
 		' FOR UPDATE',
 		undef, $name, $distribution);
@@ -2414,7 +2489,10 @@ sub get_source_info {
 sub get_all_source_info {
 	my %options = @_;
 
-	my $q = 'SELECT *, extract(days from date_trunc(\'days\', now() - state_change::timestamp)) as waiting_days FROM ' . table_name()
+	my $q = 'SELECT *, '.
+		'extract(days from date_trunc(\'days\', now() - state_change)) as state_days, '.
+		'date_trunc(\'seconds\', now() - state_change) as state_time'.
+		' FROM ' . table_name()
 		. ' WHERE distribution = ? ';
 	my @args = ($distribution);
 	if ($options{state} && uc($options{state}) ne "ALL") {
@@ -2436,12 +2514,12 @@ sub get_all_source_info {
 	}
 
 	if ($options{list_min_age} > 0) {
-		$q .= ' AND age(state_change::timestamp) > ? ';
+		$q .= ' AND age(state_change) > ? ';
 		push @args, $options{list_min_age} . " days";
 	}
 
 	if ($options{list_min_age} < 0) {
-		$q .= ' AND age(state_change::timestamp) < ? ';
+		$q .= ' AND age(state_change) < ? ';
 		push @args, -$options{list_min_age} . " days";
 	}