# read only the first line from the pipe
sha1_bytes = subprocess.Popen(
- ['git', '--git-dir', nmbhome, 'show-ref', '-s', branch],
+ ['git', '--git-dir', nmbhome, 'show-ref', '-s', '--heads', branch],
stdout=subprocess.PIPE).stdout.readline()
sha1 = sha1_bytes.decode(encoding).rstrip()
if not sha1:
status = p.wait()
if status != 0:
raise ConfigError(
- ("Missing status-config.json in branch '{branch}' of"
- '{nmbgit}. Add the file or explicitly set --config.'
- ).format(branch=branch, nmbgit=nmbhome))
+ ("Missing {filename} in branch '{branch}' of {nmbgit}. "
+ 'Add the file or explicitly set --config.'
+ ).format(filename=filename, branch=branch, nmbgit=nmbhome))
config_json = config_bytes.decode(encoding)
try:
stream.write(self.footer)
def _write_view(self, database, view, stream):
+ # 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))
if 'query-string' not in view:
query = view['query']
view['query-string'] = ' and '.join(query)
q = notmuch.Query(database, view['query-string'])
- q.set_sort(notmuch.Query.SORT.OLDEST_FIRST)
+ q.set_sort(sort)
threads = self._get_threads(messages=q.search_messages())
self._write_view_header(view=view, stream=stream)
self._write_threads(threads=threads, stream=stream)
try:
config = read_config(path=args.config)
except ConfigError as e:
- print(e)
+ print(e, file=sys.stderr)
sys.exit(1)
header_template = config['meta'].get('header', '''<!DOCTYPE html>
</style>
</head>
<body>
-<h2>{title}</h2>
+<h1>{title}</h1>
{blurb}
</p>
-<h3>Views</h3>
+<h2>Views</h2>
''')
footer_template = config['meta'].get('footer', '''