diff options
| -rw-r--r-- | alot/commands/globals.py | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/alot/commands/globals.py b/alot/commands/globals.py index db1c764a..9f2f0222 100644 --- a/alot/commands/globals.py +++ b/alot/commands/globals.py @@ -323,9 +323,8 @@ class CallCommand(Command): exec self.command except Exception as e: logging.exception(e) - msg = 'an error occurred during execution of "%s":\n'\ - '%s\nSee the logfile for details' - ui.notify(msg % e, priority='error') + msg = 'an error occurred during execution of "%s":\n%s' + ui.notify(msg % (self.command,e), priority='error') @registerCommand(MODE, 'bclose', arguments=[ @@ -371,26 +370,39 @@ class BufferCloseCommand(Command): help='focus previous buffer') @registerCommand(MODE, 'bnext', forced={'offset': +1}, help='focus next buffer') +@registerCommand(MODE, 'buffer', arguments=[ + (['index'], {'type':int, 'help':'buffer index to focus'}),], + help='focus buffer with given index') class BufferFocusCommand(Command): """focus a :class:`~alot.buffers.Buffer`""" - def __init__(self, buffer=None, offset=0, **kwargs): + def __init__(self, buffer=None, index=None, offset=0, **kwargs): """ :param buffer: the buffer to focus or None :type buffer: `alot.buffers.Buffer` + :param index: index (in bufferlist) of the buffer to focus. + :type index: int :param offset: position of the buffer to focus relative to the currently focussed one. This is used only if `buffer` is set to `None` :type offset: int """ self.buffer = buffer + self.index = index self.offset = offset Command.__init__(self, **kwargs) def apply(self, ui): - if self.offset: - idx = ui.buffers.index(ui.current_buffer) + if self.buffer is None: + if self.index is not None: + try: + self.buffer = ui.buffers[self.index] + except IndexError: + ui.notify('no buffer exists at index %d' % self.index) + return + else: + self.index = ui.buffers.index(ui.current_buffer) num = len(ui.buffers) - self.buffer = ui.buffers[(idx + self.offset) % num] + self.buffer = ui.buffers[(self.index + self.offset) % num] ui.buffer_focus(self.buffer) |