X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FPage.pm;h=6b081a2702df83ce88043646ba7a9556d254b14e;hb=d17951d1fd99fc1ed82cb900b8fff7091971e59b;hp=eedbec54e17d2e865b8ec4cfe6ddc96224d2ed03;hpb=e57ca30a8f44b2af769c55bb09222bb4c170499b;p=plack-app-gruntmaster.git

diff --git a/lib/Gruntmaster/Page.pm b/lib/Gruntmaster/Page.pm
index eedbec5..6b081a2 100644
--- a/lib/Gruntmaster/Page.pm
+++ b/lib/Gruntmaster/Page.pm
@@ -7,7 +7,7 @@ use warnings;
 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;
@@ -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$,;
@@ -47,7 +44,7 @@ sub declaregen{
 }
 
 sub generate{
-	my ($path) = @_;
+	my ($path, $topic) = @_;
 	my ($path_noext, $ext) = $path =~ m/^(.*)\.(.*)$/;
 	my ($basename, $directories) = fileparse $path_noext;
 	make_path $directories;
@@ -56,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->generate($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()}) {
@@ -84,10 +96,6 @@ sub gensrc{
 	write_file "log/src/$job.$ext", job_inmeta($job)->{files}{prog}{content};
 }
 
-sub genarticle{
-	
-}
-
 1;
 __END__
 # Below is stub documentation for your module. You'd better edit it!