Add submit

diff --git a/app.psgi b/app.psgi
index f13ef8e323be37574355c32643612b21cd27bb6e..50ec1a901bc280bc680d76252918a7fda4571f57 100644 (file)
--- a/app.psgi
+++ b/app.psgi
@@ -8,7 +8,8 @@ use Plack::Request;
 
 sub some_auth_required {
        my $r = Plack::Request->new($_[0]);
-       return 1 if $r->path eq '/action/passwd';
+       my $word = qr,(\w+),a;
+       return 1 if $r->path eq '/action/passwd' || $r->path =~ m,/pb/$word/submit$,;
        0
 }
 

diff --git a/lib/Gruntmaster/Page/Passwd.pm b/lib/Gruntmaster/Page/Passwd.pm
index 4604fbca9e19c6db972d3d8653f7fce65f62ea80..86689ac04be0621a93bc59083e5e1f36d399a865 100644 (file)
--- a/lib/Gruntmaster/Page/Passwd.pm
+++ b/lib/Gruntmaster/Page/Passwd.pm
@@ -11,7 +11,7 @@ use Apache2::Authen::Passphrase qw/pwcheck pwset/;
 use Plack::Request;
 
 sub generate{
-       my ($self, $format, $env, $ct, $job, $ext) = @_;
+       my ($self, $format, $env) = @_;
        my $r = Plack::Request->new($env);
        my ($oldpass, $newpass, $confirm) = map {scalar $r->param($_)} 'password', 'new_password', 'confirm_new_password';
 

diff --git a/lib/Gruntmaster/Page/Pb/Entry.pm b/lib/Gruntmaster/Page/Pb/Entry.pm
index 4eacd4e0f56ab2eccbc1c63f4c53690bfd06df30..2672769a5a167d7423b313cb9cc831d7e3301edb 100644 (file)
--- a/lib/Gruntmaster/Page/Pb/Entry.pm
+++ b/lib/Gruntmaster/Page/Pb/Entry.pm
@@ -15,18 +15,18 @@ use constant TEMPLATES => {
 </div>
 
 <div class="col-md-3">
-<dl class="dl-horizontal">
+<dl>
 <dt>Author</dt> <dd><tmpl_var author></dd>
 <dt>Owner</dt> <dd><tmpl_var owner></dd>
 </dl>
 
 <tmpl_if cansubmit>
 <h1>Submit solution</h1>
-<form action="https://gm.ieval.ro/action/submit" method="POST" enctype="multipart/form-data" role="form">
+<form action="<tmpl_var id>/submit" method="POST" enctype="multipart/form-data" role="form">
 <input type="hidden" name="problem" value="<tmpl_var id>">
 <tmpl_if_defined contest><input type="hidden" name="contest" value="<tmpl_var contest>"></tmpl_if_defined>
 
-<div class="form-group"><label for="prog">File:</label><input id="prog" name="prog" required type="file"></div>
+<div class="form-group"><label for="prog">File:</label><input id="prog" name="prog" type="file"></div>
 <div class="form-group"><label for="source_code">Source code:</label> <textarea class="form-control" id="source_code" name="source_code"></textarea></div>
 <div class="form-group"><label for="prog_format">File format:</label><select id="prog_format" name="prog_format" class="form-control" required>
 <tmpl_loop formats><option value="<tmpl_var _>"><tmpl_var _></option>
@@ -39,6 +39,8 @@ use constant TEMPLATES => {
 HTML
 };
 
+use constant FORMATS => [qw/C CPP MONO JAVA PASCAL PERL PYTHON/];
+
 sub _generate{
        my ($self, $htc, $lang, $env, $contest, $id) = @_;
        debug $env => "language is '$lang', contest is '$contest', id is '$id'";
@@ -48,7 +50,7 @@ sub _generate{
                $htc->param(cansubmit => time <= contest_end $contest);
                $htc->param(contest => $contest);
        }
-       $htc->param(formats => Gruntmaster::Page::Submit::FORMATS);
+       $htc->param(formats => FORMATS);
        $htc->param(id => $id);
        local $Gruntmaster::Data::contest = $contest if $contest;
        $htc->param(name => problem_name $id);

diff --git a/lib/Gruntmaster/Page/Register.pm b/lib/Gruntmaster/Page/Register.pm
index 599f1c4b0aaaf089bc3173d80f8a4b082f688caf..4b93a849802793ae25e252357d95534bb9434028 100644 (file)
--- a/lib/Gruntmaster/Page/Register.pm
+++ b/lib/Gruntmaster/Page/Register.pm
@@ -11,7 +11,7 @@ use Apache2::Authen::Passphrase qw/pwcheck pwset USER_REGEX/;
 use Plack::Request;
 
 sub generate{
-       my ($self, $format, $env, $ct, $job, $ext) = @_;
+       my ($self, $format, $env) = @_;
        my $r = Plack::Request->new($env);
        my ($username, $password, $confirm_password, $name, $email, $phone, $town, $university, $level) = map { die if length > 200; $_ } map {scalar $r->param($_)} qw/username password confirm_password name email phone town university level/;
 

diff --git a/lib/Gruntmaster/Page/Submit.pm b/lib/Gruntmaster/Page/Submit.pm
index 344661b142ee74f0800b1e32d3f89594c1ed01d6..096af4d81a2e9092a545e73a13b34c7c36b1d730 100644 (file)
--- a/lib/Gruntmaster/Page/Submit.pm
+++ b/lib/Gruntmaster/Page/Submit.pm
@@ -3,38 +3,64 @@ package Gruntmaster::Page::Submit;
 use 5.014000;
 use strict;
 use warnings;
-use Gruntmaster::Page::Base submit => 'Submit job';
+use Gruntmaster::Page::Base;
 our @ISA = qw/Gruntmaster::Page::Base/;
 our $VERSION = '0.001';
 
-use constant FORMATS => [qw/C CPP JAVA PERL PYTHON/];
+use Apache2::Authen::Passphrase qw/pwcheck pwset USER_REGEX/;
+use File::Slurp qw/read_file/;
+use Plack::Request;
 
-use constant TEMPLATES => {
-       en => <<'HTML',
-<form action="https://gm.ieval.ro/action/submit" method="POST" enctype="multipart/form-data">
-<label>Problem:<br>
-<select name="problem" required>
-<tmpl_loop problems><option value="<tmpl_var id>"><tmpl_var name></option>
-</tmpl_loop></select></label><p>
+use constant FORMAT_EXTENSION => {
+       C => 'c',
+       CPP => 'cpp',
+       MONO => 'cs',
+       JAVA => 'java',
+       PASCAL => 'pas',
+       PERL => 'pl',
+       PYTHON => 'py',
+};
 
-<label>File:<br>
-<input name="prog" required type="file"></label><p>
+sub generate{
+       my ($self, $frm, $env) = @_;
+       my $r = Plack::Request->new($env);
+       my ($problem, $format, $contest, $private, $prog) = map {scalar $r->param($_)} 'problem', 'prog_format', 'contest', 'private', 'source_code';
+       my $upload = $r->upload('prog');
+       if (defined $upload) {
+               my $temp = read_file $upload->filename;
+               $prog = $temp if $temp
+       }
+       die if defined $contest && $contest !~ /^\w+$/ ;
+       die if defined $contest && (time > contest_end $contest);
+       return reply 'A required parameter was not supplied' if grep { !defined } $problem, $format, $prog;
 
-<label>File format:<br>
-<select name="prog_format" required>
-<tmpl_loop formats><option value="<tmpl_var _>"><tmpl_var _></option>
-</tmpl_loop></select></label><p>
+       local $Gruntmaster::Data::contest = $contest;
 
-<input type="submit" value="Submit job">
-HTML
-};
+       my $job = push_job (
+               date => time,
+               problem => $problem,
+               user => $r->user,
+               defined $private ? (private => $private) : (),
+               defined $contest ? (contest => $contest, private => 1) : (),
+               filesize => length $prog,
+               extension => FORMAT_EXTENSION->{$format},
+       );
 
-sub _generate{
-       my ($self, $htc, $path, $lang) = @_;
+       set_job_inmeta $job, {
+               files => {
+                       prog => {
+                               format => $format,
+                               name => 'prog.' . FORMAT_EXTENSION->{$format},
+                               content => $prog,
+                       }
+               }
+       };
 
-       my @problems = map +{ id => $_, name => problem_name }, problems;
-       $htc->param(problems => \@problems);
-       $htc->param(formats => FORMATS);
+       $contest //= '';
+       PUBLISH 'jobs', "$contest.$job";
+       [303, [Location => $r->path =~ s,/pb/\w+/submit$,/log/,r], ['']]
 }
 
+sub variants{ [[reply => 1, undef, undef, undef, undef, undef]] }
+
 1

diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index 66f86fe47e83052ef3b6feee560687fae2f4f6fb..1fc3a85742b6a9c8a6f22a513bf819d0892186f6 100644 (file)
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -70,9 +70,9 @@ BEGIN{
        get qr,$ct/log/st, => 'St';
        get qr,$ct/log/job/$word, => 'Log::Entry';
        get qr,$ct/log/src/$word\.$word, => 'Src';
-       get qr,$ct/submit, => 'Submit';
        get qr,$ct/pb/, => 'Pb';
        get qr,$ct/pb/$word, => 'Pb::Entry';
+       post qr,$ct/pb/$word/submit, => 'Submit';
 
        post qr,/action/register, => 'Register';
        post qr,/action/passwd, => 'Passwd';