X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=contrib%2Fnmbug%2Fnmbug-status;h=d08ca08dc86445ef8026a594669970df09ce533c;hb=8ba60168897e81133c85d9f4928b96ad4a4b6ffd;hp=c6634096ae9a48bd8e655615b6ca38be8acbdd8e;hpb=d1e09413502f9affc4fd72b5624967c36606526b;p=notmuch
diff --git a/contrib/nmbug/nmbug-status b/contrib/nmbug/nmbug-status
index c6634096..d08ca08d 100755
--- a/contrib/nmbug/nmbug-status
+++ b/contrib/nmbug/nmbug-status
@@ -51,12 +51,19 @@ if args.text:
else:
output_format = 'html'
-headers = ['date', 'from', 'subject']
-last = {}
+class Thread:
+ def __init__(self, last, lines):
+ self.last = last
+ self.lines = lines
+
+ def join_utf8_with_newlines(self):
+ return '\n'.join( (line.encode('utf-8') for line in self.lines) )
-def clear_last():
- for header in headers:
- last[header] = ''
+def output_with_separator(threadlist, sep):
+ outputs = (thread.join_utf8_with_newlines() for thread in threadlist)
+ print sep.join(outputs)
+
+headers = ['date', 'from', 'subject']
def print_view(title, query, comment):
@@ -64,7 +71,12 @@ def print_view(title, query, comment):
q_new = notmuch.Query(db, query_string)
q_new.set_sort(notmuch.Query.SORT.OLDEST_FIRST)
- last['thread_id'] = ''
+ last_thread_id = ''
+ threads = {}
+ threadlist = []
+ out = {}
+ last = None
+ lines = None
if output_format == 'html':
print '
%s
' % (title, title)
@@ -77,11 +89,21 @@ def print_view(title, query, comment):
for m in q_new.search_messages():
- out = {}
-
thread_id = m.get_thread_id()
- if thread_id != last['thread_id']:
- clear_last()
+
+ if thread_id != last_thread_id:
+ if threads.has_key(thread_id):
+ last = threads[thread_id].last
+ lines = threads[thread_id].lines
+ else:
+ last = {}
+ lines = []
+ thread = Thread(last, lines)
+ threads[thread_id] = thread
+ for h in headers:
+ last[h] = ''
+ threadlist.append(thread)
+ last_thread_id = thread_id
for header in headers:
val = m.get_header(header)
@@ -94,38 +116,35 @@ def print_view(title, query, comment):
if val == '':
val = addr.split('@')[0]
- if last[header] == val:
+ if header != 'subject' and last[header] == val:
out[header] = ''
else:
- out[header] = val.encode('utf-8')
+ out[header] = val
last[header] = val
mid = m.get_message_id()
out['id'] = 'id:"%s"' % mid
if output_format == 'html':
- # XXX using
is a hack, but ... // 20111216 too
- if thread_id != last['thread_id']:
- br = '
'
- else:
- br = ''
out['subject'] = '%s' \
% (urllib.quote(mid), out['subject'])
- print ' %s %s' % (br, out['date'])
- print ' | %s %s' % (br, out['id'])
- print ' |
'
- print ' %s' % out['from']
- print ' | %s' % out['subject']
- print ' |
\n'
+ lines.append(' %s' % out['date'])
+ lines.append(' | %s' % out['id'])
+ lines.append(' |
')
+ lines.append(' %s' % out['from'])
+ lines.append(' | %s' % out['subject'])
+ lines.append(' |
')
else:
- print '%(date)-10.10s %(from)-20.20s %(subject)-40.40s\n%(id)72s\n' % out
-
- last['thread_id'] = thread_id
+ lines.append('%(date)-10.10s %(from)-20.20s %(subject)-40.40s\n%(id)72s' % out)
if output_format == 'html':
+ output_with_separator(threadlist,
+ '\n
|
\n')
print ''
+ else:
+ output_with_separator(threadlist, '\n\n')
# main program