msg_iter: make ->each_part method for PublicInbox::MIME

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

diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm
index 06b4cdc40c220d6d849f9c05ef3b439cf0708471..f718e28cbd55af423a4ad41d15c4e2a141ac55e2 100644 (file)
--- a/lib/PublicInbox/SolverGit.pm
+++ b/lib/PublicInbox/SolverGit.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # "Solve" blobs which don't exist in git code repositories by
@@ -14,7 +14,7 @@ use 5.010_001;
 use File::Temp 0.19 (); # 0.19 for ->newdir
 use Fcntl qw(SEEK_SET);
 use PublicInbox::Git qw(git_unquote git_quote);
-use PublicInbox::MsgIter qw(msg_iter msg_part_text);
+use PublicInbox::MsgIter qw(msg_part_text);
 use PublicInbox::Qspawn;
 use PublicInbox::Tmpfile;
 use URI::Escape qw(uri_escape_utf8);
@@ -34,6 +34,12 @@ my $OID_MIN = 7;
 # work fairly.  Other PSGI servers may have trouble, though.
 my $MAX_PATCH = 9999;
 
+my $LF = qr!\r?\n!;
+my $ANY = qr![^\r\n]+!;
+my $MODE = '100644|120000|100755';
+my $FN = qr!(?:("?[^/\n]+/[^\r\n]+)|/dev/null)!;
+my %BAD_COMPONENT = ('' => 1, '.' => 1, '..' => 1);
+
 # di = diff info / a hashref with information about a diff ($di):
 # {
 #      oid_a => abbreviated pre-image oid,
@@ -42,7 +48,7 @@ my $MAX_PATCH = 9999;
 #      hdr_lines => string of various header lines for mode information
 #      mode_a => original mode of oid_a (string, not integer),
 #      ibx => PublicInbox::Inbox object containing the diff
-#      smsg => PublicInbox::SearchMsg object containing diff
+#      smsg => PublicInbox::Smsg object containing diff
 #      path_a => pre-image path
 #      path_b => post-image path
 #      n => numeric path of the patch (relative to worktree)
@@ -110,10 +116,6 @@ sub extract_diff ($$) {
                $s =~ s/\r\n/\n/sg;
        }
 
-       state $LF = qr!\r?\n!;
-       state $ANY = qr![^\r\n]+!;
-       state $MODE = '100644|120000|100755';
-       state $FN = qr!(?:("?[^/\n]+/[^\r\n]+)|/dev/null)!;
 
        $s =~ m!( # $1 start header lines we save for debugging:
 
@@ -174,8 +176,7 @@ sub extract_diff ($$) {
 
        # get rid of path-traversal attempts and junk patches:
        # it's junk at best, an attack attempt at worse:
-       state $bad_component = { map { $_ => 1 } ('', '.', '..') };
-       foreach (@a, @b) { return if $bad_component->{$_} }
+       foreach (@a, @b) { return if $BAD_COMPONENT{$_} }
 
        $di->{path_a} = join('/', @a) if @a;
        $di->{path_b} = join('/', @b);
@@ -233,7 +234,7 @@ sub find_extract_diffs ($$$) {
        my $diffs = [];
        foreach my $smsg (@$msgs) {
                $ibx->smsg_mime($smsg) or next;
-               msg_iter(delete $smsg->{mime}, \&extract_diff,
+               delete($smsg->{mime})->each_part(\&extract_diff,
                                [$self, $diffs, $pre, $post, $ibx, $smsg], 1);
        }
        @$diffs ? $diffs : undef;
@@ -530,7 +531,8 @@ sub resolve_patch ($$) {
        if (my $existing = solve_existing($self, $want)) {
                my ($found_git, undef, $type, undef) = @$existing;
                dbg($self, "found $cur_want in " .
-                       join("\n", $found_git->pub_urls($self->{psgi_env})));
+                       join(" ||\n\t",
+                               $found_git->pub_urls($self->{psgi_env})));
 
                if ($cur_want eq $self->{oid_want} || $type ne 'blob') {
                        eval { done($self, $existing) };
@@ -548,7 +550,7 @@ sub resolve_patch ($$) {
 
                unshift @{$self->{patches}}, @$diffs;
                dbg($self, "found $cur_want in ".
-                       join("\n\t", map { di_url($self, $_) } @$diffs));
+                       join(" ||\n\t", map { di_url($self, $_) } @$diffs));
 
                # good, we can find a path to the oid we $want, now
                # lets see if we need to apply more patches: