X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FPage.pm;h=e57b0402495cb9e13306bea0448a798c8458ecf1;hb=1c13bea015f1f9e948de2e1979d810e960bd26a6;hp=953d8ae4ab6d78c181d558cff9de3884762f4901;hpb=ea6ce64dda40ffaa82846103d02a9c7668bd2a44;p=plack-app-gruntmaster.git

diff --git a/lib/Gruntmaster/Page.pm b/lib/Gruntmaster/Page.pm
index 953d8ae..e57b040 100644
--- a/lib/Gruntmaster/Page.pm
+++ b/lib/Gruntmaster/Page.pm
@@ -3,16 +3,14 @@ package Gruntmaster::Page;
 use 5.014000;
 use strict;
 use warnings;
-use parent qw/Exporter/;
-our @EXPORT_OK = qw/generate _generate/;
 
 use Fcntl qw/:flock/;
 use File::Basename qw/fileparse/;
 use File::Path qw/make_path/;
-use File::Slurp qw/write_file/;
+use File::Slurp qw/read_file write_file/;
 use IO::Compress::Gzip qw/gzip/;
 use IO::File;
-use Gruntmaster::Data qw/PUBLISH/;
+use Gruntmaster::Data;
 
 our $VERSION = '0.001';
 our @generators;
@@ -27,19 +25,17 @@ sub declaregen{
 	my ($generator, $regex) = @_;
 	$generator = "Gruntmaster::Page::$generator";
 	eval "require $generator";
-	my $gensub = $generator->can('generate') or die "No such generator: $generator";
-	push @generators, [$regex,  $gensub];
+	push @generators, [$regex,  $generator];
 }
 
 {
 	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$,;
@@ -47,8 +43,8 @@ sub declaregen{
 	declaregen 'Pb::Entry'		=> qr,^${contest}pb/$component$,;
 }
 
-sub _generate{
-	my ($path) = @_;
+sub generate{
+	my ($path, $topic) = @_;
 	my ($path_noext, $ext) = $path =~ m/^(.*)\.(.*)$/;
 	my ($basename, $directories) = fileparse $path_noext;
 	make_path $directories;
@@ -57,17 +53,32 @@ sub _generate{
 	flock my $lockfh = IO::File->new("<$path_noext.var"), LOCK_EX;
 	open my $typemap, ">$path_noext.var.new";
 	say $typemap "URI: $basename\n";
-	for my $gen (@generators) {
-		my ($regex, $generator) = @$gen;
-		next unless $path_noext =~ $regex;
+
+	my $fill_typemap = sub {
 		for my $lang (@{LANGUAGES()}) {
-			my $page = $generator->($path, $lang);
+			my $page = $_[0]->($lang);
 			write_file "$path_noext.$lang.$ext.new", $page;
 			say $typemap "URI: $basename.$lang.$ext\nContent-Language: $lang\nContent-Type: " . CONTENT_TYPES->{$ext} . "\n";
 			gzip \$page => "$path_noext.$lang.gz.$ext.new", Minimal => 1;
 			say $typemap "URI: $basename.$lang.gz.$ext\nContent-Language: $lang\nContent-Encoding: gzip\nContent-Type: " . CONTENT_TYPES->{$ext} . "\n";
 		}
-		last
+	};
+
+	if ($topic eq 'genpage') {
+		for my $gen (@generators) {
+			my ($regex, $generator) = @$gen;
+			next unless $path_noext =~ $regex;
+			$fill_typemap->(sub { $generator->generate($path, $_[0]) });
+			last
+		}
+	} else {
+		my $get_article = sub {
+			my $article = read_file "$ENV{GRUNTMASTER_ARTICLE_ROOT}/$basename.$_[0]";
+			my $title   = read_file "$ENV{GRUNTMASTER_ARTICLE_ROOT}/$basename.$_[0].title";
+			Gruntmaster::Page::Base::header($_[0], $title) . $article . Gruntmaster::Page::Base::footer($_[0])
+		};
+
+		$fill_typemap->($get_article);
 	}
 
 	for my $lang (@{LANGUAGES()}) {
@@ -78,8 +89,14 @@ sub _generate{
 	close $typemap;
 }
 
-sub generate{
-	PUBLISH 'genpage', shift;
+sub gensrc{
+	my ($contest, $job) = split /\./, $_[0];
+	local $Gruntmaster::Data::contest = $contest if $contest;
+	my $ext = job_extension $job;
+	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;