[PATCH 1/4] test: insert into the folder with trailing /

[Yuri Volchkov]

From database's point of view, "Drafts" and "Drafts/" are different
folders

Signed-off-by: Yuri Volchkov 
---
 test/T070-insert.sh | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/test/T070-insert.sh b/test/T070-insert.sh
index 48f212e..380934a 100755
--- a/test/T070-insert.sh
+++ b/test/T070-insert.sh
@@ -132,6 +132,13 @@ output=$(notmuch search --output=files path:Drafts/new)
 dirname=$(dirname "$output")
 test_expect_equal "$dirname" "$MAIL_DIR/Drafts/new"
 
+test_begin_subtest "Insert message into folder with trailing /"
+gen_insert_msg
+notmuch insert --folder=Drafts/ < "$gen_msg_filename"
+output=$(notmuch search --output=files id:${gen_msg_id})
+dirname=$(dirname "$output")
+test_expect_equal "$dirname" "$MAIL_DIR/Drafts/new"
+
 test_begin_subtest "Insert message into folder, add/remove tags"
 gen_insert_msg
 notmuch insert --folder=Drafts +draft -unread < "$gen_msg_filename"
-- 
2.7.4

___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch

[PATCH 3/4] test: show id:<> works even if the first duplicated is deleted

[Yuri Volchkov]

Signed-off-by: Yuri Volchkov 
---
 test/T670-duplicate-mid.sh | 25 +
 1 file changed, 25 insertions(+)

diff --git a/test/T670-duplicate-mid.sh b/test/T670-duplicate-mid.sh
index ea5e1d6..decbc0a 100755
--- a/test/T670-duplicate-mid.sh
+++ b/test/T670-duplicate-mid.sh
@@ -37,4 +37,29 @@ notmuch reindex '*'
 notmuch search --output=files "sekrit" | notmuch_dir_sanitize > OUTPUT
 test_expect_equal_file EXPECTED OUTPUT
 
+rm ${MAIL_DIR}/copy1
+test_begin_subtest 'Deleted first duplicate file does not stop notmuch show 
from working'
+output=$(notmuch show --body=false --format=json id:duplicate)
+expected='[[[{
+"id": "'duplicate'",
+"match": true,
+"excluded": false,
+"filename": [
+"'"${MAIL_DIR}"/copy1'",
+"'"${MAIL_DIR}"/copy2'"
+],
+"timestamp": 978709435,
+"date_relative": "2001-01-05",
+"tags": ["inbox","unread"],
+"headers": {
+"Subject": "message 2",
+"From": "Notmuch Test Suite ",
+"To": "Notmuch Test Suite ",
+"Date": "Fri, 05 Jan 2001 15:43:55 +"
+}
+ },
+['
+
+test_expect_equal_json "$output" "$expected"
+
 test_done
-- 
2.7.4

___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch

[PATCH 4/4] show: workaround for the missing file problem

[Yuri Volchkov]

If a message to be shown has several duplicated files, and for some
reason the first file in the list is not available anymore, notmuch
will exit with error.

This is clearly a problem in the database, but we are not going to let
this problem be a show-stopper. Let's walk through the list, and show
the first existing file.

Signed-off-by: Yuri Volchkov 
---
 mime-node.c | 28 
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/mime-node.c b/mime-node.c
index bb0870d..24d73af 100644
--- a/mime-node.c
+++ b/mime-node.c
@@ -79,12 +79,32 @@ mime_node_open (const void *ctx, notmuch_message_t *message,
 }
 talloc_set_destructor (mctx, _mime_node_context_free);
 
+/* Fast path */
 mctx->file = fopen (filename, "r");
 if (! mctx->file) {
-   fprintf (stderr, "Error opening %s: %s\n", filename, strerror (errno));
-   status = NOTMUCH_STATUS_FILE_ERROR;
-   goto DONE;
-}
+   /* Slow path - for some reason the first file in the list is
+* not available anymore. This is clearly a problem in the
+* database, but we are not going to let this problem be a
+* show stopper */
+   notmuch_filenames_t *filenames;
+   for (filenames = notmuch_message_get_filenames (message);
+notmuch_filenames_valid (filenames);
+notmuch_filenames_move_to_next (filenames))
+   {
+   filename = notmuch_filenames_get (filenames);
+   mctx->file = fopen (filename, "r");
+   if (mctx->file)
+   break;
+   }
+
+   talloc_free (filenames);
+   if (! mctx->file) {
+   /* Give up */
+   fprintf (stderr, "Error opening %s: %s\n", filename, strerror 
(errno));
+   status = NOTMUCH_STATUS_FILE_ERROR;
+   goto DONE;
+   }
+   }
 
 mctx->stream = g_mime_stream_file_new (mctx->file);
 if (!mctx->stream) {
-- 
2.7.4

___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch

[PATCH 2/4] insert: strip trailing / in folder path

[Yuri Volchkov]

I have faced a problem, that messages sent by emacs could not be shown
or found later. The "notmuch show id:" says "no such file or
directory".

The reason of this behavior is the following chain of events:
1) While sending a message, emacs calls
  notmuch insert --folder=maildir/Sent/ < test.msg

   From database's point of view, "Sent" and "Sent/" are different
   folders, and the separate record is created for the "Sent/".

   For the sake of simplicity let's assume inserted message will be
   stored as "maildir/Sent//new/msg_file_orig" (note the double slash)

2) During next sync, offlineimap uploads this message to the server,
   renames the source file according to his or servers naming
   convention. Let's say it is renamed to
   "maildir/Sent/new/msg_file_renamed"

3) The "notmuch new" command, composes a list of folders which has
   been modified. Obviously, the "Sent" dir is going to be in this
   list, but not the "Sent/".

   When notmuch scans the "Sent" folder, it finds the new file
   "maildir/Sent/new/msg_file_renamed", and adds it to the database as
   a duplicated of the message inserted in the step 1.

   But, notmuch does not notice that the file
   "maildir/Sent//new/msg_file_orig" has been deleted. So it
   erroneously stays in the database.

4) Next time, the user wants to see this email, the command "notmuch
   show id:" picks the first message file, stored in
   the database record, which happens to be the non-existing
   "maildir/Sent//new/msg_file_orig".

The solution is simple, we have to strip trailing '/' from the insert
path.

Signed-off-by: Yuri Volchkov 
---
 lib/database.cc|  3 +--
 notmuch-insert.c   |  4 +++-
 util/string-util.c | 13 +
 util/string-util.h |  2 ++
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/lib/database.cc b/lib/database.cc
index 8f0e22a..79eb3d6 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -858,8 +858,7 @@ notmuch_database_open_verbose (const char *path,
 notmuch->status_string = NULL;
 notmuch->path = talloc_strdup (notmuch, path);
 
-if (notmuch->path[strlen (notmuch->path) - 1] == '/')
-   notmuch->path[strlen (notmuch->path) - 1] = '\0';
+strip_trailing(notmuch->path, '/');
 
 notmuch->mode = mode;
 notmuch->atomic_nesting = 0;
diff --git a/notmuch-insert.c b/notmuch-insert.c
index bc96af0..2590e83 100644
--- a/notmuch-insert.c
+++ b/notmuch-insert.c
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include "string-util.h"
 
 static volatile sig_atomic_t interrupted;
 
@@ -451,7 +452,7 @@ 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;
+char *folder = NULL;
 notmuch_bool_t create_folder = FALSE;
 notmuch_bool_t keep = FALSE;
 notmuch_bool_t no_hooks = FALSE;
@@ -511,6 +512,7 @@ notmuch_insert_command (notmuch_config_t *config, int argc, 
char *argv[])
 if (folder == NULL) {
maildir = db_path;
 } else {
+   strip_trailing (folder, '/');
if (! is_valid_folder_name (folder)) {
fprintf (stderr, "Error: invalid folder name: '%s'\n", folder);
return EXIT_FAILURE;
diff --git a/util/string-util.c b/util/string-util.c
index 1812530..b010881 100644
--- a/util/string-util.c
+++ b/util/string-util.c
@@ -255,3 +255,16 @@ strcase_hash (const void *ptr)
 
 return hash;
 }
+
+void
+strip_trailing (char *str, char ch)
+{
+int i;
+
+for (i = strlen (str) - 1; i >= 0; i--) {
+   if (str[i] == ch)
+   str[i] = '\0';
+   else
+   break;
+}
+}
diff --git a/util/string-util.h b/util/string-util.h
index 87917b8..9777061 100644
--- a/util/string-util.h
+++ b/util/string-util.h
@@ -75,6 +75,8 @@ int strcase_equal (const void *a, const void *b);
 /* GLib GHashFunc compatible case insensitive hash function */
 unsigned int strcase_hash (const void *ptr);
 
+void strip_trailing (char *str, char ch);
+
 #ifdef __cplusplus
 }
 #endif
-- 
2.7.4

___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch

[PATCH 0/4] fix "no such file" problem for emails send by emacs

[Yuri Volchkov]

Hi,

I have faced a problem, that messages sent by emacs could not be shown
or found later. The "notmuch show id:" says "no such file or
directory".

This patch series fixes the problem related to my use case. The
detailed description of the root cause is provided in the related
patch.

Yuri Volchkov (4):
  test: insert into the folder with trailing /
  insert: strip trailing / in folder path
  test: show id:<> works even if the first duplicated is deleted
  show: workaround for the missing file problem

 lib/database.cc|  3 +--
 mime-node.c| 28 
 notmuch-insert.c   |  4 +++-
 test/T070-insert.sh|  7 +++
 test/T670-duplicate-mid.sh | 25 +
 util/string-util.c | 13 +
 util/string-util.h |  2 ++
 7 files changed, 75 insertions(+), 7 deletions(-)

-- 
2.7.4

___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch

[PATCH] test: remove remainder of previously killed basic test

[Yuri Volchkov]

In the commit 51cd69feb1d131db7a468e33e0fa2e043caad41e the part of the
test "test runs if prerequisite is satisfied" has been
removed. However, there was a remainder of that test - variable
'haveit'.

Kill it, to not to confuse people.

Signed-off-by: Yuri Volchkov 
---
 test/T000-basic.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/T000-basic.sh b/test/T000-basic.sh
index 36a7ca4..a4efa3c 100755
--- a/test/T000-basic.sh
+++ b/test/T000-basic.sh
@@ -23,8 +23,7 @@ test_expect_success ':'
 
 test_begin_subtest 'test runs if prerequisite is satisfied'
 test_set_prereq HAVEIT
-haveit=no
-test_expect_success 'test_have_prereq HAVEIT && haveit=yes'
+test_expect_success 'test_have_prereq HAVEIT'
 
 test_begin_subtest 'tests clean up after themselves'
 clean=no
-- 
2.7.4

___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch

Re: notmuch search does not work with search term 'id:'

[Jörg Volbers]

That was helpful! The output is:

Query(((Tmail AND 0 * 
QE5-a1wt6bgr-elaine/2/42589-dc960...@nlsender05.ui-portal.com) 
AND_NOT (Kdeleted OR Kspam)))


Actually my config has "search.exclude_tags=deleted;spam" set, and 
the mail IS a spam mail. (I wanted to train bogofilter).


Did not know that such an exclusion occurs. Makes sense, though.

Adding --exclude=false to the search makes it behave well.

Thanks for the help!



David Bremner  writes:

Jörg Volbers  writes: 
 
This is the ID which I am using for testing: 

E5-a1wt6bgr-elaine/2/42589-dc960...@nlsender05.ui-portal.com 

Can you try 

NOTMUCH_DEBUG_QUERY=y notmuch search 
id:E5-a1wt6bgr-elaine/2/42589-dc960...@nlsender05.ui-portal.com 

and report the output after "Final query is:" 

d 


--
http://www.joergvolbers.de
https://fu-berlin.academia.edu/jvolbers


signature.asc
Description: PGP signature
___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch

Re: [PATCH] go: update bindings to compile with notmuch 0.25

[David Bremner]

Kamil Klimkiewicz  writes:

> Attached is a simple patch that fixes go bindings to compile with
> notmuch 0.25. Please note it doesn't change the go API, ie. go methods
> *don't* return Status values. I am not sure you also want to break go
> API with the update. If you do, I can update the patch to return
> go-idiomatic (*Messages, Status) tuple.

for some reason this patch doesn't apply to current master

> ---
>  contrib/go/src/notmuch/notmuch.go | 18 +++---
>  1 file changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/contrib/go/src/notmuch/notmuch.go
> b/contrib/go/src/notmuch/notmuch.go
> index 2d684311..936f927c 100644
> --- a/contrib/go/src/notmuch/notmuch.go
> +++ b/contrib/go/src/notmuch/notmuch.go
> @@ -455,11 +455,12 @@ func (self *Query) GetSort() Sort {
>   * If a Xapian exception occurs this function will return NULL.
>   */
>  func (self *Query) SearchThreads() *Threads {
> -   threads := C.notmuch_query_search_threads(self.query)
> -   if threads == nil {
> +   var threads Threads
> +   C.notmuch_query_search_threads(self.query, )
> +   if threads.threads == nil {

it seems like it would be better to check the return value of
notmuch_query_search_threads here, wouldn't it?
>  /* Destroy a notmuch_query_t along with any associated resources.
> @@ -531,7 +533,9 @@ func (self *Query) Destroy() {
>   * printing a message).
>   */
>  func (self *Query) CountMessages() uint {
> -   return uint(C.notmuch_query_count_messages(self.query))
> +   var count C.uint
> +   C.notmuch_query_count_messages(self.query, )
> +   return uint(count)
>  }

Here especially you should check the return value since the API does not
promise anything about the value of count in case of errors.

d
___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch

Re: Wish: notmuch-emacs: allow for reply to attached message/rfc822 message

[David Bremner]

Gregor Zattler  writes:

> Dear notmuch developers,
>
> it would be great if it was possible in notmuch-emacs to reply to
> the very mime part of a message, the cursor is in.
>
> Use case: Mailman sends emails for approval to list owners where
> the last mime parts are a rfc822 attachment to which said list
> owner may answer in order to delete the pending message from the
> mailman queue (approval is more difficult).
>

yes, someone asked me about this in person recently as well, so I guess
you're not the only one who would use it.

d
___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch

Wish: notmuch-emacs: allow for reply to attached message/rfc822 message

[Gregor Zattler]

Dear notmuch developers,

it would be great if it was possible in notmuch-emacs to reply to
the very mime part of a message, the cursor is in.

Use case: Mailman sends emails for approval to list owners where
the last mime parts are a rfc822 attachment to which said list
owner may answer in order to delete the pending message from the
mailman queue (approval is more difficult).

In mutt (1) for instance it is possible to show the mime
structure of an email, show only a specific one and -- in case
its message/rfc822 -- reply to this.  This is very convenient.

[This being emacs I then tried to open mailmans web interface
from within emacs but in the end an error occurred an I had to
use firefox.]

Thanks for your attention, Gregor

___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch