Update for the new Gruntmaster::Data

diff --git a/app.psgi b/app.psgi
index b29127c24e3e1375ae8e65ea4c3ddddf98930beb..3a6be219ec8fe3f4a5a53a714247e9a8dbdcfa22 100644 (file)
--- a/app.psgi
+++ b/app.psgi
@@ -23,15 +23,14 @@ CSP
        $csp =~ s/\n/; /gr;
 }
 
-my $db;
+my $dbinit;
 
 sub add_database {
        my $app = $_[0];
        sub {
-               my ($env) = @_;
-               $db //= Gruntmaster::Data->connect($ENV{GRUNTMASTER_DSN} // 'dbi:Pg:');
-               $env->{'gruntmaster.dbic'} = $db;
-               $app->($env)
+               Gruntmaster::Data::init $ENV{GRUNTMASTER_DSN} // 'dbi:Pg:' unless $dbinit;
+               $dbinit = 1;
+               $app->(@_)
        }
 }
 

diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index 5a38d1faa91ae54713a0929ced4dd742e42fcc1e..77b374894e7a254fa4eb9271b260386c1eb40151 100644 (file)
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -41,12 +41,10 @@ use constant NOT_FOUND => [404, ['X-Forever' => 1, 'Content-Type' => 'text/plain
 
 my ($env, $privacy);
 
-sub db { $env->{'gruntmaster.dbic'} }
-
 sub remote_user {
        unless ($env->{'gruntmaster.user'}) {
                my $user = $env->{REMOTE_USER};
-               $user &&= db->user_entry($user);
+               $user &&= user_entry $user;
                $env->{'gruntmaster.user'} = $user;
        }
        $env->{'gruntmaster.user'}
@@ -82,10 +80,10 @@ sub dispatch_request{
                sub (/robots.txt) { NOT_FOUND },
 
                sub (/src/:job) {
-                       my $job = db->job_full($_{job});
+                       my $job = 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 $contest = $job->{contest} && contest_entry $job->{contest};
                        my $private = $job->{private} || $contest && ($contest->{started} && !$contest->{finished});
                        forbid !$isowner && $private;
                        my $privacy = $private ? 'private' : 'public';
@@ -107,12 +105,12 @@ sub dispatch_request{
                        },
                },
 
-               sub (/st/:contest) { response st => 'Standings', db->standings($_{contest}), 10 },
+               sub (/st/:contest) { response st => 'Standings', standings($_{contest}), 10 },
 
                sub (/ed/:contest) {
-                       my $contest = db->contest_full($_{contest});
+                       my $contest = contest_full $_{contest};
                        forbid !$contest->{finished};
-                       my $pblist = db->problem_list(contest => $_{contest}, solution => 1);
+                       my $pblist = problem_list contest => $_{contest}, solution => 1;
                        response ed => 'Editorial of ' . $contest->{name}, {%$pblist, editorial => $contest->{editorial}}
                },
 
@@ -123,38 +121,38 @@ 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', contest_list(%_), 300 },
                sub (/log/ + ?:contest~&:owner~&:page~&:problem~&:private~&:result~) {
                        forbid $_{private};
-                       response log => 'Job list', db->job_list(%_), 5
+                       response log => 'Job list', job_list(%_), 5
                },
                sub (/pb/  + ?:owner~&:contest~&:private~)                  {
                        forbid $_{private};
-                       my $pending = $_{contest} && !db->contest_entry($_{contest})->{started};
+                       my $pending = $_{contest} && !contest_entry($_{contest})->{started};
                        forbid $pending;
-                       response pb => 'Problems', db->problem_list(%_)
+                       response pb => 'Problems', problem_list %_
                },
 
                sub (/us/:user)    {
-                       my $user = db->user_entry($_{user});
+                       my $user = user_entry $_{user};
                        response us_entry => $user->{name}, $user
                },
                sub (/ct/:contest) {
-                       my $contest = db->contest_entry($_{contest});
+                       my $contest = contest_entry $_{contest};
                        response ct_entry => $contest->{name}, $contest, 60
                },
                sub (/log/:job)    {
-                       my $job = db->job_entry($_{job});
+                       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;
-                       $contest = $contest && db->contest_entry($_{contest});
-                       return NOT_FOUND if $contest && !db->contest_has_problem($_{contest}, $_{problem});
-                       my $problem = db->problem_entry($_{problem}, $_{contest});
+                       $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};
@@ -164,7 +162,7 @@ sub dispatch_request{
                        response pb_entry => $problem->{name}, $problem, $_{contest} ? 10 : ();
                },
                sub (/sol/:problem) {
-                       my $problem = db->problem_entry($_{problem});
+                       my $problem = problem_entry $_{problem};
                        forbid $problem->{private};
                        response sol => 'Solution of ' . $problem->{name}, {solution => $problem->{solution}};
                },
@@ -178,22 +176,22 @@ sub dispatch_request{
                sub (/action/submit + %:problem=&:contest~&:prog_format=&:source_code~ + *prog~) {
                        my (undef, undef, $prog) = @_;
                        forbid !remote_user;
-                       my $problem = db->problem_entry($_{problem});
+                       my $problem = problem_entry $_{problem};
                        my $private = $problem->{private} ? 1 : 0;
                        if ($_{contest}) {
                                $private = 0;
-                               my $contest = db->contest_entry($_{contest});
+                               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 db->contest_has_problem($_{contest}, $_{problem});
+                               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;
 
                        my $source = $prog ? read_file $prog->path : $_{source_code};
                        unlink $prog->path if $prog;
-                       my $id = db->create_job(
+                       my $id = create_job(
                                maybe contest => $_{contest},
                                private => $private,
                                date => time,