+
+=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|
|
;
}
@@ -328,7 +387,7 @@
=head2 add_status
- $self->add_status( name => { some => 'data' } );
+ $self->add_status( { name => { some => 'data' } } );
$self->add_status( "append to last status popup" );
@@ -336,10 +395,15 @@
sub add_status {
my ( $self, $data ) = @_;
+ push @status, { 'X' => [ $self->backtrace ] };
if ( ref($data) ) {
push @status, $data;
} else {
- $status[ $#status ]->{added} = $data;
+ if ( defined $status[ $#status ] ) {
+ $status[ $#status ]->{ '+' } = $data;
+ } else {
+ push @status, { '+' => $data };
+ }
}
}
@@ -353,8 +417,12 @@
sub clean_status {
my ($self) = shift;
- @head = ();
- @status = ();
+ @head = ( 'static/frey.css' );
+ @status = (
+ { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup },
+ { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },
+ { 'INC' => Frey::INC->new->as_markup },
+ );
$icon_html = '';
}
@@ -389,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';
@@ -438,29 +507,65 @@
'"' => '"',
};
+=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 $warnings;
- my $line = 0;
+ my $max = 30;
+ my $pos = 0;
+ my @warnings = ( '' x $max ); # XXX circualar buffer for 50 lines
+ 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
+
if ( $multiline_end ) {
if ( m{^\Q$multiline_end\E} || m{^\s.+\Q$multiline_end\E;$} ) {
# warn "## $line end of $multiline_end in '$_'\n";
@@ -477,27 +582,53 @@
next;
}
- $style = $warn_colors->{$1}
- ? ' style="color:' . $warn_colors->{$1} . '"'
- : '';
+=cut
+ if ( m{^(#*)} ) {
+
+ 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 = '…'
}
- $msg =~ s{^\s}{ }g;
- $warnings .= qq|$msg$spacer+$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 - 1 )
+ );
+
+ my $s = length($warnings);
+
return
- qq||
+ # need to wrap editor link into span so we can have links in warnings
+ qq||
;
}
@@ -523,10 +654,45 @@
) = caller($_) or last;
push @backtrace,
- qq|via package $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||;
+}
+
+=head2 strip
+
+Strip whitespace around content
+
+ my $stripped = strip(' no more whitespace around this ');
+
+=cut
+
+sub strip {
+ my $t = shift;
+ $t =~ s{^\s+}{}gs;
+ $t =~ s{>\s+<}{><}gs;
+ $t =~ s{\s+$}{}gs;
+ return $t;
+}
+
1;