X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster.pm;h=0666fad804a3329bf41ddade92c129b954c6a7ab;hb=fd15256b2c8997bdda94c1ebadb15d86a280d9d4;hp=87e9e5a18586bc654a8a36852af55b7c39df1255;hpb=8d7256911fcd2f44fc446f03acb39dd08e90024d;p=plack-app-gruntmaster.git

diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index 87e9e5a..0666fad 100644
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -4,10 +4,8 @@ use 5.014000;
 use strict;
 our $VERSION = '5999.000_001';
 
-use CSS::Minifier::XS;
 use Encode qw/encode decode/;
 use File::Slurp qw/read_file/;
-use JavaScript::Minifier::XS;
 use JSON::MaybeXS qw/encode_json/;
 use PerlX::Maybe;
 use Scope::Upper qw/unwind SUB UP/;
@@ -36,6 +34,7 @@ use constant CONTENT_TYPES => +{
 	pas => 'text/x-pascal',
 	pl => 'text/x-perl',
 	py => 'text/x-python',
+	rb => 'application/x-ruby',
 	l => 'text/plain',
 };
 
@@ -50,13 +49,12 @@ use constant FORMAT_EXTENSION => {
 	PASCAL => 'pas',
 	PERL => 'pl',
 	PYTHON => 'py',
+	RUBY => 'rb',
 	SBCL => 'l',
 };
 
 use constant NOT_FOUND => [404, ['X-Forever' => 1, 'Content-Type' => 'text/plain'], ['Not found']];
 
-sub development() { ($ENV{PLACK_ENV} // 'development') eq 'development' }
-
 my ($env, $privacy);
 
 sub db { $env->{'gruntmaster.dbic'} }
@@ -98,22 +96,6 @@ sub dispatch_request{
 	$privacy = 'public';
 
 	sub (GET) {
-		sub (/css/:theme) {
-			my $theme = $_{theme};
-			return NOT_FOUND unless -e "css/themes/$theme.css";
-			my $css = read_file "css/themes/$theme.css";
-			$css .= read_file $_ for <css/*.css>;
-			my @headers = ('X-Forever' => 1, 'Cache-Control' => 'public, max-age=604800', 'Content-Type' => 'text/css; charset=utf-8');
-			[200, \@headers, [development ? $css : CSS::Minifier::XS::minify $css]]
-		},
-
-		sub (/js.js) {
-			my $js;
-			$js .= read_file $_ for <js/*.js>;
-			my @headers = ('X-Forever' => 1, 'Cache-Control' => 'public, max-age=604800', 'Content-Type' => 'application/javascript; charset=utf-8');
-			[200, \@headers, [development ? $js : JavaScript::Minifier::XS::minify $js]]
-		},
-
 		sub (/robots.txt) { NOT_FOUND },
 
 		sub (/src/:job) {
@@ -127,18 +109,6 @@ sub dispatch_request{
 			[200, \@headers, [job->source]]
 		},
 
-		sub (?:contest=) {
-			return NOT_FOUND if !contest;
-			forbid contest->is_pending;
-			response_filter { return shift }
-		},
-
-		sub (?:problem=) {
-			return NOT_FOUND if !problem;
-			forbid problem->is_private;
-			response_filter { return shift }
-		},
-
 		sub (?:format~) {
 			my $format = lc ($_{format} // '');
 			response_filter {
@@ -179,13 +149,14 @@ sub dispatch_request{
 
 		sub (/us/)                                        { response us => 'Users', {us => db->user_list} },
 		sub (/ct/  + ?:owner~)                            { response ct => 'Contests', db->contest_list(%_) },
-		sub (/log/ + ?:contest~&:owner~&:page~&:problem~&:private~) {
+		sub (/log/ + ?:contest~&:owner~&:page~&:problem~&:private~&:result~) {
 			forbid $_{private};
 			response log => 'Job list', {%{db->job_list(%_)}, maybe contest => $_{contest},}
 		},
 		sub (/pb/  + ?:owner~&:contest~&:private~)                  {
 			forbid $_{private};
-			response pb => 'Problems', {%{db->problem_list(%_)}, maybe contest => $_{contest}}
+			forbid contest && contest->is_pending;
+			response pb => 'Problems', db->problem_list(%_)
 		},
 
 		sub (/us/:user)    { response us_entry => user->name, db->user_entry($_{user}) },
@@ -197,16 +168,17 @@ sub dispatch_request{
 		sub (/pb/:problem + ?contest~) {
 			my (undef, undef, $contest) = @_;
 			$_{contest} = $contest;
-			return NOT_FOUND if !contest && !problem->is_in_archive || contest && !db->contest_problems->find($_{contest}, $_{problem});
-			forbid problem->is_private;
-			if (contest && contest->is_running) {
+			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;
 				forbid !remote_user;
 				$privacy = 'private';
 			}
 			response pb_entry => problem->name, {%{db->problem_entry($_{problem}, $_{contest}, remote_user && remote_user->id)}, maybe contest => $_{contest}};
 		},
 		sub (/sol/:problem) {
-			forbid !problem->is_in_archive;
+			forbid problem->private;
 			response sol => 'Solution of ' . problem->name, {solution => db->problem($_{problem})->solution};
 		},
 
@@ -219,17 +191,17 @@ 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 !admin && contest && contest->is_pending;
-			return reply 'This problem does not belong to this contest' if !contest && !problem->is_in_archive || contest && !db->contest_problems->find($_{contest}, $_{problem});
+			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});
 			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});
 
 			my $source = $prog ? read_file $prog->path : $_{source_code};
 			unlink $prog->path if $prog;
-			my $private = (problem->private && !$_{contest}) ? 1 : 0;
-			$private = 1 if contest && contest->is_pending;
 			my $newjob = db->jobs->create({
 				maybe contest => $_{contest},
 				private => $private,