unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: Sean Whitton <spwhitton@spwhitton.name>
To: notmuch@notmuchmail.org
Cc: Sean Whitton <spwhitton@spwhitton.name>
Subject: [PATCH v2] nmbug: write tags out to a temporary file, not 'nmbug.index'
Date: Sun, 13 Feb 2022 09:54:08 -0700	[thread overview]
Message-ID: <20220213165408.972859-1-spwhitton@spwhitton.name> (raw)
In-Reply-To: <id:m2pmnr2o2f.fsf@guru.guru-group.fi>

If more than nmbug process is running at once, then each will try to
read and write the same file.  The particular failure I've seen is
that the process which finishes first deletes nmbug.index, and then
the other process dies with a FileNotFoundError.  So use a distinct
temporary file per process.
---
 devel/nmbug/nmbug | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

Here is a second attempt, though I'm afraid I have little idea whether it is
idiomatic Python.

diff --git a/devel/nmbug/nmbug b/devel/nmbug/nmbug
index 043c1863..396098d0 100755
--- a/devel/nmbug/nmbug
+++ b/devel/nmbug/nmbug
@@ -586,37 +586,38 @@ def get_status():
         'deleted': {},
         'missing': {},
         }
-    index = _index_tags()
-    maybe_deleted = _diff_index(index=index, filter='D')
-    for id, tags in maybe_deleted.items():
-        (_, stdout, stderr) = _spawn(
-            args=['notmuch', 'search', '--output=files', 'id:{0}'.format(id)],
-            stdout=_subprocess.PIPE,
-            wait=True)
-        if stdout:
-            status['deleted'][id] = tags
-        else:
-            status['missing'][id] = tags
-    status['added'] = _diff_index(index=index, filter='A')
-    _os.remove(index)
-    return status
-
-
-def _index_tags():
-    "Write notmuch tags to the nmbug.index."
-    path = _os.path.join(NMBGIT, 'nmbug.index')
+    (_, index) = _tempfile.mkstemp()
+    try:
+        _index_tags(index)
+        maybe_deleted = _diff_index(index=index, filter='D')
+        for id, tags in maybe_deleted.items():
+            (_, stdout, stderr) = _spawn(
+                args=['notmuch', 'search', '--output=files', 'id:{0}'.format(id)],
+                stdout=_subprocess.PIPE,
+                wait=True)
+            if stdout:
+                status['deleted'][id] = tags
+            else:
+                status['missing'][id] = tags
+                status['added'] = _diff_index(index=index, filter='A')
+                return status
+    finally:
+        _os.remove(index)
+
+def _index_tags(index):
+    "Write notmuch tags to a file."
     query = ' '.join('tag:"{tag}"'.format(tag=tag) for tag in get_tags())
     prefix = '+{0}'.format(_ENCODED_TAG_PREFIX)
     _git(
         args=['read-tree', '--empty'],
-        additional_env={'GIT_INDEX_FILE': path}, wait=True)
+        additional_env={'GIT_INDEX_FILE': index}, wait=True)
     with _spawn(
             args=['notmuch', 'dump', '--format=batch-tag', '--', query],
             stdout=_subprocess.PIPE) as notmuch:
         with _git(
                 args=['update-index', '--index-info'],
                 stdin=_subprocess.PIPE,
-                additional_env={'GIT_INDEX_FILE': path}) as git:
+                additional_env={'GIT_INDEX_FILE': index}) as git:
             for line in notmuch.stdout:
                 if line.strip().startswith('#'):
                     continue
@@ -629,7 +630,6 @@ def _index_tags():
                 for line in _index_tags_for_message(
                         id=id, status='A', tags=tags):
                     git.stdin.write(line)
-    return path
 
 
 def _index_tags_for_message(id, status, tags):
-- 
2.30.2

       reply	other threads:[~2022-02-13 16:54 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <id:m2pmnr2o2f.fsf@guru.guru-group.fi>
2022-02-13 16:54 ` Sean Whitton [this message]
2022-02-13 17:17   ` [PATCH v2] nmbug: write tags out to a temporary file, not 'nmbug.index' Kyle Meyer
2022-02-13 17:18   ` Sean Whitton
2022-02-13 18:08     ` Tomi Ollila

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220213165408.972859-1-spwhitton@spwhitton.name \
    --to=spwhitton@spwhitton.name \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).