X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster.pm;h=5a38d1faa91ae54713a0929ced4dd742e42fcc1e;hb=a18eef289a562809653fc592527b364c37632193;hp=8aa42d276d398e0e381352ac199b8111dde104e4;hpb=d39978bf1b98cfb0e80615e2f994883db28d25b1;p=plack-app-gruntmaster.git

diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index 8aa42d2..5a38d1f 100644
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -14,9 +14,6 @@ use Web::Simple;
 use Gruntmaster::Data;
 use Plack::App::Gruntmaster::HTML;
 
-use Email::Sender::Simple qw/sendmail/;
-use Email::Simple;
-
 use warnings NONFATAL => 'all';
 no warnings 'illegalproto';
 
@@ -24,21 +21,6 @@ no warnings 'illegalproto';
 
 use constant USER_REGEX => qr/^\w{2,20}$/a;
 
-use constant CONTENT_TYPES => +{
-	c => 'text/x-csrc',
-	cpp => 'text/x-c++src',
-	cs => 'text/x-csharp', # Used by GNOME. Not in mime.types.
-	go => 'text/plain', # ?
-	gs => 'text/plain',
-	hs => 'text/x-haskell',
-	java => 'text/x-java',
-	pas => 'text/x-pascal',
-	pl => 'text/x-perl',
-	py => 'text/x-python',
-	rb => 'application/x-ruby',
-	l => 'text/plain',
-};
-
 use constant FORMAT_EXTENSION => {
 	C => 'c',
 	CPP => 'cpp',
@@ -62,16 +44,15 @@ my ($env, $privacy);
 sub db { $env->{'gruntmaster.dbic'} }
 
 sub remote_user {
-	my $user = $env->{REMOTE_USER};
-	$user &&= db->user($user);
-	$user
+	unless ($env->{'gruntmaster.user'}) {
+		my $user = $env->{REMOTE_USER};
+		$user &&= db->user_entry($user);
+		$env->{'gruntmaster.user'} = $user;
+	}
+	$env->{'gruntmaster.user'}
 }
 
-sub admin   { remote_user && remote_user->admin }
-sub contest { db->contest ($_{contest}) }
-sub problem { db->problem ($_{problem}) }
-sub job     { db->job     ($_{job})     }
-sub user    { db->user    ($_{user})    }
+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'], \@_] }
@@ -101,14 +82,16 @@ sub dispatch_request{
 		sub (/robots.txt) { NOT_FOUND },
 
 		sub (/src/:job) {
-			return NOT_FOUND if !job;
-			my $isowner = remote_user && remote_user->id eq job->rawowner;
-			my $private = job->private || job->problem->private || job->contest && job->contest->is_running;
+			my $job = db->job_full($_{job});
+			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 $private = $job->{private} || $contest && ($contest->{started} && !$contest->{finished});
 			forbid !$isowner && $private;
 			my $privacy = $private ? 'private' : 'public';
-			my @headers = ('X-Forever' => 1, 'Cache-Control' => "$privacy, max-age=604800", 'Content-Type' => CONTENT_TYPES->{job->extension});
+			my @headers = ('X-Forever' => 1, 'Cache-Control' => "$privacy, max-age=604800", 'Content-Type' => 'text/plain');
 			push @headers, (Vary => 'Authorization') if $private;
-			[200, \@headers, [job->source]]
+			[200, \@headers, [$job->{source}]]
 		},
 
 		sub (?:format~) {
@@ -116,29 +99,21 @@ sub dispatch_request{
 			response_filter {
 				my ($r) = @_;
 				return $r if ref $r ne 'Plack::App::Gruntmaster::Response';
-				my $vary = 'X-Static';
-				$vary .= ', Authorization' if $privacy eq 'private';
-				my @hdrs = ('X-Forever' => 1, 'Cache-Control' => "$privacy, max-age=$r->{maxage}", Vary => $vary);
+				my @hdrs = ('X-Forever' => 1, 'Cache-Control' => "$privacy, max-age=$r->{maxage}");
+				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}}, maybe static => $env->{HTTP_X_STATIC};
+				my $ret = render $r->{template}, 'en', title => $r->{title}, %{$r->{params}};
 				[200, ['Content-Type' => 'text/html; charset=utf-8', @hdrs], [encode 'UTF-8', $ret]]
 			},
 		},
 
-		sub (/st/:contest) {
-			response st => 'Standings', {
-				st => [ contest->standings ],
-				problems => [
-					map { [$_->id, $_->name] }
-					sort { $a->value <=> $b->value }
-					map { $_->problem } contest->contest_problems],
-			}, 10
-		},
+		sub (/st/:contest) { response st => 'Standings', db->standings($_{contest}), 10 },
 
 		sub (/ed/:contest) {
-			forbid !contest->is_finished;
+			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}, contest->is_finished(time - 86400) ? 60 : ();
+			response ed => 'Editorial of ' . $contest->{name}, {%$pblist, editorial => $contest->{editorial}}
 		},
 
 		sub (/login) {
@@ -156,54 +131,69 @@ sub dispatch_request{
 		},
 		sub (/pb/  + ?:owner~&:contest~&:private~)                  {
 			forbid $_{private};
-			forbid contest && contest->is_pending;
+			my $pending = $_{contest} && !db->contest_entry($_{contest})->{started};
+			forbid $pending;
 			response pb => 'Problems', db->problem_list(%_)
 		},
 
-		sub (/us/:user)    { response us_entry => user->name, db->user_entry($_{user}) },
-		sub (/ct/:contest) { response ct_entry => contest->name, db->contest_entry($_{contest}), 60 },
+		sub (/us/:user)    {
+			my $user = db->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
+		},
 		sub (/log/:job)    {
-			forbid job->private;
-			response log_entry => "Job  $_{job}", db->job_entry($_{job}), 10
+			my $job = db->job_entry($_{job});
+			forbid $job->{private};
+			response log_entry => "Job  $_{job}", $job, 10
 		},
 		sub (/pb/:problem + ?contest~) {
 			my (undef, undef, $contest) = @_;
 			$_{contest} = $contest;
-			return NOT_FOUND if contest && !db->contest_problems->find($_{contest}, $_{problem});
-			forbid problem->private && !contest;
-			if (contest) {
-				return redirect "/pb/$_{problem}" unless contest->is_running;
+			$contest = $contest && db->contest_entry($_{contest});
+			return NOT_FOUND if $contest && !db->contest_has_problem($_{contest}, $_{problem});
+			my $problem = db->problem_entry($_{problem}, $_{contest});
+			forbid $problem->{private} && !$contest;
+			if ($contest) {
+				return redirect "/pb/$_{problem}" if !$contest->{started} || $contest->{finished};
 				forbid !remote_user;
 				$privacy = 'private';
 			}
-			response pb_entry => problem->name, db->problem_entry($_{problem}, $_{contest}, remote_user && remote_user->id), $_{contest} ? 10 : ();
+			response pb_entry => $problem->{name}, $problem, $_{contest} ? 10 : ();
 		},
 		sub (/sol/:problem) {
-			forbid problem->private;
-			response sol => 'Solution of ' . problem->name, {solution => db->problem($_{problem})->solution};
+			my $problem = db->problem_entry($_{problem});
+			forbid $problem->{private};
+			response sol => 'Solution of ' . $problem->{name}, {solution => $problem->{solution}};
 		},
 
 		sub (/) { redispatch_to '/index' },
 		sub (/favicon.ico) { redirect '/static/favicon.ico' },
-		sub (/:article) { [200, ['Content-Type' => 'text/html; charset=utf-8', 'Cache-Control' => 'public, max-age=3600', 'X-Forever' => 1, Vary => 'X-Static'], [render_article $_{article}, 'en', maybe static => $env->{HTTP_X_STATIC}]] }
+		sub (/:article) { [200, ['Content-Type' => 'text/html; charset=utf-8', 'Cache-Control' => 'public, max-age=3600', 'X-Forever' => 1], [render_article $_{article}, 'en']] }
 	},
 
 	sub (POST) {
 		sub (/action/submit + %:problem=&:contest~&:prog_format=&:source_code~ + *prog~) {
 			my (undef, undef, $prog) = @_;
 			forbid !remote_user;
-			my $private = (problem->private && !contest) ? 1 : 0;
-			return reply 'This contest has finished' if contest && contest->is_finished;
-			return reply 'This contest has not yet started' if contest && contest->is_pending;
-			return reply 'This problem is private' if !admin && $private;
-			return reply 'This problem does not belong to this contest' if contest && !db->contest_problems->find($_{contest}, $_{problem});
+			my $problem = db->problem_entry($_{problem});
+			my $private = $problem->{private} ? 1 : 0;
+			if ($_{contest}) {
+				$private = 0;
+				my $contest = db->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 '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;
-			remote_user->update({lastjob => time});
+			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 $newjob = db->jobs->create({
+			my $id = db->create_job(
 				maybe contest => $_{contest},
 				private => $private,
 				date => time,
@@ -211,10 +201,10 @@ sub dispatch_request{
 				format => $_{prog_format},
 				problem => $_{problem},
 				source => $source,
-				owner => remote_user->id,
-			});
+				owner => remote_user->{id},
+			);
 
-			[303, [Location => '/log/' . $newjob->id], []]
+			[303, [Location => '/log/' . $id], []]
 		},
 	}
 }