X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster.pm;h=1af76d0c14072c2696922b3d892e9034fc636df6;hb=c5343878b97ee6723193c22a1e106eaa5f3b0fba;hp=c02e7dd3f023cbdbd84c402f36cc0d85cabbcd06;hpb=ba7920cd654e91f98dbe1a783f159974fba278d9;p=plack-app-gruntmaster.git

diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index c02e7dd..1af76d0 100644
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -21,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',
@@ -60,15 +45,13 @@ sub db { $env->{'gruntmaster.dbic'} }
 
 sub remote_user {
 	my $user = $env->{REMOTE_USER};
-	$user &&= db->user($user);
+	$user &&= db->user_entry($user);
 	$user
 }
 
-sub admin   { remote_user && remote_user->admin }
+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 redirect { [301, ['X-Forever' => 1, 'Cache-Control' => 'public, max-age=86400', 'Location' => $_[0]], []] }
 sub reply    { [200, ['Content-Type' => 'text/plain; charset=utf-8'], \@_] }
@@ -98,14 +81,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~) {
@@ -113,11 +98,10 @@ 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]]
 			},
 		},
@@ -157,11 +141,18 @@ sub dispatch_request{
 			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) = @_;
@@ -173,7 +164,7 @@ sub dispatch_request{
 				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, db->problem_entry($_{problem}, $_{contest}, remote_user && remote_user->{id}), $_{contest} ? 10 : ();
 		},
 		sub (/sol/:problem) {
 			forbid problem->private;
@@ -182,7 +173,7 @@ sub dispatch_request{
 
 		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) {
@@ -195,12 +186,11 @@ sub dispatch_request{
 			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});
 			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,
@@ -208,10 +198,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], []]
 		},
 	}
 }