Move prepare and prepare_files to Format.pm

[gruntmaster-daemon.git] / lib / Gruntmaster / Daemon.pm

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index d6369656337bdf37152c0b1d950317fdce3496fc..a4d1902b0cfa6fb9f36e196ea976da3a863996e6 100644 (file)
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -7,22 +7,19 @@ use warnings;
 our $VERSION = '0.001';
 
 use Gruntmaster::Daemon::Constants qw/ERR/;
-use Gruntmaster::Daemon::Format qw/mkrun/;
+use Gruntmaster::Daemon::Format qw/prepare_files/;
 use Gruntmaster::Data;
-use Gruntmaster::Page::Log;
 
 use File::Basename qw/fileparse/;
 use File::Slurp qw/write_file/;
-use File::Spec::Functions qw/devnull/;
 use File::Temp qw/tempdir/;
-use IO::File;
-use IPC::Open3 qw/open3/;
 use Sys::Hostname qw/hostname/;
 use Time::HiRes qw/time/;
 use Try::Tiny;
-use YAML::Any qw/LoadFile DumpFile/;
 use Log::Log4perl qw/get_logger/;
 
+use constant PAGE_SIZE => 10;
+
 ##################################################
 
 sub safe_can_nodie {
@@ -41,29 +38,6 @@ sub safe_can {
   safe_can_nodie @_ or get_logger->logdie("No such \l$type: '$name'");
 }
 
-sub prepare{
-  my ($name, $format) = @_;
-  our $errors;
-  my $basename = fileparse $name, qr/\.[^.]*/;
-  get_logger->trace("Preparing file $name...");
-
-  $errors .= `gruntmaster-compile $format $basename $name 2>&1`;
-  $errors .= "\n";
-  die 'Compile error' if $?
-}
-
-sub prepare_files{
-  my $meta = shift;
-
-  for my $file (values $meta->{files}) {
-       my ($format, $name, $content) = @{$file}{qw/format name content/};
-
-       $file->{run} = mkrun($format);
-       write_file $name, $content;
-       prepare $name, $format;
-  }
-}
-
 sub process{
   my $job = shift;
 
@@ -75,7 +49,7 @@ sub process{
        $meta = job_inmeta $job;
        if (job_problem $job) {
          my $pbmeta = problem_meta job_problem $job;
-         my %files = %{$meta->{files}};
+         my %files = exists $meta->{files} ? %{$meta->{files}} : ();
          $meta = {%$meta, %$pbmeta};
          $meta->{files} = {%files, %{$pbmeta->{files}}} if exists $pbmeta->{files};
        }
@@ -130,11 +104,12 @@ sub process{
   set_job_errors $job, $errors;
 
   my $log = $Gruntmaster::Data::contest ? "ct/$Gruntmaster::Data::contest/log" : 'log';
-  PUBLISH gensrc => $job;
+
+  PUBLISH gensrc => ($Gruntmaster::Data::contest // '') . ".$job";
   PUBLISH genpage => "$log/job/$job.html";
   PUBLISH genpage => "$log/index.html";
   PUBLISH genpage => "$log/st.html";
-  my $page = ($job + Gruntmaster::Page::Log::PAGE_SIZE - 1) / Gruntmaster::Page::Log::PAGE_SIZE;
+  my $page = ($job + PAGE_SIZE - 1) / PAGE_SIZE;
   PUBLISH genpage => "$log/@{[$page - 1]}.html";
   PUBLISH genpage => "$log/$page.html";
   PUBLISH genpage => "$log/@{[$page + 1]}.html";
@@ -143,7 +118,7 @@ sub process{
 sub got_job{
        $_[0] =~ /^(\w*)\.(\d+)$/;
        my $job = $2;
-       $Gruntmaster::Data::contest = $1 if $1;
+       local $Gruntmaster::Data::contest = $1 if $1;
        get_logger->debug("Taking job $job@{[defined $1 ? \" of contest $1\" : '']}...");
        if (set_job_daemon $job, hostname . ":$$") {
                get_logger->debug("Succesfully taken job $job");