X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FPage%2FSubmit.pm;h=0c42de9ff1252058018c527be1702d5ff54c235e;hb=600e4c01f0fc265a61aea2830c26ed2bd6d77c73;hp=096af4d81a2e9092a545e73a13b34c7c36b1d730;hpb=8d29b3b10314c58d01fe2ce7e69865d04525406d;p=gruntmaster-page.git

diff --git a/lib/Gruntmaster/Page/Submit.pm b/lib/Gruntmaster/Page/Submit.pm
index 096af4d..0c42de9 100644
--- a/lib/Gruntmaster/Page/Submit.pm
+++ b/lib/Gruntmaster/Page/Submit.pm
@@ -1,15 +1,6 @@
 package Gruntmaster::Page::Submit;
 
-use 5.014000;
-use strict;
-use warnings;
 use Gruntmaster::Page::Base;
-our @ISA = qw/Gruntmaster::Page::Base/;
-our $VERSION = '0.001';
-
-use Apache2::Authen::Passphrase qw/pwcheck pwset USER_REGEX/;
-use File::Slurp qw/read_file/;
-use Plack::Request;
 
 use constant FORMAT_EXTENSION => {
 	C => 'c',
@@ -25,42 +16,34 @@ sub generate{
 	my ($self, $frm, $env) = @_;
 	my $r = Plack::Request->new($env);
 	my ($problem, $format, $contest, $private, $prog) = map {scalar $r->param($_)} 'problem', 'prog_format', 'contest', 'private', 'source_code';
+	$problem //= $env->{'gruntmaster.problem'};
+	$contest //= $env->{'gruntmaster.contest'};
 	my $upload = $r->upload('prog');
 	if (defined $upload) {
-		my $temp = read_file $upload->filename;
+		my $temp = read_file $upload->path;
 		$prog = $temp if $temp
 	}
 	die if defined $contest && $contest !~ /^\w+$/ ;
-	die if defined $contest && (time > contest_end $contest);
+	die if defined $contest && (time > db($env)->contest($contest)->stop);
 	return reply 'A required parameter was not supplied' if grep { !defined } $problem, $format, $prog;
+	return reply 'Maximum source size is 10KB' if length $prog > 25 * 1024;
+	return reply 'You must wait 30 seconds between jobs' unless time > db($env)->user($r->user)->lastjob + 30;
+	db($env)->user($r->user)->update({lastjob => time});
 
-	local $Gruntmaster::Data::contest = $contest;
-
-	my $job = push_job (
+	db($env)->jobs->create({
+		defined $contest ? (contest => $contest) : (),
 		date => time,
-		problem => $problem,
-		user => $r->user,
-		defined $private ? (private => $private) : (),
-		defined $contest ? (contest => $contest, private => 1) : (),
-		filesize => length $prog,
 		extension => FORMAT_EXTENSION->{$format},
-	);
-
-	set_job_inmeta $job, {
-		files => {
-			prog => {
-				format => $format,
-				name => 'prog.' . FORMAT_EXTENSION->{$format},
-				content => $prog,
-			}
-		}
-	};
+		format => $format,
+		defined $private ? (private => $private) : (),
+		problem => $problem,
+		source => $prog,
+		owner => $r->user
+	});
 
 	$contest //= '';
-	PUBLISH 'jobs', "$contest.$job";
-	[303, [Location => $r->path =~ s,/pb/\w+/submit$,/log/,r], ['']]
+	#PUBLISH 'jobs', "$contest.$job";
+	[303, [Location => ($contest ? "/ct/$contest/log/" : '/log/')], ['']]
 }
 
-sub variants{ [[reply => 1, undef, undef, undef, undef, undef]] }
-
 1