Update schema

[gruntmaster-data.git] / gruntmaster-problem

diff --git a/gruntmaster-problem b/gruntmaster-problem
index e5a02d8fb2fbc7d099c7c6e02ff3f6ccc9f9da3e..3ab12196135a778d6ce1734de7c2e0645933a02c 100755 (executable)
--- a/gruntmaster-problem
+++ b/gruntmaster-problem
@@ -2,12 +2,11 @@
 use v5.14;
 
 use Gruntmaster::Data;
-use Gruntmaster::Page::Submit;
 
 use IO::Prompter [ -style => 'bold', '-stdio', '-verbatim' ];
 use File::Slurp qw/read_file/;
 use Term::ANSIColor qw/RED RESET/;
-use Getopt::Long qw/GetOptions/;
+use Getopt::Long qw/:config require_order/;
 
 ##################################################
 
@@ -21,50 +20,54 @@ sub prompt_file{
        my ($meta, $name, $prefix) = @_;
        my $filename = prompt '$prefix filename', -complete => 'filenames';
        $meta->{files}{$name}{content} = read_file $filename;
-       $meta->{files}{$name}{format} = prompt '$prefix format', -menu => Gruntmaster::Page::Submit::FORMATS;
+       $meta->{files}{$name}{format} = prompt '$prefix format', -menu => [qw/C CPP MONO JAVA PASCAL PERL PYTHON/];
        $meta->{files}{$name}{name} = prompt "$prefix filename [$filename]", -default => $filename;
 }
 
 sub cmd_add{
        my $id = shift;
        my $name = prompt 'Problem name';
+       my $private = prompt('Private?', '-yn') eq 'y';
        my $author = prompt 'Problem author (full name)';
        my $owner = prompt 'Problem owner (username)';
        my $level = prompt 'Problem level', -menu => "beginner\neasy\nmedium\nhard";
        my $statement = read_file prompt 'File with problem statement', -complete => 'filenames';
        my %meta;
-       $meta{generator} = prompt 'Generator', -menu => "File\nRun\nUndef";
-       $meta{runner} = prompt 'Runner', -menu => "File\nVerifier\nInteractive";
-       $meta{judge} = prompt 'Judge', -menu => "Absolute\nPoints";
-       $meta{testcnt} = prompt 'Test count', '-i';
-
-       $meta{timeout} = prompt 'Time limit (seconds)', '-n';
-       delete $meta{timeout} unless $meta{timeout};
-       $meta{olimit} = prompt 'Output limit (bytes)', '-i';
-       delete $meta{olimit} unless $meta{olimit};
-       say 'Memory limits are broken, so I won\'t ask you for one';
+       my $generator = prompt 'Generator', -menu => "File\nRun\nUndef";
+       my $runner = prompt 'Runner', -menu => "File\nVerifier\nInteractive";
+       my $judge = prompt 'Judge', -menu => "Absolute\nPoints";
+       my $testcnt = prompt 'Test count', '-i';
 
-       if ($meta{generator} eq 'File') {
-               my $prefix = prompt '[Generator::File] Input file prefix';
-               $meta{infile}[$_ - 1] = read_file "$prefix$_.in" for 1 .. $meta{testcnt};
-       }
+       my $timeout = prompt 'Time limit (seconds)', '-n';
+       my $olimit = prompt 'Output limit (bytes)', '-i';
+       say 'Memory limits are broken, so I won\'t ask you for one';
 
-       prompt_file \%meta, gen => '[Generator::Run] Generator' if $meta{generator} eq 'Run';
+       prompt_file \%meta, gen => '[Generator::Run] Generator' if $generator eq 'Run';
 
-       if ($meta{runner} eq 'File') {
-               my $prefix = prompt '[Runner::File] Output file prefix';
-               $meta{okfile}[$_ - 1] = read_file "$prefix$_.ok" for 1 .. $meta{testcnt};
-               $meta{tests}[$_ - 1] = prompt "[Runner::File] Score for test ${_} [10]", '-i', -default => 10 for 1 .. $meta{testcnt};
+       if ($runner eq 'File') {
+               $meta{tests}[$_ - 1] = prompt "[Runner::File] Score for test ${_} [10]", '-i', -default => 10 for 1 .. $testcnt;
        }
 
-       prompt_file \%meta, ver => '[Runner::Verifier] Verifier' if $meta{runner} eq 'Verifier';
+       prompt_file \%meta, ver => '[Runner::Verifier] Verifier' if $runner eq 'Verifier';
 
-       if ($meta{runner} eq 'Interactive') {
+       if ($runner eq 'Interactive') {
                say RED, 'WARNING: Runner::Interactive is experimental', RESET;
-               prompt_file int => '[Runner::Interactive] Interactive verifier';
+               prompt_file \%meta, int => '[Runner::Interactive] Interactive verifier';
        }
 
-       insert_problem $id => name => $name, level => $level, statement => $statement, author => $author, owner => $owner;
+       insert_problem $id => (
+               name => $name,
+               level => $level,
+               statement => $statement,
+               author => $author,
+               owner => $owner,
+               generator => $generator,
+               runner => $runner,
+               judge => $judge,
+               testcnt => $testcnt,
+               ($private ? (private => $private) : ()),
+               (defined $timeout ? (timeout => $timeout) : ()),
+               (defined $olimit ? (olimit => $olimit) : ()));
        set_problem_meta $id => \%meta;
        PUBLISH genpage => $contest ? "ct/$contest/pb/index.html" : 'pb/index.html';
        PUBLISH genpage => $contest ? "ct/$contest/pb/$id.html" : "pb/$id.html";