viewdiff: rewrite and simplify

[public-inbox.git] / lib / PublicInbox / View.pm

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 544ded7dd029f8f67e8c47e50e24735ac1c26823..ff36777c60f482286fc92921a4591ba52c184634 100644 (file)
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -24,7 +24,7 @@ use constant INDENT => '  ';
 use constant TCHILD => '` ';
 sub th_pfx ($) { $_[0] == 0 ? '' : TCHILD };
 
-sub msg_html_i {
+sub msg_page_i {
        my ($nr, $ctx) = @_;
        my $more = $ctx->{more};
        if ($nr == 1) {
@@ -35,7 +35,7 @@ sub msg_html_i {
        } elsif ($more) {
                ++$ctx->{end_nr};
                # fake an EOF if {more} retrieval fails fails;
-               eval { msg_html_more($ctx, $nr) };
+               eval { msg_page_more($ctx, $nr) };
        } elsif ($nr == $ctx->{end_nr}) {
                # fake an EOF if generating the footer fails;
                # we want to at least show the message if something
@@ -48,18 +48,6 @@ sub msg_html_i {
 
 # public functions: (unstable)
 
-sub msg_html {
-       my ($ctx, $mime, $smsg) = @_;
-       my $ibx = $ctx->{-inbox};
-       $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
-       my $hdr = $ctx->{hdr} = $mime->header_obj;
-       _msg_html_prepare_obuf($hdr, $ctx, 0);
-       $ctx->{end_nr} = 2;
-       $ctx->{smsg} = $smsg;
-       $ctx->{mime} = $mime;
-       PublicInbox::WwwStream->response($ctx, 200, \&msg_html_i);
-}
-
 sub msg_page {
        my ($ctx) = @_;
        my $mid = $ctx->{mid};
@@ -78,10 +66,16 @@ sub msg_page {
        } else {
                $first = $ibx->msg_by_mid($mid) or return;
        }
-       msg_html($ctx, PublicInbox::MIME->new($first), $smsg);
+       my $mime = $ctx->{mime} = PublicInbox::MIME->new($first);
+       $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
+       my $hdr = $ctx->{hdr} = $mime->header_obj;
+       _msg_page_prepare_obuf($hdr, $ctx, 0);
+       $ctx->{end_nr} = 2;
+       $ctx->{smsg} = $smsg;
+       PublicInbox::WwwStream->response($ctx, 200, \&msg_page_i);
 }
 
-sub msg_html_more {
+sub msg_page_more {
        my ($ctx, $nr) = @_;
        my ($id, $prev, $smsg) = @{$ctx->{more}};
        my $ibx = $ctx->{-inbox};
@@ -91,7 +85,7 @@ sub msg_html_more {
        return '' unless $smsg;
        my $upfx = '../' . mid_escape($smsg->mid) . '/';
        my $mime = delete $smsg->{mime};
-       _msg_html_prepare_obuf($mime->header_obj, $ctx, $nr);
+       _msg_page_prepare_obuf($mime->header_obj, $ctx, $nr);
        multipart_text_as_html($mime, $upfx, $ctx);
        ${delete $ctx->{obuf}} .= '</pre><hr>';
 }
@@ -502,13 +496,10 @@ sub multipart_text_as_html {
 sub flush_quote {
        my ($s, $l, $quot) = @_;
 
-       # show everything in the full version with anchor from
-       # short version (see above)
-       my $rv = $l->linkify_1($$quot);
+       my $rv = $l->to_html($$quot);
 
        # we use a <span> here to allow users to specify their own
        # color for quoted text
-       $rv = $l->linkify_2(ascii_html($rv));
        $$quot = undef;
        $$s .= qq(<span\nclass="q">) . $rv . '</span>'
 }
@@ -571,7 +562,7 @@ sub add_text_body { # callback for msg_iter
                $idx[0] = $upfx . $idx[0] if $upfx ne '';
                $ctx->{-apfx} = join('/', @idx);
                $ctx->{-anchors} = {}; # attr => filename
-               $ctx->{-diff} = $diff = [];
+               $diff = 1;
                delete $ctx->{-long_path};
                my $spfx;
                if ($ibx->{-repo_objs}) {
@@ -604,18 +595,15 @@ sub add_text_body { # callback for msg_iter
                attach_link($ctx, $ct, $p, $fn, $err);
                $$rv .= "\n";
        }
-       my $l = PublicInbox::Linkify->new;
+       my $l = $ctx->{-linkify} //= PublicInbox::Linkify->new;
        foreach my $cur (@sections) {
                if ($cur =~ /\A>/) {
                        flush_quote($rv, $l, \$cur);
                } elsif ($diff) {
-                       @$diff = split(/^/m, $cur);
-                       $cur = undef;
-                       flush_diff($rv, $ctx, $l);
+                       flush_diff($rv, $ctx, \$cur);
                } else {
                        # regular lines, OK
-                       $l->linkify_1($cur);
-                       $$rv .= $l->linkify_2(ascii_html($cur));
+                       $$rv .= $l->to_html($cur);
                        $cur = undef;
                }
        }
@@ -623,7 +611,7 @@ sub add_text_body { # callback for msg_iter
        obfuscate_addrs($ibx, $$rv) if $ibx->{obfuscate};
 }
 
-sub _msg_html_prepare_obuf {
+sub _msg_page_prepare_obuf {
        my ($hdr, $ctx, $nr) = @_;
        my $over = $ctx->{-inbox}->over;
        my $obfs_ibx = $ctx->{-obfs_ibx};