X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster.pm;h=2ccbeb50d8e216211e656d9b0046a0e469ee5d84;hb=218d6f7ee80aa3dbb3781bdd9b55350a7b27faa6;hp=f401e3f5d403272e4ad971388ffea3755ae70428;hpb=54bc2c5c0fbc6bb19d46c9c638abf4ac727cebb1;p=plack-app-gruntmaster.git

diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index f401e3f..2ccbeb5 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,25 +21,12 @@ 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', # ?
-	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',
 	GCCGO => 'go',
 	GOLANG => 'go',
+	GOLFSCRIPT => 'gs',
 	HASKELL => 'hs',
 	MONO => 'cs',
 	JAVA => 'java',
@@ -104,7 +88,7 @@ sub dispatch_request{
 			my $private = job->private || job->problem->private || job->contest && job->contest->is_running;
 			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]]
 		},
@@ -114,10 +98,11 @@ 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}");
-				push @hdrs, Vary => 'Authorization' if $privacy eq 'private';
+				my $vary = 'X-Static';
+				$vary .= ', Authorization' if $privacy eq 'private';
+				my @hdrs = ('X-Forever' => 1, 'Cache-Control' => "$privacy, max-age=$r->{maxage}", Vary => $vary);
 				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}};
+				my $ret = render $r->{template}, 'en', title => $r->{title}, %{$r->{params}}, maybe static => $env->{HTTP_X_STATIC};
 				[200, ['Content-Type' => 'text/html; charset=utf-8', @hdrs], [encode 'UTF-8', $ret]]
 			},
 		},
@@ -149,7 +134,7 @@ sub dispatch_request{
 		sub (/ct/  + ?:owner~)                            { response ct => 'Contests', db->contest_list(%_), 300 },
 		sub (/log/ + ?:contest~&:owner~&:page~&:problem~&:private~&:result~) {
 			forbid $_{private};
-			response log => 'Job list', {%{db->job_list(%_)}, maybe contest => $_{contest},}, 5
+			response log => 'Job list', db->job_list(%_), 5
 		},
 		sub (/pb/  + ?:owner~&:contest~&:private~)                  {
 			forbid $_{private};
@@ -173,7 +158,7 @@ sub dispatch_request{
 				forbid !remote_user;
 				$privacy = 'private';
 			}
-			response pb_entry => problem->name, {%{db->problem_entry($_{problem}, $_{contest}, remote_user && remote_user->id)}, maybe contest => $_{contest}}, $_{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 +167,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], [render_article $_{article}, 'en']] }
+		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 (POST) {