X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FPage.pm;h=e57b0402495cb9e13306bea0448a798c8458ecf1;hb=ff57a758b0a8e3389c99b75682c2c5646f47ae99;hp=451ed8e3a0a2efbe979f7f510471d56f867500ed;hpb=eafc7f54b9d964aac41b0715e18caf5ed58ef89a;p=plack-app-gruntmaster.git

diff --git a/lib/Gruntmaster/Page.pm b/lib/Gruntmaster/Page.pm
index 451ed8e..e57b040 100644
--- a/lib/Gruntmaster/Page.pm
+++ b/lib/Gruntmaster/Page.pm
@@ -31,14 +31,11 @@ sub declaregen{
 {
 	my $component = qr'[^/]+';
 	my $contest = qr,(?:ct/$component/)?,;
-	declaregen Index			=> qr,^index$,;
-	declaregen Learn			=> qr,^learn$,;
-	declaregen Account			=> qr,^account$,;
 	declaregen Us				=> qr,^us/index$,;
 	declaregen 'Us::Entry'		=> qr,^us/$component$,;
 	declaregen Ct				=> qr,^ct/index$,;
 	declaregen 'Ct::Entry'		=> qr,^ct/$component/index$,;
-	declaregen St				=> qr,^ct/$component/log/st$,;
+	declaregen St				=> qr,^${contest}log/st$,;
 	declaregen Log				=> qr,^${contest}log/(?:\d+|index)$,;
 	declaregen 'Log::Entry'	=> qr,^${contest}log/job/$component$,;
 	declaregen Submit			=> qr,^${contest}submit$,;
@@ -93,10 +90,13 @@ sub generate{
 }
 
 sub gensrc{
-	my ($job) = @_;
+	my ($contest, $job) = split /\./, $_[0];
+	local $Gruntmaster::Data::contest = $contest if $contest;
 	my $ext = job_extension $job;
-	make_path "log/src/";
-	write_file "log/src/$job.$ext", job_inmeta($job)->{files}{prog}{content};
+	my $log = $contest ? "ct/$contest/log" : 'log';
+	make_path "$log/src/";
+	say STDERR "Writing to $log/src/$job.$ext";
+	write_file "$log/src/$job.$ext", job_inmeta($job)->{files}{prog}{content};
 }
 
 1;