From 87124f967c3da82618899b3d2c114981b12ffb7f Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Sun, 5 Feb 2006 03:14:33 +0000 Subject: [PATCH] * Complete pmoreinfo * Some big speed optimisations --- cgi-bin/show_package.pl | 115 +++++++++++++++++++------------------ lib/Packages/HTML.pm | 122 +++++++++++++++++++++------------------- lib/Packages/Page.pm | 48 +++++----------- lib/Packages/Search.pm | 23 ++++++-- 4 files changed, 156 insertions(+), 152 deletions(-) diff --git a/cgi-bin/show_package.pl b/cgi-bin/show_package.pl index f6324d6..e4e897c 100755 --- a/cgi-bin/show_package.pl +++ b/cgi-bin/show_package.pl @@ -50,7 +50,8 @@ $Packages::CGI::debug = $debug; # read the configuration our $config_read_time ||= 0; our $db_read_time ||= 0; -our ( $topdir, $ROOT, @SUITES, @SECTIONS, @ARCHIVES, @ARCHITECTURES ); +our ( $topdir, $ROOT, @SUITES, @SECTIONS, @ARCHIVES, @ARCHITECTURES, + %FTP_SITES ); # FIXME: move to own module my $modtime = (stat( "../config.sh" ))[9]; @@ -71,6 +72,8 @@ if ($modtime > $config_read_time) { $Packages::HTML::BUG_URL = $1 if /^\s*bug_url="?([^\"]*)"?\s*$/o; $Packages::HTML::SRC_BUG_URL = $1 if /^\s*src_bug_url="?([^\"]*)"?\s*$/o; $Packages::HTML::QA_URL = $1 if /^\s*qa_url="?([^\"]*)"?\s*$/o; + $FTP_SITES{us} = $1 if /^\s*ftpsite="?([^\"]*)"?\s*$/o; + $FTP_SITES{$1} = $2 if /^\s*(\w+)_ftpsite="?([^\"]*)"?\s*$/o; @SUITES = split(/\s+/, $1) if /^\s*suites="?([^\"]*)"?\s*$/o; @SECTIONS = split(/\s+/, $1) if /^\s*sections="?([^\"]*)"?\s*$/o; @ARCHIVES = split(/\s+/, $1) if /^\s*archives="?([^\"]*)"?\s*$/o; @@ -280,7 +283,8 @@ unless (@Packages::CGI::fatal_errors) { # # display dependencies # - my $dep_list = print_deps( \%packages, \%opts, $pkg, + my $dep_list; + $dep_list = print_deps( \%packages, \%opts, $pkg, $page->get_dep_field('depends'), 'depends' ); $dep_list .= print_deps( \%packages, \%opts, $pkg, @@ -302,62 +306,63 @@ unless (@Packages::CGI::fatal_errors) { [ 'sug', gettext( 'suggests' ) ], ); $package_page .= $dep_list; - $package_page .= " \n"; - - # - # Download package - # - my $encodedpack = uri_escape( $pkg ); - $package_page .= "
"; - $package_page .= sprintf( "

".gettext( "Download %s\n" )."

", - $pkg ) ; - $package_page .= "\n"; - $package_page .= "\n"; + $package_page .= "\n"; + } + + # + # Download package + # + my $encodedpack = uri_escape( $pkg ); + $package_page .= "
"; + $package_page .= sprintf( "

".gettext( "Download %s\n" )."

", + $pkg ) ; + $package_page .= "
".gettext("Download for all available architectures")."
\n"; + $package_page .= "\n"; + $package_page .= "\n"; + $package_page .= "\n"; + foreach my $a ( @archs ) { $package_page .= "\n"; - $package_page .= "\n"; - foreach my $a ( @archs ) { - $package_page .= "\n"; - $package_page .= "\n"; - $package_page .= "\n\n\n"; + $package_page .= "
".gettext("Download for all available architectures")."
".gettext("Architecture")."".gettext("Files")."".gettext( "Package Size")."".gettext("Installed Size")."
".gettext("Architecture")."".gettext("Files")."".gettext( "Package Size")."".gettext("Installed Size")."
{$a}); - $package_page .= "&md5sum=$file_md5sums->{$a}"; - $package_page .= "&arch=$a"; - # there was at least one package with two - # different source packages on different - # archs where one had a security update - # and the other one not - for ($archives->{$a}) { - /security/o && do { - $package_page .= "&type=security"; last }; - /volatile/o && do { - $package_page .= "&type=volatile"; last }; - /non-us/io && do { - $package_page .= "&type=nonus"; last }; - $package_page .= "&type=main"; - } - $package_page .= "\">$a"; - if ( $suite ne "experimental" ) { - $package_page .= sprintf( "[".gettext( "list of files" )."]\n", "$FILELIST_URL$encodedpkg&version=$suite&arch=$a", $pkg ); - } else { - $package_page .= gettext( "no current information" ); - } - $package_page .= ""; - $package_page .= floor(($sizes_deb->{$a}/102.4)+0.5)/10; - $package_page .= ""; - $package_page .= $sizes_inst->{$a}; - $package_page .= "
{$a}); + $package_page .= "&md5sum=$file_md5sums->{$a}"; + $package_page .= "&arch=$a"; + # there was at least one package with two + # different source packages on different + # archs where one had a security update + # and the other one not + for ($archives->{$a}) { + /security/o && do { + $package_page .= "&type=security"; last }; + /volatile/o && do { + $package_page .= "&type=volatile"; last }; + /non-us/io && do { + $package_page .= "&type=nonus"; last }; + $package_page .= "&type=main"; } - $package_page .= "

".gettext ( "Size is measured in kBytes." )."

\n"; - $package_page .= "
\n"; - - # - # more information - # - $package_page .= pmoreinfo( name => $pkg, data => $page, - bugreports => 1, sourcedownload => 1, - changesandcopy => 0, maintainers => 1, - search => 1 ); + $package_page .= "\">$a\n"; + $package_page .= ""; + if ( $suite ne "experimental" ) { + $package_page .= sprintf( "[".gettext( "list of files" )."]\n", "$FILELIST_URL$encodedpkg&version=$suite&arch=$a", $pkg ); + } else { + $package_page .= gettext( "no current information" ); + } + $package_page .= "\n"; + $package_page .= floor(($sizes_deb->{$a}/102.4)+0.5)/10; + $package_page .= "\n"; + $package_page .= $sizes_inst->{$a}; + $package_page .= "\n"; } + $package_page .= "

".gettext ( "Size is measured in kBytes." )."

\n"; + $package_page .= " \n"; + + # + # more information + # + $package_page .= pmoreinfo( name => $pkg, data => $page, + env => \%FTP_SITES, + bugreports => 1, sourcedownload => 1, + changesandcopy => 1, maintainers => 1, + search => 1 ); } } } diff --git a/lib/Packages/HTML.pm b/lib/Packages/HTML.pm index 38bfb58..da02433 100644 --- a/lib/Packages/HTML.pm +++ b/lib/Packages/HTML.pm @@ -7,7 +7,7 @@ use URI::Escape; use HTML::Entities; use Packages::CGI; -use Packages::Search qw( read_entry ); +use Packages::Search qw( read_entry_simple ); #use Packages::Util; #use Packages::I18N::Locale; @@ -82,44 +82,44 @@ sub pdeplegend { return $str; } -sub pkg_list { - my ( $pkgs, $lang, $env ) = @_; +# sub pkg_list { +# my ( $pkgs, $lang, $env ) = @_; - my $str = ""; - foreach my $p ( @$pkgs ) { - my $p_pkg = $env->{db}->get_pkg( $p ); +# my $str = ""; +# foreach my $p ( @$pkgs ) { +# my $p_pkg = $env->{db}->get_pkg( $p ); - if ( $p_pkg ) { - if ($p_pkg->is_virtual) { - $str .= "
$p
\n". - "\t
".gettext("Virtual package")."
\n"; - } else { - my %subsections = $p_pkg->get_arch_fields( 'section', - $env->{archs} ); - my $subsection = $subsections{max_unique}; - my %desc_md5s = $p_pkg->get_arch_fields( 'description-md5', - $env->{archs} ); - my $short_desc = conv_desc( $lang, - encode_entities( $env->{db}->get_short_desc( $desc_md5s{max_unique}, $lang ), "<>&\"" ) ); - $str .= "
$p
\n". - "\t
$short_desc
\n"; - } - } else { - $str .= "
$p
\n\t
".gettext("Not available")."
\n"; - } - } - if ($str) { - $str = "
$str
\n"; - } +# if ( $p_pkg ) { +# if ($p_pkg->is_virtual) { +# $str .= "
$p
\n". +# "\t
".gettext("Virtual package")."
\n"; +# } else { +# my %subsections = $p_pkg->get_arch_fields( 'section', +# $env->{archs} ); +# my $subsection = $subsections{max_unique}; +# my %desc_md5s = $p_pkg->get_arch_fields( 'description-md5', +# $env->{archs} ); +# my $short_desc = conv_desc( $lang, +# encode_entities( $env->{db}->get_short_desc( $desc_md5s{max_unique}, $lang ), "<>&\"" ) ); +# $str .= "
$p
\n". +# "\t
$short_desc
\n"; +# } +# } else { +# $str .= "
$p
\n\t
".gettext("Not available")."
\n"; +# } +# } +# if ($str) { +# $str = "
$str
\n"; +# } - return $str; -} +# return $str; +# } sub pmoreinfo { my %info = @_; my $name = $info{name} or return; -# my $env = $info{env} or return; + my $env = $info{env} or return; my $page = $info{data} or return; my $is_source = $info{is_source}; @@ -135,6 +135,8 @@ sub pmoreinfo { } my $source = $page->get_src( 'name' ); + my $source_version = $page->get_src( 'version' ); + my $src_dir = $page->get_src('directory'); if ($info{sourcedownload}) { my $files = $page->get_src( 'files' ); $str .= gettext( "Source Package:" ); @@ -146,15 +148,15 @@ sub pmoreinfo { } else { foreach( @$files ) { my ($src_file_md5, $src_file_size, $src_file_name) = @$_; -# if ($d->{is_security}) { -# $str .= "{opts}{security_site}/$d->{src_directory}/$src_file_name\">["; -# } elsif ($d->{is_volatile}) { -# $str .= "{opts}{volatile_site}/$d->{src_directory}/$src_file_name\">["; -# } elsif ($d->{is_nonus}) { -# $str .= "{opts}{nonus_site}/$d->{src_directory}/$src_file_name\">["; -# } else { -# $str .= "{opts}{debian_site}/$d->{src_directory}/$src_file_name\">["; -# } + for ($page->get_newest('archive')) { + /security/o && do { + $str .= "{security}/$src_dir/$src_file_name\">["; last }; + /volatile/o && do { + $str .= "{volatile}/$src_dir/$src_file_name\">["; last }; + /non-us/io && do { + $str .= "{nonus_site}/$src_dir/$src_file_name\">["; last }; + $str .= "{us}/$src_dir/$src_file_name\">["; + } if ($src_file_name =~ /dsc$/) { $str .= "dsc"; } else { @@ -167,22 +169,21 @@ sub pmoreinfo { # if ($src_version ne $version) && !$src_version_given_in_control; } -# if ($info{changesandcopy}) { -# if ( $d->{src_directory} ) { -# my $src_dir = $d->{src_directory}; -# (my $src_basename = $d->{src_version}) =~ s,^\d+:,,; # strip epoche -# $src_basename = "$d->{src_name}_$src_basename"; -# $src_dir =~ s,pool/updates,pool,o; -# $src_dir =~ s,pool/non-US,pool,o; -# $str .= "
".sprintf( gettext( "View the Debian changelog" ), -# "$CHANGELOG_URL/$src_dir/$src_basename/changelog" )."
\n"; -# my $copyright_url = "$CHANGELOG_URL/$src_dir/$src_basename/"; -# $copyright_url .= ( $is_source ? 'copyright' : "$name.copyright" ); - -# $str .= sprintf( gettext( "View the copyright file" ), -# $copyright_url )."

"; -# } -# } + if ($info{changesandcopy}) { + if ( $src_dir ) { + (my $src_basename = $source_version) =~ s,^\d+:,,; # strip epoche + $src_basename = "${source}_$src_basename"; + $src_dir =~ s,pool/updates,pool,o; + $src_dir =~ s,pool/non-US,pool,o; + $str .= "
".sprintf( gettext( "View the Debian changelog" ), + "$CHANGELOG_URL/$src_dir/$src_basename/changelog" )."
\n"; + my $copyright_url = "$CHANGELOG_URL/$src_dir/$src_basename/"; + $copyright_url .= ( $is_source ? 'copyright' : "$name.copyright" ); + + $str .= sprintf( gettext( "View the copyright file" ), + $copyright_url )."

"; + } + } if ($info{maintainers}) { my @uploaders = @{$page->get_src( 'uploaders' )}; @@ -284,13 +285,16 @@ sub print_deps { $pkg_version = "($pkg_version)" if $pkg_version; my @results; - read_entry( $packages, $p_name, \@results, $opts); - if ( @results ) { + my %short_descs; + my $short_desc = $short_descs{$p_name} || + (read_entry_simple( $packages, $p_name, $opts->{suite}))->[-1]; + if ( $short_desc ) { if ( $is_old_pkgs ) { push @res_pkgs, dep_item( "/$opts->{suite}/$p_name", $p_name, "$pkg_version$arch_str" ); } else { - my $short_desc = encode_entities( $results[0][-1], "<>&\"" ); + $short_descs{$p_name} ||= $short_desc; + $short_desc = encode_entities( $short_desc, "<>&\"" ); push @res_pkgs, dep_item( "/$opts->{suite}/$p_name", $p_name, "$pkg_version$arch_str", $short_desc ); } diff --git a/lib/Packages/Page.pm b/lib/Packages/Page.pm index bd74688..bc7fdc0 100644 --- a/lib/Packages/Page.pm +++ b/lib/Packages/Page.pm @@ -32,27 +32,17 @@ sub new { sub merge_data { my ($self, $pkg, $version, $architecture, $data) = @_; - local $/ = ""; - my $strio = IO::String->new($data); - my $merged = 0; - while (<$strio>) { - next if /^\s*$/; - my %data = ( package => $pkg, + my %data = ( package => $pkg, version => $version, architecture => $architecture ); - chomp; - s/\n /\377/g; - while (/^(\S+):\s*(.*)\s*$/mg) { - my ($key, $value) = ($1, $2); - $value =~ s/\377/\n /g; - $key =~ tr [A-Z] [a-z]; - $data{$key} = $value; - } -# debug( "Merge package:\n".Dumper(\%data), 3 ); - $merged += $self->merge_package( \%data ); + chomp($data); + while ($data =~ /^(\S+):\s*(.*)\s*$/mg) { + my ($key, $value) = ($1, $2); + $key =~ tr [A-Z] [a-z]; + $data{$key} = $value; } - close DATA; - return $merged; +# debug( "Merge package:\n".Dumper(\%data), 3 ); + return $self->merge_package( \%data ); } sub gettext { return $_[0]; } @@ -76,22 +66,13 @@ sub split_name_mail { sub add_src_data { my ($self, $src, $version, $data) = @_; - local $/ = ""; - my $strio = IO::String->new($data); - my %data; - while (<$strio>) { - next if /^\s*$/; - chomp; - %data = (); - s/\n /\377/g; - while (/^(\S+):\s*(.*)\s*$/mg) { - my ($key, $value) = ($1, $2); - $value =~ s/\377/\n /g; - $key =~ tr [A-Z] [a-z]; - $data{$key} = $value; - } + chomp($data); + my %data = (); + while ($data =~ /^(\S+):\s*(.*)\s*$/mg) { + my ($key, $value) = ($1, $2); + $key =~ tr [A-Z] [a-z]; + $data{$key} = $value; } - close DATA; $self->{src}{name} = $src; $self->{src}{version} = $version; @@ -103,6 +84,7 @@ sub add_src_data { push @{$self->{src}{files}}, [ split( /\s+/, $sf) ]; } } + $self->{src}{directory} = $data{directory}; my @uploaders; if ($data{maintainer} ||= '') { push @uploaders, [ split_name_mail( $data{maintainer} ) ]; diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm index 000dc60..a7a76d0 100644 --- a/lib/Packages/Search.pm +++ b/lib/Packages/Search.pm @@ -56,7 +56,8 @@ our @ISA = qw( Exporter ); our @EXPORT_OK = qw( nextlink prevlink indexline resperpagelink - read_entry read_entry_all read_src_entry find_binaries + read_entry read_entry_all read_entry_simple + read_src_entry find_binaries do_names_search do_fulltext_search printindexline multipageheader ); our %EXPORT_TAGS = ( all => [ @EXPORT_OK ] ); @@ -341,8 +342,8 @@ sub multipageheader { sub read_entry_all { my ($hash, $key, $results, $non_results, $opts) = @_; my $result = $hash->{$key} || ''; - foreach (split /\000/, $result) { - my @data = split ( /\s/, $_, 8 ); + foreach (split /\000/o, $result) { + my @data = split ( /\s/o, $_, 8 ); debug( "Considering entry ".join( ':', @data), 2); if ($opts->{h_archives}{$data[0]} && $opts->{h_suites}{$data[1]} && ($opts->{h_archs}{$data[2]} || $data[2] eq 'all') @@ -359,11 +360,23 @@ sub read_entry { my @non_results; read_entry_all( $hash, $key, $results, \@non_results, $opts ); } +sub read_entry_simple { + my ($hash, $key, $suite) = @_; + my $result = $hash->{$key} || ''; + foreach (split /\000/o, $result) { + my @data = split ( /\s/o, $_, 8 ); + debug( "Considering entry ".join( ':', @data), 2); + if ($data[1] eq $suite) { + debug( "Using entry ".join( ':', @data), 2); + return \@data; + } + } +} sub read_src_entry { my ($hash, $key, $results, $opts) = @_; my $result = $hash->{$key} || ''; - foreach (split /\000/, $result) { - my @data = split ( /\s/, $_, 6 ); + foreach (split /\000/o, $result) { + my @data = split ( /\s/o, $_, 6 ); debug( "Considering entry ".join( ':', @data), 2); if ($opts->{h_archives}{$data[0]} && $opts->{h_suites}{$data[1]} -- 2.39.2