X-Git-Url: http://git.ieval.ro/?p=plack-app-gruntmaster.git;a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster.pm;h=c9965d08a46894e02b5aa61cdbf89087c28d9000;hp=0666fad804a3329bf41ddade92c129b954c6a7ab;hb=6533844f1a2ec6b162b696c31a623a4dc8ee72bb;hpb=c83dca87863f8e36ad2279f4c8c78cbbdc6704ea

diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index 0666fad..c9965d0 100644
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -71,7 +71,7 @@ sub problem { db->problem ($_{problem}) }
 sub job     { db->job     ($_{job})     }
 sub user    { db->user    ($_{user})    }
 
-sub redirect { [301, ['X-Forever' => 1, 'Location' => $_[0]], []] }
+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) = @_;
@@ -81,7 +81,7 @@ sub response {
 	}
 	$params->{time} = time;
 	$params->{args} = {%_};
-	bless {template => $template, title => $title, params => $params, maxage => ($maxage // 1)}, __PACKAGE__.'::Response'
+	bless {template => $template, title => $title, params => $params, maxage => ($maxage // 3600)}, __PACKAGE__.'::Response'
 }
 
 sub forbid {
@@ -114,10 +114,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} + 1;
 				[200, ['Content-Type' => 'text/html; charset=utf-8', @hdrs], [encode 'UTF-8', $ret]]
 			},
 		},
@@ -135,23 +136,21 @@ sub dispatch_request{
 		sub (/ed/:contest) {
 			forbid !contest->is_finished;
 			my $pblist = db->problem_list(contest => $_{contest}, solution => 1);
-			response ed => 'Editorial of ' . contest->name, {%$pblist, editorial => contest->editorial};
+			response ed => 'Editorial of ' . contest->name, {%$pblist, editorial => contest->editorial}, contest->is_finished(time - 86400) ? 60 : ();
 		},
 
 		sub (/login) {
 			forbid !remote_user;
-
-			my $return = $env->{HTTP_REFERER} // '/';
-			[303, ['Set-Cookie' => "username=".remote_user->id, Location => $return], []]
+			[200, ['Content-Type' => 'text/plain; charset=UTF-8', 'Cache-Control' => 'private, max-age=300', Vary => 'Authorization'], [$env->{REMOTE_USER}]]
 		},
 
 		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(%_) },
+		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},}
+			response log => 'Job list', db->job_list(%_), 5
 		},
 		sub (/pb/  + ?:owner~&:contest~&:private~)                  {
 			forbid $_{private};
@@ -160,10 +159,10 @@ sub dispatch_request{
 		},
 
 		sub (/us/:user)    { response us_entry => user->name, db->user_entry($_{user}) },
-		sub (/ct/:contest) { response ct_entry => contest->name, db->contest_entry($_{contest}) },
+		sub (/ct/:contest) { response ct_entry => contest->name, db->contest_entry($_{contest}), 60 },
 		sub (/log/:job)    {
 			forbid job->private;
-			response log_entry => "Job  $_{job}", db->job_entry($_{job})
+			response log_entry => "Job  $_{job}", db->job_entry($_{job}), 10
 		},
 		sub (/pb/:problem + ?contest~) {
 			my (undef, undef, $contest) = @_;
@@ -175,7 +174,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}};
+			response pb_entry => problem->name, db->problem_entry($_{problem}, $_{contest}, remote_user && remote_user->id), $_{contest} ? 10 : ();
 		},
 		sub (/sol/:problem) {
 			forbid problem->private;
@@ -184,7 +183,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=60', '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) {