Make all generators inherit from a common base

[gruntmaster-page.git] / lib / Gruntmaster / Page / Log.pm

diff --git a/lib/Gruntmaster/Page/Log.pm b/lib/Gruntmaster/Page/Log.pm
index 47c8a2e9288770b3df5d7062831aca3e3d1abe72..fce36cbe8fe1a4f5d91b3082c528a9cb18060bcb 100644 (file)
--- a/lib/Gruntmaster/Page/Log.pm
+++ b/lib/Gruntmaster/Page/Log.pm
@@ -3,8 +3,8 @@ 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 PAGE_SIZE => 10;
@@ -13,12 +13,7 @@ use constant FORMAT_EXTENSION => {
   CPP => 'cpp',
 };
 
-use HTML::Template::Compiled;
-use POSIX qw/strftime/;
-use Gruntmaster::Page::Common qw/cook_templates reload_templates/;
-use Gruntmaster::Data qw/jobcard job_date job_extension job_filesize problem_name job_private job_problem job_result job_result_text job_user/;
-
-my %orig_templates = (
+use constant TEMPLATES => {
        en => <<'HTML',
 <table border>
 <thead>
@@ -32,18 +27,16 @@ my %orig_templates = (
 </tmpl_loop>
 </table>
 HTML
-);
+};
 
-my %templates = cook_templates %orig_templates, log => 'Job log';
+sub _generate{
+       my ($self, $htc, $path, $lang) = @_;
 
-sub generate{
-       %templates = cook_templates %orig_templates, log => 'Job log' if reload_templates;
-       $_[0] =~ m,^(?:ct/([^/]+)/)?log/(\w+)\.html$,;
+       $path =~ m,^(?:ct/([^/]+)/)?log/(\w+)\.html$,;
        local $Gruntmaster::Data::contest = $1;
        my $pages = jobcard / PAGE_SIZE;
        my $page = $2 eq 'index' ? $pages : $2;
 
-       my $htc = HTML::Template::Compiled->new(scalarref => \$templates{$_[1]});
        my @log = sort { $b->{id} <=> $a->{id} } map +{
                id => $_,
                (job_private() ? (private => job_private) : ()),
@@ -56,7 +49,6 @@ sub generate{
                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);
-       $htc->output
 }
 
 1