debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-26 12:55:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nmbug: use dump --format=batch-tag

Browse source 
This should make nmbug tolerate tags with whitespace and other special
characters it.  At the moment this relies on _not_ passing calls to
notmuch tag through the shell, which is a documented feature of perl's
system function.
This commit is contained in:
David Bremner 2013-02-20 18:24:34 -04:00
parent d6d3fa32f6
commit 2ec4ea610c
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
devel/nmbug/nmbug
View file

@ -39,6 +39,11 @@ my %command = (
status => \&do_status, status => \&do_status,
); );
# Convert prefix into form suitable for literal matching against
# notmuch dump --format=batch-tag output.
my $ENCPREFIX = encode_for_fs ($TAGPREFIX);
$ENCPREFIX =~ s/:/%3a/g;
my $subcommand = shift || usage (); my $subcommand = shift || usage ();
if (!exists $command{$subcommand}) { if (!exists $command{$subcommand}) {
@ -203,9 +208,9 @@ sub index_tags {
my $index = $NMBGIT.'/nmbug.index'; my $index = $NMBGIT.'/nmbug.index';
my $query = join ' ', map ("tag:$_", get_tags ($TAGPREFIX)); my $query = join ' ', map ("tag:\"$_\"", get_tags ($TAGPREFIX));
my $fh = spawn ('-|', qw/notmuch dump --/, $query) my $fh = spawn ('-|', qw/notmuch dump --format=batch-tag --/, $query)
or die "notmuch dump: $!"; or die "notmuch dump: $!";
git ('read-tree', '--empty'); git ('read-tree', '--empty');
@ -214,22 +219,30 @@ sub index_tags {
or die 'git update-index'; or die 'git update-index';
while (<$fh>) { while (<$fh>) {
m/ ( [^ ]* ) \s+ \( ([^\)]* ) \) /x || die 'syntax error in dump';
my ($id,$rest) = ($1,$2);
#strip prefixes before writing chomp();
my @tags = grep { s/^$TAGPREFIX//; } split (' ', $rest); my ($rest,$id) = split(/ -- id:/);
if ($id =~ s/^"(.*)"\s*$/$1/) {
# xapian quoted string, dequote.
$id =~ s/""/"/g;
}
#strip prefixes from tags before writing
my @tags = grep { s/^[+]$ENCPREFIX//; } split (' ', $rest);
index_tags_for_msg ($git,$id, 'A', @tags); index_tags_for_msg ($git,$id, 'A', @tags);
} }
unless (close $git) { unless (close $git) {
die "'git update-index --index-info' exited with nonzero value\n"; die "'git update-index --index-info' exited with nonzero value\n";
} }
unless (close $fh) { unless (close $fh) {
die "'notmuch dump -- $query' exited with nonzero value\n"; die "'notmuch dump --format=batch-tag -- $query' exited with nonzero value\n";
} }
return $index; return $index;
} }
# update the git index to either create or delete an empty file.
# Neither argument should be encoded/escaped.
sub index_tags_for_msg { sub index_tags_for_msg {
my $fh = shift; my $fh = shift;
my $msgid = shift; my $msgid = shift;