Rename Job list to Job log
[plack-app-gruntmaster.git] / lib / Plack / App / Gruntmaster.pm
index f876bae0dba1534ae04fe33e242d923c50323dc7..c7c6620ed9f52bfe4952b15ebad4d029cbba8a15 100644 (file)
@@ -41,19 +41,16 @@ use constant NOT_FOUND => [404, ['X-Forever' => 1, 'Content-Type' => 'text/plain
 
 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 &&= 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'], \@_] }
@@ -83,10 +80,10 @@ sub dispatch_request{
                sub (/robots.txt) { NOT_FOUND },
 
                sub (/src/:job) {
-                       return NOT_FOUND if !job;
-                       my $job = db->job_full($_{job});
-                       my $isowner = remote_user && remote_user->id eq $job->{owner};
-                       my $contest = $job->{contest} && db->contest_entry($job->{contest});
+                       my $job = db->select(jobs => '*', {id => $_{job}})->hash;
+                       return NOT_FOUND if !$job;
+                       my $isowner = remote_user && remote_user->{id} eq $job->{owner};
+                       my $contest = $job->{contest} && contest_entry $job->{contest};
                        my $private = $job->{private} || $contest && ($contest->{started} && !$contest->{finished});
                        forbid !$isowner && $private;
                        my $privacy = $private ? 'private' : 'public';
@@ -109,19 +106,15 @@ 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
+                       my @pb = map { [$_->{id}, $_->{name}] } @{problem_list contest => $_{contest}};
+                       response st => 'Standings', {problems => \@pb, st => standings $_{contest}}, 10
                },
 
                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}, contest->is_finished(time - 86400) ? 60 : ();
+                       my $contest = db->select(contests => '*', {id => $_{contest}})->hash;
+                       forbid time < $contest->{stop};
+                       my $pblist = problem_list contest => $_{contest}, solution => 1;
+                       response ed => 'Editorial of ' . $contest->{name}, {pb => $pblist, editorial => $contest->{editorial}}
                },
 
                sub (/login) {
@@ -131,39 +124,51 @@ sub dispatch_request{
 
                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(%_), 300 },
+               sub (/us/)                                        { response us => 'Users', {us => user_list} },
+               sub (/ct/  + ?:owner~)                            { response ct => 'Contests', {ct => contest_list(%_)}, 300 },
                sub (/log/ + ?:contest~&:owner~&:page~&:problem~&:private~&:result~) {
                        forbid $_{private};
-                       response log => 'Job list', db->job_list(%_), 5
+                       my ($jobs, $pageinfo) = job_list(%_);
+                       response log => 'Job log', {log => $jobs, %$pageinfo}, 5
                },
                sub (/pb/  + ?:owner~&:contest~&:private~)                  {
                        forbid $_{private};
-                       forbid contest && contest->is_pending;
-                       response pb => 'Problems', db->problem_list(%_)
+                       my $pending = $_{contest} && !contest_entry($_{contest})->{started};
+                       forbid $pending;
+                       response pb => 'Problems', {pb => 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 = user_entry $_{user};
+                       response us_entry => $user->{name}, $user
+               },
+               sub (/ct/:contest) {
+                       my $contest = 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 = 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 && contest_entry $_{contest};
+                       return NOT_FOUND if $contest && !contest_has_problem $_{contest}, $_{problem};
+                       my $problem = 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 = problem_entry $_{problem};
+                       forbid $problem->{private};
+                       response sol => 'Solution of ' . $problem->{name}, {solution => $problem->{solution}};
                },
 
                sub (/) { redispatch_to '/index' },
@@ -175,18 +180,22 @@ 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 = problem_entry $_{problem};
+                       my $private = $problem->{private} ? 1 : 0;
+                       if ($_{contest}) {
+                               $private = 0;
+                               my $contest = 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 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 = create_job(
                                maybe contest => $_{contest},
                                private => $private,
                                date => time,
@@ -194,10 +203,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], []]
                },
        }
 }
This page took 0.015461 seconds and 4 git commands to generate.