--- /dev/null
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 20883431FDA\r
+ for <notmuch@notmuchmail.org>; Sun, 9 Mar 2014 14:40:57 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id mLZpxZ7aTQnc for <notmuch@notmuchmail.org>;\r
+ Sun, 9 Mar 2014 14:40:49 -0700 (PDT)\r
+Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com\r
+ [209.85.217.169]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 90772431FC0\r
+ for <notmuch@notmuchmail.org>; Sun, 9 Mar 2014 14:40:46 -0700 (PDT)\r
+Received: by mail-lb0-f169.google.com with SMTP id l4so4121151lbv.14\r
+ for <notmuch@notmuchmail.org>; Sun, 09 Mar 2014 14:40:45 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
+ :references:in-reply-to:references;\r
+ bh=DRhH5Pt/0/QzLlQI4FG2Gr6Q/xv07wQQRvopzTcguxE=;\r
+ b=jhacgN59421YKFKaFOqIAiSnLtTHRPS8k1SwUEaCvohncS4FeKMNBRcWVPKiFEUd25\r
+ AAM6l+WOR6wnAJlVw+xLzDgkBpX/EAUQQl0xG8mScfizVJ/XiXV5UqtAoxG6NSPbae34\r
+ +wCWWonxmrxHDohHqvDsK4NGnuHoMrAxVVh5NbE3AWjjs/LWYhRRv9EiyTScrdlkJ1xq\r
+ vCi58DsREFnAcU1+5LafVbWwPukV++CRi4Pg2ucRfB7BSDH69nS2PheSUSSLJiWjXahi\r
+ QsLV/WBuCWdHlSGBnZgdvYIK0pbd+glZ/jmzpYJmCK6CzryvEoMGaIURa9TeBjSvFmrN\r
+ ELjQ==\r
+X-Gm-Message-State:\r
+ ALoCoQmHiHEEmX53PeqT4UfTECP2nvv9ipkwbelpwUmL6zYYu050mCNDeB/BtFYmlVh3+3KvTE5M\r
+X-Received: by 10.112.205.5 with SMTP id lc5mr4464lbc.40.1394401245092;\r
+ Sun, 09 Mar 2014 14:40:45 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
+ [88.195.111.91]) by mx.google.com with ESMTPSA id\r
+ wv4sm10382957lbb.10.2014.03.09.14.40.43 for <multiple recipients>\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Sun, 09 Mar 2014 14:40:44 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v4 03/13] lib: refactor folder term update after filename\r
+ removal\r
+Date: Sun, 9 Mar 2014 23:40:24 +0200\r
+Message-Id:\r
+ <54310c07d86909b8f1e087261b9d052968803325.1394400503.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.9.0\r
+In-Reply-To: <cover.1394400503.git.jani@nikula.org>\r
+References: <cover.1394400503.git.jani@nikula.org>\r
+In-Reply-To: <cover.1394400503.git.jani@nikula.org>\r
+References: <cover.1394400503.git.jani@nikula.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 09 Mar 2014 21:40:57 -0000\r
+\r
+Abstract some blocks of code for reuse. No functional changes.\r
+---\r
+ lib/message.cc | 135 ++++++++++++++++++++++++++++-----------------------------\r
+ 1 file changed, 66 insertions(+), 69 deletions(-)\r
+\r
+diff --git a/lib/message.cc b/lib/message.cc\r
+index c91f3a59836f..7aff4ae5111a 100644\r
+--- a/lib/message.cc\r
++++ b/lib/message.cc\r
+@@ -481,6 +481,68 @@ notmuch_message_get_replies (notmuch_message_t *message)\r
+ return _notmuch_messages_create (message->replies);\r
+ }\r
+ \r
++static void\r
++_notmuch_message_remove_terms (notmuch_message_t *message, const char *prefix)\r
++{\r
++ Xapian::TermIterator i;\r
++ size_t prefix_len = strlen (prefix);\r
++\r
++ while (1) {\r
++ i = message->doc.termlist_begin ();\r
++ i.skip_to (prefix);\r
++\r
++ /* Terminate loop when no terms remain with desired prefix. */\r
++ if (i == message->doc.termlist_end () ||\r
++ strncmp ((*i).c_str (), prefix, prefix_len))\r
++ break;\r
++\r
++ try {\r
++ message->doc.remove_term ((*i));\r
++ } catch (const Xapian::InvalidArgumentError) {\r
++ /* Ignore failure to remove non-existent term. */\r
++ }\r
++ }\r
++}\r
++\r
++/* Add directory based terms for all filenames of the message. */\r
++static notmuch_status_t\r
++_notmuch_message_add_directory_terms (void *ctx, notmuch_message_t *message)\r
++{\r
++ const char *direntry_prefix = _find_prefix ("file-direntry");\r
++ int direntry_prefix_len = strlen (direntry_prefix);\r
++ Xapian::TermIterator i = message->doc.termlist_begin ();\r
++ notmuch_status_t status = NOTMUCH_STATUS_SUCCESS;\r
++\r
++ for (i.skip_to (direntry_prefix); i != message->doc.termlist_end (); i++) {\r
++ unsigned int directory_id;\r
++ const char *direntry, *directory;\r
++ char *colon;\r
++\r
++ /* Terminate loop at first term without desired prefix. */\r
++ if (strncmp ((*i).c_str (), direntry_prefix, direntry_prefix_len))\r
++ break;\r
++\r
++ /* Indicate that there are filenames remaining. */\r
++ status = NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID;\r
++\r
++ direntry = (*i).c_str ();\r
++ direntry += direntry_prefix_len;\r
++\r
++ directory_id = strtol (direntry, &colon, 10);\r
++\r
++ if (colon == NULL || *colon != ':')\r
++ INTERNAL_ERROR ("malformed direntry");\r
++\r
++ directory = _notmuch_database_get_directory_path (ctx,\r
++ message->notmuch,\r
++ directory_id);\r
++ if (strlen (directory))\r
++ _notmuch_message_gen_terms (message, "folder", directory);\r
++ }\r
++\r
++ return status;\r
++}\r
++\r
+ /* Add an additional 'filename' for 'message'.\r
+ *\r
+ * This change will not be reflected in the database until the next\r
+@@ -536,17 +598,12 @@ notmuch_status_t\r
+ _notmuch_message_remove_filename (notmuch_message_t *message,\r
+ const char *filename)\r
+ {\r
+- const char *direntry_prefix = _find_prefix ("file-direntry");\r
+- int direntry_prefix_len = strlen (direntry_prefix);\r
+- const char *folder_prefix = _find_prefix ("folder");\r
+- int folder_prefix_len = strlen (folder_prefix);\r
+ void *local = talloc_new (message);\r
++ const char *folder_prefix = _find_prefix ("folder");\r
+ char *zfolder_prefix = talloc_asprintf(local, "Z%s", folder_prefix);\r
+- int zfolder_prefix_len = strlen (zfolder_prefix);\r
+ char *direntry;\r
+ notmuch_private_status_t private_status;\r
+ notmuch_status_t status;\r
+- Xapian::TermIterator i, last;\r
+ \r
+ status = _notmuch_database_filename_to_direntry (\r
+ local, message->notmuch, filename, NOTMUCH_FIND_LOOKUP, &direntry);\r
+@@ -567,73 +624,13 @@ _notmuch_message_remove_filename (notmuch_message_t *message,\r
+ * 3. adding back terms for all remaining filenames of the message. */\r
+ \r
+ /* 1. removing all "folder:" terms */\r
+- while (1) {\r
+- i = message->doc.termlist_begin ();\r
+- i.skip_to (folder_prefix);\r
+-\r
+- /* Terminate loop when no terms remain with desired prefix. */\r
+- if (i == message->doc.termlist_end () ||\r
+- strncmp ((*i).c_str (), folder_prefix, folder_prefix_len))\r
+- {\r
+- break;\r
+- }\r
+-\r
+- try {\r
+- message->doc.remove_term ((*i));\r
+- } catch (const Xapian::InvalidArgumentError) {\r
+- /* Ignore failure to remove non-existent term. */\r
+- }\r
+- }\r
++ _notmuch_message_remove_terms (message, folder_prefix);\r
+ \r
+ /* 2. removing all "folder:" stemmed terms */\r
+- while (1) {\r
+- i = message->doc.termlist_begin ();\r
+- i.skip_to (zfolder_prefix);\r
+-\r
+- /* Terminate loop when no terms remain with desired prefix. */\r
+- if (i == message->doc.termlist_end () ||\r
+- strncmp ((*i).c_str (), zfolder_prefix, zfolder_prefix_len))\r
+- {\r
+- break;\r
+- }\r
+-\r
+- try {\r
+- message->doc.remove_term ((*i));\r
+- } catch (const Xapian::InvalidArgumentError) {\r
+- /* Ignore failure to remove non-existent term. */\r
+- }\r
+- }\r
++ _notmuch_message_remove_terms (message, zfolder_prefix);\r
+ \r
+ /* 3. adding back terms for all remaining filenames of the message. */\r
+- i = message->doc.termlist_begin ();\r
+- i.skip_to (direntry_prefix);\r
+-\r
+- for (; i != message->doc.termlist_end (); i++) {\r
+- unsigned int directory_id;\r
+- const char *direntry, *directory;\r
+- char *colon;\r
+-\r
+- /* Terminate loop at first term without desired prefix. */\r
+- if (strncmp ((*i).c_str (), direntry_prefix, direntry_prefix_len))\r
+- break;\r
+-\r
+- /* Indicate that there are filenames remaining. */\r
+- status = NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID;\r
+-\r
+- direntry = (*i).c_str ();\r
+- direntry += direntry_prefix_len;\r
+-\r
+- directory_id = strtol (direntry, &colon, 10);\r
+-\r
+- if (colon == NULL || *colon != ':')\r
+- INTERNAL_ERROR ("malformed direntry");\r
+-\r
+- directory = _notmuch_database_get_directory_path (local,\r
+- message->notmuch,\r
+- directory_id);\r
+- if (strlen (directory))\r
+- _notmuch_message_gen_terms (message, "folder", directory);\r
+- }\r
++ status = _notmuch_message_add_directory_terms (local, message);\r
+ \r
+ talloc_free (local);\r
+ \r
+-- \r
+1.9.0\r
+\r
projects / notmuch-archives.git / commitdiff