X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster.pm;h=31ea346f8f9d637d05ba29565b2108c6934b79a0;hb=7baee29b2642aabb77a24745dc8be86440c30a4f;hp=5a38d1faa91ae54713a0929ced4dd742e42fcc1e;hpb=a18eef289a562809653fc592527b364c37632193;p=gruntmaster-page.git

diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index 5a38d1f..31ea346 100644
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -7,6 +7,7 @@ our $VERSION = '5999.000_001';
 use Encode qw/encode decode/;
 use File::Slurp qw/read_file/;
 use JSON::MaybeXS qw/encode_json/;
+use List::Util qw/min/;
 use PerlX::Maybe;
 use Scope::Upper qw/unwind SUB UP/;
 use Web::Simple;
@@ -22,18 +23,24 @@ no warnings 'illegalproto';
 use constant USER_REGEX => qr/^\w{2,20}$/a;
 
 use constant FORMAT_EXTENSION => {
+	BRAINFUCK => 'bf',
 	C => 'c',
 	CPP => 'cpp',
+	D => 'd',
 	GCCGO => 'go',
 	GOLANG => 'go',
 	GOLFSCRIPT => 'gs',
 	HASKELL => 'hs',
-	MONO => 'cs',
 	JAVA => 'java',
+	JULIA => 'jl',
+	MONO => 'cs',
+	OCAML => 'ml',
 	PASCAL => 'pas',
 	PERL => 'pl',
+	PHP => 'php',
 	PYTHON => 'py',
 	RUBY => 'rb',
+	RUST => 'rs',
 	SBCL => 'l',
 };
 
@@ -41,12 +48,10 @@ use constant NOT_FOUND => [404, ['X-Forever' => 1, 'Content-Type' => 'text/plain
 
 my ($env, $privacy);
 
-sub db { $env->{'gruntmaster.dbic'} }
-
 sub remote_user {
 	unless ($env->{'gruntmaster.user'}) {
 		my $user = $env->{REMOTE_USER};
-		$user &&= db->user_entry($user);
+		$user &&= user_entry $user;
 		$env->{'gruntmaster.user'} = $user;
 	}
 	$env->{'gruntmaster.user'}
@@ -57,14 +62,14 @@ sub admin   { remote_user && remote_user->{admin} }
 sub redirect { [301, ['X-Forever' => 1, 'Cache-Control' => 'public, max-age=86400', 'Location' => $_[0]], []] }
 sub reply    { [200, ['Content-Type' => 'text/plain; charset=utf-8'], \@_] }
 sub response {
-	my ($template, $title, $params, $maxage) = @_;
+	my ($template, $title, $params, $maxage, $smaxage) = @_;
 	unless ($params) {
 		$params = $title;
 		$title = 'No title';
 	}
 	$params->{time} = time;
 	$params->{args} = {%_};
-	bless {template => $template, title => $title, params => $params, maxage => ($maxage // 3600)}, __PACKAGE__.'::Response'
+	bless {template => $template, title => $title, params => $params, maxage => ($maxage // 3600), maybe smaxage => $smaxage}, __PACKAGE__.'::Response'
 }
 
 sub forbid {
@@ -82,10 +87,10 @@ sub dispatch_request{
 		sub (/robots.txt) { NOT_FOUND },
 
 		sub (/src/:job) {
-			my $job = db->job_full($_{job});
+			my $job = db->select(jobs => '*', {id => $_{job}})->hash;
 			return NOT_FOUND if !$job;
 			my $isowner = remote_user && remote_user->{id} eq $job->{owner};
-			my $contest = $job->{contest} && db->contest_entry($job->{contest});
+			my $contest = $job->{contest} && contest_entry $job->{contest};
 			my $private = $job->{private} || $contest && ($contest->{started} && !$contest->{finished});
 			forbid !$isowner && $private;
 			my $privacy = $private ? 'private' : 'public';
@@ -99,7 +104,9 @@ sub dispatch_request{
 			response_filter {
 				my ($r) = @_;
 				return $r if ref $r ne 'Plack::App::Gruntmaster::Response';
-				my @hdrs = ('X-Forever' => 1, 'Cache-Control' => "$privacy, max-age=$r->{maxage}");
+				my $smaxage = $r->{smaxage} ? ", s-maxage=$r->{smaxage}" : '';
+				my @hdrs = ('Cache-Control' => "$privacy$smaxage, max-age=$r->{maxage}");
+				push @hdrs, 'X-Forever' => 1 unless $smaxage;
 				push @hdrs, Vary => 'Authorization' if $privacy eq 'private';
 				return [200, ['Content-Type' => 'application/json; charset=utf-8', @hdrs], [encode_json $r->{params}]] if $format eq 'json';
 				my $ret = render $r->{template}, 'en', title => $r->{title}, %{$r->{params}};
@@ -107,13 +114,16 @@ sub dispatch_request{
 			},
 		},
 
-		sub (/st/:contest) { response st => 'Standings', db->standings($_{contest}), 10 },
+		sub (/st/:contest) {
+			my @pb = map { [$_->{id}, $_->{name}] } sort { $a->{value} <=> $b->{value} } @{problem_list contest => $_{contest}};
+			response st => 'Standings', {problems => \@pb, st => standings $_{contest}}, 10
+		},
 
 		sub (/ed/:contest) {
-			my $contest = db->contest_full($_{contest});
-			forbid !$contest->{finished};
-			my $pblist = db->problem_list(contest => $_{contest}, solution => 1);
-			response ed => 'Editorial of ' . $contest->{name}, {%$pblist, editorial => $contest->{editorial}}
+			my $contest = db->select(contests => '*', {id => $_{contest}})->hash;
+			forbid time < $contest->{stop};
+			my $pblist = problem_list contest => $_{contest}, solution => 1;
+			response ed => 'Editorial of ' . $contest->{name}, {pb => $pblist, editorial => $contest->{editorial}}
 		},
 
 		sub (/login) {
@@ -123,38 +133,48 @@ sub dispatch_request{
 
 		sub (/ct/:contest/log/st) { redirect "/st/$_{contest}" },
 
-		sub (/us/)                                        { response us => 'Users', {us => db->user_list} },
-		sub (/ct/  + ?:owner~)                            { response ct => 'Contests', db->contest_list(%_), 300 },
+		sub (/us/)                                        { response us => 'Users', {us => user_list} },
+		sub (/ct/  + ?:owner~)                            {
+			my $cts = contest_list(%_);
+			my $first_event = min
+			  map ({ $_->{start} } grep { !$_->{started} } @$cts),
+			  map ({ $_->{stop}  } grep {  $_->{started} && !$_->{finished}} @$cts);
+			response ct => 'Contests', {ct => $cts}, 300, $first_event ? ($first_event - time) : ();
+		},
 		sub (/log/ + ?:contest~&:owner~&:page~&:problem~&:private~&:result~) {
 			forbid $_{private};
-			response log => 'Job list', db->job_list(%_), 5
+			my ($jobs, $pageinfo) = job_list(%_);
+			response log => 'Job log', {log => $jobs, %$pageinfo}, 5
 		},
 		sub (/pb/  + ?:owner~&:contest~&:private~)                  {
 			forbid $_{private};
-			my $pending = $_{contest} && !db->contest_entry($_{contest})->{started};
+			my $pending = $_{contest} && !contest_entry($_{contest})->{started};
 			forbid $pending;
-			response pb => 'Problems', db->problem_list(%_)
+			response pb => 'Problems', {pb => problem_list %_}
 		},
 
 		sub (/us/:user)    {
-			my $user = db->user_entry($_{user});
+			my $user = user_entry $_{user};
 			response us_entry => $user->{name}, $user
 		},
 		sub (/ct/:contest) {
-			my $contest = db->contest_entry($_{contest});
-			response ct_entry => $contest->{name}, $contest, 60
+			my $contest = contest_entry $_{contest};
+			my $smaxage;
+			$smaxage = $contest->{start} - time if !$contest->{started};
+			$smaxage = $contest->{stop}  - time if  $contest->{started} && !$contest->{finished};
+			response ct_entry => $contest->{name}, $contest, 60, $smaxage ? ($smaxage) : ()
 		},
 		sub (/log/:job)    {
-			my $job = db->job_entry($_{job});
+			my $job = job_entry $_{job};
 			forbid $job->{private};
 			response log_entry => "Job  $_{job}", $job, 10
 		},
 		sub (/pb/:problem + ?contest~) {
 			my (undef, undef, $contest) = @_;
 			$_{contest} = $contest;
-			$contest = $contest && db->contest_entry($_{contest});
-			return NOT_FOUND if $contest && !db->contest_has_problem($_{contest}, $_{problem});
-			my $problem = db->problem_entry($_{problem}, $_{contest});
+			$contest = $contest && contest_entry $_{contest};
+			return NOT_FOUND if $contest && !contest_has_problem $_{contest}, $_{problem};
+			my $problem = problem_entry $_{problem}, $_{contest};
 			forbid $problem->{private} && !$contest;
 			if ($contest) {
 				return redirect "/pb/$_{problem}" if !$contest->{started} || $contest->{finished};
@@ -164,7 +184,7 @@ sub dispatch_request{
 			response pb_entry => $problem->{name}, $problem, $_{contest} ? 10 : ();
 		},
 		sub (/sol/:problem) {
-			my $problem = db->problem_entry($_{problem});
+			my $problem = problem_entry $_{problem};
 			forbid $problem->{private};
 			response sol => 'Solution of ' . $problem->{name}, {solution => $problem->{solution}};
 		},
@@ -178,22 +198,22 @@ sub dispatch_request{
 		sub (/action/submit + %:problem=&:contest~&:prog_format=&:source_code~ + *prog~) {
 			my (undef, undef, $prog) = @_;
 			forbid !remote_user;
-			my $problem = db->problem_entry($_{problem});
+			my $problem = problem_entry $_{problem};
 			my $private = $problem->{private} ? 1 : 0;
 			if ($_{contest}) {
 				$private = 0;
-				my $contest = db->contest_entry($_{contest});
+				my $contest = contest_entry $_{contest};
 				return reply 'This contest has not yet started' if !$contest->{started};
 				return reply 'This contest has finished' if $contest->{finished};
 				return reply 'This problem is private' if !admin && $private;
-				return reply 'This problem does not belong to this contest' unless db->contest_has_problem($_{contest}, $_{problem});
+				return reply 'This problem does not belong to this contest' unless contest_has_problem $_{contest}, $_{problem};
 			}
 			return reply 'Maximum source size is 10KB' if ($prog ? $prog->size : length $_{source_code}) > 10 * 1024;
 			return reply 'You must wait 30 seconds between jobs' if !admin && time <= remote_user->{lastjob} + 30;
 
 			my $source = $prog ? read_file $prog->path : $_{source_code};
 			unlink $prog->path if $prog;
-			my $id = db->create_job(
+			my $id = create_job(
 				maybe contest => $_{contest},
 				private => $private,
 				date => time,