From: Frank Lichtenheld Date: Thu, 23 Feb 2006 16:50:14 +0000 (+0000) Subject: Add format parameter (used by DoNewPkg and DoIndex) X-Git-Tag: switch-to-templates~45 X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=6b32484cb228479df13814cf1ba0f6667ff7148d;p=deb%2Fpackages.git Add format parameter (used by DoNewPkg and DoIndex) Add mode paramter (used by DoNewPkg) Add DoNewPkg which displays the list of new packages --- diff --git a/cgi-bin/dispatcher.pl b/cgi-bin/dispatcher.pl index e863de9..5ff3b67 100755 --- a/cgi-bin/dispatcher.pl +++ b/cgi-bin/dispatcher.pl @@ -33,6 +33,7 @@ use Packages::DoSearch; use Packages::DoSearchContents; use Packages::DoShow; use Packages::DoIndex; +use Packages::DoNewPkg; use Packages::DoDownload; use Packages::DoFilelist; @@ -64,7 +65,7 @@ $Packages::CGI::debug = $debug; my $acc = I18N::AcceptLanguage->new(); my $http_lang = $acc->accepts( $input->http("Accept-Language"), - \@LANGUAGES ); + \@LANGUAGES ) || 'en'; debug( "LANGUAGES=@LANGUAGES header=". $input->http("Accept-Language"). " http_lang=$http_lang", 2 ) if DEBUG; @@ -96,7 +97,7 @@ if (my $path = $input->path_info() || $input->param('PATH_INFO')) { } else { for ($components[-1]) { - /^(index|changelog|copyright|download|filelist)$/ && do { + /^(index|allpackages|newpkg|changelog|copyright|download|filelist)$/ && do { pop @components; $what_to_do = $1; last; @@ -186,6 +187,8 @@ my %params_def = ( keywords => { default => undef, arch => { default => 'any', match => '^([\w-]+)$', array => ',', var => \@archs, replace => { any => \@ARCHITECTURES } }, + format => { default => 'html', match => '^(\w+)$', }, + mode => { default => undef, match => '^(\w+)$', }, ); my %opts; my %params = Packages::Search::parse_params( $input, \%params_def, \%opts ); diff --git a/lib/Packages/DoIndex.pm b/lib/Packages/DoIndex.pm index 3e6041d..b204d3d 100644 --- a/lib/Packages/DoIndex.pm +++ b/lib/Packages/DoIndex.pm @@ -12,10 +12,17 @@ use Packages::I18N::Locale; use Packages::CGI; our @ISA = qw( Exporter ); -our @EXPORT = qw( do_index ); +our @EXPORT = qw( do_index do_allpackages ); sub do_index { - my ($params, $opts, $html_header) = @_; + return send_file( 'index', @_ ); +} +sub do_allpackages { + return send_file( 'allpackages', @_ ); +} + +sub send_file { + my ($file, $params, $opts, $html_header) = @_; if ($params->{errors}{suite}) { fatal_error( _g( "suite not valid or not specified" ) ); @@ -33,7 +40,7 @@ sub do_index { $path .= "$opts->{subsection}[0]/" if @{$opts->{subsection}}; # we don't have translated index pages for subsections yet $opts->{lang} = 'en' if @{$opts->{subsection}}; - $path .= "index.$opts->{lang}.html"; + $path .= "$file.$opts->{lang}.$opts->{format}"; unless (@Packages::CGI::fatal_errors) { my $buffer; diff --git a/lib/Packages/DoNewPkg.pm b/lib/Packages/DoNewPkg.pm new file mode 100644 index 0000000..c3175ec --- /dev/null +++ b/lib/Packages/DoNewPkg.pm @@ -0,0 +1,150 @@ +package Packages::DoNewPkg; + +use strict; +use warnings; + +use Benchmark ':hireswallclock'; +use HTML::Entities; +use POSIX; +use XML::RSS; +use CGI (); +use Exporter; +our @ISA = qw( Exporter ); +our @EXPORT = qw( do_newpkg ); + +use Packages::I18N::Locale; +use Packages::Search qw( :all ); +use Packages::CGI; +use Packages::DB; +use Packages::Config qw( $TOPDIR @SECTIONS $HOSTNAME $ROOT ); + +sub do_newpkg { + my ($params, $opts, $html_header, $menu, $page_content) = @_; + + if ($params->{errors}{suite}) { + fatal_error( _g( "suite not valid or not specified" ) ); + } + if (@{$opts->{suite}} > 1) { + fatal_error( sprintf( _g( "more than one suite specified for show (%s)" ), "@{$opts->{suite}}" ) ); + } + + my $sort_func = sub { $_[0][0] cmp $_[1][0] }; + $sort_func = sub { $_[0][1] <=> $_[1][1] or $_[0][0] cmp $_[1][0] } + if $opts->{mode} eq 'byage'; + + my $suite = $opts->{suite}[0]; + my $one_archive = @{$opts->{archive}} == 1 ? + $opts->{archive}[0] : undef; + my $one_section = @{$opts->{section}} == 1 ? + $opts->{section}[0] : undef; + + my @full_path = ($HOSTNAME, $ROOT, $suite); + push @full_path, $one_archive if $one_archive; + my $full_path = join( '/', @full_path ); + + my @new_pkgs; + #FIXME: move to Packages::DB? + open NEWPKG, '<', "$TOPDIR/files/packages/newpkg_info" + or die "can't read newpkg_info file: $!"; + while () { + chomp; + my @data = split /\s/, $_, 10; + + next unless $data[3] eq $suite; + next if $one_archive and $data[2] ne $one_archive; + next if $one_section and $data[5] ne $one_section; + + debug( "new pkg: @data", 1 ) if DEBUG; + push @new_pkgs, \@data; + } + close NEWPKG; + + (my @date)= gmtime(); + my $now_time = strftime ("%B %d, %Y", @date); + my $rss_time = strftime ("%Y-%m-%dT%H:%M+00:00", @date); + + unless ($opts->{format} eq 'rss') { + my $title = sprintf( _g( "New Packages in \"%s\"" ), + $suite ); + %$html_header = ( title => $title, + title_keywords => "debian, "._g('new packages').", $suite, @{$opts->{section}}", + meta => "", + lang => $opts->{lang}, + print_title => 1 ); + + $$page_content .= "

" + . sprintf(_g( "The following packages were added to suite %s%s in the Debian archive during the last 7 days."), $suite, + $one_section ? sprintf(_g(" (section %s)"),$one_section):'')."

" + . "

".sprintf( _g( "This information is also available as an RSS feed." ), "newpkg?format=rss" ) + ." \"[RSS

"; + + if (@new_pkgs) { + $$page_content .= "\n\n" if @new_pkgs; + } + + my $slist = ''; + if ($one_section) { + foreach my $s (@SECTIONS) { + $slist .= ", " if $slist; + $slist .= $one_section eq $s ? $s : + "$s"; + } + } + + $$page_content .= '

". + _g( "All packages" ) ."
(". + _g( "compact compressed textlist" ).")
". + ($slist ? sprintf(_g( "New packages in %s" ), $slist ):''). + "

\n"; + + } else { # unless ($opts->{format} eq 'rss') + my ( $rss_link, $rss_description, $rss_date ); + + $rss_description = sprintf(_g( "The following packages were added to suite %s%s in the Debian archive during the last 7 days."), $suite, + $one_section ? sprintf(_g(" (section %s)"),$one_section):''); + + my $rss = new XML::RSS (version => '1.0'); + $rss_link = "$full_path".($one_section?"$one_section/":'')."/newpkg?format=rss"; + $rss->channel( + title => _g("New Debian Packages"), + link => $rss_link, + description => $rss_description, + dc => { + date => $rss_time, + publisher => 'debian-www@lists.debian.org', + rights => 'Copyright '.($date[5]+1900).', SPI Inc.', + language => $opts->{lang}, + }, + syn => { + updatePeriod => "daily", + updateFrequency => "2", +# updateBase => "1901-01-01T00:00+00:00", + } ); + + foreach my $pkg (sort { &$sort_func($a,$b) } @new_pkgs) { + $rss->add_item( + title => $pkg->[0], + link => "$full_path/$pkg->[0]", + description => $pkg->[-1], + dc => { + subject => $pkg->[6], + } ); + } + print &CGI::header( -type => 'application/rss+xml' ); + print $rss->as_string; + exit; + } +} + +1; diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm index e18991a..c9912df 100644 --- a/lib/Packages/DoShow.pm +++ b/lib/Packages/DoShow.pm @@ -100,7 +100,8 @@ sub do_show { $data{package} = $pkg; $data{architecture} = $arch; $data{version} = $version; - $page->merge_package(\%data) or debug( "Merging $pkg $arch $version FAILED", 2 ) if DEBUG; + $page->merge_package(\%data) + or debug( "Merging $pkg $arch $version FAILED", 2 ) if DEBUG; } else { $page->add_provided_by([split /\s+/, $provided_by]); }