'.html_escape($cgi_var{package}).' Version Graph

X-Git-Url: https://git.donarmstrong.com/?p=debbugs.git;a=blobdiff_plain;f=cgi%2Fversion.cgi;h=e3df1fc1cd2decd453e54c67681a91d07f6b61f2;hp=e0471a389fb231cce49d9038f61acc1965d4fe36;hb=6321024b3c612ef7626eef85499a34ee35f7372c;hpb=a54f07e01f95b7ab702a9f08375dc8dad3394ac9 diff --git a/cgi/version.cgi b/cgi/version.cgi index e0471a3..e3df1fc 100755 --- a/cgi/version.cgi +++ b/cgi/version.cgi @@ -5,7 +5,7 @@ use strict; # Hack to work on merkel where suexec is in place BEGIN{ - if ($ENV{HTTP_HOST} eq 'merkel.debian.org') { + if (defined $ENV{HTTP_HOST} and $ENV{HTTP_HOST} eq 'merkel.debian.org') { unshift @INC, qw(/home/don/perl/usr/share/perl5 /home/don/perl/usr/lib/perl5 /home/don/source); $ENV{DEBBUGS_CONFIG_FILE}="/home/don/config_internal"; } @@ -14,48 +14,160 @@ BEGIN{ use CGI::Simple; -use CGI::Alert 'don@donarmstrong.com'; +# by default send this message nowhere +# use CGI::Alert q(nobody@example.com); use Debbugs::Config qw(:config); -use Debbugs::CGI qw(htmlize_packagelinks html_escape); + +our $VERSION=1; + +use Debbugs::CGI qw(htmlize_packagelinks html_escape cgi_parameters munge_url :cache); use Debbugs::Versions; use Debbugs::Versions::Dpkg; -use Debbugs::Packages qw(getversions); +use Debbugs::Packages qw(get_versions makesourceversions); use HTML::Entities qw(encode_entities); use File::Temp qw(tempdir); use IO::File; use IO::Handle; +my %img_types = (svg => 'image/svg+xml', + png => 'image/png', + ); -my $q = new CGI::Simple; +my $q = CGI::Simple->new(); -my %cgi_var = cgi_parameters($q); +my %cgi_var = cgi_parameters(query => $q, + single => [qw(package format ignore_boring width height collapse info)], + default => {package => 'spamass-milter', + found => [], + fixed => [], + ignore_boring => 1, + collapse => 0, + format => 'png', + width => undef, + height => undef, + info => 0, + }, + ); +my $this = munge_url('version.cgi?', + %cgi_var, + ); -$cgi_var{package} = ['xterm'] if not defined $cgi_var{package}; -$cgi_var{found} = [] if not defined $cgi_var{found}; -$cgi_var{fixed} = [] if not defined $cgi_var{fixed}; +if (defined $cgi_var{width}) { + $cgi_var{width} =~ /(\d+)/; + $cgi_var{width} = $1; +} +if (defined $cgi_var{height}) { + $cgi_var{height} =~ /(\d+)/; + $cgi_var{height} = $1; +} + +if (defined $cgi_var{format}) { + $cgi_var{format} =~ /(png|svg|jpg|gif)/; + $cgi_var{format} = $1 || 'png'; +} +else { + $cgi_var{format} = 'png'; +} -# we only care about one package -$cgi_var{package} = $cgi_var{package}[0]; +my $etag; +if ($cgi_var{info} and not defined $cgi_var{dot}) { + $etag = etag_does_not_match(cgi=>$q, + additional_data=>[grep {defined $_ ? $_ : ()} + @cgi_var{(qw(package ignore_boring), + qw(collapse)) + }, + $this, + $VERSION], + ); + if (not $etag) { + print $q->header(-status => 304); + print "304: Not modified\n"; + exit 0; + } + print $q->header(-status => 200, + -cache_control => 'public, max-age=86400', + -etag => $etag, + -content_type => 'text/html', + ); + print < + +END + print ''.html_escape($cgi_var{package}).' Version Graph'."\n"; + print "\n"; + print '['.($cgi_var{ignore_boring}?"Don't i":'I').'gnore boring] '; + print '['.($cgi_var{collapse}?"Don't c":'C').'ollapse] '; + print '[Dot]
'; + print '

'; + print < + +END + exit 0; +} # we want to first load the appropriate file, # then figure out which versions are there in which architectures, my %versions; my %version_to_dist; -for my $dist (qw(oldstable stable testing unstable)) { - $versions{$dist} = [getversions($cgi_var{package},$dist)]; +for my $dist (@{$config{distributions}}) { + $versions{$dist} = [get_versions(package => [split /\s*,\s*/, $cgi_var{package}], + dist => $dist, + source => 1, + )]; # make version_to_dist foreach my $version (@{$versions{$dist}}){ push @{$version_to_dist{$version}}, $dist; } } + # then figure out which are affected. +# turn found and fixed into full versions +@{$cgi_var{found}} = map {makesourceversions($_,undef,@{$cgi_var{found}})} split/\s*,\s*/, $cgi_var{package}; +@{$cgi_var{fixed}} = map {makesourceversions($_,undef,@{$cgi_var{fixed}})} split/\s*,\s*/, $cgi_var{package}; +my @interesting_versions = map {makesourceversions($_,undef,keys %version_to_dist)} split/\s*,\s*/, $cgi_var{package}; + +# We need to be able to rip out leaves which the versions that do not affect the current versions of unstable/testing +my %sources; +@sources{map {m{(.+)/}; $1} @{$cgi_var{found}}} = (1) x @{$cgi_var{found}}; +@sources{map {m{(.+)/}; $1} @{$cgi_var{fixed}}} = (1) x @{$cgi_var{fixed}}; +@sources{map {m{(.+)/}; $1} @interesting_versions} = (1) x @interesting_versions; + +# at this point, we know enough to calculate the etag. + +my @versions_files; +foreach my $source (keys %sources) { + my $srchash = substr $source, 0, 1; + next unless -e "$config{version_packages_dir}/$srchash/$source"; + push @versions_files, "$config{version_packages_dir}/$srchash/$source"; +} + +$etag = etag_does_not_match(cgi=>$q, + additional_data=>[@cgi_var{(qw(package ignore_boring), + qw(collapse)) + }, + $this, + $VERSION], + files => [@versions_files + ], + ); +if (not $etag) { + print $q->header(-status => 304); + print "304: Not modified\n"; + exit 0; +} -my $srchash = substr $cgi_var{package}, 0, 1; my $version = Debbugs::Versions->new(\&Debbugs::Versions::Dpkg::vercmp); -my $version_fh = new IO::File "$config{version_packages_dir}/$srchash/$cgi_var{package}", 'r'; -$version->load($version_fh); +for my $version_fn (@versions_files) { + my $version_fh = IO::File->new($version_fn, 'r') or + warn "Unable to open $version_fn for reading: $!"; + $version->load($version_fh); +} # Here, we need to generate a short version to full version map my %version_map; foreach my $key (keys %{$version->{parent}}) { @@ -81,58 +193,178 @@ for my $found_fixed (qw(found fixed)) { my %all_states = $version->allstates($cgi_var{found},$cgi_var{fixed}); my $dot = "digraph G {\n"; +if (defined $cgi_var{width} and defined $cgi_var{height}) { + $dot .= qq(size="$cgi_var{width},$cgi_var{height}";\n); +} my %state = (found => ['fillcolor="salmon"', 'style="filled"', - 'shape="diamond"', + 'shape="ellipse"', ], absent => ['fillcolor="grey"', 'style="filled"', + 'shape="trapezium"', ], fixed => ['fillcolor="chartreuse"', 'style="filled"', 'shape="rect"', ], ); +# TODO: Allow collapsing versions which are at the same state and not +# in a suite. +my %collapsed_nodes; +my %group_nodes; +if ($cgi_var{collapse}) { + my %reversed_nodes; + foreach my $key (keys %{$version->{parent}}) { + next if $cgi_var{ignore_boring} and (not defined $all_states{$key} + or $all_states{$key} eq 'absent'); + next if $cgi_var{ignore_boring} and not version_relevant($version,$key,\@interesting_versions); + if (defined $version->{parent}{$key}) { + next if $cgi_var{ignore_boring} and (not defined $all_states{$version->{parent}{$key}} + or $all_states{$version->{parent}{$key}} eq 'absent'); + next if $cgi_var{ignore_boring} and not version_relevant($version,$version->{parent}{$key},\@interesting_versions); + push @{$reversed_nodes{$version->{parent}{$key}}},$key; + } + else { + $reversed_nodes{$key} ||=[]; + } + } + # nodes that can be collapsed are those that have one child + # are in the same state as their parent, and are not in a suite + foreach my $key (keys %reversed_nodes) { + my ($short_version) = $key =~ m{/(.+)$}; + if (not exists $version_to_dist{$key} + and @{$reversed_nodes{$key}} <= 1 + and defined $version->{parent}{$key} + and $all_states{$key} eq $all_states{$version->{parent}{$key}} + ) { + # check to see if there is an entry for the parent or child of this node + my $group_node; + if ((@{$reversed_nodes{$key}} and exists $collapsed_nodes{$reversed_nodes{$key}[0]})) { + $group_node = $collapsed_nodes{$reversed_nodes{$key}[0]}; + if ($group_nodes{$group_node}{parent} eq $key) { + $group_nodes{$group_node}{parent} = $version->{parent}{$key}; + } + } + if (defined $version->{parent}{$key} and exists $collapsed_nodes{$version->{parent}{$key}}) { + if (defined $group_node) { + #MWHAHAHAHAHA + my $collapser = $group_nodes{$collapsed_nodes{$version->{parent}{$key}}}; + push @{$collapser->{collapsed_nodes}},@{$group_nodes{$group_node}{collapsed_nodes}},$group_node; + foreach (@{$collapser->{collapsed_nodes}}) { + if (exists $group_nodes{$_}) { + $group_nodes{$_} = $collapser; + } + } + } + $group_node = $collapsed_nodes{$version->{parent}{$key}}; + } + if (not defined $group_node) { + $group_node = "group_$key"; + $group_nodes{$group_node} = {attr => qq("$group_node" [).join(',','label="some versions"', + @{$state{$all_states{$key}}}, + 'style="bold,filled"', + ).qq(]\n), + name => $group_node, + parent => $version->{parent}{$key}, + collapsed_nodes => [], + }; + } + $collapsed_nodes{$key} = $group_node; + } + } + my %used_node; + foreach my $group (values %group_nodes) { + next if $used_node{$group->{name}}; + $used_node{$group->{name}} = 1; + $dot .= $group->{attr}; + } +} + foreach my $key (keys %all_states) { my ($short_version) = $key =~ m{/(.+)$}; + next if exists $collapsed_nodes{$key}; + next if $cgi_var{ignore_boring} and (not defined $all_states{$key} + or $all_states{$key} eq 'absent'); + next if $cgi_var{ignore_boring} and not version_relevant($version,$key,\@interesting_versions); my @attributes = @{$state{$all_states{$key}}}; - if (length $short_version and exists $version_to_dist{$short_version}) { - push @attributes, 'label="'.$key.'\n'."(".join(', ',@{$version_to_dist{$short_version}}).")\""; + if (exists $version_to_dist{$key}) { + push @attributes, 'label="'.$key.'\n'."(".join(', ',@{$version_to_dist{$key}}).")\""; } my $node_attributes = qq("$key" [).join(',',@attributes).qq(]\n); $dot .= $node_attributes; } + foreach my $key (keys %{$version->{parent}}) { - $dot .= qq("$key").'->'.qq("$version->{parent}{$key}" [dir="back"])."\n" if defined $version->{parent}{$key}; + next if not defined $version->{parent}{$key}; + next if $cgi_var{ignore_boring} and $all_states{$key} eq 'absent'; + next if $cgi_var{ignore_boring} and (not defined $all_states{$version->{parent}{$key}} + or $all_states{$version->{parent}{$key}} eq 'absent'); + # Ignore branches which are not ancestors of a currently distributed version + next if $cgi_var{ignore_boring} and not version_relevant($version,$key,\@interesting_versions); + next if exists $collapsed_nodes{$key}; + $dot .= qq("$key").'->'.q("). + (exists $collapsed_nodes{$version->{parent}{$key}}? + $group_nodes{$collapsed_nodes{$version->{parent}{$key}}}{name}:$version->{parent}{$key}). + qq(" [dir="back"])."\n" if defined $version->{parent}{$key}; +} +if ($cgi_var{collapse}) { + my %used_node; + foreach my $group (values %group_nodes) { + next if $used_node{$group->{name}}; + next if not defined $group->{parent}; + $used_node{$group->{name}} = 1; + $dot .= qq("$group->{name}").'->'.q("). + (exists $collapsed_nodes{$group->{parent}}? + $group_nodes{$collapsed_nodes{$group->{parent}}}{name}:$group->{parent}). + qq(" [dir="back"])."\n"; + } } $dot .= "}\n"; my $temp_dir = tempdir(CLEANUP => 1); if (not defined $cgi_var{dot}) { - my $dot_fh = new IO::File "$temp_dir/temp.dot",'w' or + my $dot_fh = IO::File->new("$temp_dir/temp.dot",'w') or die "Unable to open $temp_dir/temp.dot for writing: $!"; print {$dot_fh} $dot or die "Unable to print output to the dot file: $!"; close $dot_fh or die "Unable to close the dot file: $!"; - system('dot','-Tpng',"$temp_dir/temp.dot",'-o',"$temp_dir/temp.png") == 0 + system('dot','-T'.$cgi_var{format},"$temp_dir/temp.dot",'-o',"$temp_dir/temp.$cgi_var{format}") == 0 or print "Content-Type: text\n\nDot failed." and die "Dot failed: $?"; - my $png_fh = new IO::File "$temp_dir/temp.png", 'r' or - die "Unable to open $temp_dir/temp.png for reading: $!"; - print "Content-Type: image/png\n\n"; - print <$png_fh>; - close $png_fh; + my $img_fh = IO::File->new("$temp_dir/temp.$cgi_var{format}", 'r') or + die "Unable to open $temp_dir/temp.$cgi_var{format} for reading: $!"; + print $q->header(-status => 200, + -cache_control => 'public, max-age=300', + -etag => $etag, + -content_type => $img_types{$cgi_var{format}}, + ); + print <$img_fh>; + close $img_fh; } else { - print "Content-Type: text\n\n"; + print $q->header(-status => 200, + -cache_control => 'public, max-age=300', + -etag => $etag, + -content_type => 'text', + ); print $dot; } -sub cgi_parameters { - my ($q) = @_; - my %param; - foreach my $paramname ($q->param) { - $param{$paramname} = [$q->param($paramname)] +our %_version_relevant_cache; +sub version_relevant { + my ($version,$test_version,$relevant_versions) = @_; + for my $dist_version (@{$relevant_versions}) { + if (exists $_version_relevant_cache{$dist_version}{$test_version}{$version}) { + return 1 if $_version_relevant_cache{$dist_version}{$test_version}{$version}; + } + else { + my $rel = $version->isancestor($test_version,$dist_version); + $_version_relevant_cache{$dist_version}{$test_version}{$version} = $rel; + return 1 if $rel; + } } - return %param; + return 0; } + +