From a18eef289a562809653fc592527b364c37632193 Mon Sep 17 00:00:00 2001 From: Marius Gavrilescu Date: Sun, 29 Mar 2015 23:48:12 +0300 Subject: [PATCH] Remove any dependency on DBIC --- lib/Plack/App/Gruntmaster.pm | 52 ++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm index d48166e..5a38d1f 100644 --- a/lib/Plack/App/Gruntmaster.pm +++ b/lib/Plack/App/Gruntmaster.pm @@ -53,8 +53,6 @@ sub remote_user { } sub admin { remote_user && remote_user->{admin} } -sub contest { db->contest ($_{contest}) } -sub problem { db->problem ($_{problem}) } sub redirect { [301, ['X-Forever' => 1, 'Cache-Control' => 'public, max-age=86400', 'Location' => $_[0]], []] } sub reply { [200, ['Content-Type' => 'text/plain; charset=utf-8'], \@_] } @@ -109,20 +107,13 @@ sub dispatch_request{ }, }, - 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) { @@ -140,7 +131,8 @@ 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(%_) }, @@ -160,18 +152,21 @@ sub dispatch_request{ 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' }, @@ -183,11 +178,16 @@ sub dispatch_request{ 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; -- 2.39.2