X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=gruntmaster-problem;h=3ab12196135a778d6ce1734de7c2e0645933a02c;hb=9a987597aaf367c5a3b2fa291f6420569147f1b4;hp=5b4375f40f77aba24cae3c5b95ee427d2c6581bc;hpb=cd25d613ea68d3fae63a98225efe0a30cf82274e;p=gruntmaster-data.git

diff --git a/gruntmaster-problem b/gruntmaster-problem
index 5b4375f..3ab1219 100755
--- a/gruntmaster-problem
+++ b/gruntmaster-problem
@@ -2,7 +2,6 @@
 use v5.14;
 
 use Gruntmaster::Data;
-use Gruntmaster::Page::Submit;
 
 use IO::Prompter [ -style => 'bold', '-stdio', '-verbatim' ];
 use File::Slurp qw/read_file/;
@@ -21,14 +20,14 @@ 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';
+	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";
@@ -56,7 +55,19 @@ sub cmd_add{
 		prompt_file \%meta, int => '[Runner::Interactive] Interactive verifier';
 	}
 
-	insert_problem $id => name => $name, level => $level, statement => $statement, author => $author, owner => $owner, private => $private, generator => $generator, runner => $runner, judge => $judge, testcnt => $testcnt, (defined $timeout ? (timeout => $timeout) : ()), (defined $olimit ? (olimit => $olimit) : ());
+	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";