86 |
$dump =~ s{(\n[^\n]{$width})([^\n]+?)([^\n]{5})}{\n$1...$3}gs; |
$dump =~ s{(\n[^\n]{$width})([^\n]+?)([^\n]{5})}{\n$1...$3}gs; |
87 |
$dump = $self->html_escape( $dump ); |
$dump = $self->html_escape( $dump ); |
88 |
$dump =~ s{\Q...\E}{…}gs; |
$dump =~ s{\Q...\E}{…}gs; |
89 |
# $dump =~ $self->editor_links( $dump ); # FIXME include this |
# $dump =~ $self->html_links( $dump ); # FIXME include this |
90 |
return "<code>$dump</code>"; |
return "<code>$dump</code>"; |
91 |
} |
} |
92 |
|
|
184 |
| ); |
| ); |
185 |
} |
} |
186 |
|
|
187 |
|
sub add_js { |
188 |
|
my ($self,$css) = @_; |
189 |
|
my ( $package, $path, $line ) = caller; |
190 |
|
$self->add_head( qq| |
191 |
|
<script type="text/javascript"> |
192 |
|
/* via $package at $path line $line */ |
193 |
|
$css |
194 |
|
</script> |
195 |
|
| ); |
196 |
|
} |
197 |
|
|
198 |
our $reload_counter = 0; |
our $reload_counter = 0; |
199 |
|
|
200 |
|
|
315 |
qq|>$class</a>|; |
qq|>$class</a>|; |
316 |
} |
} |
317 |
|
|
318 |
=head2 editor_links |
=head2 html_links |
319 |
|
|
320 |
Create HTML links to editor for perl error message |
Create HTML links to editor for perl error message |
321 |
|
|
322 |
my $html = $self->editor_links( $error ) |
my $html = $self->html_links( $error ) |
323 |
|
|
324 |
=cut |
=cut |
325 |
|
|
326 |
sub editor_links { |
sub html_links { |
327 |
my ( $self, $error ) = @_; |
my ( $self, $error ) = @_; |
328 |
|
|
329 |
|
$error = $self->strip_full_path( $error ); |
330 |
|
|
331 |
# $error =~ s[(bless\({\s+.+?\s+},\s+)("[^"]+")(\) at)][<span class="frey-dropdown">$1<code>$2</code>$3</span>]gs; # FIXME insert bless hiding back |
# $error =~ s[(bless\({\s+.+?\s+},\s+)("[^"]+")(\) at)][<span class="frey-dropdown">$1<code>$2</code>$3</span>]gs; # FIXME insert bless hiding back |
332 |
|
|
333 |
# perl's backtrace |
# perl's backtrace |
345 |
$error =~ s{(method ")(\w+)(" via)} |
$error =~ s{(method ")(\w+)(" via)} |
346 |
{$1<a target="$2" href="/Frey::Shell::Grep/as_markup?pattern=$2" title="grep $2">$2</a>$3}gsm; |
{$1<a target="$2" href="/Frey::Shell::Grep/as_markup?pattern=$2" title="grep $2">$2</a>$3}gsm; |
347 |
|
|
348 |
|
# link paths to editor |
349 |
|
$error =~ s{((?:lib|t)/[\S]+)\s+(\d+\s+bytes)} |
350 |
|
{<a target="editor" href="/editor+$1+1" title="vi $1 [$2]">$1</a>}gsm; |
351 |
|
|
352 |
|
$error =~ s{(class ")([\w:]+)(")} |
353 |
|
{$1<a target="$2" href="/$2" title="introspect $2">$2</a>$3}gsm; |
354 |
|
|
355 |
return $error; |
return $error; |
356 |
} |
} |
371 |
if ( $error !~ m{\n$} ) { |
if ( $error !~ m{\n$} ) { |
372 |
if ( my @backtrace = $self->backtrace ) { |
if ( my @backtrace = $self->backtrace ) { |
373 |
$error .= "\n\t" . join( "\n\t", @backtrace ); |
$error .= "\n\t" . join( "\n\t", @backtrace ); |
374 |
$fatal = qq| class="fatal"|; |
$fatal = qq| frey-fatal|; |
375 |
} |
} |
376 |
} |
} |
377 |
|
|
378 |
warn "ERROR: $error\n"; |
warn "ERROR: $error\n"; |
379 |
return |
return |
380 |
qq|<pre class="frey-error$fatal">| |
qq|<pre class="frey-error$fatal">| |
381 |
. $self->editor_links( $error ) . |
. $self->html_links( $error ) . |
382 |
qq|</pre>| |
qq|</pre>| |
383 |
; |
; |
384 |
} |
} |
457 |
sub icon_path { |
sub icon_path { |
458 |
my ($self,$class,$variant) = @_; |
my ($self,$class,$variant) = @_; |
459 |
my $icon = $class; |
my $icon = $class; |
460 |
|
$icon ||= $self->title; |
461 |
$icon =~ s{::}{/}g; |
$icon =~ s{::}{/}g; |
462 |
$icon .= "/$variant" if $variant; |
$icon .= "/$variant" if $variant; |
463 |
my $path = 'static/icons/' . $icon . '.png'; |
my $path = 'static/icons/' . $icon . '.png'; |
518 |
$Frey::Bootstrap::log_path || die "no log_path?"; |
$Frey::Bootstrap::log_path || die "no log_path?"; |
519 |
} |
} |
520 |
|
|
|
our $last_log_pos = 0; |
|
|
our $last_log_line = 0; |
|
|
|
|
521 |
our $pwd = `pwd`; |
our $pwd = `pwd`; |
522 |
chomp $pwd; |
chomp $pwd; |
523 |
|
|
524 |
|
sub strip_full_path { |
525 |
|
my ($self, $msg) = @_; |
526 |
|
# Mojo seems to expand warn messages to full path which is annoying |
527 |
|
$msg =~ s{/[^/]+/\.\./}{/}gs; |
528 |
|
$msg =~ s{$pwd/*}{}gs; |
529 |
|
return $msg; |
530 |
|
} |
531 |
|
|
532 |
|
our $last_log_pos = 0; |
533 |
|
our $last_log_line = 0; |
534 |
|
|
535 |
sub warnings_html { |
sub warnings_html { |
536 |
my ($self,$level) = shift; |
my ($self,$level) = shift; |
537 |
$level ||= $self->debug, |
$level ||= $self->debug, |
586 |
if ( m{^(#*)} ) { |
if ( m{^(#*)} ) { |
587 |
|
|
588 |
my $level = $1; |
my $level = $1; |
589 |
my $msg = $_; |
my $msg = $self->strip_full_path( $_ ); |
|
|
|
|
# Mojo seems to expand warn messages to full path which is annoying |
|
|
$msg =~ s{/[^/]+/\.\./}{/}gs; |
|
|
$msg =~ s{$pwd/*}{}gs; |
|
590 |
|
|
591 |
my $spacer = ' '; |
my $spacer = ' '; |
592 |
my $real_msg = expand( $msg ); |
my $real_msg = expand( $msg ); |
627 |
return |
return |
628 |
# need to wrap editor link into span so we can have links in warnings |
# need to wrap editor link into span so we can have links in warnings |
629 |
qq|<span class="frey-popup"><a target="editor" href="/editor+$path+$line" title="$path \| $size -> $s bytes \| $line -> $pos lines \| level $level">warn</a><code>| |
qq|<span class="frey-popup"><a target="editor" href="/editor+$path+$line" title="$path \| $size -> $s bytes \| $line -> $pos lines \| level $level">warn</a><code>| |
630 |
. $self->editor_links( $warnings ) |
. $self->html_links( $warnings ) |
631 |
. qq|</code></span>| |
. qq|</code></span>| |
632 |
; |
; |
633 |
} |
} |
660 |
return @backtrace; |
return @backtrace; |
661 |
} |
} |
662 |
|
|
663 |
|
=head2 checkbox |
664 |
|
|
665 |
|
Generate checkbox html markup from some attribute |
666 |
|
|
667 |
|
my $html = $self->checkbox('attribute_name', $value); |
668 |
|
|
669 |
|
=cut |
670 |
|
|
671 |
|
sub checkbox { |
672 |
|
my ($self,$name,$value) = @_; |
673 |
|
my $checked = ''; |
674 |
|
my $all_checkboxes = eval { $self->$name }; |
675 |
|
warn "ERROR tried to get checkbox value for '$name' which is unknown: $@" if $@; |
676 |
|
$all_checkboxes = [ $all_checkboxes ] unless ref($all_checkboxes) eq 'ARRAY'; # sigh, too chatty |
677 |
|
$checked = ' checked' if grep { defined $_ && $_ eq $value } @$all_checkboxes; |
678 |
|
warn "# checkbox $name $value $checked\t", $self->dump( $self->$name ); |
679 |
|
qq|<input name="$name" value="$value" type="checkbox"$checked>|; |
680 |
|
} |
681 |
|
|
682 |
|
=head2 strip |
683 |
|
|
684 |
|
Strip whitespace around content |
685 |
|
|
686 |
|
my $stripped = strip(' no more whitespace around this '); |
687 |
|
|
688 |
|
=cut |
689 |
|
|
690 |
|
sub strip { |
691 |
|
my $t = shift; |
692 |
|
$t =~ s{^\s+}{}gs; |
693 |
|
$t =~ s{>\s+<}{><}gs; |
694 |
|
$t =~ s{\s+$}{}gs; |
695 |
|
return $t; |
696 |
|
} |
697 |
|
|
698 |
1; |
1; |