[PATCH] emacs: show: hide large text attachments by default
Mark Walters writes: > notmuch-show can be slow displaying large attachments so hide them by > default. The default maximum size is 1 bytes/characters but it is > customizable. > > Note that notmuch-show-insert-bodypart is also called from the reply > code so we need to be a little careful. I didn't look at the code yet, but I can confirm it makes a huge (about 17 times faster) difference for the problematic thread I have been profiling. d
[Patch v6 4/8] lib: add "verbose" versions of notmuch_database_{open, create}
On Sat, Mar 28 2015, David Bremner wrote:
> The compatibility wrapper ensures that clients calling
> notmuch_database_open will receive consistent output for now.
>
> The changes to notmuch-{new,search} and test/symbol-test are just to
> make the test suite pass.
>
> The use of IGNORE_RESULT is justified by two things. 1) I don't know
> what else to do. 2) asprintf guarantees the output string is NULL if
> an error occurs, so at least we are not passing garbage back.
> ---
> lib/database.cc | 109
> ++--
> lib/notmuch.h | 21 ++
> notmuch-new.c | 11 +-
> notmuch-search.c| 13 ++-
> test/symbol-test.cc | 9 -
> 5 files changed, 130 insertions(+), 33 deletions(-)
>
> diff --git a/lib/database.cc b/lib/database.cc
> index 3974e2e..5d973b9 100644
> --- a/lib/database.cc
> +++ b/lib/database.cc
> @@ -608,29 +608,50 @@ parse_references (void *ctx,
> notmuch_status_t
> notmuch_database_create (const char *path, notmuch_database_t **database)
> {
> +char *status_string = NULL;
> +notmuch_status_t status;
> +
> +status = notmuch_database_create_verbose (path, database,
> + _string);
> +
> +if (status_string) {
> + fputs (status_string, stderr);
> + free (status_string);
> +}
> +
> +return status;
> +}
> +
> +notmuch_status_t
> +notmuch_database_create_verbose (const char *path,
> + notmuch_database_t **database,
> + char **status_string)
> +{
> notmuch_status_t status = NOTMUCH_STATUS_SUCCESS;
> notmuch_database_t *notmuch = NULL;
> char *notmuch_path = NULL;
> +char *message = NULL;
> struct stat st;
> int err;
>
> if (path == NULL) {
> - fprintf (stderr, "Error: Cannot create a database for a NULL path.\n");
> + message = strdup ("Error: Cannot create a database for a NULL path.\n");
> status = NOTMUCH_STATUS_NULL_POINTER;
> goto DONE;
> }
>
> err = stat (path, );
> if (err) {
> - fprintf (stderr, "Error: Cannot create database at %s: %s.\n",
> - path, strerror (errno));
> + IGNORE_RESULT (asprintf (, "Error: Cannot create database at
> %s: %s.\n",
> + path, strerror (errno)));
> status = NOTMUCH_STATUS_FILE_ERROR;
> goto DONE;
> }
>
> if (! S_ISDIR (st.st_mode)) {
> - fprintf (stderr, "Error: Cannot create database at %s: Not a
> directory.\n",
> - path);
> + IGNORE_RESULT (asprintf (, "Error: Cannot create database at
> %s: "
> + "Not a directory.\n",
> + path));
> status = NOTMUCH_STATUS_FILE_ERROR;
> goto DONE;
> }
> @@ -640,15 +661,15 @@ notmuch_database_create (const char *path,
> notmuch_database_t **database)
> err = mkdir (notmuch_path, 0755);
>
> if (err) {
> - fprintf (stderr, "Error: Cannot create directory %s: %s.\n",
> - notmuch_path, strerror (errno));
> + IGNORE_RESULT (asprintf (, "Error: Cannot create directory %s:
> %s.\n",
> + notmuch_path, strerror (errno)));
> status = NOTMUCH_STATUS_FILE_ERROR;
> goto DONE;
> }
>
> -status = notmuch_database_open (path,
> - NOTMUCH_DATABASE_MODE_READ_WRITE,
> - );
> +status = notmuch_database_open_verbose (path,
> + NOTMUCH_DATABASE_MODE_READ_WRITE,
> + , );
> if (status)
> goto DONE;
>
> @@ -667,6 +688,9 @@ notmuch_database_create (const char *path,
> notmuch_database_t **database)
> if (notmuch_path)
> talloc_free (notmuch_path);
>
> +if (status_string && message)
> + *status_string = message;
This series looks good and tests pass (I had confusion there before seeing
one of the last patch moving one output from stderr to stdout of where
the test status_cb prints it output)
Just that this small piece of code above git pass my sparse sieve, perhaps
this could be amended to:
if (message) {
if (status_string)
*status_string = message;
else
free(message);
}
IMO either amend or leave to followup patch; just for that I don't
want to go through full patch series ;D
> +
> if (database)
> *database = notmuch;
> else
> @@ -767,37 +791,58 @@ notmuch_database_open (const char *path,
> notmuch_database_mode_t mode,
> notmuch_database_t **database)
> {
> +char *status_string = NULL;
> +notmuch_status_t status;
> +
> +status = notmuch_database_open_verbose (path, mode, database,
> +_string);
> +
> +if (status_string) {
> + fputs (status_string, stderr);
> +
[PATCH] emacs: print messages when starting and ending notmuch queries
For slow queries, it is possible for a second query to block while the first is still running. This has the unfortunate effect that it is impossible for the user to know if the query returned no results, or if it is still running. This change tries to remedy this by printing messages in the echo area when starting and finishing queries. --- I'm curious what people think about this possible change. It does make the whole UI a bit noisier for fast queries. OTOH, it seems simpler than trying to mess with the results buffer or mode line. emacs/notmuch.el | 4 1 file changed, 4 insertions(+) diff --git a/emacs/notmuch.el b/emacs/notmuch.el index ab00454..cb8ddef 100644 --- a/emacs/notmuch.el +++ b/emacs/notmuch.el @@ -616,6 +616,7 @@ of the result." (let ((buffer (process-buffer proc)) (status (process-status proc)) (exit-status (process-exit-status proc)) + (query (process-get proc 'query)) (never-found-target-thread nil)) (when (memq status '(exit signal)) (catch 'return @@ -629,6 +630,7 @@ of the result." (if (eq status 'signal) (insert "Incomplete search results (search process was killed).\n")) (when (eq status 'exit) + (message "notmuch query %s complete" query) (insert "End of search results.\n") ;; For version mismatch, there's no point in ;; showing the search buffer @@ -931,6 +933,7 @@ the configured default sort order." (error "notmuch search process already running for query `%s'" query) ) (erase-buffer) + (message "running notmuch query %s..." query) (goto-char (point-min)) (save-excursion (let ((proc (notmuch-start-notmuch @@ -945,6 +948,7 @@ the configured default sort order." ;; should be called no matter how the process dies. (parse-buf (generate-new-buffer " *notmuch search parse*"))) (process-put proc 'parse-buf parse-buf) + (process-put proc 'query query) (set-process-filter proc 'notmuch-search-process-filter) (set-process-query-on-exit-flag proc nil (run-hooks 'notmuch-search-hook))) -- 2.1.4
[PATCH] emacs: show: hide large text attachments by default
notmuch-show can be slow displaying large attachments so hide them by default. The default maximum size is 1 bytes/characters but it is customizable. Note that notmuch-show-insert-bodypart is also called from the reply code so we need to be a little careful. --- This code is getting a little fragile -- there are quite a lot of factors in deciding whether to show or hide a part and the code is called from both show and reply -- but it seems to work. For testing I suggest setting notmuch-show-max-text-part-size to something small like 100 or 1000. Best wishes Mark emacs/notmuch-show.el | 17 +++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index f4ad802..2a53461 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -99,6 +99,13 @@ visible for any given message." :group 'notmuch-show :group 'notmuch-hooks) +(defcustom notmuch-show-max-text-part-size 1 + "Maximum size of a text part to be shown by default in characters. + +Set to 0 to show the part regardless of size." + :type 'integer + :group 'notmuch-show) + ;; Mostly useful for debugging. (defcustom notmuch-show-all-multipart/alternative-parts nil "Should all parts of multipart/alternative parts be shown?" @@ -937,14 +944,20 @@ useful for quoting in replies)." "text/x-diff") content-type)) (nth (plist-get part :id)) +(long (and (notmuch-match-content-type mime-type "text/*") + (> notmuch-show-max-text-part-size 0) + (> (length (plist-get part :content)) notmuch-show-max-text-part-size))) (beg (point)) -;; Hide the part initially if HIDE is t. -(show-part (not (equal hide t))) ;; We omit the part button for the first (or only) part if ;; this is text/plain, or HIDE is 'no-buttons. (button (unless (or (equal hide 'no-buttons) (and (string= mime-type "text/plain") (<= nth 1))) (notmuch-show-insert-part-header nth mime-type content-type (plist-get part :filename +;; Hide the part initially if HIDE is t, or if it is too long +;; and we have a button to allow toggling (thus reply which +;; uses 'no-buttons automatically includes long parts) +(show-part (not (or (equal hide t) +(and long button (content-beg (point))) ;; Store the computed mime-type for later use (e.g. by attachment handlers). -- 2.1.4
Can't compose message in Emacs - Notmuch
Tomi Ollila writes: > > Instead of noise I think this is valuable information... > > ... if we had "troubleshooting" (or just put to emacstips.mdwn) page > we could add something along the line: > >emacs -Q -L /path/to/notmuch/elisp/dir --eval "(require 'notmuch)" > For the record, I started a "troubleshooting" page at http://notmuchmail.org/bugs It's a wiki, so feel free to improve this page. d
[PATCH] NEWS: fix 'not' -> 'now' typo in 0.19 nmbug section
--- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 70ad3f3..8a1b310 100644 --- a/NEWS +++ b/NEWS @@ -167,7 +167,7 @@ nmbug The Perl script has been translated to Python; you'll need Python 2.7 or anything from the 3.x line. Most of the user-facing interface is -the same, but `nmbug help` is not `nmbug --help`, and the following nmbug +the same, but `nmbug help` is now `nmbug --help`, and the following nmbug commands have slightly different interfaces: `archive`, `commit`, `fetch`, `log`, `pull`, `push`, and `status`. For details on the new interface for a given command, run `nmbug COMMAND --help`. -- 2.1.0.60.g85f0837
[Patch v6 8/8] lib: eliminate fprintf from _notmuch_message_file_open
You may wonder why _notmuch_message_file_open_ctx has two parameters.
This is because we need sometime to use a ctx which is a
notmuch_message_t. While we could get the database from this, there is
no easy way in C to tell type we are getting.
---
lib/database.cc | 2 +-
lib/message-file.c| 11 +++
lib/message.cc| 3 ++-
lib/notmuch-private.h | 5 +++--
4 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/lib/database.cc b/lib/database.cc
index e40674a..9f66b5f 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -2307,7 +2307,7 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
if (ret)
return ret;
-message_file = _notmuch_message_file_open (filename);
+message_file = _notmuch_message_file_open (notmuch, filename);
if (message_file == NULL)
return NOTMUCH_STATUS_FILE_ERROR;
diff --git a/lib/message-file.c b/lib/message-file.c
index a41d9ad..8ac96e8 100644
--- a/lib/message-file.c
+++ b/lib/message-file.c
@@ -76,7 +76,8 @@ _notmuch_message_file_destructor (notmuch_message_file_t
*message)
/* Create a new notmuch_message_file_t for 'filename' with 'ctx' as
* the talloc owner. */
notmuch_message_file_t *
-_notmuch_message_file_open_ctx (void *ctx, const char *filename)
+_notmuch_message_file_open_ctx (notmuch_database_t *notmuch,
+ void *ctx, const char *filename)
{
notmuch_message_file_t *message;
@@ -98,16 +99,18 @@ _notmuch_message_file_open_ctx (void *ctx, const char
*filename)
return message;
FAIL:
-fprintf (stderr, "Error opening %s: %s\n", filename, strerror (errno));
+_notmuch_database_log (notmuch, "Error opening %s: %s\n",
+ filename, strerror (errno));
_notmuch_message_file_close (message);
return NULL;
}
notmuch_message_file_t *
-_notmuch_message_file_open (const char *filename)
+_notmuch_message_file_open (notmuch_database_t *notmuch,
+ const char *filename)
{
-return _notmuch_message_file_open_ctx (NULL, filename);
+return _notmuch_message_file_open_ctx (notmuch, NULL, filename);
}
void
diff --git a/lib/message.cc b/lib/message.cc
index a8ca988..5bc7aff 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -437,7 +437,8 @@ _notmuch_message_ensure_message_file (notmuch_message_t
*message)
if (unlikely (filename == NULL))
return;
-message->message_file = _notmuch_message_file_open_ctx (message, filename);
+message->message_file = _notmuch_message_file_open_ctx (
+ _notmuch_message_database (message), message, filename);
}
const char *
diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h
index dc58a2f..cc9ce12 100644
--- a/lib/notmuch-private.h
+++ b/lib/notmuch-private.h
@@ -358,11 +358,12 @@ typedef struct _notmuch_message_file
notmuch_message_file_t;
* Returns NULL if any error occurs.
*/
notmuch_message_file_t *
-_notmuch_message_file_open (const char *filename);
+_notmuch_message_file_open (notmuch_database_t *notmuch, const char *filename);
/* Like notmuch_message_file_open but with 'ctx' as the talloc owner. */
notmuch_message_file_t *
-_notmuch_message_file_open_ctx (void *ctx, const char *filename);
+_notmuch_message_file_open_ctx (notmuch_database_t *notmuch,
+ void *ctx, const char *filename);
/* Close a notmuch message previously opened with notmuch_message_open. */
void
--
2.1.4
[Patch v6 7/8] lib: replace almost all fprintfs in library with _n_d_log
This is not supposed to change any functionality from an end user
point of view. Note that it will eliminate some output to stderr. The
query debugging output is left as is; it doesn't really fit with the
current primitive logging model. The remaining "bad" fprintf will need
an internal API change.
---
lib/database.cc| 38 +-
lib/directory.cc | 4 ++--
lib/index.cc | 11 +++
lib/message.cc | 6 +++---
lib/query.cc | 18 --
test/T560-lib-error.sh | 6 +-
6 files changed, 50 insertions(+), 33 deletions(-)
diff --git a/lib/database.cc b/lib/database.cc
index c114765..e40674a 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -473,7 +473,7 @@ notmuch_database_find_message (notmuch_database_t *notmuch,
return NOTMUCH_STATUS_SUCCESS;
} catch (const Xapian::Error ) {
- fprintf (stderr, "A Xapian exception occurred finding message: %s.\n",
+ _notmuch_database_log (notmuch, "A Xapian exception occurred finding
message: %s.\n",
error.get_msg().c_str());
notmuch->exception_reported = TRUE;
*message_ret = NULL;
@@ -719,7 +719,7 @@ notmuch_status_t
_notmuch_database_ensure_writable (notmuch_database_t *notmuch)
{
if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_ONLY) {
- fprintf (stderr, "Cannot write to a read-only database.\n");
+ _notmuch_database_log (notmuch, "Cannot write to a read-only
database.\n");
return NOTMUCH_STATUS_READ_ONLY_DATABASE;
}
@@ -1015,7 +1015,7 @@ notmuch_database_close (notmuch_database_t *notmuch)
} catch (const Xapian::Error ) {
status = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
if (! notmuch->exception_reported) {
- fprintf (stderr, "Error: A Xapian exception occurred closing
database: %s\n",
+ _notmuch_database_log (notmuch, "Error: A Xapian exception
occurred closing database: %s\n",
error.get_msg().c_str());
}
}
@@ -1147,12 +1147,12 @@ notmuch_database_compact (const char *path,
}
if (stat (backup_path, ) != -1) {
- fprintf (stderr, "Path already exists: %s\n", backup_path);
+ _notmuch_database_log (notmuch, "Path already exists: %s\n",
backup_path);
ret = NOTMUCH_STATUS_FILE_ERROR;
goto DONE;
}
if (errno != ENOENT) {
- fprintf (stderr, "Unknown error while stat()ing path: %s\n",
+ _notmuch_database_log (notmuch, "Unknown error while stat()ing path:
%s\n",
strerror (errno));
ret = NOTMUCH_STATUS_FILE_ERROR;
goto DONE;
@@ -1172,20 +1172,20 @@ notmuch_database_compact (const char *path,
compactor.set_destdir (compact_xapian_path);
compactor.compact ();
} catch (const Xapian::Error ) {
- fprintf (stderr, "Error while compacting: %s\n",
error.get_msg().c_str());
+ _notmuch_database_log (notmuch, "Error while compacting: %s\n",
error.get_msg().c_str());
ret = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
goto DONE;
}
if (rename (xapian_path, backup_path)) {
- fprintf (stderr, "Error moving %s to %s: %s\n",
+ _notmuch_database_log (notmuch, "Error moving %s to %s: %s\n",
xapian_path, backup_path, strerror (errno));
ret = NOTMUCH_STATUS_FILE_ERROR;
goto DONE;
}
if (rename (compact_xapian_path, xapian_path)) {
- fprintf (stderr, "Error moving %s to %s: %s\n",
+ _notmuch_database_log (notmuch, "Error moving %s to %s: %s\n",
compact_xapian_path, xapian_path, strerror (errno));
ret = NOTMUCH_STATUS_FILE_ERROR;
goto DONE;
@@ -1193,7 +1193,7 @@ notmuch_database_compact (const char *path,
if (! keep_backup) {
if (rmtree (backup_path)) {
- fprintf (stderr, "Error removing old database %s: %s\n",
+ _notmuch_database_log (notmuch, "Error removing old database %s:
%s\n",
backup_path, strerror (errno));
ret = NOTMUCH_STATUS_FILE_ERROR;
goto DONE;
@@ -1204,6 +1204,10 @@ notmuch_database_compact (const char *path,
if (notmuch) {
notmuch_status_t ret2;
+ const char *str = notmuch_database_status_string (notmuch);
+ if (status_cb && str)
+ status_cb (str, closure);
+
ret2 = notmuch_database_destroy (notmuch);
/* don't clobber previous error status */
@@ -1222,7 +1226,7 @@ notmuch_database_compact (unused (const char *path),
unused (notmuch_compact_status_cb_t status_cb),
unused (void *closure))
{
-fprintf (stderr, "notmuch was compiled against a xapian version lacking
compaction support.\n");
+_notmuch_database_log (notmuch, "notmuch was compiled against a xapian
version lacking compaction support.\n");
return NOTMUCH_STATUS_UNSUPPORTED_OPERATION;
}
#endif
@@ -1500,7
[Patch v6 6/8] lib: add private function to extract the database for a message.
This is needed by logging in functions outside message.cc that take
only a notmuch_message_t object.
---
lib/message.cc| 6 ++
lib/notmuch-private.h | 2 ++
2 files changed, 8 insertions(+)
diff --git a/lib/message.cc b/lib/message.cc
index 956a70a..b84e5e1 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -1626,3 +1626,9 @@ notmuch_message_destroy (notmuch_message_t *message)
{
talloc_free (message);
}
+
+notmuch_database_t *
+_notmuch_message_database (notmuch_message_t *message)
+{
+return message->notmuch;
+}
diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h
index 7cb6fd4..dc58a2f 100644
--- a/lib/notmuch-private.h
+++ b/lib/notmuch-private.h
@@ -472,6 +472,8 @@ _notmuch_doc_id_set_remove (notmuch_doc_id_set_t *doc_ids,
void
_notmuch_message_add_reply (notmuch_message_t *message,
notmuch_message_t *reply);
+notmuch_database_t *
+_notmuch_message_database (notmuch_message_t *message);
/* sha1.c */
--
2.1.4
[Patch v6 5/8] lib: add a log function with output to a string in notmuch_database_t
In principle in the future this could do something fancier than
asprintf.
---
lib/database-private.h | 4
lib/database.cc| 24
lib/notmuch-private.h | 4
lib/notmuch.h | 7 +++
4 files changed, 39 insertions(+)
diff --git a/lib/database-private.h b/lib/database-private.h
index 6d6fa2c..24243db 100644
--- a/lib/database-private.h
+++ b/lib/database-private.h
@@ -154,6 +154,10 @@ struct _notmuch_database {
unsigned int last_doc_id;
uint64_t last_thread_id;
+/* error reporting; this value persists only until the
+ * next library call. May be NULL */
+char *status_string;
+
Xapian::QueryParser *query_parser;
Xapian::TermGenerator *term_gen;
Xapian::ValueRangeProcessor *value_range_processor;
diff --git a/lib/database.cc b/lib/database.cc
index 5d973b9..c114765 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -348,6 +348,23 @@ notmuch_status_to_string (notmuch_status_t status)
}
}
+void
+_notmuch_database_log (notmuch_database_t *notmuch,
+ const char *format,
+ ...)
+{
+va_list va_args;
+
+va_start (va_args, format);
+
+if (notmuch->status_string)
+ talloc_free (notmuch->status_string);
+
+notmuch->status_string = talloc_vasprintf (notmuch, format, va_args);
+
+va_end (va_args);
+}
+
static void
find_doc_ids_for_term (notmuch_database_t *notmuch,
const char *term,
@@ -860,6 +877,7 @@ notmuch_database_open_verbose (const char *path,
notmuch = talloc_zero (NULL, notmuch_database_t);
notmuch->exception_reported = FALSE;
+notmuch->status_string = NULL;
notmuch->path = talloc_strdup (notmuch, path);
if (notmuch->path[strlen (notmuch->path) - 1] == '/')
@@ -2545,3 +2563,9 @@ notmuch_database_get_all_tags (notmuch_database_t *db)
return NULL;
}
}
+
+const char *
+notmuch_database_status_string (notmuch_database_t *notmuch)
+{
+return notmuch->status_string;
+}
diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h
index 8a1f2fa..7cb6fd4 100644
--- a/lib/notmuch-private.h
+++ b/lib/notmuch-private.h
@@ -190,6 +190,10 @@ _notmuch_message_id_compressed (void *ctx, const char
*message_id);
notmuch_status_t
_notmuch_database_ensure_writable (notmuch_database_t *notmuch);
+void
+_notmuch_database_log (notmuch_database_t *notmuch,
+ const char *format, ...);
+
const char *
_notmuch_database_relative_path (notmuch_database_t *notmuch,
const char *path);
diff --git a/lib/notmuch.h b/lib/notmuch.h
index c671d82..20c4e01 100644
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -302,6 +302,13 @@ notmuch_database_open_verbose (const char *path,
char **error_message);
/**
+ * Retrieve last status string for given database.
+ *
+ */
+const char *
+notmuch_database_status_string (notmuch_database_t *notmuch);
+
+/**
* Commit changes and close the given notmuch database.
*
* After notmuch_database_close has been called, calls to other
--
2.1.4
[Patch v6 4/8] lib: add "verbose" versions of notmuch_database_{open,create}
The compatibility wrapper ensures that clients calling
notmuch_database_open will receive consistent output for now.
The changes to notmuch-{new,search} and test/symbol-test are just to
make the test suite pass.
The use of IGNORE_RESULT is justified by two things. 1) I don't know
what else to do. 2) asprintf guarantees the output string is NULL if
an error occurs, so at least we are not passing garbage back.
---
lib/database.cc | 109 ++--
lib/notmuch.h | 21 ++
notmuch-new.c | 11 +-
notmuch-search.c| 13 ++-
test/symbol-test.cc | 9 -
5 files changed, 130 insertions(+), 33 deletions(-)
diff --git a/lib/database.cc b/lib/database.cc
index 3974e2e..5d973b9 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -608,29 +608,50 @@ parse_references (void *ctx,
notmuch_status_t
notmuch_database_create (const char *path, notmuch_database_t **database)
{
+char *status_string = NULL;
+notmuch_status_t status;
+
+status = notmuch_database_create_verbose (path, database,
+ _string);
+
+if (status_string) {
+ fputs (status_string, stderr);
+ free (status_string);
+}
+
+return status;
+}
+
+notmuch_status_t
+notmuch_database_create_verbose (const char *path,
+notmuch_database_t **database,
+char **status_string)
+{
notmuch_status_t status = NOTMUCH_STATUS_SUCCESS;
notmuch_database_t *notmuch = NULL;
char *notmuch_path = NULL;
+char *message = NULL;
struct stat st;
int err;
if (path == NULL) {
- fprintf (stderr, "Error: Cannot create a database for a NULL path.\n");
+ message = strdup ("Error: Cannot create a database for a NULL path.\n");
status = NOTMUCH_STATUS_NULL_POINTER;
goto DONE;
}
err = stat (path, );
if (err) {
- fprintf (stderr, "Error: Cannot create database at %s: %s.\n",
-path, strerror (errno));
+ IGNORE_RESULT (asprintf (, "Error: Cannot create database at
%s: %s.\n",
+ path, strerror (errno)));
status = NOTMUCH_STATUS_FILE_ERROR;
goto DONE;
}
if (! S_ISDIR (st.st_mode)) {
- fprintf (stderr, "Error: Cannot create database at %s: Not a
directory.\n",
-path);
+ IGNORE_RESULT (asprintf (, "Error: Cannot create database at
%s: "
+"Not a directory.\n",
+path));
status = NOTMUCH_STATUS_FILE_ERROR;
goto DONE;
}
@@ -640,15 +661,15 @@ notmuch_database_create (const char *path,
notmuch_database_t **database)
err = mkdir (notmuch_path, 0755);
if (err) {
- fprintf (stderr, "Error: Cannot create directory %s: %s.\n",
-notmuch_path, strerror (errno));
+ IGNORE_RESULT (asprintf (, "Error: Cannot create directory %s:
%s.\n",
+notmuch_path, strerror (errno)));
status = NOTMUCH_STATUS_FILE_ERROR;
goto DONE;
}
-status = notmuch_database_open (path,
- NOTMUCH_DATABASE_MODE_READ_WRITE,
- );
+status = notmuch_database_open_verbose (path,
+ NOTMUCH_DATABASE_MODE_READ_WRITE,
+ , );
if (status)
goto DONE;
@@ -667,6 +688,9 @@ notmuch_database_create (const char *path,
notmuch_database_t **database)
if (notmuch_path)
talloc_free (notmuch_path);
+if (status_string && message)
+ *status_string = message;
+
if (database)
*database = notmuch;
else
@@ -767,37 +791,58 @@ notmuch_database_open (const char *path,
notmuch_database_mode_t mode,
notmuch_database_t **database)
{
+char *status_string = NULL;
+notmuch_status_t status;
+
+status = notmuch_database_open_verbose (path, mode, database,
+ _string);
+
+if (status_string) {
+ fputs (status_string, stderr);
+ free (status_string);
+}
+
+return status;
+}
+
+notmuch_status_t
+notmuch_database_open_verbose (const char *path,
+ notmuch_database_mode_t mode,
+ notmuch_database_t **database,
+ char **status_string)
+{
notmuch_status_t status = NOTMUCH_STATUS_SUCCESS;
void *local = talloc_new (NULL);
notmuch_database_t *notmuch = NULL;
char *notmuch_path, *xapian_path, *incompat_features;
+char *message = NULL;
struct stat st;
int err;
unsigned int i, version;
static int initialized = 0;
if (path == NULL) {
- fprintf (stderr, "Error: Cannot open a database for a NULL path.\n");
+ message = strdup
[Patch v6 3/8] test: add error reporting tests
This includes tests for all of the error fprintfs in the library I
could figure out how to test without using gdb scripts. It boils down
to errors opening files and exceptions caused by corrupted Xapian
databases.
---
test/T560-lib-error.sh | 285 +
1 file changed, 285 insertions(+)
create mode 100755 test/T560-lib-error.sh
diff --git a/test/T560-lib-error.sh b/test/T560-lib-error.sh
new file mode 100755
index 000..f1ca543
--- /dev/null
+++ b/test/T560-lib-error.sh
@@ -0,0 +1,285 @@
+#!/usr/bin/env bash
+test_description="error reporting for library"
+
+. ./test-lib.sh
+
+backup_database () {
+rm -rf notmuch-dir-backup
+cp -pR ${MAIL_DIR}/.notmuch notmuch-dir-backup
+}
+restore_database () {
+rm -rf ${MAIL_DIR}/.notmuch
+cp -pR notmuch-dir-backup ${MAIL_DIR}/.notmuch
+}
+
+
+add_email_corpus
+
+test_expect_success "building database" "NOTMUCH_NEW"
+
+test_begin_subtest "Open null pointer"
+test_C <<'EOF'
+#include
+#include
+int main (int argc, char** argv)
+{
+notmuch_database_t *db;
+notmuch_status_t stat;
+stat = notmuch_database_open (NULL, 0, 0);
+}
+EOF
+cat <<'EOF' >EXPECTED
+== stdout ==
+== stderr ==
+Error: Cannot open a database for a NULL path.
+EOF
+test_expect_equal_file EXPECTED OUTPUT
+
+test_begin_subtest "Open nonexistent database"
+test_C <<'EOF'
+#include
+#include
+int main (int argc, char** argv)
+{
+notmuch_database_t *db;
+notmuch_status_t stat;
+stat = notmuch_database_open ("/nonexistent/foo", 0, 0);
+}
+EOF
+cat <<'EOF' >EXPECTED
+== stdout ==
+== stderr ==
+Error opening database at /nonexistent/foo/.notmuch: No such file or directory
+EOF
+test_expect_equal_file EXPECTED OUTPUT
+
+test_begin_subtest "create NULL path"
+test_C <<'EOF'
+#include
+#include
+int main (int argc, char** argv)
+{
+notmuch_status_t stat;
+stat = notmuch_database_create (NULL, NULL);
+}
+EOF
+cat <<'EOF' >EXPECTED
+== stdout ==
+== stderr ==
+Error: Cannot create a database for a NULL path.
+EOF
+test_expect_equal_file EXPECTED OUTPUT
+
+test_begin_subtest "Create database in non-existant directory"
+test_C <<'EOF'
+#include
+#include
+int main (int argc, char** argv)
+{
+notmuch_database_t *db;
+notmuch_status_t stat;
+stat = notmuch_database_create ("/nonexistent/foo", );
+}
+EOF
+cat <<'EOF' >EXPECTED
+== stdout ==
+== stderr ==
+Error: Cannot create database at /nonexistent/foo: No such file or directory.
+EOF
+test_expect_equal_file EXPECTED OUTPUT
+
+test_begin_subtest "Write to read-only database"
+test_C ${MAIL_DIR} <<'EOF'
+#include
+#include
+int main (int argc, char** argv)
+{
+ notmuch_database_t *db;
+ notmuch_status_t stat;
+ stat = notmuch_database_open (argv[1], NOTMUCH_DATABASE_MODE_READ_ONLY,
);
+ if (stat != NOTMUCH_STATUS_SUCCESS) {
+ fprintf (stderr, "error opening database: %d\n", stat);
+ }
+ stat = notmuch_database_add_message (db, "/dev/null", NULL);
+}
+EOF
+cat <<'EOF' >EXPECTED
+== stdout ==
+== stderr ==
+Cannot write to a read-only database.
+EOF
+test_expect_equal_file EXPECTED OUTPUT
+
+test_begin_subtest "Add non-existent file"
+test_C ${MAIL_DIR} <<'EOF'
+#include
+#include
+int main (int argc, char** argv)
+{
+ notmuch_database_t *db;
+ notmuch_status_t stat;
+ stat = notmuch_database_open (argv[1], NOTMUCH_DATABASE_MODE_READ_WRITE,
);
+ if (stat != NOTMUCH_STATUS_SUCCESS) {
+ fprintf (stderr, "error opening database: %d\n", stat);
+ }
+ stat = notmuch_database_add_message (db, "/nonexistent", NULL);
+ if (stat)
+ fputs (notmuch_database_status_string (db), stderr);
+
+}
+EOF
+cat <<'EOF' >EXPECTED
+== stdout ==
+== stderr ==
+Error opening /nonexistent: No such file or directory
+EOF
+test_expect_equal_file EXPECTED OUTPUT
+
+test_begin_subtest "compact, overwriting existing backup"
+test_C ${MAIL_DIR} <<'EOF'
+#include
+#include
+static void
+status_cb (const char *msg, void *closure)
+{
+printf ("%s\n", msg);
+}
+int main (int argc, char** argv)
+{
+ notmuch_database_t *db;
+ notmuch_status_t stat;
+ stat = notmuch_database_compact (argv[1], argv[1], status_cb, NULL);
+}
+EOF
+cat <<'EOF' >EXPECTED
+== stdout ==
+== stderr ==
+Path already exists: CWD/mail
+EOF
+test_expect_equal_file EXPECTED OUTPUT
+
+cat <<'EOF' > c_head
+#include
+#include
+#include
+#include
+#include
+#include
+
+int main (int argc, char** argv)
+{
+ notmuch_database_t *db;
+ notmuch_status_t stat;
+ char *path;
+ int fd;
+
+ stat = notmuch_database_open (argv[1], NOTMUCH_DATABASE_MODE_READ_WRITE,
);
+ if (stat != NOTMUCH_STATUS_SUCCESS) {
+ fprintf (stderr, "error opening database: %d\n", stat);
+ }
+ path = talloc_asprintf (db, "%s/.notmuch/xapian/postlist.DB", argv[1]);
+ fd = open(path,O_WRONLY|O_TRUNC);
+ if (fd < 0)
+ fprintf (stderr, "error opening %s\n");
+EOF
+cat <<'EOF' > c_tail
+ if (stat) {
+ const char *stat_str = notmuch_database_status_string (db);
+
[Patch v6 2/8] test: add support for compiling and running C snippets
This is to limit the copy-pasta involved in running C tests. I decided
to keep things simple and not try to provide an actual C skeleton.
The setting of LD_LIBRARY_PATH is to force using the built libnotmuch
rather than any potential system one.
---
test/README | 5 +
test/test-lib.sh | 15 +++
2 files changed, 20 insertions(+)
diff --git a/test/README b/test/README
index 81a1c82..5b40474 100644
--- a/test/README
+++ b/test/README
@@ -84,6 +84,11 @@ the tests in one of the following ways.
TEST_EMACS=my-special-emacs TEST_EMACSCLIENT=my-emacsclient ./emacs
make test TEST_EMACS=my-special-emacs TEST_EMACSCLIENT=my-emacsclient
+Some tests may require a c compiler. You can choose the name and flags
similarly
+to with emacs, e.g.
+
+ make test TEST_CC=gcc TEST_CFLAGS="-g -O2"
+
Quiet Execution
---
diff --git a/test/test-lib.sh b/test/test-lib.sh
index 133fbe4..486d1c4 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -73,6 +73,8 @@ if [[ ( -n "$TEST_EMACS" && -z "$TEST_EMACSCLIENT" ) || \
fi
TEST_EMACS=${TEST_EMACS:-${EMACS:-emacs}}
TEST_EMACSCLIENT=${TEST_EMACSCLIENT:-emacsclient}
+TEST_CC=${TEST_CC:-cc}
+TEST_CFLAGS=${TEST_CFLAGS:-"-g -O0"}
# Protect ourselves from common misconfiguration to export
# CDPATH into the environment
@@ -1161,6 +1163,19 @@ test_python() {
| $cmd -
}
+test_C () {
+exec_file="test${test_count}"
+test_file="${exec_file}.c"
+cat > ${test_file}
+export LD_LIBRARY_PATH=${TEST_DIRECTORY}/../lib
+${TEST_CC} ${TEST_CFLAGS} -I${TEST_DIRECTORY}/../lib -o ${exec_file}
${test_file} -L${TEST_DIRECTORY}/../lib/ -lnotmuch -ltalloc
+echo "== stdout ==" > OUTPUT.stdout
+echo "== stderr ==" > OUTPUT.stderr
+./${exec_file} "$@" 1>>OUTPUT.stdout 2>>OUTPUT.stderr
+sed "s,${PWD},CWD,g" OUTPUT.stdout OUTPUT.stderr > OUTPUT
+}
+
+
# Creates a script that counts how much time it is executed and calls
# notmuch. $notmuch_counter_command is set to the path to the
# generated script. Use notmuch_counter_value() function to get the
--
2.1.4
[Patch v6 1/8] test: Add two tests for error output from notmuch_database_open
This is arguably testing the same thing twice, but in the brave new
future where we don't use printf anymore, each subcommand will be
responsible for handling the output on it's own.
---
test/T050-new.sh | 7 +++
test/T150-tagging.sh | 6 ++
2 files changed, 13 insertions(+)
diff --git a/test/T050-new.sh b/test/T050-new.sh
index 7119356..e6c3291 100755
--- a/test/T050-new.sh
+++ b/test/T050-new.sh
@@ -276,4 +276,11 @@ test_expect_code 1 "Invalid tags set exit code" \
notmuch config set new.tags $OLDCONFIG
+
+test_begin_subtest "Xapian exception: read only files"
+chmod u-w ${MAIL_DIR}/.notmuch/xapian/*.DB
+output=$(NOTMUCH_NEW 2>&1 | sed 's/: .*$//' )
+chmod u+w ${MAIL_DIR}/.notmuch/xapian/*.DB
+test_expect_equal "$output" "A Xapian exception occurred opening database"
+
test_done
diff --git a/test/T150-tagging.sh b/test/T150-tagging.sh
index 45471ac..4a2673d 100755
--- a/test/T150-tagging.sh
+++ b/test/T150-tagging.sh
@@ -261,4 +261,10 @@ test_expect_code 1 "Empty tag names" 'notmuch tag + One'
test_expect_code 1 "Tag name beginning with -" 'notmuch tag +- One'
+test_begin_subtest "Xapian exception: read only files"
+chmod u-w ${MAIL_DIR}/.notmuch/xapian/*.DB
+output=$(notmuch tag +something '*' 2>&1 | sed 's/: .*$//' )
+chmod u+w ${MAIL_DIR}/.notmuch/xapian/*.DB
+test_expect_equal "$output" "A Xapian exception occurred opening database"
+
test_done
--
2.1.4
Library logging overhaul, round 6
This obsoletes
id:1427203451-1540-1-git-send-email-david at tethera.net
I think this addresses all of Tomi's comments, except the use of
status_cb to print error output from notmuch_database_compact.
I added some tests for notmuch_database_create error output.
diff --git a/lib/database.cc b/lib/database.cc
index 85054df..9f66b5f 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -625,7 +625,18 @@ parse_references (void *ctx,
notmuch_status_t
notmuch_database_create (const char *path, notmuch_database_t **database)
{
-return notmuch_database_create_verbose (path, database, NULL);
+char *status_string = NULL;
+notmuch_status_t status;
+
+status = notmuch_database_create_verbose (path, database,
+ _string);
+
+if (status_string) {
+ fputs (status_string, stderr);
+ free (status_string);
+}
+
+return status;
}
notmuch_status_t
@@ -694,8 +705,9 @@ notmuch_database_create_verbose (const char *path,
if (notmuch_path)
talloc_free (notmuch_path);
-if (message)
+if (status_string && message)
*status_string = message;
+
if (database)
*database = notmuch;
else
@@ -799,10 +811,13 @@ notmuch_database_open (const char *path,
char *status_string = NULL;
notmuch_status_t status;
-status = notmuch_database_open_verbose(path, mode, database,
+status = notmuch_database_open_verbose (path, mode, database,
_string);
-if (status_string) fputs(status_string, stderr);
+if (status_string) {
+ fputs (status_string, stderr);
+ free (status_string);
+}
return status;
}
diff --git a/notmuch-new.c b/notmuch-new.c
index 93b70bf..e6c283e 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -988,7 +988,10 @@ notmuch_new_command (notmuch_config_t *config, int argc,
char *argv[])
char *status_string = NULL;
if (notmuch_database_open_verbose (db_path,
NOTMUCH_DATABASE_MODE_READ_WRITE,
, _string)) {
- if (status_string) fputs (status_string, stderr);
+ if (status_string) {
+ fputs (status_string, stderr);
+ free (status_string);
+ }
return EXIT_FAILURE;
}
diff --git a/notmuch-search.c b/notmuch-search.c
index d012af3..b81ac01 100644
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -574,7 +574,12 @@ _notmuch_search_prepare (search_context_t *ctx,
notmuch_config_t *config, int ar
if (notmuch_database_open_verbose (
notmuch_config_get_database_path (config),
NOTMUCH_DATABASE_MODE_READ_ONLY, >notmuch, _string)) {
- if (status_string) fputs (status_string, stderr);
+
+ if (status_string) {
+ fputs (status_string, stderr);
+ free (status_string);
+ }
+
return EXIT_FAILURE;
}
diff --git a/test/T560-lib-error.sh b/test/T560-lib-error.sh
index ec7552a..67a5e8d 100755
--- a/test/T560-lib-error.sh
+++ b/test/T560-lib-error.sh
@@ -3,13 +3,13 @@ test_description="error reporting for library"
. ./test-lib.sh
-backup_database (){
+backup_database () {
rm -rf notmuch-dir-backup
-cp -a ${MAIL_DIR}/.notmuch notmuch-dir-backup
+cp -pR ${MAIL_DIR}/.notmuch notmuch-dir-backup
}
-restore_database (){
+restore_database () {
rm -rf ${MAIL_DIR}/.notmuch
-cp -a notmuch-dir-backup ${MAIL_DIR}/.notmuch
+cp -pR notmuch-dir-backup ${MAIL_DIR}/.notmuch
}
@@ -18,7 +18,7 @@ add_email_corpus
test_expect_success "building database" "NOTMUCH_NEW"
test_begin_subtest "Open null pointer"
-test_C <
#include
int main (int argc, char** argv)
@@ -28,7 +28,7 @@ int main (int argc, char** argv)
stat = notmuch_database_open (NULL, 0, 0);
}
EOF
-cat EXPECTED
== stdout ==
== stderr ==
Error: Cannot open a database for a NULL path.
@@ -36,7 +36,7 @@ EOF
test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "Open nonexistent database"
-test_C <
#include
int main (int argc, char** argv)
@@ -46,15 +46,50 @@ int main (int argc, char** argv)
stat = notmuch_database_open ("/nonexistent/foo", 0, 0);
}
EOF
-cat EXPECTED
== stdout ==
== stderr ==
Error opening database at /nonexistent/foo/.notmuch: No such file or directory
EOF
test_expect_equal_file EXPECTED OUTPUT
+test_begin_subtest "create NULL path"
+test_C <<'EOF'
+#include
+#include
+int main (int argc, char** argv)
+{
+notmuch_status_t stat;
+stat = notmuch_database_create (NULL, NULL);
+}
+EOF
+cat <<'EOF' >EXPECTED
+== stdout ==
+== stderr ==
+Error: Cannot create a database for a NULL path.
+EOF
+test_expect_equal_file EXPECTED OUTPUT
+
+test_begin_subtest "Create database in non-existant directory"
+test_C <<'EOF'
+#include
+#include
+int main (int argc, char** argv)
+{
+notmuch_database_t *db;
+notmuch_status_t stat;
+stat =
Re: [Patch v6 4/8] lib: add verbose versions of notmuch_database_{open,create}
Tomi Ollila tomi.oll...@iki.fi writes:
Just that this small piece of code above git pass my sparse sieve, perhaps
this could be amended to:
if (message) {
if (status_string)
*status_string = message;
else
free(message);
}
I amended and pushed. Thanks for all the reviewing.
d
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch
Re: [PATCH] emacs: show: hide large text attachments by default
Mark Walters markwalters1...@gmail.com writes: notmuch-show can be slow displaying large attachments so hide them by default. The default maximum size is 1 bytes/characters but it is customizable. Note that notmuch-show-insert-bodypart is also called from the reply code so we need to be a little careful. I didn't look at the code yet, but I can confirm it makes a huge (about 17 times faster) difference for the problematic thread I have been profiling. d ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
[PATCH] emacs: show: hide large text attachments by default
notmuch-show can be slow displaying large attachments so hide them by default. The default maximum size is 1 bytes/characters but it is customizable. Note that notmuch-show-insert-bodypart is also called from the reply code so we need to be a little careful. --- This code is getting a little fragile -- there are quite a lot of factors in deciding whether to show or hide a part and the code is called from both show and reply -- but it seems to work. For testing I suggest setting notmuch-show-max-text-part-size to something small like 100 or 1000. Best wishes Mark emacs/notmuch-show.el | 17 +++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index f4ad802..2a53461 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -99,6 +99,13 @@ visible for any given message. :group 'notmuch-show :group 'notmuch-hooks) +(defcustom notmuch-show-max-text-part-size 1 + Maximum size of a text part to be shown by default in characters. + +Set to 0 to show the part regardless of size. + :type 'integer + :group 'notmuch-show) + ;; Mostly useful for debugging. (defcustom notmuch-show-all-multipart/alternative-parts nil Should all parts of multipart/alternative parts be shown? @@ -937,14 +944,20 @@ useful for quoting in replies). text/x-diff) content-type)) (nth (plist-get part :id)) +(long (and (notmuch-match-content-type mime-type text/*) + ( notmuch-show-max-text-part-size 0) + ( (length (plist-get part :content)) notmuch-show-max-text-part-size))) (beg (point)) -;; Hide the part initially if HIDE is t. -(show-part (not (equal hide t))) ;; We omit the part button for the first (or only) part if ;; this is text/plain, or HIDE is 'no-buttons. (button (unless (or (equal hide 'no-buttons) (and (string= mime-type text/plain) (= nth 1))) (notmuch-show-insert-part-header nth mime-type content-type (plist-get part :filename +;; Hide the part initially if HIDE is t, or if it is too long +;; and we have a button to allow toggling (thus reply which +;; uses 'no-buttons automatically includes long parts) +(show-part (not (or (equal hide t) +(and long button (content-beg (point))) ;; Store the computed mime-type for later use (e.g. by attachment handlers). -- 2.1.4 ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
[PATCH] NEWS: fix 'not' - 'now' typo in 0.19 nmbug section
--- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 70ad3f3..8a1b310 100644 --- a/NEWS +++ b/NEWS @@ -167,7 +167,7 @@ nmbug The Perl script has been translated to Python; you'll need Python 2.7 or anything from the 3.x line. Most of the user-facing interface is -the same, but `nmbug help` is not `nmbug --help`, and the following nmbug +the same, but `nmbug help` is now `nmbug --help`, and the following nmbug commands have slightly different interfaces: `archive`, `commit`, `fetch`, `log`, `pull`, `push`, and `status`. For details on the new interface for a given command, run `nmbug COMMAND --help`. -- 2.1.0.60.g85f0837 ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
Re: [Patch v6 4/8] lib: add verbose versions of notmuch_database_{open, create}
On Sat, Mar 28 2015, David Bremner da...@tethera.net wrote:
The compatibility wrapper ensures that clients calling
notmuch_database_open will receive consistent output for now.
The changes to notmuch-{new,search} and test/symbol-test are just to
make the test suite pass.
The use of IGNORE_RESULT is justified by two things. 1) I don't know
what else to do. 2) asprintf guarantees the output string is NULL if
an error occurs, so at least we are not passing garbage back.
---
lib/database.cc | 109
++--
lib/notmuch.h | 21 ++
notmuch-new.c | 11 +-
notmuch-search.c| 13 ++-
test/symbol-test.cc | 9 -
5 files changed, 130 insertions(+), 33 deletions(-)
diff --git a/lib/database.cc b/lib/database.cc
index 3974e2e..5d973b9 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -608,29 +608,50 @@ parse_references (void *ctx,
notmuch_status_t
notmuch_database_create (const char *path, notmuch_database_t **database)
{
+char *status_string = NULL;
+notmuch_status_t status;
+
+status = notmuch_database_create_verbose (path, database,
+ status_string);
+
+if (status_string) {
+ fputs (status_string, stderr);
+ free (status_string);
+}
+
+return status;
+}
+
+notmuch_status_t
+notmuch_database_create_verbose (const char *path,
+ notmuch_database_t **database,
+ char **status_string)
+{
notmuch_status_t status = NOTMUCH_STATUS_SUCCESS;
notmuch_database_t *notmuch = NULL;
char *notmuch_path = NULL;
+char *message = NULL;
struct stat st;
int err;
if (path == NULL) {
- fprintf (stderr, Error: Cannot create a database for a NULL path.\n);
+ message = strdup (Error: Cannot create a database for a NULL path.\n);
status = NOTMUCH_STATUS_NULL_POINTER;
goto DONE;
}
err = stat (path, st);
if (err) {
- fprintf (stderr, Error: Cannot create database at %s: %s.\n,
- path, strerror (errno));
+ IGNORE_RESULT (asprintf (message, Error: Cannot create database at
%s: %s.\n,
+ path, strerror (errno)));
status = NOTMUCH_STATUS_FILE_ERROR;
goto DONE;
}
if (! S_ISDIR (st.st_mode)) {
- fprintf (stderr, Error: Cannot create database at %s: Not a
directory.\n,
- path);
+ IGNORE_RESULT (asprintf (message, Error: Cannot create database at
%s:
+ Not a directory.\n,
+ path));
status = NOTMUCH_STATUS_FILE_ERROR;
goto DONE;
}
@@ -640,15 +661,15 @@ notmuch_database_create (const char *path,
notmuch_database_t **database)
err = mkdir (notmuch_path, 0755);
if (err) {
- fprintf (stderr, Error: Cannot create directory %s: %s.\n,
- notmuch_path, strerror (errno));
+ IGNORE_RESULT (asprintf (message, Error: Cannot create directory %s:
%s.\n,
+ notmuch_path, strerror (errno)));
status = NOTMUCH_STATUS_FILE_ERROR;
goto DONE;
}
-status = notmuch_database_open (path,
- NOTMUCH_DATABASE_MODE_READ_WRITE,
- notmuch);
+status = notmuch_database_open_verbose (path,
+ NOTMUCH_DATABASE_MODE_READ_WRITE,
+ notmuch, message);
if (status)
goto DONE;
@@ -667,6 +688,9 @@ notmuch_database_create (const char *path,
notmuch_database_t **database)
if (notmuch_path)
talloc_free (notmuch_path);
+if (status_string message)
+ *status_string = message;
This series looks good and tests pass (I had confusion there before seeing
one of the last patch moving one output from stderr to stdout of where
the test status_cb prints it output)
Just that this small piece of code above git pass my sparse sieve, perhaps
this could be amended to:
if (message) {
if (status_string)
*status_string = message;
else
free(message);
}
IMO either amend or leave to followup patch; just for that I don't
want to go through full patch series ;D
+
if (database)
*database = notmuch;
else
@@ -767,37 +791,58 @@ notmuch_database_open (const char *path,
notmuch_database_mode_t mode,
notmuch_database_t **database)
{
+char *status_string = NULL;
+notmuch_status_t status;
+
+status = notmuch_database_open_verbose (path, mode, database,
+status_string);
+
+if (status_string) {
+ fputs (status_string, stderr);
+ free (status_string);
+}
+
+return status;
+}
+
[PATCH] emacs: print messages when starting and ending notmuch queries
For slow queries, it is possible for a second query to block while the first is still running. This has the unfortunate effect that it is impossible for the user to know if the query returned no results, or if it is still running. This change tries to remedy this by printing messages in the echo area when starting and finishing queries. --- I'm curious what people think about this possible change. It does make the whole UI a bit noisier for fast queries. OTOH, it seems simpler than trying to mess with the results buffer or mode line. emacs/notmuch.el | 4 1 file changed, 4 insertions(+) diff --git a/emacs/notmuch.el b/emacs/notmuch.el index ab00454..cb8ddef 100644 --- a/emacs/notmuch.el +++ b/emacs/notmuch.el @@ -616,6 +616,7 @@ of the result. (let ((buffer (process-buffer proc)) (status (process-status proc)) (exit-status (process-exit-status proc)) + (query (process-get proc 'query)) (never-found-target-thread nil)) (when (memq status '(exit signal)) (catch 'return @@ -629,6 +630,7 @@ of the result. (if (eq status 'signal) (insert Incomplete search results (search process was killed).\n)) (when (eq status 'exit) + (message notmuch query %s complete query) (insert End of search results.\n) ;; For version mismatch, there's no point in ;; showing the search buffer @@ -931,6 +933,7 @@ the configured default sort order. (error notmuch search process already running for query `%s' query) ) (erase-buffer) + (message running notmuch query %s... query) (goto-char (point-min)) (save-excursion (let ((proc (notmuch-start-notmuch @@ -945,6 +948,7 @@ the configured default sort order. ;; should be called no matter how the process dies. (parse-buf (generate-new-buffer *notmuch search parse*))) (process-put proc 'parse-buf parse-buf) + (process-put proc 'query query) (set-process-filter proc 'notmuch-search-process-filter) (set-process-query-on-exit-flag proc nil (run-hooks 'notmuch-search-hook))) -- 2.1.4 ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
Re: Can't compose message in Emacs - Notmuch
Tomi Ollila tomi.oll...@iki.fi writes: Instead of noise I think this is valuable information... ... if we had troubleshooting (or just put to emacstips.mdwn) page we could add something along the line: emacs -Q -L /path/to/notmuch/elisp/dir --eval (require 'notmuch) For the record, I started a troubleshooting page at http://notmuchmail.org/bugs It's a wiki, so feel free to improve this page. d ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
