2012-07-07 21:29:38 +02:00
|
|
|
#!/usr/bin/python
|
|
|
|
#
|
|
|
|
# Copyright (c) 2011-2012 David Bremner <david@tethera.net>
|
2014-06-01 00:20:22 +02:00
|
|
|
#
|
2012-07-07 21:29:38 +02:00
|
|
|
# dependencies
|
|
|
|
# - python 2.6 for json
|
|
|
|
# - argparse; either python 2.7, or install separately
|
2014-06-01 00:20:22 +02:00
|
|
|
#
|
|
|
|
# This program is free software: you can redistribute it and/or modify
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
|
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
|
|
# (at your option) any later version.
|
|
|
|
#
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
# along with this program. If not, see http://www.gnu.org/licenses/ .
|
2012-07-07 21:29:38 +02:00
|
|
|
|
2014-06-01 00:20:23 +02:00
|
|
|
"""Generate HTML for one or more notmuch searches.
|
|
|
|
|
|
|
|
Messages matching each search are grouped by thread. Each message
|
|
|
|
that contains both a subject and message-id will have the displayed
|
|
|
|
subject link to the Gmane view of the message.
|
|
|
|
"""
|
|
|
|
|
2014-02-10 19:40:22 +01:00
|
|
|
from __future__ import print_function
|
2014-02-10 19:40:31 +01:00
|
|
|
from __future__ import unicode_literals
|
2014-02-10 19:40:22 +01:00
|
|
|
|
2014-02-10 19:40:24 +01:00
|
|
|
import codecs
|
2014-02-10 19:40:31 +01:00
|
|
|
import collections
|
2012-07-07 21:29:38 +02:00
|
|
|
import datetime
|
2014-02-10 19:40:23 +01:00
|
|
|
import email.utils
|
2014-02-10 19:40:30 +01:00
|
|
|
try: # Python 3
|
|
|
|
from urllib.parse import quote
|
|
|
|
except ImportError: # Python 2
|
|
|
|
from urllib import quote
|
2012-07-07 21:29:38 +02:00
|
|
|
import json
|
|
|
|
import argparse
|
|
|
|
import os
|
2014-02-13 17:47:17 +01:00
|
|
|
import re
|
2013-04-01 11:44:01 +02:00
|
|
|
import sys
|
2012-07-07 21:29:38 +02:00
|
|
|
import subprocess
|
2014-02-13 17:47:20 +01:00
|
|
|
import xml.sax.saxutils
|
2012-07-07 21:29:38 +02:00
|
|
|
|
2014-02-10 19:40:24 +01:00
|
|
|
|
2014-02-14 17:48:55 +01:00
|
|
|
_ENCODING = 'UTF-8'
|
2014-02-10 19:40:31 +01:00
|
|
|
_PAGES = {}
|
2014-02-10 19:40:24 +01:00
|
|
|
|
|
|
|
|
2014-02-10 19:40:32 +01:00
|
|
|
if not hasattr(collections, 'OrderedDict'): # Python 2.6 or earlier
|
|
|
|
class _OrderedDict (dict):
|
|
|
|
"Just enough of a stub to get through Page._get_threads"
|
|
|
|
def __init__(self, *args, **kwargs):
|
|
|
|
super(_OrderedDict, self).__init__(*args, **kwargs)
|
|
|
|
self._keys = [] # record key order
|
|
|
|
|
|
|
|
def __setitem__(self, key, value):
|
|
|
|
super(_OrderedDict, self).__setitem__(key, value)
|
|
|
|
self._keys.append(key)
|
|
|
|
|
2014-02-18 19:34:52 +01:00
|
|
|
def values(self):
|
2014-02-10 19:40:32 +01:00
|
|
|
for key in self._keys:
|
|
|
|
yield self[key]
|
|
|
|
|
|
|
|
|
|
|
|
collections.OrderedDict = _OrderedDict
|
|
|
|
|
|
|
|
|
nmbug-status: Clarify errors for illegible configs
Carl Worth pointed out that errors like:
$ ./nmbug-status
fatal: Not a git repository: '/home/cworth/.nmbug'
fatal: Not a git repository: '/home/cworth/.nmbug'
Traceback (most recent call last):
File "./nmbug-status", line 254, in <module>
config = read_config(path=args.config)
File "./nmbug-status", line 73, in read_config
return json.load(fp)
File "/usr/lib/python2.7/json/__init__.py", line 290, in load
**kw)
File "/usr/lib/python2.7/json/__init__.py", line 338, in loads
return _default_decoder.decode(s)
File "/usr/lib/python2.7/json/decoder.py", line 366, in decode
obj, end = self.raw_decode(s, idx=_w(s, 0).end())
File "/usr/lib/python2.7/json/decoder.py", line 384, in raw_decode
raise ValueError("No JSON object could be decoded")
ValueError: No JSON object could be decoded
are not particularly clear. With this commit, we'll get output like:
$ ./nmbug-status
fatal: Not a git repository: '/home/wking/.nmbug'
No local branch 'config' in /home/wking/.nmbug. Checkout a local
config branch or explicitly set --config.
which is much more accessible. I've also added user-friendly messages
for a number of other config-parsing errors.
2014-05-10 21:16:38 +02:00
|
|
|
class ConfigError (Exception):
|
|
|
|
"""Errors with config file usage
|
|
|
|
"""
|
|
|
|
pass
|
|
|
|
|
|
|
|
|
2014-02-10 19:40:25 +01:00
|
|
|
def read_config(path=None, encoding=None):
|
|
|
|
"Read config from json file"
|
|
|
|
if not encoding:
|
|
|
|
encoding = _ENCODING
|
|
|
|
if path:
|
nmbug-status: Clarify errors for illegible configs
Carl Worth pointed out that errors like:
$ ./nmbug-status
fatal: Not a git repository: '/home/cworth/.nmbug'
fatal: Not a git repository: '/home/cworth/.nmbug'
Traceback (most recent call last):
File "./nmbug-status", line 254, in <module>
config = read_config(path=args.config)
File "./nmbug-status", line 73, in read_config
return json.load(fp)
File "/usr/lib/python2.7/json/__init__.py", line 290, in load
**kw)
File "/usr/lib/python2.7/json/__init__.py", line 338, in loads
return _default_decoder.decode(s)
File "/usr/lib/python2.7/json/decoder.py", line 366, in decode
obj, end = self.raw_decode(s, idx=_w(s, 0).end())
File "/usr/lib/python2.7/json/decoder.py", line 384, in raw_decode
raise ValueError("No JSON object could be decoded")
ValueError: No JSON object could be decoded
are not particularly clear. With this commit, we'll get output like:
$ ./nmbug-status
fatal: Not a git repository: '/home/wking/.nmbug'
No local branch 'config' in /home/wking/.nmbug. Checkout a local
config branch or explicitly set --config.
which is much more accessible. I've also added user-friendly messages
for a number of other config-parsing errors.
2014-05-10 21:16:38 +02:00
|
|
|
try:
|
|
|
|
with open(path, 'rb') as f:
|
|
|
|
config_bytes = f.read()
|
|
|
|
except IOError as e:
|
|
|
|
raise ConfigError('Could not read config from {}'.format(path))
|
2014-02-10 19:40:25 +01:00
|
|
|
else:
|
|
|
|
nmbhome = os.getenv('NMBGIT', os.path.expanduser('~/.nmbug'))
|
nmbug-status: Clarify errors for illegible configs
Carl Worth pointed out that errors like:
$ ./nmbug-status
fatal: Not a git repository: '/home/cworth/.nmbug'
fatal: Not a git repository: '/home/cworth/.nmbug'
Traceback (most recent call last):
File "./nmbug-status", line 254, in <module>
config = read_config(path=args.config)
File "./nmbug-status", line 73, in read_config
return json.load(fp)
File "/usr/lib/python2.7/json/__init__.py", line 290, in load
**kw)
File "/usr/lib/python2.7/json/__init__.py", line 338, in loads
return _default_decoder.decode(s)
File "/usr/lib/python2.7/json/decoder.py", line 366, in decode
obj, end = self.raw_decode(s, idx=_w(s, 0).end())
File "/usr/lib/python2.7/json/decoder.py", line 384, in raw_decode
raise ValueError("No JSON object could be decoded")
ValueError: No JSON object could be decoded
are not particularly clear. With this commit, we'll get output like:
$ ./nmbug-status
fatal: Not a git repository: '/home/wking/.nmbug'
No local branch 'config' in /home/wking/.nmbug. Checkout a local
config branch or explicitly set --config.
which is much more accessible. I've also added user-friendly messages
for a number of other config-parsing errors.
2014-05-10 21:16:38 +02:00
|
|
|
branch = 'config'
|
|
|
|
filename = 'status-config.json'
|
2014-02-10 19:40:25 +01:00
|
|
|
|
|
|
|
# read only the first line from the pipe
|
|
|
|
sha1_bytes = subprocess.Popen(
|
2015-03-22 23:51:41 +01:00
|
|
|
['git', '--git-dir', nmbhome, 'show-ref', '-s', '--heads', branch],
|
2014-02-10 19:40:25 +01:00
|
|
|
stdout=subprocess.PIPE).stdout.readline()
|
|
|
|
sha1 = sha1_bytes.decode(encoding).rstrip()
|
nmbug-status: Clarify errors for illegible configs
Carl Worth pointed out that errors like:
$ ./nmbug-status
fatal: Not a git repository: '/home/cworth/.nmbug'
fatal: Not a git repository: '/home/cworth/.nmbug'
Traceback (most recent call last):
File "./nmbug-status", line 254, in <module>
config = read_config(path=args.config)
File "./nmbug-status", line 73, in read_config
return json.load(fp)
File "/usr/lib/python2.7/json/__init__.py", line 290, in load
**kw)
File "/usr/lib/python2.7/json/__init__.py", line 338, in loads
return _default_decoder.decode(s)
File "/usr/lib/python2.7/json/decoder.py", line 366, in decode
obj, end = self.raw_decode(s, idx=_w(s, 0).end())
File "/usr/lib/python2.7/json/decoder.py", line 384, in raw_decode
raise ValueError("No JSON object could be decoded")
ValueError: No JSON object could be decoded
are not particularly clear. With this commit, we'll get output like:
$ ./nmbug-status
fatal: Not a git repository: '/home/wking/.nmbug'
No local branch 'config' in /home/wking/.nmbug. Checkout a local
config branch or explicitly set --config.
which is much more accessible. I've also added user-friendly messages
for a number of other config-parsing errors.
2014-05-10 21:16:38 +02:00
|
|
|
if not sha1:
|
|
|
|
raise ConfigError(
|
|
|
|
("No local branch '{branch}' in {nmbgit}. "
|
|
|
|
'Checkout a local {branch} branch or explicitly set --config.'
|
|
|
|
).format(branch=branch, nmbgit=nmbhome))
|
2014-02-10 19:40:25 +01:00
|
|
|
|
nmbug-status: Clarify errors for illegible configs
Carl Worth pointed out that errors like:
$ ./nmbug-status
fatal: Not a git repository: '/home/cworth/.nmbug'
fatal: Not a git repository: '/home/cworth/.nmbug'
Traceback (most recent call last):
File "./nmbug-status", line 254, in <module>
config = read_config(path=args.config)
File "./nmbug-status", line 73, in read_config
return json.load(fp)
File "/usr/lib/python2.7/json/__init__.py", line 290, in load
**kw)
File "/usr/lib/python2.7/json/__init__.py", line 338, in loads
return _default_decoder.decode(s)
File "/usr/lib/python2.7/json/decoder.py", line 366, in decode
obj, end = self.raw_decode(s, idx=_w(s, 0).end())
File "/usr/lib/python2.7/json/decoder.py", line 384, in raw_decode
raise ValueError("No JSON object could be decoded")
ValueError: No JSON object could be decoded
are not particularly clear. With this commit, we'll get output like:
$ ./nmbug-status
fatal: Not a git repository: '/home/wking/.nmbug'
No local branch 'config' in /home/wking/.nmbug. Checkout a local
config branch or explicitly set --config.
which is much more accessible. I've also added user-friendly messages
for a number of other config-parsing errors.
2014-05-10 21:16:38 +02:00
|
|
|
p = subprocess.Popen(
|
2014-02-10 19:40:25 +01:00
|
|
|
['git', '--git-dir', nmbhome, 'cat-file', 'blob',
|
nmbug-status: Clarify errors for illegible configs
Carl Worth pointed out that errors like:
$ ./nmbug-status
fatal: Not a git repository: '/home/cworth/.nmbug'
fatal: Not a git repository: '/home/cworth/.nmbug'
Traceback (most recent call last):
File "./nmbug-status", line 254, in <module>
config = read_config(path=args.config)
File "./nmbug-status", line 73, in read_config
return json.load(fp)
File "/usr/lib/python2.7/json/__init__.py", line 290, in load
**kw)
File "/usr/lib/python2.7/json/__init__.py", line 338, in loads
return _default_decoder.decode(s)
File "/usr/lib/python2.7/json/decoder.py", line 366, in decode
obj, end = self.raw_decode(s, idx=_w(s, 0).end())
File "/usr/lib/python2.7/json/decoder.py", line 384, in raw_decode
raise ValueError("No JSON object could be decoded")
ValueError: No JSON object could be decoded
are not particularly clear. With this commit, we'll get output like:
$ ./nmbug-status
fatal: Not a git repository: '/home/wking/.nmbug'
No local branch 'config' in /home/wking/.nmbug. Checkout a local
config branch or explicitly set --config.
which is much more accessible. I've also added user-friendly messages
for a number of other config-parsing errors.
2014-05-10 21:16:38 +02:00
|
|
|
'{}:{}'.format(sha1, filename)],
|
|
|
|
stdout=subprocess.PIPE)
|
|
|
|
config_bytes, err = p.communicate()
|
|
|
|
status = p.wait()
|
|
|
|
if status != 0:
|
|
|
|
raise ConfigError(
|
2016-01-02 07:08:01 +01:00
|
|
|
("Missing {filename} in branch '{branch}' of {nmbgit}. "
|
|
|
|
'Add the file or explicitly set --config.'
|
|
|
|
).format(filename=filename, branch=branch, nmbgit=nmbhome))
|
nmbug-status: Clarify errors for illegible configs
Carl Worth pointed out that errors like:
$ ./nmbug-status
fatal: Not a git repository: '/home/cworth/.nmbug'
fatal: Not a git repository: '/home/cworth/.nmbug'
Traceback (most recent call last):
File "./nmbug-status", line 254, in <module>
config = read_config(path=args.config)
File "./nmbug-status", line 73, in read_config
return json.load(fp)
File "/usr/lib/python2.7/json/__init__.py", line 290, in load
**kw)
File "/usr/lib/python2.7/json/__init__.py", line 338, in loads
return _default_decoder.decode(s)
File "/usr/lib/python2.7/json/decoder.py", line 366, in decode
obj, end = self.raw_decode(s, idx=_w(s, 0).end())
File "/usr/lib/python2.7/json/decoder.py", line 384, in raw_decode
raise ValueError("No JSON object could be decoded")
ValueError: No JSON object could be decoded
are not particularly clear. With this commit, we'll get output like:
$ ./nmbug-status
fatal: Not a git repository: '/home/wking/.nmbug'
No local branch 'config' in /home/wking/.nmbug. Checkout a local
config branch or explicitly set --config.
which is much more accessible. I've also added user-friendly messages
for a number of other config-parsing errors.
2014-05-10 21:16:38 +02:00
|
|
|
|
|
|
|
config_json = config_bytes.decode(encoding)
|
|
|
|
try:
|
|
|
|
return json.loads(config_json)
|
|
|
|
except ValueError as e:
|
|
|
|
if not path:
|
|
|
|
path = "{} in branch '{}' of {}".format(
|
|
|
|
filename, branch, nmbhome)
|
|
|
|
raise ConfigError(
|
|
|
|
'Could not parse JSON from the config file {}:\n{}'.format(
|
|
|
|
path, e))
|
2014-02-10 19:40:25 +01:00
|
|
|
|
|
|
|
|
2014-02-10 19:40:31 +01:00
|
|
|
class Thread (list):
|
|
|
|
def __init__(self):
|
|
|
|
self.running_data = {}
|
|
|
|
|
|
|
|
|
|
|
|
class Page (object):
|
|
|
|
def __init__(self, header=None, footer=None):
|
|
|
|
self.header = header
|
|
|
|
self.footer = footer
|
|
|
|
|
|
|
|
def write(self, database, views, stream=None):
|
|
|
|
if not stream:
|
|
|
|
try: # Python 3
|
|
|
|
byte_stream = sys.stdout.buffer
|
|
|
|
except AttributeError: # Python 2
|
|
|
|
byte_stream = sys.stdout
|
2014-02-14 17:48:54 +01:00
|
|
|
stream = codecs.getwriter(encoding=_ENCODING)(stream=byte_stream)
|
2014-02-10 19:40:31 +01:00
|
|
|
self._write_header(views=views, stream=stream)
|
|
|
|
for view in views:
|
|
|
|
self._write_view(database=database, view=view, stream=stream)
|
|
|
|
self._write_footer(views=views, stream=stream)
|
|
|
|
|
|
|
|
def _write_header(self, views, stream):
|
|
|
|
if self.header:
|
|
|
|
stream.write(self.header)
|
|
|
|
|
|
|
|
def _write_footer(self, views, stream):
|
|
|
|
if self.footer:
|
|
|
|
stream.write(self.footer)
|
|
|
|
|
|
|
|
def _write_view(self, database, view, stream):
|
2015-09-26 13:37:51 +02:00
|
|
|
# sort order, default to oldest-first
|
|
|
|
sort_key = view.get('sort', 'oldest-first')
|
|
|
|
# dynamically accept all values in Query.SORT
|
|
|
|
sort_attribute = sort_key.upper().replace('-', '_')
|
|
|
|
try:
|
|
|
|
sort = getattr(notmuch.Query.SORT, sort_attribute)
|
|
|
|
except AttributeError:
|
|
|
|
raise ConfigError('Invalid sort setting for {}: {!r}'.format(
|
|
|
|
view['title'], sort_key))
|
2014-02-10 19:40:31 +01:00
|
|
|
if 'query-string' not in view:
|
|
|
|
query = view['query']
|
|
|
|
view['query-string'] = ' and '.join(query)
|
|
|
|
q = notmuch.Query(database, view['query-string'])
|
2015-09-26 13:37:51 +02:00
|
|
|
q.set_sort(sort)
|
2014-02-10 19:40:31 +01:00
|
|
|
threads = self._get_threads(messages=q.search_messages())
|
|
|
|
self._write_view_header(view=view, stream=stream)
|
|
|
|
self._write_threads(threads=threads, stream=stream)
|
|
|
|
|
|
|
|
def _get_threads(self, messages):
|
|
|
|
threads = collections.OrderedDict()
|
|
|
|
for message in messages:
|
|
|
|
thread_id = message.get_thread_id()
|
|
|
|
if thread_id in threads:
|
|
|
|
thread = threads[thread_id]
|
2012-10-24 08:59:59 +02:00
|
|
|
else:
|
2014-02-10 19:40:31 +01:00
|
|
|
thread = Thread()
|
2012-10-24 08:59:59 +02:00
|
|
|
threads[thread_id] = thread
|
2014-02-10 19:40:31 +01:00
|
|
|
thread.running_data, display_data = self._message_display_data(
|
|
|
|
running_data=thread.running_data, message=message)
|
|
|
|
thread.append(display_data)
|
|
|
|
return list(threads.values())
|
|
|
|
|
|
|
|
def _write_view_header(self, view, stream):
|
|
|
|
pass
|
|
|
|
|
|
|
|
def _write_threads(self, threads, stream):
|
|
|
|
for thread in threads:
|
|
|
|
for message_display_data in thread:
|
|
|
|
stream.write(
|
|
|
|
('{date:10.10s} {from:20.20s} {subject:40.40s}\n'
|
|
|
|
'{message-id-term:>72}\n'
|
|
|
|
).format(**message_display_data))
|
|
|
|
if thread != threads[-1]:
|
|
|
|
stream.write('\n')
|
|
|
|
|
|
|
|
def _message_display_data(self, running_data, message):
|
|
|
|
headers = ('thread-id', 'message-id', 'date', 'from', 'subject')
|
|
|
|
data = {}
|
2012-07-07 21:29:38 +02:00
|
|
|
for header in headers:
|
2014-02-10 19:40:31 +01:00
|
|
|
if header == 'thread-id':
|
|
|
|
value = message.get_thread_id()
|
|
|
|
elif header == 'message-id':
|
|
|
|
value = message.get_message_id()
|
|
|
|
data['message-id-term'] = 'id:"{0}"'.format(value)
|
|
|
|
elif header == 'date':
|
|
|
|
value = str(datetime.datetime.utcfromtimestamp(
|
|
|
|
message.get_date()).date())
|
2012-07-07 21:29:38 +02:00
|
|
|
else:
|
2014-02-10 19:40:31 +01:00
|
|
|
value = message.get_header(header)
|
|
|
|
if header == 'from':
|
|
|
|
(value, addr) = email.utils.parseaddr(value)
|
|
|
|
if not value:
|
|
|
|
value = addr.split('@')[0]
|
|
|
|
data[header] = value
|
|
|
|
next_running_data = data.copy()
|
|
|
|
for header, value in data.items():
|
|
|
|
if header in ['message-id', 'subject']:
|
|
|
|
continue
|
|
|
|
if value == running_data.get(header, None):
|
|
|
|
data[header] = ''
|
|
|
|
return (next_running_data, data)
|
|
|
|
|
|
|
|
|
|
|
|
class HtmlPage (Page):
|
2014-02-13 17:47:17 +01:00
|
|
|
_slug_regexp = re.compile('\W+')
|
|
|
|
|
2014-02-10 19:40:31 +01:00
|
|
|
def _write_header(self, views, stream):
|
|
|
|
super(HtmlPage, self)._write_header(views=views, stream=stream)
|
|
|
|
stream.write('<ul>\n')
|
|
|
|
for view in views:
|
2014-02-13 17:47:17 +01:00
|
|
|
if 'id' not in view:
|
|
|
|
view['id'] = self._slug(view['title'])
|
2014-02-10 19:40:31 +01:00
|
|
|
stream.write(
|
2014-02-13 17:47:17 +01:00
|
|
|
'<li><a href="#{id}">{title}</a></li>\n'.format(**view))
|
2014-02-10 19:40:31 +01:00
|
|
|
stream.write('</ul>\n')
|
|
|
|
|
|
|
|
def _write_view_header(self, view, stream):
|
2014-02-13 17:47:17 +01:00
|
|
|
stream.write('<h3 id="{id}">{title}</h3>\n'.format(**view))
|
2014-02-13 17:47:18 +01:00
|
|
|
stream.write('<p>\n')
|
2014-02-10 19:40:31 +01:00
|
|
|
if 'comment' in view:
|
|
|
|
stream.write(view['comment'])
|
|
|
|
stream.write('\n')
|
|
|
|
for line in [
|
|
|
|
'The view is generated from the following query:',
|
2014-02-13 17:47:18 +01:00
|
|
|
'</p>',
|
|
|
|
'<p>',
|
|
|
|
' <code>',
|
2014-02-10 19:40:31 +01:00
|
|
|
view['query-string'],
|
2014-02-13 17:47:18 +01:00
|
|
|
' </code>',
|
|
|
|
'</p>',
|
2014-02-10 19:40:31 +01:00
|
|
|
]:
|
|
|
|
stream.write(line)
|
|
|
|
stream.write('\n')
|
|
|
|
|
|
|
|
def _write_threads(self, threads, stream):
|
|
|
|
if not threads:
|
|
|
|
return
|
|
|
|
stream.write('<table>\n')
|
|
|
|
for thread in threads:
|
2014-02-14 17:48:52 +01:00
|
|
|
stream.write(' <tbody>\n')
|
2014-02-10 19:40:31 +01:00
|
|
|
for message_display_data in thread:
|
|
|
|
stream.write((
|
nmbug-status: Add inter-message padding
We already had the tbody with a blank row separating threads (which is
not colored); this commit adds a bit of spacing to separate messages
within a thread. It will also add a bit of colored padding above the
first message and below the final message, but the main goal is to add
padding *between* two-row message blocks.
<--- new padding
thread-1, message-1, row-1 (class="message-first")
thread-1, message-1, row-2 (class="message-last")
<--- new padding
spacer tbody with a blank row
<--- new padding
thread-2, message-1, row-1 (class="message-first")
thread-2, message-1, row-2 (class="message-last")
<--- new padding
<--- new padding
thread-2, message-2, row-1 (class="message-first")
thread-2, message-2, row-2 (class="message-last")
<--- new padding
2014-02-14 17:48:53 +01:00
|
|
|
' <tr class="message-first">\n'
|
2014-02-14 17:48:52 +01:00
|
|
|
' <td>{date}</td>\n'
|
|
|
|
' <td><code>{message-id-term}</code></td>\n'
|
|
|
|
' </tr>\n'
|
nmbug-status: Add inter-message padding
We already had the tbody with a blank row separating threads (which is
not colored); this commit adds a bit of spacing to separate messages
within a thread. It will also add a bit of colored padding above the
first message and below the final message, but the main goal is to add
padding *between* two-row message blocks.
<--- new padding
thread-1, message-1, row-1 (class="message-first")
thread-1, message-1, row-2 (class="message-last")
<--- new padding
spacer tbody with a blank row
<--- new padding
thread-2, message-1, row-1 (class="message-first")
thread-2, message-1, row-2 (class="message-last")
<--- new padding
<--- new padding
thread-2, message-2, row-1 (class="message-first")
thread-2, message-2, row-2 (class="message-last")
<--- new padding
2014-02-14 17:48:53 +01:00
|
|
|
' <tr class="message-last">\n'
|
2014-02-14 17:48:52 +01:00
|
|
|
' <td>{from}</td>\n'
|
|
|
|
' <td>{subject}</td>\n'
|
|
|
|
' </tr>\n'
|
2014-02-10 19:40:31 +01:00
|
|
|
).format(**message_display_data))
|
2014-02-14 17:48:52 +01:00
|
|
|
stream.write(' </tbody>\n')
|
2014-02-10 19:40:31 +01:00
|
|
|
if thread != threads[-1]:
|
2014-02-14 17:48:52 +01:00
|
|
|
stream.write(
|
|
|
|
' <tbody><tr><td colspan="2"><br /></td></tr></tbody>\n')
|
2014-02-10 19:40:31 +01:00
|
|
|
stream.write('</table>\n')
|
|
|
|
|
|
|
|
def _message_display_data(self, *args, **kwargs):
|
|
|
|
running_data, display_data = super(
|
|
|
|
HtmlPage, self)._message_display_data(
|
|
|
|
*args, **kwargs)
|
|
|
|
if 'subject' in display_data and 'message-id' in display_data:
|
|
|
|
d = {
|
|
|
|
'message-id': quote(display_data['message-id']),
|
2014-02-13 17:47:20 +01:00
|
|
|
'subject': xml.sax.saxutils.escape(display_data['subject']),
|
2014-02-10 19:40:31 +01:00
|
|
|
}
|
|
|
|
display_data['subject'] = (
|
|
|
|
'<a href="http://mid.gmane.org/{message-id}">{subject}</a>'
|
|
|
|
).format(**d)
|
2014-02-13 17:47:20 +01:00
|
|
|
for key in ['message-id', 'from']:
|
|
|
|
if key in display_data:
|
|
|
|
display_data[key] = xml.sax.saxutils.escape(display_data[key])
|
2014-02-10 19:40:31 +01:00
|
|
|
return (running_data, display_data)
|
|
|
|
|
2014-02-13 17:47:17 +01:00
|
|
|
def _slug(self, string):
|
|
|
|
return self._slug_regexp.sub('-', string)
|
|
|
|
|
2014-06-01 00:20:23 +02:00
|
|
|
parser = argparse.ArgumentParser(description=__doc__)
|
2014-03-13 13:04:05 +01:00
|
|
|
parser.add_argument('--text', help='output plain text format',
|
|
|
|
action='store_true')
|
|
|
|
parser.add_argument('--config', help='load config from given file',
|
|
|
|
metavar='PATH')
|
|
|
|
parser.add_argument('--list-views', help='list views',
|
|
|
|
action='store_true')
|
|
|
|
parser.add_argument('--get-query', help='get query for view',
|
|
|
|
metavar='VIEW')
|
|
|
|
|
|
|
|
args = parser.parse_args()
|
|
|
|
|
nmbug-status: Clarify errors for illegible configs
Carl Worth pointed out that errors like:
$ ./nmbug-status
fatal: Not a git repository: '/home/cworth/.nmbug'
fatal: Not a git repository: '/home/cworth/.nmbug'
Traceback (most recent call last):
File "./nmbug-status", line 254, in <module>
config = read_config(path=args.config)
File "./nmbug-status", line 73, in read_config
return json.load(fp)
File "/usr/lib/python2.7/json/__init__.py", line 290, in load
**kw)
File "/usr/lib/python2.7/json/__init__.py", line 338, in loads
return _default_decoder.decode(s)
File "/usr/lib/python2.7/json/decoder.py", line 366, in decode
obj, end = self.raw_decode(s, idx=_w(s, 0).end())
File "/usr/lib/python2.7/json/decoder.py", line 384, in raw_decode
raise ValueError("No JSON object could be decoded")
ValueError: No JSON object could be decoded
are not particularly clear. With this commit, we'll get output like:
$ ./nmbug-status
fatal: Not a git repository: '/home/wking/.nmbug'
No local branch 'config' in /home/wking/.nmbug. Checkout a local
config branch or explicitly set --config.
which is much more accessible. I've also added user-friendly messages
for a number of other config-parsing errors.
2014-05-10 21:16:38 +02:00
|
|
|
try:
|
|
|
|
config = read_config(path=args.config)
|
|
|
|
except ConfigError as e:
|
2015-10-03 09:57:56 +02:00
|
|
|
print(e, file=sys.stderr)
|
nmbug-status: Clarify errors for illegible configs
Carl Worth pointed out that errors like:
$ ./nmbug-status
fatal: Not a git repository: '/home/cworth/.nmbug'
fatal: Not a git repository: '/home/cworth/.nmbug'
Traceback (most recent call last):
File "./nmbug-status", line 254, in <module>
config = read_config(path=args.config)
File "./nmbug-status", line 73, in read_config
return json.load(fp)
File "/usr/lib/python2.7/json/__init__.py", line 290, in load
**kw)
File "/usr/lib/python2.7/json/__init__.py", line 338, in loads
return _default_decoder.decode(s)
File "/usr/lib/python2.7/json/decoder.py", line 366, in decode
obj, end = self.raw_decode(s, idx=_w(s, 0).end())
File "/usr/lib/python2.7/json/decoder.py", line 384, in raw_decode
raise ValueError("No JSON object could be decoded")
ValueError: No JSON object could be decoded
are not particularly clear. With this commit, we'll get output like:
$ ./nmbug-status
fatal: Not a git repository: '/home/wking/.nmbug'
No local branch 'config' in /home/wking/.nmbug. Checkout a local
config branch or explicitly set --config.
which is much more accessible. I've also added user-friendly messages
for a number of other config-parsing errors.
2014-05-10 21:16:38 +02:00
|
|
|
sys.exit(1)
|
2014-02-10 19:40:31 +01:00
|
|
|
|
2014-06-01 00:20:27 +02:00
|
|
|
header_template = config['meta'].get('header', '''<!DOCTYPE html>
|
2014-02-10 19:40:34 +01:00
|
|
|
<html lang="en">
|
2014-02-10 19:40:31 +01:00
|
|
|
<head>
|
2014-02-14 17:48:54 +01:00
|
|
|
<meta http-equiv="Content-Type" content="text/html; charset={encoding}" />
|
2014-03-13 13:04:04 +01:00
|
|
|
<title>{title}</title>
|
2014-02-14 17:48:52 +01:00
|
|
|
<style media="screen" type="text/css">
|
|
|
|
table {{
|
|
|
|
border-spacing: 0;
|
|
|
|
}}
|
nmbug-status: Add inter-message padding
We already had the tbody with a blank row separating threads (which is
not colored); this commit adds a bit of spacing to separate messages
within a thread. It will also add a bit of colored padding above the
first message and below the final message, but the main goal is to add
padding *between* two-row message blocks.
<--- new padding
thread-1, message-1, row-1 (class="message-first")
thread-1, message-1, row-2 (class="message-last")
<--- new padding
spacer tbody with a blank row
<--- new padding
thread-2, message-1, row-1 (class="message-first")
thread-2, message-1, row-2 (class="message-last")
<--- new padding
<--- new padding
thread-2, message-2, row-1 (class="message-first")
thread-2, message-2, row-2 (class="message-last")
<--- new padding
2014-02-14 17:48:53 +01:00
|
|
|
tr.message-first td {{
|
|
|
|
padding-top: {inter_message_padding};
|
|
|
|
}}
|
|
|
|
tr.message-last td {{
|
|
|
|
padding-bottom: {inter_message_padding};
|
|
|
|
}}
|
2014-02-14 17:48:52 +01:00
|
|
|
td {{
|
|
|
|
padding-left: {border_radius};
|
|
|
|
padding-right: {border_radius};
|
|
|
|
}}
|
|
|
|
tr:first-child td:first-child {{
|
|
|
|
border-top-left-radius: {border_radius};
|
|
|
|
}}
|
|
|
|
tr:first-child td:last-child {{
|
|
|
|
border-top-right-radius: {border_radius};
|
|
|
|
}}
|
|
|
|
tr:last-child td:first-child {{
|
|
|
|
border-bottom-left-radius: {border_radius};
|
|
|
|
}}
|
|
|
|
tr:last-child td:last-child {{
|
|
|
|
border-bottom-right-radius: {border_radius};
|
|
|
|
}}
|
|
|
|
tbody:nth-child(4n+1) tr td {{
|
|
|
|
background-color: #ffd96e;
|
|
|
|
}}
|
|
|
|
tbody:nth-child(4n+3) tr td {{
|
|
|
|
background-color: #bce;
|
|
|
|
}}
|
2014-06-01 00:20:24 +02:00
|
|
|
hr {{
|
|
|
|
border: 0;
|
|
|
|
height: 1px;
|
|
|
|
color: #ccc;
|
|
|
|
background-color: #ccc;
|
|
|
|
}}
|
2014-02-14 17:48:52 +01:00
|
|
|
</style>
|
2014-02-10 19:40:31 +01:00
|
|
|
</head>
|
|
|
|
<body>
|
2014-03-13 13:04:04 +01:00
|
|
|
<h2>{title}</h2>
|
|
|
|
{blurb}
|
2014-02-13 17:47:18 +01:00
|
|
|
</p>
|
2014-02-10 19:40:31 +01:00
|
|
|
<h3>Views</h3>
|
2014-06-01 00:20:27 +02:00
|
|
|
''')
|
|
|
|
|
|
|
|
footer_template = config['meta'].get('footer', '''
|
2014-06-01 00:20:24 +02:00
|
|
|
<hr>
|
2014-06-01 00:20:26 +02:00
|
|
|
<p>Generated: {datetime}
|
2014-06-01 00:20:24 +02:00
|
|
|
</body>
|
|
|
|
</html>
|
2014-06-01 00:20:27 +02:00
|
|
|
''')
|
|
|
|
|
|
|
|
now = datetime.datetime.utcnow()
|
|
|
|
context = {
|
|
|
|
'date': now,
|
|
|
|
'datetime': now.strftime('%Y-%m-%d %H:%M:%SZ'),
|
|
|
|
'title': config['meta']['title'],
|
|
|
|
'blurb': config['meta']['blurb'],
|
|
|
|
'encoding': _ENCODING,
|
|
|
|
'inter_message_padding': '0.25em',
|
|
|
|
'border_radius': '0.5em',
|
|
|
|
}
|
|
|
|
|
|
|
|
_PAGES['text'] = Page()
|
|
|
|
_PAGES['html'] = HtmlPage(
|
|
|
|
header=header_template.format(**context),
|
|
|
|
footer=footer_template.format(**context),
|
2014-02-10 19:40:31 +01:00
|
|
|
)
|
2014-02-10 19:40:27 +01:00
|
|
|
|
|
|
|
if args.list_views:
|
|
|
|
for view in config['views']:
|
|
|
|
print(view['title'])
|
|
|
|
sys.exit(0)
|
|
|
|
elif args.get_query != None:
|
|
|
|
for view in config['views']:
|
|
|
|
if args.get_query == view['title']:
|
|
|
|
print(' and '.join(view['query']))
|
|
|
|
sys.exit(0)
|
|
|
|
else:
|
|
|
|
# only import notmuch if needed
|
|
|
|
import notmuch
|
|
|
|
|
|
|
|
if args.text:
|
2014-02-10 19:40:31 +01:00
|
|
|
page = _PAGES['text']
|
2014-02-10 19:40:27 +01:00
|
|
|
else:
|
2014-02-10 19:40:31 +01:00
|
|
|
page = _PAGES['html']
|
2012-07-07 21:29:38 +02:00
|
|
|
|
2014-02-10 19:40:28 +01:00
|
|
|
db = notmuch.Database(mode=notmuch.Database.MODE.READ_ONLY)
|
2014-02-10 19:40:31 +01:00
|
|
|
page.write(database=db, views=config['views'])
|