lei q|up: fix saved searches for single-phrase search

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

diff --git a/lib/PublicInbox/LeiSavedSearch.pm b/lib/PublicInbox/LeiSavedSearch.pm
index 8ceaaf018ec628a6cba2132304304797ce733f4f..1d13aef6728a6a5ebcbcd942a93630f61872e1ed 100644 (file)
--- a/lib/PublicInbox/LeiSavedSearch.pm
+++ b/lib/PublicInbox/LeiSavedSearch.pm
@@ -21,6 +21,7 @@ my %cquote = ("\n" => '\\n', "\t" => '\\t', "\b" => '\\b');
 sub cquote_val ($) { # cf. git-config(1)
        my ($val) = @_;
        $val =~ s/([\n\t\b])/$cquote{$1}/g;
+       $val =~ s/\"/\\\"/g;
        $val;
 }
 
@@ -29,31 +30,25 @@ sub BOOL_FIELDS () {
        qw(external local remote import-remote import-before threads)
 }
 
-sub cfg_dump ($$) {
-       my ($lei, $f) = @_;
-       my $ret = eval { PublicInbox::Config->git_config_dump($f, $lei->{2}) };
-       return $ret if !$@;
-       $lei->err($@);
-       undef;
-}
+sub SINGLE_FIELDS () { qw(limit dedupe output) }
 
 sub lss_dir_for ($$;$) {
        my ($lei, $dstref, $on_fs) = @_;
-       my @n;
+       my $pfx;
        if ($$dstref =~ m,\Aimaps?://,i) { # already canonicalized
                require PublicInbox::URIimap;
                my $uri = PublicInbox::URIimap->new($$dstref)->canonical;
                $$dstref = $$uri;
-               @n = ($uri->mailbox);
+               $pfx = $uri->mailbox;
        } else {
                # can't use Cwd::abs_path since dirname($$dstref) may not exist
                $$dstref = $lei->rel2abs($$dstref);
                $$dstref =~ tr!/!/!s;
-               @n = ($$dstref =~ m{([^/]+)/*\z}); # basename
+               $pfx = $$dstref;
        }
-       push @n, sha256_hex($$dstref);
+       ($pfx) = ($pfx =~ m{([^/]+)/*\z}); # basename
        my $lss_dir = $lei->share_path . '/saved-searches/';
-       my $d = $lss_dir . join('-', @n);
+       my $d = "$lss_dir$pfx-".sha256_hex($$dstref);
 
        # fall-back to looking up by st_ino + st_dev in case we're in
        # a symlinked or bind-mounted path
@@ -61,10 +56,10 @@ sub lss_dir_for ($$;$) {
                my @cur = stat(_);
                my $want = pack('dd', @cur[1,0]); # st_ino + st_dev
                my ($c, $o, @st);
-               for my $g ("$n[0]-*", '*') {
+               for my $g ("$pfx-*", '*') {
                        my @maybe = glob("$lss_dir$g/lei.saved-search");
                        for my $f (@maybe) {
-                               $c = cfg_dump($lei, $f) // next;
+                               $c = $lei->cfg_dump($f) // next;
                                $o = $c->{'lei.q.output'} // next;
                                $o =~ s!$LOCAL_PFX!! or next;
                                @st = stat($o) or next;
@@ -88,7 +83,7 @@ sub list {
                print $fh "\tpath = ", cquote_val($p), "\n";
        }
        close $fh or die "close $f: $!";
-       my $cfg = cfg_dump($lei, $f);
+       my $cfg = $lei->cfg_dump($f);
        unlink($f);
        my $out = $cfg ? $cfg->get_all('lei.q.output') : [];
        map {;
@@ -97,12 +92,12 @@ sub list {
        } @$out
 }
 
-sub translate_dedupe ($$$) {
-       my ($self, $lei, $dd) = @_;
-       $dd //= 'content';
+sub translate_dedupe ($$) {
+       my ($self, $lei) = @_;
+       my $dd = $lei->{opt}->{dedupe} // 'content';
        return 1 if $dd eq 'content'; # the default
        return $self->{"-dedupe_$dd"} = 1 if ($dd eq 'oid' || $dd eq 'mid');
-       $lei->fail("--dedupe=$dd unsupported with --save");
+       die("--dedupe=$dd requires --no-save\n");
 }
 
 sub up { # updating existing saved search via "lei up"
@@ -111,9 +106,9 @@ sub up { # updating existing saved search via "lei up"
        my $self = bless { ale => $lei->ale }, $cls;
        my $dir = $dst;
        output2lssdir($self, $lei, \$dir, \$f) or
-               return $lei->fail("--save was not used with $dst cwd=".
-                                       $lei->rel2abs('.'));
-       $self->{-cfg} = cfg_dump($lei, $f) // return $lei->fail;
+               return die("--no-save was used with $dst cwd=".
+                                       $lei->rel2abs('.')."\n");
+       $self->{-cfg} = $lei->cfg_dump($f) // return $lei->child_error;
        $self->{-ovf} = "$dir/over.sqlite3";
        $self->{'-f'} = $f;
        $self->{lock_path} = "$self->{-f}.flock";
@@ -136,8 +131,7 @@ sub new { # new saved search "lei q --save"
        File::Path::make_path($dir); # raises on error
        $self->{-cfg} = {};
        my $f = $self->{'-f'} = "$dir/lei.saved-search";
-       my $dd = $lei->{opt}->{dedupe};
-       translate_dedupe($self, $lei, $dd) or return;
+       translate_dedupe($self, $lei) or return;
        open my $fh, '>', $f or return $lei->fail("open $f: $!");
        my $sq_dst = PublicInbox::Config::squote_maybe($dst);
        my $q = $lei->{mset_opt}->{q_raw} // die 'BUG: {q_raw} missing';
@@ -147,14 +141,14 @@ sub new { # new saved search "lei q --save"
                $q = "\tq = ".cquote_val($q);
        }
        $dst = "$lei->{ovv}->{fmt}:$dst" if $dst !~ m!\Aimaps?://!i;
+       $lei->{opt}->{output} = $dst;
        print $fh <<EOM;
 ; to refresh with new results, run: lei up $sq_dst
+; `maxuid' and `lastresult' lines are maintained by "lei up" for optimization
 [lei]
 $q
 [lei "q"]
-       output = $dst
 EOM
-       print $fh "\tdedupe = $dd\n" if $dd;
        for my $k (ARRAY_FIELDS) {
                my $ary = $lei->{opt}->{$k} // next;
                for my $x (@$ary) {
@@ -165,6 +159,14 @@ EOM
                my $val = $lei->{opt}->{$k} // next;
                print $fh "\t$k = ".($val ? 1 : 0)."\n";
        }
+       for my $k (SINGLE_FIELDS) {
+               my $val = $lei->{opt}->{$k} // next;
+               print $fh "\t$k = $val\n";
+       }
+       $lei->{opt}->{stdin} and print $fh <<EOM;
+[lei "internal"]
+       rawstr = 1 # stdin was used initially
+EOM
        close($fh) or return $lei->fail("close $f: $!");
        $self->{lock_path} = "$self->{-f}.flock";
        $self->{-ovf} = "$dir/over.sqlite3";
@@ -275,7 +277,7 @@ sub output2lssdir {
        my $dir = lss_dir_for($lei, \$dst, 1);
        my $f = "$dir/lei.saved-search";
        if (-f $f && -r _) {
-               $self->{-cfg} = cfg_dump($lei, $f) // return;
+               $self->{-cfg} = $lei->cfg_dump($f) // return;
                $$dir_ref = $dir;
                $$fn_ref = $f;
                return 1;