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

diff --git a/lib/Gruntmaster/Page.pm b/lib/Gruntmaster/Page.pm
index a07a102..6ca62dd 100644
--- a/lib/Gruntmaster/Page.pm
+++ b/lib/Gruntmaster/Page.pm
@@ -17,60 +17,60 @@ our @generators;
 
 use constant LANGUAGES => [ 'en' ];
 use constant CONTENT_TYPES => {
-  html => 'text/html; charset=UTF-8',
-  txt => 'text/plain; charset=UTF-8',
+	html => 'text/html; charset=UTF-8',
+	txt => 'text/plain; charset=UTF-8',
 };
 
 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];
+	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];
 }
 
 {
-  my $component = qr'[^/]+';
-  my $contest = qr,(?:ct/$component/)?,;
-  declaregen Index        => qr,^index$,;
-  declaregen Ct           => qr,^ct/index$,;
-  declaregen 'Ct::Entry'  => qr,^ct/$component/index$,;
-  declaregen St           => qr,^ct/$component/log/st$,;
-  declaregen Learn        => qr,^learn$,;
-  declaregen Log          => qr,^${contest}log/index$,;
-  declaregen 'Log::Entry' => qr,^${contest}log/$component/index$,;
-  declaregen Submit       => qr,^${contest}submit$,;
-  declaregen Pb           => qr,^${contest}pb/index$,;
-  declaregen 'Pb::Entry'  => qr,^${contest}pb/$component/index$,;
+	my $component = qr'[^/]+';
+	my $contest = qr,(?:ct/$component/)?,;
+	declaregen Index			=> qr,^index$,;
+	declaregen Learn			=> qr,^learn$,;
+	declaregen Ct				=> qr,^ct/index$,;
+	declaregen 'Ct::Entry'		=> qr,^ct/$component/index$,;
+	declaregen St				=> qr,^ct/$component/log/st$,;
+	declaregen Log				=> qr,^${contest}log/(?:\d+|index)$,;
+	declaregen 'Log::Entry'	=> qr,^${contest}log/$component/index$,;
+	declaregen Submit			=> qr,^${contest}submit$,;
+	declaregen Pb				=> qr,^${contest}pb/index$,;
+	declaregen 'Pb::Entry'		=> qr,^${contest}pb/$component/index$,;
 }
 
 sub generate{
-  my ($path) = @_;
-  my ($path_noext, $ext) = $path =~ m/^(.*)\.(.*)$/;
-  my $basename = fileparse $path_noext;
-
-  IO::File->new(">$path_noext.var")->close unless -f "$path_noext.var";
-  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 ($path) = @_;
+	my ($path_noext, $ext) = $path =~ m/^(.*)\.(.*)$/;
+	my $basename = fileparse $path_noext;
+
+	IO::File->new(">$path_noext.var")->close unless -f "$path_noext.var";
+	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;
+		for my $lang (@{LANGUAGES()}) {
+			my $page = $generator->($path, $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";
+		}
+	}
+
 	for my $lang (@{LANGUAGES()}) {
-	  my $page = $generator->($path, $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";
+		rename "$path_noext.$lang.$ext.new", "$path_noext.$lang.$ext";
+		rename "$path_noext.$lang.gz.$ext.new", "$path_noext.$lang.gz.$ext";
 	}
-  }
-
-  for my $lang(@{LANGUAGES()}) {
-	rename "$path_noext.$lang.$ext.new", "$path_noext.$lang.$ext";
-	rename "$path_noext.$lang.gz.$ext.new", "$path_noext.$lang.gz.$ext";
-  }
-  rename "$path_noext.var.new", "$path_noext.var";
-  close $typemap;
+	rename "$path_noext.var.new", "$path_noext.var";
+	close $typemap;
 }
 
 1;