X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=contrib%2Fnmbug%2Fnmbug-status;h=d08ca08dc86445ef8026a594669970df09ce533c;hp=6aa86a05fd796545158d74e8c15e0e3e94179768;hb=06c70d3d754720f1043a0828f6cee33d2788eaf9;hpb=3e5fb88f11359b0c3d43eb06f105ef42e63d31b5

diff --git a/contrib/nmbug/nmbug-status b/contrib/nmbug/nmbug-status
index 6aa86a05..d08ca08d 100755
--- a/contrib/nmbug/nmbug-status
+++ b/contrib/nmbug/nmbug-status
@@ -18,10 +18,10 @@ import subprocess
 # parse command line arguments
 
 parser = argparse.ArgumentParser()
-parser.add_argument("--text", help="output plain text format",
-                    action="store_true")
+parser.add_argument('--text', help='output plain text format',
+                    action='store_true')
 
-parser.add_argument("--config", help="load config from given file")
+parser.add_argument('--config', help='load config from given file')
 
 
 args = parser.parse_args()
@@ -31,18 +31,18 @@ args = parser.parse_args()
 if args.config != None:
     fp = open(args.config)
 else:
-    nmbhome = os.getenv('NMBGIT', os.path.expanduser("~/.nmbug"))
+    nmbhome = os.getenv('NMBGIT', os.path.expanduser('~/.nmbug'))
 
     # read only the first line from the pipe
-    sha1 =  subprocess.Popen(['git', '--git-dir', nmbhome,
-                     'show-ref', '-s', 'config'],
-                      stdout=subprocess.PIPE).stdout.readline()
+    sha1 = subprocess.Popen(['git', '--git-dir', nmbhome,
+                             'show-ref', '-s', 'config'],
+                            stdout=subprocess.PIPE).stdout.readline()
 
     sha1 = sha1.rstrip()
 
-    fp =  subprocess.Popen(['git', '--git-dir', nmbhome,
-                            'cat-file', 'blob', sha1+':status-config.json'],
-                           stdout=subprocess.PIPE).stdout
+    fp = subprocess.Popen(['git', '--git-dir', nmbhome,
+                           'cat-file', 'blob', sha1+':status-config.json'],
+                          stdout=subprocess.PIPE).stdout
 
 config = json.load(fp)
 
@@ -51,24 +51,35 @@ 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):
 
-    query_string = " and ".join(query)
+    query_string = ' and '.join(query)
     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 '<h3>%s</h3>' % title
+        print '<h3><a name="%s" />%s</h3>' % (title, title)
         print comment
         print 'The view is generated from the following query:'
         print '<blockquote>'
@@ -78,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)
@@ -91,39 +112,39 @@ def print_view(title, query, comment):
                 val = str.join(' ', val.split(None)[1:4])
                 val = str(datetime.datetime.strptime(val, '%d %b %Y').date())
             elif header == 'from':
-                val = rfc822.parseaddr(val)[0]
+                (val, addr) = rfc822.parseaddr(val)
+                if val == '':
+                    val = addr.split('@')[0]
 
-            if last[header] == val:
-                out[header] = ""
+            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 <br /> is a hack, but ... // 20111216 too
-            if thread_id != last['thread_id']:
-                br = '<br />'
-            else:
-                br = ''
-                out['subject'] = '<a href="http://mid.gmane.org/%s">%s</a>' \
-                                        % (urllib.quote(mid), out['subject'])
-
-            print " <tr><td>%s %s" % (br, out['date'])
-            print "</td><td>%s %s" % (br, out['id'])
-            print "</td></tr>"
-            print " <tr><td>%s" % out['from']
-            print "</td><td>%s" % out['subject']
-            print "</td></tr>\n"
-        else:
-            print '%(date)-10.10s %(from)-20.20s %(subject)-40.40s\n%(id)72s\n' % out
 
-        last['thread_id'] = thread_id
+            out['subject'] = '<a href="http://mid.gmane.org/%s">%s</a>' \
+                % (urllib.quote(mid), out['subject'])
+
+            lines.append(' <tr><td>%s' % out['date'])
+            lines.append('</td><td>%s' % out['id'])
+            lines.append('</td></tr>')
+            lines.append(' <tr><td>%s' % out['from'])
+            lines.append('</td><td>%s' % out['subject'])
+            lines.append('</td></tr>')
+        else:
+            lines.append('%(date)-10.10s %(from)-20.20s %(subject)-40.40s\n%(id)72s' % out)
 
     if output_format == 'html':
+        output_with_separator(threadlist,
+                              '\n<tr><td colspan="2"><br /></td></tr>\n')
         print '</table>'
+    else:
+        output_with_separator(threadlist, '\n\n')
 
 # main program
 
@@ -142,6 +163,12 @@ if output_format == 'html':
     print 'Generated: %s<br />' % datetime.datetime.utcnow().date()
     print 'For more infomation see <a href="http://notmuchmail.org/nmbug">nmbug</a>'
 
+    print '<h3>Views</h3>'
+    print '<ul>'
+    for view in config['views']:
+        print '<li><a href="#%(title)s">%(title)s</a></li>' % view
+    print '</ul>'
+
 for view in config['views']:
     print_view(**view)