+
+=cut
+
sub error {
my $self = shift;
my $error = join(" ", @_);
- my @backtrace = $self->backtrace;
- $error .= "\n\t" . join( "\n\t", @backtrace ) if @backtrace;
+ my $fatal = '';
+
+ if ( $error !~ m{\n$} ) {
+ if ( my @backtrace = $self->backtrace ) {
+ $error .= "\n\t" . join( "\n\t", @backtrace );
+ $fatal = qq| frey-fatal|;
+ }
+ }
warn "ERROR: $error\n";
return
- qq||
- . $self->editor_links( $error ) .
+ qq||
+ . $self->html_links( $error ) .
qq|
|
;
}
@@ -364,7 +421,7 @@
@status = (
{ 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup },
{ 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },
- { 'INC' => Frey::INC->new->as_markup },
+ { 'INC' => Frey::INC->new->as_markup },
);
$icon_html = '';
}
@@ -400,6 +457,7 @@
sub icon_path {
my ($self,$class,$variant) = @_;
my $icon = $class;
+ $icon ||= $self->title;
$icon =~ s{::}{/}g;
$icon .= "/$variant" if $variant;
my $path = 'static/icons/' . $icon . '.png';
@@ -449,29 +507,61 @@
'"' => '"',
};
+=for later
+
my $multiline_re = '[\\' . join('\\', keys %$multiline_markers ) . ']';
warn "## multiline markers ", dump( $multiline_markers ), " -> $multiline_re";
+=cut
+
sub log_path {
- $Frey::Bootstrap::log_path || warn "no log_path?";
+ $Frey::Bootstrap::log_path || die "no log_path?";
+}
+
+our $pwd = `pwd`;
+chomp $pwd;
+
+sub strip_full_path {
+ my ($self, $msg) = @_;
+ # Mojo seems to expand warn messages to full path which is annoying
+ $msg =~ s{/[^/]+/\.\./}{/}gs;
+ $msg =~ s{$pwd/*}{}gs;
+ return $msg;
}
+our $last_log_pos = 0;
+our $last_log_line = 0;
+
sub warnings_html {
my ($self,$level) = shift;
$level ||= $self->debug,
my $path = $self->log_path;
- my $max = 50;
+ my $max = 30;
my $pos = 0;
my @warnings = ( '' x $max ); # XXX circualar buffer for 50 lines
- my $line = 0;
+ my $line = $last_log_line;
my $multiline_end;
- open(my $log, '<', $path) || die "can't open $path: $!";
+ # XXX do we really want to do this every time?
+ my $css = qq|/* short css classes for levels */\n|;
+ my $level_to_class;
+ foreach ( keys %$warn_colors ) {
+ my $l = length($_);
+ my $class = 'l' . $l;
+ $css .= qq|.$class { color: $warn_colors->{$_} }\n|;
+ $level_to_class->{ $_ } = $class;
+ }
+ $self->add_css( $css );
+
+ open(my $log, '<', $path) || die "can't open $path: $!";
+ seek($log, $last_log_pos, 0) || warn "can't seek: $!";
while(<$log>) {
chomp;
$line++;
+ next if m{^\s+(Mojo|Class::MOP|Moose)::};
+
my $style = '';
=for filter
@@ -493,42 +583,52 @@
}
=cut
- if ( m{^(#*)\s+} ) { # FIXME
+ if ( m{^(#*)} ) {
- $style = $warn_colors->{$1}
- ? ' style="color:' . $warn_colors->{$1} . '"'
- : '';
+ my $level = $1;
+ my $msg = $self->strip_full_path( $_ );
- my $msg = $self->html_escape( $_ );
my $spacer = ' ';
- if ( length($msg) > $self->html_dump_width ) {
- $msg = substr( $msg, 0, $self->html_dump_width );
+ my $real_msg = expand( $msg );
+ if ( length($real_msg) > $self->html_dump_width ) {
+
+ $real_msg = substr( $msg, 0, $self->html_dump_width );
+ $msg = unexpand( $real_msg );
$spacer = '…'
}
- $warnings[ $pos++ % $max ]
- = $msg
-# = ( $style ? qq|$msg| : $msg )
- . $spacer
- . qq|+$line
|;
- # FIXME should be but CSS hates me
+
+ $msg = $self->html_escape( $msg );
+
+ if ( my $class = $level_to_class->{ $level } ) {
+ $msg = qq|$msg|;
+ }
+
+ #$msg .= $spacer . qq|$line\n|;
+ $msg = qq|$line$msg|
+ . ( $spacer ? $spacer : '' )
+ . "\n"; # XXX needs this
+
+ $warnings[ $pos++ % $max ] = $msg;
}
}
+ $last_log_pos = tell($log);
+ $last_log_line = $line;
+ warn "log has $line lines tell position $last_log_pos";
close($log) || die "can't close $path: $!";
my $size = -s $path;
- my $warnings = join('',
- map { $warnings[ ( $pos + $_ ) % $max ] || '' } 0 .. $max
+ my $warnings = join("",
+ map { $warnings[ ( $pos + $_ ) % $max ] || '' } 0 .. ( $max - 1 )
);
my $s = length($warnings);
return
- # need to wrap into span so we can have links in warnings
+ # need to wrap editor link into span so we can have links in warnings
qq||
+ . $self->html_links( $warnings )
+ . qq||
;
}
@@ -554,10 +654,29 @@
) = caller($_) or last;
push @backtrace,
- qq|via $package at $path line $line|;
+ qq|via "$package" at $path line $line|;
}
- warn "# backtrace: ", dump( @backtrace ) if @backtrace;
+ #warn "# backtrace: ", dump( @backtrace ) if @backtrace;
return @backtrace;
}
+=head2 checkbox
+
+Generate checkbox html markup from some attribute
+
+ my $html = $self->checkbox('attribute_name', $value);
+
+=cut
+
+sub checkbox {
+ my ($self,$name,$value) = @_;
+ my $checked = '';
+ my $all_checkboxes = eval { $self->$name };
+ warn "ERROR tried to get checkbox value for '$name' which is unknown: $@" if $@;
+ $all_checkboxes = [ $all_checkboxes ] unless ref($all_checkboxes) eq 'ARRAY'; # sigh, too chatty
+ $checked = ' checked' if grep { defined $_ && $_ eq $value } @$all_checkboxes;
+ warn "# checkbox $name $value $checked\t", $self->dump( $self->$name );
+ qq||;
+}
+
1;