X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster%2FHTML.pm;h=bcd1a887cdb20b2b9a09b27021d83e699e78a81d;hb=127d5b70463179e8683b802bb85ec5561d3214c1;hp=1eb6d988d05d081d98b173b1ec8d9867cc0ef5a5;hpb=93ed6f8465757803a8307da3b2c097297ecec715;p=plack-app-gruntmaster.git

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index 1eb6d98..bcd1a88 100644
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -4,12 +4,22 @@ use parent qw/Exporter/;
 our @EXPORT = qw/render render_article/;
 
 use File::Slurp qw/read_file/;
-use HTML::Seamstress;
+use HTML::Element::Library;
+use HTML::TreeBuilder;
 use POSIX qw//;
 use Data::Dumper qw/Dumper/;
 
+my $optional_end_tags = {%HTML::Tagset::optionalEndTag, tr => 1, td => 1, th => 1};
+
 sub ftime ($)   { POSIX::strftime '%c', localtime shift }
-sub literal ($) { HTML::Element::Library::super_literal shift // '' }
+sub literal ($) {
+	my ($html) = @_;
+	return unless $html;
+	my $b = HTML::TreeBuilder->new;
+	$b->ignore_unknown(0);
+	$b->parse($html);
+	HTML::Element::Library::super_literal $b->guts->as_HTML(undef, undef, $optional_end_tags);
+}
 
 sub HTML::Element::edit_href {
 	my ($self, $sub) = @_;
@@ -42,6 +52,14 @@ sub HTML::Element::namedlink {
 	$self->replace_content($name);
 }
 
+my %page_cache;
+for (<tmpl/*>) {
+	my ($tmpl, $lang) = m,tmpl/(\w+)\.(\w+),;
+	my $builder = HTML::TreeBuilder->new;
+	$builder->ignore_unknown(0);
+	$page_cache{$tmpl, $lang} = $builder->parse_file($_);
+}
+
 sub render {
 	my ($tmpl, $lang, %args) = @_;
 	$lang //= 'en';
@@ -53,23 +71,22 @@ sub render_article {
 	my ($art, $lang, %args) = @_;
 	$lang //= 'en';
 	my $title = read_file "a/$art.$lang.title";
+	chomp $title;
 	my $meat  = read_file "a/$art.$lang";
 	_render('skel', $lang, title => $title , meat => $meat, %args)
 }
 
 sub _render {
 	my ($tmpl, $lang, %args) = @_;
-	my $builder = HTML::Seamstress->new;
-	$builder->ignore_unknown(0);
-	my $tree = $builder->parse_file("tmpl/$tmpl.$lang");
+	my $tree = $page_cache{$tmpl, $lang}->clone or die "No such template/language combination: $tmpl/$lang\n";
 	$tree = $tree->guts unless $tmpl eq 'skel';
 	$tree->defmap(smap => \%args);
 	my $process = __PACKAGE__->can("process_$tmpl");
 	$process->($tree, %args) if $process;
 	$_->detach for $tree->look_down(static => $args{static} ? 'no' : 'yes');
 	$_->attr('static', undef) for $tree->look_down(sub {$_[0]->attr('static')});
-	$_->attr('smap', undef) for $tree->look_down(sub {$_[0]->attr('defmap')});
-	$tree->as_HTML;
+	$_->attr('smap', undef) for $tree->look_down(sub {$_[0]->attr('smap')});
+	$tree->as_HTML(undef, undef, $optional_end_tags);
 }
 
 sub process_skel {
@@ -260,6 +277,10 @@ sub process_log {
 		$elem->find('a')->edit_href(sub{s/$/&$str/}) if $str;
 	}
 	$tree->fclass('current')->replace_content("Page $args{current_page} of $args{last_page}");
+
+	my @detach;
+	push @detach, $args{args}{$_} ? $tree->fclass($_) : () for qw/problem contest owner/;
+	$_->detach for @detach;
 }
 
 sub process_st {
@@ -295,3 +316,6 @@ sub process_ed {
 	my @pb = map { @{$args{$_} // []} } qw/beginner easy medium hard/;
 	$tree->fclass('well')->iter3(\@pb, $iter);
 }
+
+1;
+__END__