artemis-bts: comparison artemis/artemis.py

equal deleted inserted replaced

-:0bfd48368c17
+:4129876c8b86
 from email.mime.audio import MIMEAudio
 from email.mime.base import MIMEBase
 from email.mime.image import MIMEImage
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
+from itertools import izip
-from    termcolor       import colored
 state = { 'new':      ['new'],
 'resolved': ['fixed', 'resolved'] }
-annotation = { 'resolved': 'resolution' }
 default_state = 'new'
 default_issues_dir = ".issues"
 filter_prefix = ".filter"
 date_format = '%a, %d %b %Y %H:%M:%S %1%2'
 maildir_dirs = ['new','cur','tmp']
+default_format = '%(id)s (%(len)3d) [%(state)s]: %(Subject)s'
 def ilist(ui, repo, **opts):
 """List issues associated with the project"""
 # Process options
 match_date, date_match = True, util.matchdate(opts['date'])
 order = 'new'
 if opts['order']:
 order = opts['order']
-# Colors
+# Formats
-colors = _read_colors(ui)
+formats = _read_formats(ui)
 # Find issues
 issues_dir = ui.config('artemis', 'issues', default = default_issues_dir)
 issues_path = os.path.join(repo.root, issues_dir)
 if not os.path.exists(issues_path): return
 if not show_all and (not properties or not property_match) and (properties or mbox[root]['State'].upper() in [f.upper() for f in state['resolved']]): continue
 if match_date and not date_match(util.parsedate(mbox[root]['date'])[0]): continue
 if not list_properties:
-summaries.append((_summary_line(mbox, root, issue[len(issues_path)+1:], colors),     # +1 for trailing /
+summaries.append((_summary_line(mbox, root, issue[len(issues_path)+1:], formats),     # +1 for trailing /
 _find_mbox_date(mbox, root, order)))
 else:
 for lp in list_properties:
 if lp in mbox[root]:    list_properties_dict.setdefault(lp, set()).add(mbox[root][lp])
 if not list_properties:
 summaries.sort(lambda (s1,d1),(s2,d2): cmp(d2,d1))
 for s,d in summaries:
-ui.write(s)
+ui.write(s + '\n')
 else:
 for lp in list_properties_dict.keys():
 ui.write("%s:\n" % lp)
 for value in sorted(list_properties_dict[lp]):
 ui.write("  %s\n" % value)
 # Set the filename parameter
 attachment.add_header('Content-Disposition', 'attachment', filename=filename)
 outer.attach(attachment)
 return outer
-def _status_msg(msg):
+def _read_formats(ui):
-s = msg['State']
+formats = []
-if s in annotation:
+global default_format
-return '%s=%s' % (s, msg[annotation[s]])
-else:
-return s
-def _read_colors(ui):
-colors = {}
 for k,v in ui.configitems('artemis'):
-if k == 'issues': continue
+if not k.startswith('format'): continue
-k = k.split('.')
+if k == 'format':
-s = k[0]; t = k[1]
+default_format = v
-if s not in colors: colors[s] = {}
+continue
-colors[s][t] = v
+formats.append((k.split(':')[1], v))
-return colors
+return formats
-def _color_summary(line, msg, colors):
+def _format_match(props, formats):
-s = msg['State']
+for k,v in formats:
-for alias, l in state.items():
+eq = k.split('&')
-if s in l: s = alias; break
+eq = [e.split('*') for e in eq]
-if s in colors:
+for e in eq:
-color    = colors[s]['color']         if 'color'    in colors[s] else None
+if props[e[0]] != e[1]:
-on_color = colors[s]['on_color']      if 'on_color' in colors[s] else None
+break
-attrs    = colors[s]['attrs'].split() if 'attrs'    in colors[s] else None
+else:
-return colored(line, color, on_color, attrs)
+return v
-else:
-return line
+return default_format
-def _summary_line(mbox, root, issue, colors):
+def _summary_line(mbox, root, issue, formats):
-line = "%s (%3d) [%s]: %s\n" % (issue,
+props = PropertiesDictionary(mbox[root])
-len(mbox)-1,                # number of replies (-1 for self)
+props['id']  = issue
-_status_msg(mbox[root]),
+props['len'] = len(mbox)-1              # number of replies (-1 for self)
-mbox[root]['Subject'])
-return _color_summary(line, mbox[root], colors)
+return _format_match(props, formats) % props
+class PropertiesDictionary(dict):
+def __init__(self, msg):
+# Borrowed from termcolor
+for k,v in zip(['bold', 'dark', '', 'underline', 'blink', '', 'reverse', 'concealed'], range(1, 9)) + \
+zip(['grey', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white'], range(30, 38)):
+self[k] = '\033[' + str(v) + 'm'
+self['reset']  = '\033[0m'
+del self['']
+for k,v in msg.items():
+self[k] = v
+def __contains__(self, k):
+return super(PropertiesDictionary, self).__contains__(k.lower())
+def __getitem__(self, k):
+if k not in self: return ''
+return super(PropertiesDictionary, self).__getitem__(k.lower())
+def __setitem__(self, k, v):
+super(PropertiesDictionary, self).__setitem__(k.lower(), v)
 cmdtable = {
 'ilist':    (ilist,
 [('a', 'all', False,
 'list all issues (by default only those with state new)'),

changeset 66	4129876c8b86
parent 63	c384fa42f8a2
child 67	30bd40ef9165