b4: Ensure we read threadfile for message-id

* b4: Ensure we read threadfile for message-id
@ 2021-04-21 20:29 Morten Linderud
  2021-04-21 23:33 ` Kyle Meyer
  0 siblings, 1 reply; 3+ messages in thread
From: Morten Linderud @ 2021-04-21 20:29 UTC (permalink / raw)
  To: tools; +Cc: Morten Linderud

This fixes a bug where reading from `get_msgid_from_stdin` couldn't grab
the message-id when we collect a thread from stdin.

This is mainly because there is no good way to override `sys.stdin`
(from what I can see) and it probably makes more sense to try fetch
message-ids from files instead. This allows us to replace the default
file "sys.stdin" with the thread file whenever we need.

No patch:

    $ curl -s "https://lore.kernel.org/lkml/20210421130105.1226686-1-gregkh@linuxfoundation.org/raw" | b4 mbox
    Looking up https://lore.kernel.org/r/20210421130105.1226686-1-gregkh%40linuxfoundation.org
    Grabbing thread from lore.kernel.org/lkml
    272 messages in the thread
    Unable to find a valid message-id in stdin.

With patch:

    $ curl -s "https://lore.kernel.org/lkml/20210421130105.1226686-1-gregkh@linuxfoundation.org/raw" | .4 mbox
    Looking up https://lore.kernel.org/r/20210421130105.1226686-1-gregkh%40linuxfoundation.org
    Grabbing thread from lore.kernel.org/lkml
    272 messages in the thread
    Saved ./20210421130105.1226686-1-gregkh@linuxfoundation.org.mbx

Signed-off-by: Morten Linderud <foxboron@archlinux.org>
---
 b4/__init__.py | 8 ++++----
 b4/mbox.py     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/b4/__init__.py b/b4/__init__.py
index 32b5c02..e81d395 100644
--- a/b4/__init__.py
+++ b/b4/__init__.py
@@ -2179,18 +2179,18 @@ def get_requests_session():
     return REQSESSION
 
 
-def get_msgid_from_stdin():
+def get_msgid_from_file(file):
     if not sys.stdin.isatty():
-        message = email.message_from_string(sys.stdin.read())
+        message = email.message_from_string(file.read())
         return message.get('Message-ID', None)
     logger.error('Error: pipe a message or pass msgid as parameter')
     sys.exit(1)
 
 
-def get_msgid(cmdargs):
+def get_msgid(cmdargs, file=sys.stdin):
     if not cmdargs.msgid:
         logger.debug('Getting Message-ID from stdin')
-        msgid = get_msgid_from_stdin()
+        msgid = get_msgid_from_file(file)
         if msgid is None:
             logger.error('Unable to find a valid message-id in stdin.')
             sys.exit(1)
diff --git a/b4/mbox.py b/b4/mbox.py
index d3bde25..791f545 100644
--- a/b4/mbox.py
+++ b/b4/mbox.py
@@ -566,7 +566,7 @@ def main(cmdargs):
     if cmdargs.wantname:
         savefile = os.path.join(cmdargs.outdir, cmdargs.wantname)
     else:
-        msgid = b4.get_msgid(cmdargs)
+        msgid = b4.get_msgid(cmdargs, file=open(threadfile))
         savefile = os.path.join(cmdargs.outdir, '%s.mbx' % msgid)
 
     mbx.close()
-- 
2.31.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread