Fix some small bugs

[plack-app-gruntmaster.git] / lib / Gruntmaster / Page / Pb / Entry.pm

diff --git a/lib/Gruntmaster/Page/Pb/Entry.pm b/lib/Gruntmaster/Page/Pb/Entry.pm
index 53cc2102babd8a53c1a4ba73564906be0d924742..c9dfe206b3f8aacd080c6fc5a2817088e6dca562 100644 (file)
--- a/lib/Gruntmaster/Page/Pb/Entry.pm
+++ b/lib/Gruntmaster/Page/Pb/Entry.pm
@@ -11,16 +11,15 @@ use Fcntl qw/:flock/;
 use HTML::Template::Compiled;
 use IO::File;
 use POSIX qw/strftime/;
-use YAML::Any qw/LoadFile/;
 use File::Basename qw/fileparse/;
-use File::Slurp qw/slurp/;
 use Gruntmaster::Page::Common qw/header footer/;
+use Gruntmaster::Data qw/contest_start contest_end problem_name problem_statement/;
 
 use constant FORMATS => [qw/CPP/];
 use constant TITLE => '<tmpl_var name>';
 
 my %templates = (
-  en => <<'HTML',
+       en => <<'HTML',
 <tmpl_var statement>
 
 <tmpl_if cansubmit>
@@ -35,6 +34,7 @@ my %templates = (
 </tmpl_loop></select></label>
 
 <input type="submit" value="Submit job">
+</form>
 </tmpl_if>
 HTML
 );
@@ -43,27 +43,22 @@ $templates{$_}  = header($_, TITLE) . $templates{$_} for keys %templates;
 $templates{$_} .= footer $_ for keys %templates;
 
 sub generate{
-  my ($path, $lang) = @_;
-  my $contest;
-  $contest = $1 if $path =~ m,ct/([^/]*)/,;
-  my $id = ($path =~ m,pb/([^/]*)/index,)[0];
-  $path =~ s,/index\.html$,,;
-  my $template = $templates{$_[1]};
-  my $htc = HTML::Template::Compiled->new(scalarref => \$template);
-  flock my $metafh = IO::File->new("<$path/meta.yml"), LOCK_SH;
-  my $meta = LoadFile "$path/meta.yml";
+       $_[0] =~ m,(?:ct/([^/])+/)?pb/(\w+)\.html$,;
 
-  $htc->param(cansubmit => 1);
-  if (defined $contest) {
-       my $meta = LoadFile "ct/$contest/meta.yml";
-       $htc->param(cansubmit => time >= $meta->{start} && time <= $meta->{end});
-       $htc->param(contest => $contest);
-  }
-  $htc->param(formats => FORMATS);
-  $htc->param(id => $id);
-  $htc->param(name => $meta->{name});
-  $htc->param(statement => scalar slurp "$path/statement.$lang");
-  $htc->output
+       my ($contest, $id) = ($1, $2);
+       my $htc = HTML::Template::Compiled->new(scalarref => \$templates{$_[1]});
+
+       $htc->param(cansubmit => 1);
+       if (defined $contest) {
+               $htc->param(cansubmit => time >= contest_start $contest && time <= contest_end $contest);
+               $htc->param(contest => $contest);
+       }
+       $htc->param(formats => FORMATS);
+       $htc->param(id => $id);
+       local $Gruntmaster::Data::contest = $contest if $contest;
+       $htc->param(name => problem_name $id);
+       $htc->param(statement => problem_statement $id);
+       $htc->output
 }
 
 1