--- trunk/lib/Frey/Web.pm 2008/11/26 00:45:52 524
+++ trunk/lib/Frey/Web.pm 2008/11/26 07:57:12 532
@@ -142,6 +142,8 @@
our @status;
sub status { @status };
+our $icon_html;
+
sub page {
my $self = shift;
my $a = {@_};
@@ -183,26 +185,7 @@
$body = '';
}
- my $warn_colors = {
- '#' => '#444',
- '##' => '#888',
- };
-
- $status_line
- .= qq||
- if $self->warnings;
+ $status_line .= $self->warnings_html;
my ($exit,$description) = ('exit','stop server');
($exit,$description) = ('restart','restart server')
@@ -220,13 +203,14 @@
my $revision = Frey::SVK->info->{Revision} || '';
$revision = $1 if $info->{'Mirrored From'} =~ m{Rev\.\s+(\d+)};
- $self->add_icon;
+ $self->add_icon unless $icon_html;
my $html = join("\n",
qq|
|,
$self->_head_html,
'' . ( $self->title || $a->{title} || ref($self) ) . '',
'',
+ ( $icon_html || '' ),
( $a->{head} || '' ),
qq|
@@ -308,6 +292,7 @@
sub clean_status {
@status = ();
+ $icon_html = '';
}
sub status_parts {
@@ -316,33 +301,118 @@
sub DEMOLISH {
my ( $self ) = @_;
- cluck "## DEMOLISH status ", $#status + 1, " elements ", dump( map { keys %$_ } @status ) if @status;
+ warn "## $self DEMOLISH status ", $#status + 1, " elements ", dump( map { keys %$_ } @status ) if @status;
}
-sub add_icon {
- my $self = shift;
- my $icon = ref($self);
- $icon = $self->class if $self->can('class');
+=head2 add_icon
+
+ Frey::Foo->add_icon; # /static/icons/Frey/Foo.png
+ Frey::Foo->add_icon('warning'); # /static/icons/Frey/Foo/warning.png
+
+=cut
+
+sub icon_path {
+ my ($self,$class,$variant) = @_;
+ my $icon = $class;
$icon =~ s{::}{/}g;
+ $icon .= "/$variant" if $variant;
+ my $path = 'static/icons/' . $icon . '.png';
+ if ( -e $path ) {
+ warn "# $class from $self icon_path $path";
+ return $path;
+ } else {
+ warn "TODO: add $path icon for $class";
+ return undef;
+ }
+}
+
+sub add_icon {
+ my ($self,$variant) = @_;
+
+ my $class = ref($self);
+ $class = $self->class if $self->can('class');
+ my $icon_path = $self->icon_path( $class, $variant ) || return;
+
+ $icon_html .= qq||;
+ warn "# using icon $icon_path";
+
+=for later
+
+ # FIXME http://en.wikipedia.org/wiki/Favicon suggest just rel="icon" but that doesn't seem to work!
+ my $ico_path = $icon_path;
+ $ico_path =~ s{png$}{ico};
+ if ( ! -e $ico_path ) {
+ system "convert $icon_path $ico_path";
+ warn "# convert $icon_path $ico_path : $@";
+ }
+ $icon_html .= qq|| if -e $ico_path;
- my $icon_path = "static/icons/$icon.png";
+=cut
+
+}
+
+my $warn_colors = {
+ '#' => '#444',
+ '##' => '#888',
+};
+
+my $multiline_markers = {
+ '(' => '\)',
+ '{' => '}',
+ '[' => '\]',
+ '"' => '"',
+};
- if ( -e $icon_path ) {
- $self->add_head( qq|| );
- warn "# using icon $icon_path";
-
- # FIXME http://en.wikipedia.org/wiki/Favicon suggest just rel="icon" but that doesn't seem to work!
- my $ico_path = $icon_path;
- $ico_path =~ s{png$}{ico};
- if ( ! -e $ico_path ) {
- system "convert $icon_path $ico_path";
- warn "# convert $icon_path $ico_path : $@";
+my $multiline_re = '[\\' . join('\\', keys %$multiline_markers ) . ']';
+warn "## multiline markers ", dump( $multiline_markers ), " -> $multiline_re";
+
+sub log_path {
+ $Frey::Bootstrap::log_path || warn "no log_path?";
+}
+
+sub warnings_html {
+ my ($self,$level) = shift;
+ $level ||= $self->debug;
+ my $path = $self->log_path;
+
+ my $warnings;
+ my $line = 0;
+ my $multiline_end;
+
+ open(my $log, '<', $path) || die "can't open $path: $!";
+ while(<$log>) {
+ chomp;
+ $line++;
+
+ if ( $multiline_end ) {
+ undef $multiline_end if m{^$multiline_end};
+ next;
}
- $self->add_head( qq|| ) if -e $ico_path;
- } else {
- warn "can't find $icon_path";
+ my $style = '';
+
+ if ( m{^(#*)\s+} ) {
+ my $l = $1 ? length($1) : 0;
+ $multiline_end = $multiline_markers->{$1} if m{($multiline_re)$};
+ next if $l > $level;
+ warn "## multiline_end: $multiline_end $l > $level for '$_'" if $multiline_end;
+ undef $multiline_end;
+
+ $style = $warn_colors->{$1}
+ ? ' style="color:' . $warn_colors->{$1} . '"'
+ : '';
+
+ $warnings .= qq|$_ +$line
|;
+ # FIXME should be but CSS hates me
+ }
}
+ close($log) || die "can't close $path: $!";
+
+ return
+ qq||
+ ;
}
1;