the future of notmuch-vim?
Felipe Contreras writes: > > I did try the emacs frontend, and it was not working properly for me at the > time, and I believe I documented my issues. It was not just my dislike of > emacs > that motivated me to write notmuch-vim-ruby. I could only find a comment about the (admittedly imperfect) handling of HTML messages in emacs. Was there some other issues you remember? If you can point me to message-ids, I'd appreciate it. I've been trying to get http://nmbug.tethera.net/status/#Bugs up to date by tagging unresolved bugs reported to the mailing list. d PS: for what it's worth (and mainly for the benefit of others reading this thread), I find the combination of toggling visibility of mime parts and the shr renderer in emacs24 has noticably improved my experience with HTML email. YMMV, of course.
the future of notmuch-vim?
Hi, Sorry for the late reply, I wasn't following the ml. David Bremner wrote: > There is apparently still some people that use it (although notice the > "Vote" column is 0). > > On the other hand > > - The vim frontend is afaik the last thing depending on the legacy text > output format. > > - The plugin seems to be only semi-functional at the moment; in a quick > test I found a message that didn't display it's content, and one that > displayed the content, along with "junk" from the internal > representation. Indeed, I'd say the code is very poor at best. > - There are now several alternatives for people whose only motivation to > use the vim frontend was dislike of emacs (alot and notmuch-mutt). I did try the emacs frontend, and it was not working properly for me at the time, and I believe I documented my issues. It was not just my dislike of emacs that motivated me to write notmuch-vim-ruby. > There are several alternative vim frontends floating around in (at > least) ruby and python. I don't if they are better or worse > functionality wise. I'd say notmuch-vim-ruby is the best one, but of course I'm biased :) > I'm considering stopping building debian packages for notmuch-vim, since > I don't see any current prospects for the package improving. I'm not > sure what the equivalent thing to do upstream would be, perhaps moving > it to contrib. Or, deprecating it and then removing it. > > What do people think? Personally I think notmuch-vim should be replaced with notmuch-vim-ruby. I did try the python version, and remember discussing options with the guy developing it, but nothing happened out of it, and I think the ruby version is superior. I'd be open to discuss the options here, but I think notmuch-vim-ruby is the only real option. Cheers. -- Felipe Contreras
[PATCH 0/5] Random patches for notmuch-vim-ruby
Hi, Sorry for the late reply, I haven't really been following or doing any development, but I'm back. Kirill A. Shutemov wrote: > From: "Kirill A. Shutemov" > > Kirill A. Shutemov (5): > open_reply: fallback to use addr.local if addr.name is nil > rename g:notmuch_sendmail -> g:notmuch_rb_sendmail > /usr/sbin/sendmail as a default g:notmuch_rb_sendmail > Introduce g:notmuch_rb_folders_count_threads > Drop harmful reply buffer preparation -- Felipe Contreras
[PATCH 5/5] Drop harmful reply buffer preparation
Kirill A. Shutemov wrote: > From: "Kirill A. Shutemov" > > Inserting empty lines at the end of reply buffer and switching to insert > mode are not what user want on reply. It's only annoying if you try to > comment on patch. > > If a user really wants this kind of preparation it should be implemented > as an user-specific hook. Insert mode, maybe, but the empty lines don't hurt. See, with your patch I end up in: > part = orig.find_first_text > part.convert.each_line do |l| > body_lines << "> %s" % l.chomp > -- > 1.7.10.4 <- HERE > > -- I cannot type there, and in any case I have to remove those lines, so I end selecting the text upwards and remove them. With the current code: > part = orig.find_first_text > part.convert.each_line do |l| > body_lines << "> %s" % l.chomp > -- > 1.7.10.4 > > <- HERE > > -- Not much of a difference, I still have to select the lines upwards and remove them. That is of course if you reply *inline*. You might want to reply to the whole thing without modifications, in which case the original behavior is more useful. I'm not strongly opposed to this, but I don't see why those extra lines would hurt. Cheers. -- Felipe Contreras
[PATCH 4/5] Introduce g:notmuch_rb_folders_count_threads
Kirill A. Shutemov wrote: > From: "Kirill A. Shutemov" > > If the option set, folders list shows count of threads, not messages > folders.each do |name, search| > q = db.query(search) > $searches << search > - b << "%9d %-20s (%s)" % > [q.search_messages.count, name, search] > + count = count_threads == 0 ? > + q.search_messages.count : > q.search_threads.count I prefer: count = count_threads ? q.search_threads.count : q.search_messages.count But other than that looks good to me. Applied. -- Felipe Contreras
[PATCH 3/5] /usr/sbin/sendmail as a default g:notmuch_rb_sendmail
Kirill A. Shutemov wrote: > From: "Kirill A. Shutemov" > > It's confusing that we don't have a default sendmail program. Let's use > /usr/sbin/sendmail as reasonable default. Applied. -- Felipe Contreras
[PATCH 1/5] open_reply: fallback to use addr.local if addr.name is nil
Kirill A. Shutemov wrote: > From: "Kirill A. Shutemov" > > If address doesn't contain name we end up with " wrote:" as a reply > header. It doesn't look nice. > > Let's use addr.local + "@" if name is not defined. If addr.local is not > defined too, let's just use "somebody". Thanks. Applied. -- Felipe Contreras
[PATCH 2/5] rename g:notmuch_sendmail -> g:notmuch_rb_sendmail
On Mon, Jan 28, 2013 at 9:52 AM, Kirill A. Shutemov wrote: > From: "Kirill A. Shutemov" > > All configuration variable use prefix notmuch_rb_ except > notmuch_sendmail. Let's fix it. I'm not sure about this one. notmuch-vim is official, what happens if you have both notmuch-vim and notmuch-vim-ruby? Wouldn't it be nice to use the same variable for configuration? -- Felipe Contreras
[Joerg Jaspert] Bug#688609: notmuch: Can't deal with compressed maildir files
I misread this the first time, thinking it was about mboxes. Dealing with compressed individual messages seems at least potentially simpler. -- next part -- An embedded message was scrubbed... From: Joerg Jaspert <jo...@debian.org> Subject: Bug#688609: notmuch: Can't deal with compressed maildir files Date: Mon, 24 Sep 2012 09:00:32 +0200 Size: 4948 URL: <http://notmuchmail.org/pipermail/notmuch/attachments/20130402/52ef9ba9/attachment.mht>
[Joerg Jaspert] Bug#688609: notmuch: Can't deal with compressed maildir files
I misread this the first time, thinking it was about mboxes. Dealing with compressed individual messages seems at least potentially simpler. ---BeginMessage--- Package: notmuch Version: 0.13.2-1 Severity: wishlist Dear Maintainer, another wishlist going upstream. Would be nice if notmuch can be told that the mailfiles are compressed (gzip in this case), or even better - detect that itself. And then transparently deal with it. -- bye, Joerg I guess some people never change. Or, they quickly change and then quickly change back. ---End Message--- ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
Re: [PATCH 2/5] rename g:notmuch_sendmail - g:notmuch_rb_sendmail
On Mon, Jan 28, 2013 at 9:52 AM, Kirill A. Shutemov kir...@shutemov.name wrote: From: Kirill A. Shutemov kir...@shutemov.name All configuration variable use prefix notmuch_rb_ except notmuch_sendmail. Let's fix it. I'm not sure about this one. notmuch-vim is official, what happens if you have both notmuch-vim and notmuch-vim-ruby? Wouldn't it be nice to use the same variable for configuration? -- Felipe Contreras ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
RE: [PATCH 1/5] open_reply: fallback to use addr.local if addr.name is nil
Kirill A. Shutemov wrote: From: Kirill A. Shutemov kir...@shutemov.name If address doesn't contain name we end up with wrote: as a reply header. It doesn't look nice. Let's use addr.local + @ if name is not defined. If addr.local is not defined too, let's just use somebody. Thanks. Applied. -- Felipe Contreras ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
RE: [PATCH 3/5] /usr/sbin/sendmail as a default g:notmuch_rb_sendmail
Kirill A. Shutemov wrote: From: Kirill A. Shutemov kir...@shutemov.name It's confusing that we don't have a default sendmail program. Let's use /usr/sbin/sendmail as reasonable default. Applied. -- Felipe Contreras ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
RE: [PATCH 4/5] Introduce g:notmuch_rb_folders_count_threads
Kirill A. Shutemov wrote: From: Kirill A. Shutemov kir...@shutemov.name If the option set, folders list shows count of threads, not messages folders.each do |name, search| q = db.query(search) $searches search - b %9d %-20s (%s) % [q.search_messages.count, name, search] + count = count_threads == 0 ? + q.search_messages.count : q.search_threads.count I prefer: count = count_threads ? q.search_threads.count : q.search_messages.count But other than that looks good to me. Applied. -- Felipe Contreras ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
RE: [PATCH 5/5] Drop harmful reply buffer preparation
Kirill A. Shutemov wrote: From: Kirill A. Shutemov kir...@shutemov.name Inserting empty lines at the end of reply buffer and switching to insert mode are not what user want on reply. It's only annoying if you try to comment on patch. If a user really wants this kind of preparation it should be implemented as an user-specific hook. Insert mode, maybe, but the empty lines don't hurt. See, with your patch I end up in: part = orig.find_first_text part.convert.each_line do |l| body_lines %s % l.chomp -- 1.7.10.4 - HERE -- I cannot type there, and in any case I have to remove those lines, so I end selecting the text upwards and remove them. With the current code: part = orig.find_first_text part.convert.each_line do |l| body_lines %s % l.chomp -- 1.7.10.4 - HERE -- Not much of a difference, I still have to select the lines upwards and remove them. That is of course if you reply *inline*. You might want to reply to the whole thing without modifications, in which case the original behavior is more useful. I'm not strongly opposed to this, but I don't see why those extra lines would hurt. Cheers. -- Felipe Contreras ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
RE: [PATCH 0/5] Random patches for notmuch-vim-ruby
Hi, Sorry for the late reply, I haven't really been following or doing any development, but I'm back. Kirill A. Shutemov wrote: From: Kirill A. Shutemov kir...@shutemov.name Kirill A. Shutemov (5): open_reply: fallback to use addr.local if addr.name is nil rename g:notmuch_sendmail - g:notmuch_rb_sendmail /usr/sbin/sendmail as a default g:notmuch_rb_sendmail Introduce g:notmuch_rb_folders_count_threads Drop harmful reply buffer preparation -- Felipe Contreras ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
RE: the future of notmuch-vim?
Hi, Sorry for the late reply, I wasn't following the ml. David Bremner wrote: There is apparently still some people that use it (although notice the Vote column is 0). On the other hand - The vim frontend is afaik the last thing depending on the legacy text output format. - The plugin seems to be only semi-functional at the moment; in a quick test I found a message that didn't display it's content, and one that displayed the content, along with junk from the internal representation. Indeed, I'd say the code is very poor at best. - There are now several alternatives for people whose only motivation to use the vim frontend was dislike of emacs (alot and notmuch-mutt). I did try the emacs frontend, and it was not working properly for me at the time, and I believe I documented my issues. It was not just my dislike of emacs that motivated me to write notmuch-vim-ruby. There are several alternative vim frontends floating around in (at least) ruby and python. I don't if they are better or worse functionality wise. I'd say notmuch-vim-ruby is the best one, but of course I'm biased :) I'm considering stopping building debian packages for notmuch-vim, since I don't see any current prospects for the package improving. I'm not sure what the equivalent thing to do upstream would be, perhaps moving it to contrib. Or, deprecating it and then removing it. What do people think? Personally I think notmuch-vim should be replaced with notmuch-vim-ruby. I did try the python version, and remember discussing options with the guy developing it, but nothing happened out of it, and I think the ruby version is superior. I'd be open to discuss the options here, but I think notmuch-vim-ruby is the only real option. Cheers. -- Felipe Contreras ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
[PATCH v5 00/12] insert command
- rebased - cleaned up insert_message, sync_dir error paths - clarified maildir destination in man page Peter Wang (12): tag-util: move out 'tag' command-line checks tag-util: do not reset list in parse_tag_command_line cli: add insert command man: document 'insert' command man: reference notmuch-insert.1 test: add tests for insert insert: add --folder option man: document insert --folder option test: test insert --folder option insert: add --create-folder option man: document insert --create-folder test: test insert --create-folder option Makefile.local | 1 + man/Makefile.local | 1 + man/man1/notmuch-config.1 | 4 +- man/man1/notmuch-count.1| 4 +- man/man1/notmuch-dump.1 | 4 +- man/man1/notmuch-insert.1 | 64 ++ man/man1/notmuch-new.1 | 4 +- man/man1/notmuch-reply.1| 3 +- man/man1/notmuch-restore.1 | 3 +- man/man1/notmuch-search.1 | 3 +- man/man1/notmuch-show.1 | 3 +- man/man1/notmuch-tag.1 | 3 +- man/man1/notmuch.1 | 3 +- man/man5/notmuch-hooks.5| 4 +- man/man7/notmuch-search-terms.7 | 3 +- notmuch-client.h| 3 + notmuch-insert.c| 479 notmuch-tag.c | 5 + notmuch.c | 3 + tag-util.c | 8 +- tag-util.h | 2 + test/insert | 110 + test/notmuch-test | 1 + 23 files changed, 696 insertions(+), 22 deletions(-) create mode 100644 man/man1/notmuch-insert.1 create mode 100644 notmuch-insert.c create mode 100755 test/insert -- 1.7.12.1 ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
[PATCH v5 01/12] tag-util: move out 'tag' command-line checks
parse_tag_command_line checked for two error conditions which are
specific to the 'tag' command. It can be reused for the forthcoming
notmuch 'insert' command if we move the checks out, into notmuch-tag.c.
---
notmuch-tag.c | 5 +
tag-util.c| 6 +++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/notmuch-tag.c b/notmuch-tag.c
index 9a5d3e7..3b09df9 100644
--- a/notmuch-tag.c
+++ b/notmuch-tag.c
@@ -247,6 +247,11 @@ notmuch_tag_command (notmuch_config_t *config, int argc,
char *argv[])
fprintf (stderr, Error: 'notmuch tag' requires at least one tag to
add or remove.\n);
return 1;
}
+
+ if (*query_string == '\0') {
+ fprintf (stderr, Error: notmuch tag requires at least one search
term.\n);
+ return 1;
+ }
}
if (notmuch_database_open (notmuch_config_get_database_path (config),
diff --git a/tag-util.c b/tag-util.c
index c5f5859..92e08a1 100644
--- a/tag-util.c
+++ b/tag-util.c
@@ -190,9 +190,9 @@ parse_tag_command_line (void *ctx, int argc, char **argv,
*query_str = query_string_from_args (ctx, argc - i, argv[i]);
-if (*query_str == NULL || **query_str == '\0') {
- fprintf (stderr, Error: notmuch tag requires at least one search
term.\n);
- return TAG_PARSE_INVALID;
+if (*query_str == NULL) {
+ fprintf (stderr, Out of memory.\n);
+ return TAG_PARSE_OUT_OF_MEMORY;
}
return TAG_PARSE_SUCCESS;
--
1.7.12.1
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch
[PATCH v5 02/12] tag-util: do not reset list in parse_tag_command_line
No current callers of parse_tag_command_line require that it clear its
tag list argument. The notmuch 'insert' command will be better served
if the function modifies a pre-populated list (of new.tags) instead of
clobbering it outright.
---
tag-util.c | 2 --
tag-util.h | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tag-util.c b/tag-util.c
index 92e08a1..3bde409 100644
--- a/tag-util.c
+++ b/tag-util.c
@@ -165,8 +165,6 @@ parse_tag_command_line (void *ctx, int argc, char **argv,
int i;
-tag_op_list_reset (tag_ops);
-
for (i = 0; i argc; i++) {
if (strcmp (argv[i], --) == 0) {
i++;
diff --git a/tag-util.h b/tag-util.h
index 246de85..4628f16 100644
--- a/tag-util.h
+++ b/tag-util.h
@@ -81,6 +81,8 @@ parse_tag_line (void *ctx, char *line,
* Output Parameters:
* ops contains a list of tag operations
* query_str the search terms.
+ *
+ * The ops argument is not cleared.
*/
tag_parse_status_t
--
1.7.12.1
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch
[PATCH v5 03/12] cli: add insert command
The notmuch insert command reads a message from standard input,
writes it to a Maildir folder, and then incorporates the message into
the notmuch database. Essentially it moves the functionality of
notmuch-deliver into notmuch.
Though it could be used as an alternative to notmuch new, the reason
I want this is to allow my notmuch frontend to add postponed or sent
messages to the mail store and notmuch database, without resorting to
another tool (e.g. notmuch-deliver) nor directly modifying the maildir.
---
Makefile.local | 1 +
notmuch-client.h | 3 +
notmuch-insert.c | 336 +++
notmuch.c| 3 +
4 files changed, 343 insertions(+)
create mode 100644 notmuch-insert.c
diff --git a/Makefile.local b/Makefile.local
index c274f07..bb2381d 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -261,6 +261,7 @@ notmuch_client_srcs = \
notmuch-config.c\
notmuch-count.c \
notmuch-dump.c \
+ notmuch-insert.c\
notmuch-new.c \
notmuch-reply.c \
notmuch-restore.c \
diff --git a/notmuch-client.h b/notmuch-client.h
index 45749a6..da332f3 100644
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -180,6 +180,9 @@ int
notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]);
int
+notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[]);
+
+int
notmuch_reply_command (notmuch_config_t *config, int argc, char *argv[]);
int
diff --git a/notmuch-insert.c b/notmuch-insert.c
new file mode 100644
index 000..19b1cf9
--- /dev/null
+++ b/notmuch-insert.c
@@ -0,0 +1,336 @@
+/* notmuch - Not much of an email program, (just index and search)
+ *
+ * Copyright © 2013 Peter Wang
+ *
+ * Based in part on notmuch-deliver
+ * Copyright © 2010 Ali Polatel
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/ .
+ *
+ * Author: Peter Wang noval...@gmail.com
+ */
+
+#include notmuch-client.h
+#include tag-util.h
+
+#include sys/types.h
+#include sys/stat.h
+#include fcntl.h
+
+static volatile sig_atomic_t interrupted;
+
+static void
+handle_sigint (unused (int sig))
+{
+static char msg[] = Stopping... \n;
+
+/* This write is opportunistic, so it's okay to ignore the
+ * result. It is not required for correctness, and if it does
+ * fail or produce a short write, we want to get out of the signal
+ * handler as quickly as possible, not retry it. */
+IGNORE_RESULT (write (2, msg, sizeof (msg) - 1));
+interrupted = 1;
+}
+
+/* Like gethostname but guarantees that a null-terminated hostname is
+ * returned, even if it has to make one up. Invalid characters are
+ * substituted such that the hostname can be used within a filename.
+ */
+static void
+safe_gethostname (char *hostname, size_t len)
+{
+char *p;
+
+if (gethostname (hostname, len) == -1) {
+ strncpy (hostname, unknown, len);
+}
+hostname[len - 1] = '\0';
+
+for (p = hostname; *p != '\0'; p++) {
+ if (*p == '/' || *p == ':')
+ *p = '_';
+}
+}
+
+/* Call fsync() on a directory path. */
+static notmuch_bool_t
+sync_dir (const char *dir)
+{
+notmuch_bool_t ret;
+int fd;
+
+fd = open (dir, O_RDONLY);
+if (fd == -1) {
+ fprintf (stderr, Error: open() dir failed: %s\n, strerror (errno));
+ return FALSE;
+}
+ret = (fsync (fd) == 0);
+if (! ret) {
+ fprintf (stderr, Error: fsync() dir failed: %s\n, strerror (errno));
+}
+close (fd);
+return ret;
+}
+
+/* Open a unique file in the Maildir 'tmp' directory.
+ * Returns the file descriptor on success, or -1 on failure.
+ * On success, file paths for the message in the 'tmp' and 'new'
+ * directories are returned via tmppath and newpath,
+ * and the path of the 'new' directory itself in newdir. */
+static int
+maildir_open_tmp_file (void *ctx, const char *dir,
+ char **tmppath, char **newpath, char **newdir)
+{
+pid_t pid;
+char hostname[256];
+struct timeval tv;
+char *filename;
+int fd = -1;
+
+/* We follow the Dovecot file name generation algorithm. */
+pid = getpid ();
+safe_gethostname (hostname, sizeof (hostname));
+do {
+ gettimeofday (tv, NULL);
+ filename = talloc_asprintf (ctx, %ld.M%ldP%d.%s,
+
[PATCH v5 04/12] man: document 'insert' command
Add initial documentation for notmuch insert command. --- man/Makefile.local| 1 + man/man1/notmuch-insert.1 | 38 ++ 2 files changed, 39 insertions(+) create mode 100644 man/man1/notmuch-insert.1 diff --git a/man/Makefile.local b/man/Makefile.local index 72e2a18..216aaa0 100644 --- a/man/Makefile.local +++ b/man/Makefile.local @@ -12,6 +12,7 @@ MAN1 := \ $(dir)/man1/notmuch-count.1 \ $(dir)/man1/notmuch-dump.1 \ $(dir)/man1/notmuch-restore.1 \ + $(dir)/man1/notmuch-insert.1 \ $(dir)/man1/notmuch-new.1 \ $(dir)/man1/notmuch-reply.1 \ $(dir)/man1/notmuch-search.1 \ diff --git a/man/man1/notmuch-insert.1 b/man/man1/notmuch-insert.1 new file mode 100644 index 000..870e1bc --- /dev/null +++ b/man/man1/notmuch-insert.1 @@ -0,0 +1,38 @@ +.TH NOTMUCH-INSERT 1 2013-xx-xx Notmuch 0.xx +.SH NAME +notmuch-insert \- add a message to the maildir and notmuch database +.SH SYNOPSIS + +.B notmuch insert +.RI [ + tag |\- tag ... ] + +.SH DESCRIPTION + +.B notmuch insert +reads a message from standard input +and delivers it into the maildir directory given by configuration option +.BR database.path , +then incorporates the message into the notmuch database. +It is an alternative to using a separate tool to deliver +the message then running +.B notmuch new +afterwards. + +The new message will be tagged with the tags specified by the +.B new.tags +configuration option, then by operations specified on the command-line: +tags prefixed by '+' are added while +those prefixed by '\-' are removed. + +If the new message is a duplicate of an existing message in the database +(it has same Message-ID), it will be added to the maildir folder and +notmuch database, but the tags will not be changed. + +.RE +.SH SEE ALSO + +\fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1), +\fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-reply\fR(1), +\fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1), +\fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1), +\fBnotmuch-tag\fR(1) -- 1.7.12.1 ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
[PATCH v5 05/12] man: reference notmuch-insert.1
Add references to notmuch-insert.1 from other man pages.
---
man/man1/notmuch-config.1 | 4 ++--
man/man1/notmuch-count.1| 4 ++--
man/man1/notmuch-dump.1 | 4 ++--
man/man1/notmuch-new.1 | 4 ++--
man/man1/notmuch-reply.1| 3 ++-
man/man1/notmuch-restore.1 | 3 ++-
man/man1/notmuch-search.1 | 3 ++-
man/man1/notmuch-show.1 | 3 ++-
man/man1/notmuch-tag.1 | 3 ++-
man/man1/notmuch.1 | 3 ++-
man/man5/notmuch-hooks.5| 4 ++--
man/man7/notmuch-search-terms.7 | 3 ++-
12 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/man/man1/notmuch-config.1 b/man/man1/notmuch-config.1
index db31166..1635951 100644
--- a/man/man1/notmuch-config.1
+++ b/man/man1/notmuch-config.1
@@ -152,7 +152,7 @@ use ${HOME}/.notmuch\-config if this variable is not set.
.SH SEE ALSO
\fBnotmuch\fR(1), \fBnotmuch-count\fR(1), \fBnotmuch-dump\fR(1),
-\fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), \fBnotmuch-reply\fR(1),
-\fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1),
+\fBnotmuch-hooks\fR(5), \fBnotmuch-insert\fR(1), \fBnotmuch-new\fR(1),
+\fBnotmuch-reply\fR(1), \fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1),
\fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1),
\fBnotmuch-tag\fR(1)
diff --git a/man/man1/notmuch-count.1 b/man/man1/notmuch-count.1
index 7fc4378..c172a22 100644
--- a/man/man1/notmuch-count.1
+++ b/man/man1/notmuch-count.1
@@ -72,7 +72,7 @@ Read input from given file, instead of from stdin. Implies
.SH SEE ALSO
\fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-dump\fR(1),
-\fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), \fBnotmuch-reply\fR(1),
-\fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1),
+\fBnotmuch-hooks\fR(5), \fBnotmuch-insert\fR(1), \fBnotmuch-new\fR(1),
+\fBnotmuch-reply\fR(1), \fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1),
\fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1),
\fBnotmuch-tag\fR(1)
diff --git a/man/man1/notmuch-dump.1 b/man/man1/notmuch-dump.1
index 3fa51bd..a758a52 100644
--- a/man/man1/notmuch-dump.1
+++ b/man/man1/notmuch-dump.1
@@ -92,7 +92,7 @@ for details of the supported syntax for search-terms.
.SH SEE ALSO
\fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1),
-\fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), \fBnotmuch-reply\fR(1),
-\fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1),
+\fBnotmuch-hooks\fR(5), \fBnotmuch-insert\fR(1), \fBnotmuch-new\fR(1),
+\fBnotmuch-reply\fR(1), \fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1),
\fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1),
\fBnotmuch-tag\fR(1)
diff --git a/man/man1/notmuch-new.1 b/man/man1/notmuch-new.1
index 02f7954..3fcfc29 100644
--- a/man/man1/notmuch-new.1
+++ b/man/man1/notmuch-new.1
@@ -64,7 +64,7 @@ Prevents hooks from being run.
.SH SEE ALSO
\fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1),
-\fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-reply\fR(1),
-\fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1),
+\fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-insert\fR(1),
+\fBnotmuch-reply\fR(1), \fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1),
\fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1),
\fBnotmuch-tag\fR(1)
diff --git a/man/man1/notmuch-reply.1 b/man/man1/notmuch-reply.1
index bf2021f..f0394b2 100644
--- a/man/man1/notmuch-reply.1
+++ b/man/man1/notmuch-reply.1
@@ -126,7 +126,8 @@ The requested format version is too new.
.SH SEE ALSO
\fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1),
-\fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1),
+\fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5),
+\fBnotmuch-insert\fR(1), \fBnotmuch-new\fR(1),
\fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1),
\fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1),
\fBnotmuch-tag\fR(1)
diff --git a/man/man1/notmuch-restore.1 b/man/man1/notmuch-restore.1
index 4ec4c80..686c0ac 100644
--- a/man/man1/notmuch-restore.1
+++ b/man/man1/notmuch-restore.1
@@ -84,7 +84,8 @@ should be accurate.
.SH SEE ALSO
\fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1),
-\fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1),
+\fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5),
+\fBnotmuch-insert\fR(1), \fBnotmuch-new\fR(1),
\fBnotmuch-reply\fR(1), \fBnotmuch-search\fR(1),
\fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1),
\fBnotmuch-tag\fR(1)
diff --git a/man/man1/notmuch-search.1 b/man/man1/notmuch-search.1
index d3391f8..1861b54 100644
--- a/man/man1/notmuch-search.1
+++ b/man/man1/notmuch-search.1
@@ -155,7 +155,8 @@ The requested format version is too new.
.SH SEE ALSO
\fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1),
-\fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1),
+\fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5),
+\fBnotmuch-insert\fR(1), \fBnotmuch-new\fR(1),
\fBnotmuch-reply\fR(1), \fBnotmuch-restore\fR(1),
\fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1),
[PATCH v5 06/12] test: add tests for insert
Add tests for new 'insert' command.
---
test/insert | 69 +++
test/notmuch-test | 1 +
2 files changed, 70 insertions(+)
create mode 100755 test/insert
diff --git a/test/insert b/test/insert
new file mode 100755
index 000..d880af9
--- /dev/null
+++ b/test/insert
@@ -0,0 +1,69 @@
+#!/usr/bin/env bash
+test_description='notmuch insert'
+. ./test-lib.sh
+
+# Create directories and database before inserting.
+mkdir -p $MAIL_DIR/{cur,new,tmp}
+mkdir -p $MAIL_DIR/Drafts/{cur,new,tmp}
+notmuch new /dev/null
+
+# We use generate_message to create the temporary message files.
+# They happen to be in the mail directory already but that is okay
+# since we do not call notmuch new hereafter.
+
+gen_insert_msg() {
+generate_message \
+ [subject]=\insert-subject\ \
+ [date]=\Sat, 01 Jan 2000 12:00:00 -\ \
+ [body]=\insert-message\
+}
+
+test_begin_subtest Insert message, copied exactly
+gen_insert_msg
+notmuch insert $gen_msg_filename
+cur_msg_filename=$(notmuch search --output=files subject:insert-subject)
+test_expect_equal_file $cur_msg_filename $gen_msg_filename
+
+test_begin_subtest Insert message, default tags
+output=$(notmuch show --format=json subject:insert-subject)
+expected='[[[{
+ id: '${gen_msg_id}',
+ match: true,
+ excluded: false,
+ filename: '${cur_msg_filename}',
+ timestamp: 946728000,
+ date_relative: 2000-01-01,
+ tags: [inbox,unread],
+ headers: {
+ Subject: insert-subject,
+ From: Notmuch Test Suite test_su...@notmuchmail.org,
+ To: Notmuch Test Suite test_su...@notmuchmail.org,
+ Date: Sat, 01 Jan 2000 12:00:00 +},
+ body: [{id: 1,
+ content-type: text/plain,
+ content: insert-message\n}]},
+ ['
+test_expect_equal_json $output $expected
+
+test_begin_subtest Insert message, duplicate message
+notmuch insert +duptag -unread $gen_msg_filename
+output=$(notmuch search --output=files subject:insert-subject | wc -l)
+test_expect_equal $output 2
+
+test_begin_subtest Insert message, duplicate message does not change tags
+output=$(notmuch search --format=json --output=tags subject:insert-subject)
+test_expect_equal_json $output '[inbox, unread]'
+
+test_begin_subtest Insert message, add tag
+gen_insert_msg
+notmuch insert +custom $gen_msg_filename
+output=$(notmuch count tag:custom)
+test_expect_equal $output 1
+
+test_begin_subtest Insert message, add/remove tag
+gen_insert_msg
+notmuch insert +custom -unread $gen_msg_filename
+output=$(notmuch count tag:custom NOT tag:unread)
+test_expect_equal $output 1
+
+test_done
diff --git a/test/notmuch-test b/test/notmuch-test
index ca9c3dc..6952f0a 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -22,6 +22,7 @@ TESTS=
config
new
count
+ insert
search
search-output
search-by-folder
--
1.7.12.1
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch
[PATCH v5 07/12] insert: add --folder option
Allow the new message to be inserted into a folder within the Maildir
hierarchy instead of the top-level folder.
---
notmuch-insert.c | 47 +--
1 file changed, 45 insertions(+), 2 deletions(-)
diff --git a/notmuch-insert.c b/notmuch-insert.c
index 19b1cf9..778ac04 100644
--- a/notmuch-insert.c
+++ b/notmuch-insert.c
@@ -83,6 +83,23 @@ sync_dir (const char *dir)
return ret;
}
+/* Check the specified folder name does not contain a directory
+ * component .. to prevent writes outside of the Maildir hierarchy. */
+static notmuch_bool_t
+check_folder_name (const char *folder)
+{
+const char *p = folder;
+
+for (;;) {
+ if ((p[0] == '.') (p[1] == '.') (p[2] == '\0' || p[2] == '/'))
+ return FALSE;
+ p = strchr (p, '/');
+ if (!p)
+ return TRUE;
+ p++;
+}
+}
+
/* Open a unique file in the Maildir 'tmp' directory.
* Returns the file descriptor on success, or -1 on failure.
* On success, file paths for the message in the 'tmp' and 'new'
@@ -287,11 +304,25 @@ notmuch_insert_command (notmuch_config_t *config, int
argc, char *argv[])
size_t new_tags_length;
tag_op_list_t *tag_ops;
char *query_string = NULL;
+const char *folder = NULL;
const char *maildir;
-int opt_index = 1;
+int opt_index;
unsigned int i;
notmuch_bool_t ret;
+notmuch_opt_desc_t options[] = {
+ { NOTMUCH_OPT_STRING, folder, folder, 0, 0 },
+ { NOTMUCH_OPT_END, 0, 0, 0, 0 }
+};
+
+opt_index = parse_arguments (argc, argv, options, 1);
+
+if (opt_index 0) {
+ fprintf (stderr, Error: bad argument to notmuch insert: %s\n,
+argv[-opt_index]);
+ return 1;
+}
+
db_path = notmuch_config_get_database_path (config);
new_tags = notmuch_config_get_new_tags (config, new_tags_length);
@@ -314,7 +345,19 @@ notmuch_insert_command (notmuch_config_t *config, int
argc, char *argv[])
return 1;
}
-maildir = db_path;
+if (folder == NULL) {
+ maildir = db_path;
+} else {
+ if (! check_folder_name (folder)) {
+ fprintf (stderr, Error: bad folder name: %s\n, folder);
+ return 1;
+ }
+ maildir = talloc_asprintf (config, %s/%s, db_path, folder);
+ if (! maildir) {
+ fprintf (stderr, Out of memory\n);
+ return 1;
+ }
+}
/* Setup our handler for SIGINT. We do not set SA_RESTART so that copying
* from standard input may be interrupted. */
--
1.7.12.1
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch
[PATCH v5 09/12] test: test insert --folder option
Add tests for notmuch insert --folder option. --- test/insert | 17 + 1 file changed, 17 insertions(+) diff --git a/test/insert b/test/insert index d880af9..44e071c 100755 --- a/test/insert +++ b/test/insert @@ -66,4 +66,21 @@ notmuch insert +custom -unread $gen_msg_filename output=$(notmuch count tag:custom NOT tag:unread) test_expect_equal $output 1 +test_begin_subtest Insert message, folder +gen_insert_msg +notmuch insert --folder=Drafts $gen_msg_filename +output=$(notmuch search --output=files folder:Drafts) +dirname=$(dirname $output) +test_expect_equal $dirname $MAIL_DIR/Drafts/cur + +test_begin_subtest Insert message, folder and tags +gen_insert_msg +notmuch insert --folder=Drafts +draft -unread $gen_msg_filename +output=$(notmuch count folder:Drafts tag:draft NOT tag:unread) +test_expect_equal $output 1 + +gen_insert_msg +test_expect_code 1 Insert message, non-existent folder \ +notmuch insert --folder=nonesuch $gen_msg_filename + test_done -- 1.7.12.1 ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
[PATCH v5 10/12] insert: add --create-folder option
Allow the insert command to create the maildir folder
into which the new message should be delivered.
---
notmuch-insert.c | 100 +++
1 file changed, 100 insertions(+)
diff --git a/notmuch-insert.c b/notmuch-insert.c
index 778ac04..8ae5dc9 100644
--- a/notmuch-insert.c
+++ b/notmuch-insert.c
@@ -100,6 +100,99 @@ check_folder_name (const char *folder)
}
}
+/* Make the given directory, succeeding if it already exists. */
+static notmuch_bool_t
+make_directory (char *path, int mode)
+{
+notmuch_bool_t ret;
+char *slash;
+
+if (mkdir (path, mode) != 0)
+ return (errno == EEXIST);
+
+/* Sync the parent directory for durability. */
+ret = TRUE;
+slash = strrchr (path, '/');
+if (slash) {
+ *slash = '\0';
+ ret = sync_dir (path);
+ *slash = '/';
+}
+return ret;
+}
+
+/* Make the given directory including its parent directories as necessary.
+ * Return TRUE on success, FALSE on error. */
+static notmuch_bool_t
+make_directory_and_parents (char *path, int mode)
+{
+struct stat st;
+char *start;
+char *end;
+notmuch_bool_t ret;
+
+/* First check the common case: directory already exists. */
+if (stat (path, st) == 0)
+ return S_ISDIR (st.st_mode) ? TRUE : FALSE;
+
+for (start = path; *start != '\0'; start = end + 1) {
+ /* start points to the first unprocessed character.
+* Find the next slash from start onwards. */
+ end = strchr (start, '/');
+
+ /* If there are no more slashes then all the parent directories
+* have been made. Now attempt to make the whole path. */
+ if (end == NULL)
+ return make_directory (path, mode);
+
+ /* Make the path up to the next slash, unless the current
+* directory component is actually empty. */
+ if (end start) {
+ *end = '\0';
+ ret = make_directory (path, mode);
+ *end = '/';
+ if (! ret)
+ return FALSE;
+ }
+}
+
+return TRUE;
+}
+
+/* Create the given maildir folder, i.e. dir and its subdirectories
+ * 'cur', 'new', 'tmp'. */
+static notmuch_bool_t
+maildir_create_folder (void *ctx, const char *dir)
+{
+const int mode = 0700;
+char *subdir;
+char *tail;
+
+/* Create 'cur' directory, including parent directories. */
+subdir = talloc_asprintf (ctx, %s/cur, dir);
+if (! subdir) {
+ fprintf (stderr, Out of memory.\n);
+ return FALSE;
+}
+if (! make_directory_and_parents (subdir, mode))
+ return FALSE;
+
+tail = subdir + strlen (subdir) - 3;
+
+/* Create 'new' directory. */
+strcpy (tail, new);
+if (! make_directory (subdir, mode))
+ return FALSE;
+
+/* Create 'tmp' directory. */
+strcpy (tail, tmp);
+if (! make_directory (subdir, mode))
+ return FALSE;
+
+talloc_free (subdir);
+return TRUE;
+}
+
/* Open a unique file in the Maildir 'tmp' directory.
* Returns the file descriptor on success, or -1 on failure.
* On success, file paths for the message in the 'tmp' and 'new'
@@ -305,6 +398,7 @@ notmuch_insert_command (notmuch_config_t *config, int argc,
char *argv[])
tag_op_list_t *tag_ops;
char *query_string = NULL;
const char *folder = NULL;
+notmuch_bool_t create_folder = FALSE;
const char *maildir;
int opt_index;
unsigned int i;
@@ -312,6 +406,7 @@ notmuch_insert_command (notmuch_config_t *config, int argc,
char *argv[])
notmuch_opt_desc_t options[] = {
{ NOTMUCH_OPT_STRING, folder, folder, 0, 0 },
+ { NOTMUCH_OPT_BOOLEAN, create_folder, create-folder, 0, 0 },
{ NOTMUCH_OPT_END, 0, 0, 0, 0 }
};
@@ -357,6 +452,11 @@ notmuch_insert_command (notmuch_config_t *config, int
argc, char *argv[])
fprintf (stderr, Out of memory\n);
return 1;
}
+ if (create_folder ! maildir_create_folder (config, maildir)) {
+ fprintf (stderr, Error: creating maildir %s: %s\n,
+maildir, strerror (errno));
+ return 1;
+ }
}
/* Setup our handler for SIGINT. We do not set SA_RESTART so that copying
--
1.7.12.1
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch
[PATCH v5 11/12] man: document insert --create-folder
Add documentation for notmuch insert --create-folder option. --- man/man1/notmuch-insert.1 | 12 1 file changed, 12 insertions(+) diff --git a/man/man1/notmuch-insert.1 b/man/man1/notmuch-insert.1 index 0d7bccd..74d6a3d 100644 --- a/man/man1/notmuch-insert.1 +++ b/man/man1/notmuch-insert.1 @@ -43,6 +43,18 @@ relative to the top-level directory given by the value of The default is to deliver to the top-level directory. .RE + +.RS 4 +.TP 4 +.B --create-folder + +Try to create the folder named by the +.B --folder +option, if it does not exist. +Otherwise the folder must already exist for mail +delivery to succeed. + +.RE .SH SEE ALSO \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1), -- 1.7.12.1 ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
[PATCH v5 12/12] test: test insert --create-folder option
Add tests for notmuch insert --create-folder option.
---
test/insert | 24
1 file changed, 24 insertions(+)
diff --git a/test/insert b/test/insert
index 44e071c..24a61e1 100755
--- a/test/insert
+++ b/test/insert
@@ -83,4 +83,28 @@ gen_insert_msg
test_expect_code 1 Insert message, non-existent folder \
notmuch insert --folder=nonesuch $gen_msg_filename
+test_begin_subtest Insert message, create folder
+gen_insert_msg
+notmuch insert --folder=F --create-folder +folder $gen_msg_filename
+output=$(notmuch search --output=files folder:F tag:folder)
+basename=$(basename $output)
+test_expect_equal_file $gen_msg_filename $MAIL_DIR/F/cur/${basename}
+
+test_begin_subtest Insert message, create subfolder
+gen_insert_msg
+notmuch insert --folder=F/G/H/I/J --create-folder +folder $gen_msg_filename
+output=$(notmuch search --output=files folder:F/G/H/I/J tag:folder)
+basename=$(basename $output)
+test_expect_equal_file $gen_msg_filename
${MAIL_DIR}/F/G/H/I/J/cur/${basename}
+
+test_begin_subtest Insert message, create existing subfolder
+gen_insert_msg
+notmuch insert --folder=F/G/H/I/J --create-folder +folder $gen_msg_filename
+output=$(notmuch count folder:F/G/H/I/J tag:folder)
+test_expect_equal $output 2
+
+gen_insert_msg
+test_expect_code 1 Insert message, create invalid subfolder \
+notmuch insert --folder=../G --create-folder $gen_msg_filename
+
test_done
--
1.7.12.1
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch
RE: the future of notmuch-vim?
Felipe Contreras felipe.contre...@gmail.com writes: I did try the emacs frontend, and it was not working properly for me at the time, and I believe I documented my issues. It was not just my dislike of emacs that motivated me to write notmuch-vim-ruby. I could only find a comment about the (admittedly imperfect) handling of HTML messages in emacs. Was there some other issues you remember? If you can point me to message-ids, I'd appreciate it. I've been trying to get http://nmbug.tethera.net/status/#Bugs up to date by tagging unresolved bugs reported to the mailing list. d PS: for what it's worth (and mainly for the benefit of others reading this thread), I find the combination of toggling visibility of mime parts and the shr renderer in emacs24 has noticably improved my experience with HTML email. YMMV, of course. ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
