X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FPage%2FLog.pm;h=cdef1df1aa9f4fbb167bd40d6ebc10b6760e7f8a;hb=a73373457a03facd0c96632a9c19150eda3f85f3;hp=957b5102e64b031b2d11b914a9a50de9a6dcf91d;hpb=c259ad15c1e3ed8f643fda85c5c4f432aac2d6ef;p=plack-app-gruntmaster.git

diff --git a/lib/Gruntmaster/Page/Log.pm b/lib/Gruntmaster/Page/Log.pm
index 957b510..cdef1df 100644
--- a/lib/Gruntmaster/Page/Log.pm
+++ b/lib/Gruntmaster/Page/Log.pm
@@ -3,60 +3,48 @@ package Gruntmaster::Page::Log;
 use 5.014000;
 use strict;
 use warnings;
-use parent qw/Exporter/;
-our @EXPORT_OK = qw/generate/;
+use Gruntmaster::Page::Base log => 'Job log';
+our @ISA = qw/Gruntmaster::Page::Base/;
 our $VERSION = '0.001';
 
-use constant TITLE => 'Job log';
+use constant PAGE_SIZE => 10;
 
-use Fcntl qw/:flock/;
-use HTML::Template::Compiled;
-use IO::File;
-use POSIX qw/strftime/;
-use YAML::Any qw/LoadFile/;
-use Gruntmaster::Page qw/header footer/;
-
-my %templates = (
-  en => <<'HTML',
+use constant TEMPLATES => {
+	en => <<'HTML',
 <table border>
 <thead>
 <tr><th>ID<th>Problem<th>Date<th>Size<th>User<th>Result
 <tbody>
-<tmpl_loop log><tr><td><a href="<tmpl_var id>"><tmpl_var id></a>
-<td><a href="/pb/<tmpl_var problem>"><tmpl_var name></a>
+<tmpl_loop log><tr><td><a href="job/<tmpl_var id>.var"><tmpl_var id></a>
+<td><a href="../pb/<tmpl_var problem>"><tmpl_var name></a>
 <td><tmpl_var date>
-<td><a href="<tmpl_var id>/in/<tmpl_var filename>"<tmpl_if private> data-private</tmpl_if>><tmpl_var size></a>
+<td><a href="src/<tmpl_var id>.<tmpl_var extension>"<tmpl_if private> data-private</tmpl_if>><tmpl_var size></a></a>
 <td><tmpl_var user><td class="r<tmpl_var result>"><tmpl_var result_text>
 </tmpl_loop>
 </table>
 HTML
-);
+};
+
+sub _generate{
+	my ($self, $htc, $path, $lang) = @_;
 
-$templates{$_}  = header($_, TITLE) . $templates{$_} for keys %templates;
-$templates{$_} .= footer $_ for keys %templates;
+	$path =~ m,^(?:ct/([^/]+)/)?log/(\w+)\.html$,;
+	local $Gruntmaster::Data::contest = $1 if $1;
+	my $pages = POSIX::ceil (jobcard / PAGE_SIZE);
+	my $page = $2 eq 'index' ? $pages : $2;
 
-sub generate{
-  my ($path, $lang) = @_;
-  $path =~ s,/index\.html$,,;
-  my $template = $templates{$lang};
-  my $htc = HTML::Template::Compiled->new(scalarref => \$template);
-  IO::File->new(">$path/meta.yml")->close unless -f "$path/meta.yml";
-  flock my $metafh = IO::File->new("<$path/meta.yml"), LOCK_SH;
-  my $meta = LoadFile "$path/meta.yml";
-  my @log = sort { $b->{id} <=> $a->{id} } map {
-	my $meta = LoadFile "$path/$_/meta.yml";
-	+{ id => $_,
-	   date => (exists $meta->{date} ? strftime ('%c' => localtime $meta->{date}) : '?'),
-	   user => $meta->{user},
-	   result => $meta->{result},
-	   name => $meta->{name},
-	   problem => $meta->{problem},
-	   filename => $meta->{files}{prog}{name},
-	   (defined $meta->{private} ? (private => $meta->{private}) : ()),
-	   size => sprintf ("%.2f KiB", (-s "$path/$_/in/" . $meta->{files}{prog}{name}) / 1024),
-	   result_text => $meta->{result_text}} } 1 .. $meta->{last};
-  $htc->param(log => \@log);
-  $htc->output
+	my @log = sort { $b->{id} <=> $a->{id} } map +{
+		id => $_,
+		(job_private() ? (private => job_private) : ()),
+		date => (job_date() ? strftime ('%c' => localtime job_date) : '?'),
+		extension => job_extension,
+		name => problem_name job_problem,
+		problem => job_problem,
+		result => job_result,
+		result_text => job_result_text,
+		size => sprintf ("%.2f KiB", job_filesize() / 1024),
+		user => job_user}, ($page - 1) * PAGE_SIZE + 1 .. ($page == $pages ? jobcard : $page * PAGE_SIZE);
+	$htc->param(log => \@log);
 }
 
 1