visidata 2.11.dev0__py3-none-any.whl → 3.0__py3-none-any.whl

visidata/shell.py

@@ -10,19 +10,25 @@ except ImportError:
     pass # pwd,grp modules not available on Windows
 
 from visidata import Column, Sheet, LazyComputeRow, asynccache, BaseSheet, vd
-from visidata import Path, ENTER, asyncthread, FileExistsError, VisiData
+from visidata import Path, ENTER, asyncthread, VisiData
 from visidata import modtime, filesize, vstat, Progress, TextSheet
 from visidata.type_date import date
 
 
-vd.option('dir_recurse', False, 'walk source path recursively on DirSheet')
+vd.option('dir_depth', 0, 'folder recursion depth on DirSheet')
 vd.option('dir_hidden', False, 'load hidden files on DirSheet')
 
 
+@VisiData.api
+def guess_dir(vd, p):
+    if p.is_dir():
+        return dict(filetype='dir')
+
+
 @VisiData.lazy_property
 def currentDirSheet(p):
     'Support opening the current DirSheet from the vdmenu'
-    return DirSheet('.', source=Path('.'))
+    return DirSheet(Path('.').absolute().name, source=Path('.'))
 
 @asyncthread
 def exec_shell(*args):
@@ -35,11 +41,11 @@ def exec_shell(*args):
 
 @VisiData.api
 def open_dir(vd, p):
-    return DirSheet(p.name, source=p)
+    return DirSheet(p.base_stem, source=p)
 
 @VisiData.api
 def open_fdir(vd, p):
-    return FileListSheet(p.name, source=p)
+    return FileListSheet(p.base_stem, source=p)
 
 @VisiData.api
 def addShellColumns(vd, cmd, sheet):
@@ -76,6 +82,21 @@ class ColumnShell(Column):
 
 class DirSheet(Sheet):
     'Sheet displaying directory, using ENTER to open a particular file.  Edited fields are applied to the filesystem.'
+    guide = '''
+        # Directory Sheet
+        This is a list of files in the {sheet.displaySource} folder.
+
+        - {help.commands.open_row_file}
+        - {help.commands.open_rows}
+        - (`open-dir-parent`) to open parent directory
+        - {help.commands.sysopen_row}
+
+        ## Options (must reload to take effect)
+
+        - {help.options.dir_depth}
+            - [CLI] `-r` to include all files in all subfolders
+        - {help.options.dir_hidden}
+    '''
     rowtype = 'files' # rowdef: Path
     defer = True
     columns = [
@@ -145,11 +166,14 @@ class DirSheet(Sheet):
 
     def removeFile(self, path):
         if path.is_dir():
-            os.rmdir(path)
+            if self.options.safety_first:
+                os.rmdir(path)
+            else:
+                shutil.rmtree(path)  #1965
         else:
             path.unlink()
 
-    def deleteSourceRow(self, r):
+    def commitDeleteRow(self, r):
         self.removeFile(r)
 
     def newRow(self):
@@ -158,7 +182,7 @@ class DirSheet(Sheet):
     def iterload(self):
         hidden_files = self.options.dir_hidden
 
-        def _walkfiles(p):
+        def _walkfiles(p, dir_depth:int=0):
             basepath = str(p)
             for folder, subdirs, files in os.walk(basepath):
                 subfolder = folder[len(basepath)+1:]
@@ -166,24 +190,23 @@ class DirSheet(Sheet):
                 if subfolder in ['.', '..']: continue
 
                 fpath = Path(folder)
-                yield fpath
+                if str(fpath) != str(p):
+                    yield fpath
 
                 for fn in files:
                     yield fpath/fn
 
-        def _listfiles(p):
-            basepath = str(p)
-            for fn in os.listdir(basepath):
-                yield p/fn
-
+                if dir_depth < len(fpath.parents)-len(p.parents)+1:
+                    for d in subdirs:
+                        yield fpath/d
+                    subdirs.clear()
 
         basepath = str(self.source)
 
         folders = set()
-        f = _walkfiles if self.options.dir_recurse else _listfiles
 
-        for p in f(self.source):
-            if not hidden_files and p.name.startswith('.'):
+        for p in _walkfiles(self.source, self.options.dir_depth):
+            if not hidden_files and str(p).startswith('.') and not str(p).startswith('..'):
                 continue
 
             yield p
@@ -204,11 +227,14 @@ class DirSheet(Sheet):
         self._deferredDels.clear()
         self.reload()
 
+    def getDefaultSaveName(sheet):
+        return sheet.name + '.' + sheet.options.save_filetype
+
 
 class FileListSheet(DirSheet):
     _ordering = []
     def iterload(self):
-        for fn in self.source.open_text():
+        for fn in self.source.open():
             yield Path(fn.rstrip())
 
 
@@ -219,10 +245,10 @@ def inputShell(vd):
         vd.warning('no $column in command')
     return cmd
 
-DirSheet.addCommand('`', 'open-dir-parent', 'vd.push(openSource(source/".."))', 'open parent directory')
+DirSheet.addCommand('`', 'open-dir-parent', 'vd.push(openSource(source.parent if source.resolve()!=Path(".").resolve() else os.path.dirname(source.resolve())))', 'open parent directory')  #1801
 BaseSheet.addCommand('', 'open-dir-current', 'vd.push(vd.currentDirSheet)', 'open Directory Sheet: browse properties of files in current directory')
 
-Sheet.addCommand('z;', 'addcol-sh', 'cmd=inputShell(); addShellColumns(cmd, sheet)', 'create new column from bash expression, with $columnNames as variables')
+Sheet.addCommand('z;', 'addcol-shell', 'cmd=inputShell(); addShellColumns(cmd, sheet)', 'create new column from bash expression, with $columnNames as variables')
 
 DirSheet.addCommand(ENTER, 'open-row-file', 'vd.push(openSource(cursorRow or fail("no row"), filetype="dir" if cursorRow.is_dir() else LazyComputeRow(sheet, cursorRow).ext))', 'open current file as a new sheet')
 DirSheet.addCommand('g'+ENTER, 'open-rows', 'for r in selectedRows: vd.push(openSource(r))', 'open selected files as new sheets')
@@ -243,7 +269,7 @@ def copy_files(sheet, paths, dest):
         try:
             destpath = destdir/str(srcpath._path.name)
             if srcpath.is_dir():
-                shutil.copy_tree(srcpath, destpath)
+                shutil.copytree(srcpath, destpath)
             else:
                 shutil.copyfile(srcpath, destpath)
         except Exception as e:
@@ -253,3 +279,7 @@ def copy_files(sheet, paths, dest):
 vd.addGlobals({
     'DirSheet': DirSheet
 })
+
+vd.addMenuItems('''
+    Column > Add column > shell > addcol-shell
+''')

visidata/sidebar.py

@@ -0,0 +1,162 @@
+from typing import Optional, Union
+import textwrap
+
+from visidata import vd, VisiData, BaseSheet, colors, TextSheet, clipdraw, wraptext, dispwidth, AttrDict, wrmap
+from visidata import CommandHelpGetter, OptionHelpGetter
+
+
+vd.option('disp_sidebar', True, 'whether to display sidebar')
+vd.option('disp_sidebar_fmt', '{guide}', 'format string for default sidebar')
+vd.theme_option('disp_sidebar_width', 0, 'max width for sidebar')
+vd.theme_option('disp_sidebar_height', 0, 'max height for sidebar')
+vd.theme_option('color_sidebar', 'black on 114 blue', 'base color of sidebar')
+vd.theme_option('color_sidebar_title', 'black on yellow', 'color of sidebar title')
+
+@BaseSheet.property
+def formatter_helpstr(sheet):
+    return AttrDict(commands=CommandHelpGetter(type(sheet)),
+                    options=OptionHelpGetter())
+
+
+@BaseSheet.property
+def default_sidebar(sheet):
+    'Default to format options.disp_sidebar_fmt.  Overridable.'
+    fmt = sheet.options.disp_sidebar_fmt
+    return sheet.formatString(fmt, help=sheet.formatter_helpstr)
+
+
+@VisiData.property
+def recentStatusMessages(vd) -> str:
+    r = ''
+    for (pri, msgparts), n in vd.statuses.items():
+        msg = '; '.join(wrmap(str, msgparts))
+        msg = f'[{n}x] {msg}' if n > 1 else msg
+
+        if pri == 3: msgattr = '[:error]'
+        elif pri == 2: msgattr = '[:warning]'
+        elif pri == 1: msgattr = '[:warning]'
+        else: msgattr = ''
+
+        if msgattr:
+            r += '\n' + f'{msgattr}{msg}[/]'
+        else:
+            r += '\n' + msg
+
+    if r:
+        return '# statuses' + r
+
+    return ''
+
+
+@VisiData.api
+def drawSidebar(vd, scr, sheet):
+    sidebar = vd.recentStatusMessages
+    bottommsg = ''
+    overflowmsg = '[:reverse] Ctrl+P to view all status messages [/]'
+    try:
+        if not sidebar and sheet.options.disp_sidebar:
+            sidebar = sheet.default_sidebar
+            if not sidebar and sheet.options.disp_help > 0:
+                sidebar = sheet.formatString(sheet.guide, help=sheet.formatter_helpstr)
+
+            if sheet.options.disp_help < 0:
+                bottommsg = '[:onclick sidebar-toggle][:reverse][x][:]'
+                overflowmsg = '[:onclick open-sidebar]…↓…[/]'
+            else:
+                bottommsg = '[:onclick sidebar-toggle][:reverse] b to toggle sidebar [:]'
+                overflowmsg = '[:reverse] see full sidebar with [:code]gb[/] [:]'
+    except Exception as e:
+        vd.exceptionCaught(e)
+        sidebar = f'# error\n{e}'
+
+    sheet.current_sidebar = sidebar
+
+    return sheet.drawSidebarText(scr, text=sheet.current_sidebar, overflowmsg=overflowmsg, bottommsg=bottommsg)
+
+@BaseSheet.api
+def drawSidebarText(sheet, scr, text:Union[None,str,'HelpPane'], title:str='', overflowmsg:str='', bottommsg:str=''):
+    scrh, scrw = scr.getmaxyx()
+    maxw = sheet.options.disp_sidebar_width or scrw//2
+    maxh = sheet.options.disp_sidebar_height or scrh-2
+
+    cattr = colors.get_color('color_sidebar')
+
+    text = text or ''
+
+    if hasattr(text, 'draw'):  # like a HelpPane
+        maxlinew = text.width
+        winh = min(maxh, text.height+2)+1
+    else:
+        text = textwrap.dedent(text.strip('\n'))
+
+        if not text:
+            return
+
+        lines = text.splitlines()
+        if not title and lines and lines[0].strip().startswith('# '):
+            title = lines[0].strip()[2:]
+            text = '\n'.join(lines[1:])
+
+        if not text:
+            return
+
+        lines = list(wraptext(text, width=maxw-4))
+        maxlinew = 0
+        if lines:
+            maxlinew = max(maxlinew, max(dispwidth(textonly, maxwidth=maxw) for line, textonly in lines))
+        winh = min(maxh, len(lines)+2)
+
+    titlew = dispwidth(title)
+
+    maxlinew = max(maxlinew, dispwidth(overflowmsg)+4)
+    maxlinew = max(maxlinew, dispwidth(bottommsg)+4)
+    maxlinew = max(maxlinew, titlew)
+    winw = min(maxw, maxlinew+4)
+    x, y, w, h = scrw-winw-1, scrh-winh-1, winw, winh
+
+    sidebarscr = vd.subwindow(scr, x, y, w, h)
+
+    sidebarscr.erase()
+    sidebarscr.bkgd(' ', cattr.attr)
+    sidebarscr.border()
+    vd.onMouse(sidebarscr, 0, 0, w, h, BUTTON1_RELEASED='no-op', BUTTON1_PRESSED='no-op')
+
+    if hasattr(text, 'draw'):  # like a HelpPane
+        text.draw(sidebarscr, attr=cattr)
+    else:
+        i = 0
+        for line, _ in lines:
+            if i >= h-2:
+                bottommsg = overflowmsg
+                break
+
+            x += clipdraw(sidebarscr, i+1, 2, line, cattr, w=w-3)
+            i += 1
+
+    x = max(0, w-titlew-6)
+    clipdraw(sidebarscr, 0, x, f"|[:sidebar_title] {title} [:]|", cattr, w=titlew+4)
+    if bottommsg:
+        clipdraw(sidebarscr, h-1, winw-dispwidth(bottommsg)-4, '|'+bottommsg+'|[:]', cattr)
+
+    sidebarscr.refresh()
+
+
+@VisiData.api
+class SidebarSheet(TextSheet):
+    guide = '''
+        # Sidebar Guide
+        The sidebar provides additional information about the current sheet, defaulting to a basic guide to the current sheet type.
+        It can be configured to show many useful attributes via `options.disp_sidebar_fmt`.
+
+        - `gb` to open the sidebar in a new sheet
+        - `b` to toggle the sidebar on/off for the current sheet
+    '''
+
+BaseSheet.addCommand('b', 'sidebar-toggle', 'sheet.options.disp_sidebar = not sheet.options.disp_sidebar', 'toggle sidebar on/off')
+BaseSheet.addCommand('gb', 'open-sidebar', 'sheet.current_sidebar = "" if not hasattr(sheet, "current_sidebar") else sheet.current_sidebar; vd.push(SidebarSheet(name, options.disp_sidebar_fmt, source=sheet.current_sidebar.splitlines()))', 'open sidebar in new sheet')
+
+
+vd.addMenuItems('''
+    View > Sidebar > toggle > sidebar-toggle
+    View > Sidebar > open in new sheet > open-sidebar
+''')

visidata/sort.py

@@ -36,7 +36,7 @@ class Reversor:
 
 
 @Sheet.api
-def sortkey(self, r, prog=None):
+def sortkey(self, r):
     ret = []
     for col, reverse in self._ordering:
         if isinstance(col, str):
@@ -44,8 +44,6 @@ def sortkey(self, r, prog=None):
         val = col.getTypedValue(r)
         ret.append(Reversor(val) if reverse else val)
 
-    if prog:
-        prog.addProgress(1)
 
     return ret
 
@@ -58,7 +56,7 @@ def sort(self):
     try:
         with Progress(gerund='sorting', total=self.nRows) as prog:
             # must not reassign self.rows: use .sort() instead of sorted()
-            self.rows.sort(key=lambda r,self=self,prog=prog: self.sortkey(r, prog=prog))
+            self.rows.sort(key=lambda r,self=self,prog=prog: (prog.addProgress(1), self.sortkey(r))[1])
     except TypeError as e:
         vd.warning('sort incomplete due to TypeError; change column type')
         vd.exceptionCaught(e, status=False)
@@ -75,3 +73,12 @@ Sheet.addCommand('z[', 'sort-asc-add', 'orderBy(cursorCol)', 'sort ascending by
 Sheet.addCommand('z]', 'sort-desc-add', 'orderBy(cursorCol, reverse=True)', 'sort descending by current column; add to existing sort criteria')
 Sheet.addCommand('gz[', 'sort-keys-asc-add', 'orderBy(*keyCols)', 'sort ascending by all key columns; add to existing sort criteria')
 Sheet.addCommand('gz]', 'sort-keys-desc-add', 'orderBy(*keyCols, reverse=True)', 'sort descending by all key columns; add to existing sort criteria')
+
+vd.addMenuItems('''
+    Column > Sort by > current column only > ascending > sort-asc
+    Column > Sort by > current column only > descending > sort-desc
+    Column > Sort by > current column also > ascending > sort-asc-add
+    Column > Sort by > current column also > descending > sort-desc-add
+    Column > Sort by > key columns > ascending > sort-keys-asc
+    Column > Sort by > key columns > descending > sort-keys-desc
+''')

visidata/statusbar.py

@@ -1,30 +1,42 @@
+'''
+Status messages get added with vd.{debug/aside/status/warning/fail/error}(), and cleared in mainloop
+'''
+
+import builtins
 import collections
 import curses
+import sys
 
-from visidata import vd, VisiData, BaseSheet, Sheet, ColumnItem, Column, RowColorizer, options, colors, wrmap, clipdraw, ExpectedException, update_attr, MissingAttrFormatter
+import visidata
+from visidata import vd, VisiData, BaseSheet, Sheet, ColumnItem, Column, RowColorizer, options, colors, wrmap, clipdraw, ExpectedException, update_attr, dispwidth, ColorAttr
 
 
-vd.option('disp_rstatus_fmt', ' {sheet.longname} {sheet.nRows:9d} {sheet.rowtype} {sheet.modifiedStatus} {sheet.options.disp_selected_note}{sheet.nSelectedRows}', 'right-side status format string')
-vd.option('disp_status_fmt', '{sheet.shortcut}› {sheet.name}| ', 'status line prefix')
-vd.option('disp_lstatus_max', 0, 'maximum length of left status line')
-vd.option('disp_status_sep', ' │ ', 'separator between statuses')
+vd.option('disp_rstatus_fmt', '{sheet.threadStatus} {sheet.keystrokeStatus}   {sheet.longname}  {sheet.nRows:9d} {sheet.rowtype} {sheet.modifiedStatus}{sheet.selectedStatus}{vd.replayStatus}', 'right-side status format string')
+vd.option('disp_status_fmt', '[:onclick sheets-stack]{sheet.shortcut}› {sheet.name}[/]| ', 'status line prefix')
+vd.theme_option('disp_lstatus_max', 0, 'maximum length of left status line')
+vd.theme_option('disp_status_sep', '│', 'separator between statuses')
 
-vd.option('color_keystrokes', 'bold 233 black on 110 cyan', 'color of input keystrokes on status line')
-vd.option('color_status', 'bold black on 110 cyan', 'status line color')
-vd.option('color_error', 'red', 'error message color')
-vd.option('color_warning', 'yellow', 'warning message color')
-vd.option('color_top_status', 'underline', 'top window status bar color')
-vd.option('color_active_status', 'black on 110 cyan', ' active window status bar color')
-vd.option('color_inactive_status', '8 on black', 'inactive window status bar color')
+vd.theme_option('color_keystrokes', 'bold white on 237', 'color of input keystrokes on status line')
+vd.theme_option('color_keys', 'bold', 'color of keystrokes in help')
+vd.theme_option('color_status', 'bold on 238', 'status line color')
+vd.theme_option('color_error', '202 1', 'error message color')
+vd.theme_option('color_warning', '166 15', 'warning message color')
+vd.theme_option('color_top_status', 'underline', 'top window status bar color')
+vd.theme_option('color_active_status', 'black on 68 blue', ' active window status bar color')
+vd.theme_option('color_inactive_status', '8 on black', 'inactive window status bar color')
+vd.theme_option('color_highlight_status', 'black on green', 'color of highlighted elements in statusbar')
 
 BaseSheet.init('longname', lambda: '')
 
-vd.beforeExecHooks.append(lambda sheet, cmd, args, ks: setattr(sheet, 'longname', cmd.longname))
+@BaseSheet.api
+def _updateStatusBeforeExec(sheet, cmd, args, ks):
+    sheet.longname = cmd.longname
+    if sheet._scr:
+        vd.drawRightStatus(sheet._scr, sheet)  #996 show longname during commands
+        sheet._scr.refresh()
 
 
-@BaseSheet.property
-def modifiedStatus(sheet):
-    return ' [M]' if sheet.hasBeenModified else ''
+vd.beforeExecHooks.append(BaseSheet._updateStatusBeforeExec)
 
 
 @VisiData.lazy_property
@@ -36,6 +48,11 @@ def statuses(vd):
 def statusHistory(vd):
     return list()  # list of [priority, statusmsg, repeats] for all status messages ever
 
+@VisiData.api
+def getStatusSource(vd):
+    return None
+
+
 @VisiData.api
 def status(vd, *args, priority=0):
     'Display *args* on status until next action.'
@@ -45,17 +62,25 @@ def status(vd, *args, priority=0):
     k = (priority, tuple(map(str, args)))
     vd.statuses[k] = vd.statuses.get(k, 0) + 1
 
-    return vd.addToStatusHistory(*args, priority=priority)
+    source = vd.getStatusSource()
+
+    if not vd.cursesEnabled:
+        msg = '\r' + composeStatus(args)
+        if vd.options.debug:
+            msg += f' [{source}]'
+        builtins.print(msg, file=sys.stderr)
+
+    return vd.addToStatusHistory(*args, priority=priority, source=source)
 
 @VisiData.api
-def addToStatusHistory(vd, *args, priority=0):
+def addToStatusHistory(vd, *args, priority=0, source=None):
     if vd.statusHistory:
-        prevpri, prevargs, prevn = vd.statusHistory[-1]
+        prevpri, prevargs, _, _ = vd.statusHistory[-1]
         if prevpri == priority and prevargs == args:
             vd.statusHistory[-1][2] += 1
             return True
 
-    vd.statusHistory.append([priority, args, 1])
+    vd.statusHistory.append([priority, args, 1, source])
     return True
 
 @VisiData.api
@@ -75,6 +100,11 @@ def warning(vd, *args):
     'Display *args* on status as a warning.'
     vd.status(*args, priority=1)
 
+@VisiData.api
+def aside(vd, *args, priority=0):
+    'Add a message to statuses without showing the message proactively.'
+    return vd.addToStatusHistory(*args, priority=priority, source=vd.getStatusSource())
+
 @VisiData.api
 def debug(vd, *args, **kwargs):
     'Display *args* on status if options.debug is set.'
@@ -87,7 +117,7 @@ def middleTruncate(s, w):
     return s[:w] + options.disp_truncator + s[-w:]
 
 
-def composeStatus(msgparts, n):
+def composeStatus(msgparts, n=1):
     msg = '; '.join(wrmap(str, msgparts))
     if n > 1:
         msg = '[%sx] %s' % (n, msg)
@@ -97,13 +127,13 @@ def composeStatus(msgparts, n):
 @BaseSheet.api
 def leftStatus(sheet):
     'Return left side of status bar for this sheet. Overridable.'
-    return options.disp_status_fmt.format(sheet=sheet, vd=vd)
+    return sheet.formatString(sheet.options.disp_status_fmt)
 
 
 @VisiData.api
 def drawLeftStatus(vd, scr, vs):
     'Draw left side of status bar.'
-    cattr = colors.get_color('color_status')
+    cattr = colors.get_color('color_active_status')
     active = (vs is vd.activeSheet)
     if active:
         cattr = update_attr(cattr, colors.color_active_status, 1)
@@ -113,103 +143,77 @@ def drawLeftStatus(vd, scr, vs):
     if scr is vd.winTop:
         cattr = update_attr(cattr, colors.color_top_status, 1)
 
-    attr = cattr.attr
-    error_attr = update_attr(cattr, colors.color_error, 1).attr
-    warn_attr = update_attr(cattr, colors.color_warning, 2).attr
-    sep = options.disp_status_sep
-
     x = 0
     y = vs.windowHeight-1  # status for each window
-    try:
-        lstatus = vs.leftStatus()
-        maxwidth = options.disp_lstatus_max
-        if maxwidth > 0:
-            lstatus = middleTruncate(lstatus, maxwidth//2)
-
-        x = clipdraw(scr, y, 0, lstatus, attr, w=vs.windowWidth-1)
-
-        vd.onMouse(scr, y, 0, 1, x,
-                        BUTTON1_PRESSED='sheets-stack',
-                        BUTTON1_RELEASED='sheets-stack',
-                        BUTTON3_PRESSED='rename-sheet',
-                        BUTTON3_CLICKED='rename-sheet')
-    except Exception as e:
-        vd.exceptionCaught(e)
-
-    if not active:
-        return
-
-    one = False
-    for (pri, msgparts), n in sorted(vd.statuses.items(), key=lambda k: -k[0][0]):
-        try:
-            if x > vs.windowWidth:
-                break
-            if one:  # any messages already:
-                x += clipdraw(scr, y, x, sep, attr, w=vs.windowWidth-x)
-            one = True
-            msg = composeStatus(msgparts, n)
-
-            if pri == 3: msgattr = error_attr
-            elif pri == 2: msgattr = warn_attr
-            elif pri == 1: msgattr = warn_attr
-            else: msgattr = attr
-            x += clipdraw(scr, y, x, msg, msgattr, w=vs.windowWidth-x)
-        except Exception as e:
-            vd.exceptionCaught(e)
+    lstatus = vs.leftStatus()
+    maxwidth = options.disp_lstatus_max
+    if maxwidth > 0:
+        lstatus = middleTruncate(lstatus, maxwidth//2)
+
+    x = clipdraw(scr, y, 0, lstatus, cattr, w=vs.windowWidth-1)
+
+    vd.onMouse(scr, 0, y, x, 1,
+                    BUTTON3_PRESSED='rename-sheet',
+                    BUTTON3_CLICKED='rename-sheet')
 
 
 @VisiData.api
 def rightStatus(vd, sheet):
     'Return right side of status bar.  Overridable.'
-    return MissingAttrFormatter().format(sheet.options.disp_rstatus_fmt, sheet=sheet, vd=vd)
+    return sheet.formatString(sheet.options.disp_rstatus_fmt)
 
 
-@VisiData.api
-def drawRightStatus(vd, scr, vs):
-    'Draw right side of status bar.  Return length displayed.'
-    rightx = vs.windowWidth
-
-    ret = 0
-    statcolors = [
-        (vd.rightStatus(vs), 'color_status'),
-    ]
+@BaseSheet.property
+def keystrokeStatus(vs):
+    if vs is vd.activeSheet:
+        return f'[:keystrokes]{vd.keystrokes}[/]'
 
-    active = vs is vd.activeSheet
+    return ''
 
-    if active:
-        statcolors.append((f'{vd.prettykeys(vd.keystrokes)} ' or '', 'color_keystrokes'))
 
+@BaseSheet.property
+def threadStatus(vs) -> str:
     if vs.currentThreads:
-        statcolors.insert(0, vd.checkMemoryUsage())
+        ret = str(vd.checkMemoryUsage())
         gerunds = [p.gerund for p in vs.progresses if p.gerund] or ['processing']
-        statcolors.insert(1, ('  %s %s…' % (vs.progressPct, gerunds[0]), 'color_working'))
-
-    if active and vd.currentReplay:
-        statcolors.insert(0, (vd.replayStatus, 'color_status_replay'))
-
-    for rstatcolor in statcolors:
-        if rstatcolor:
-            try:
-                rstatus, coloropt = rstatcolor
-                rstatus = ' '+rstatus
-                cattr = colors.get_color(coloropt)
-                if scr is vd.winTop:
-                    cattr = update_attr(cattr, colors.color_top_status, 0)
-                if active:
-                    cattr = update_attr(cattr, colors.color_active_status, 0)
-                else:
-                    cattr = update_attr(cattr, colors.color_inactive_status, 0)
-                statuslen = clipdraw(scr, vs.windowHeight-1, rightx, rstatus, cattr.attr, w=vs.windowWidth-1, rtl=True)
-                rightx -= statuslen
-                ret += statuslen
-            except Exception as e:
-                vd.exceptionCaught(e)
-
-    if scr:
-        curses.doupdate()
+        ret += f' [:working]{vs.progressPct} {gerunds[0]}…[/]'
+        return ret
+    return ''
+
+@BaseSheet.property
+def modifiedStatus(sheet):
+    ret = ' [M]' if sheet.hasBeenModified else ''
+    if not vd.couldOverwrite():
+        ret += ' [:highlight_status][RO][/] '
     return ret
 
 
+@Sheet.property
+def selectedStatus(sheet):
+    if sheet.nSelectedRows:
+        return f' [:selected_row][:onclick dup-selected]{sheet.options.disp_selected_note}{sheet.nSelectedRows}[/][/] '
+
+
+@VisiData.api
+def drawRightStatus(vd, scr, vs):
+    'Draw right side of status bar.  Return length displayed.'
+    rightx = vs.windowWidth
+
+    statuslen = 0
+    try:
+        cattr = ColorAttr()
+        if scr is vd.winTop:
+            cattr = update_attr(cattr, colors.color_top_status, 0)
+        cattr = update_attr(cattr, colors.color_active_status if vs is vd.activeSheet else colors.color_inactive_status, 0)
+        rstat = vd.rightStatus(vs)
+        x = max(2, rightx-dispwidth(rstat)-1)
+        statuslen = clipdraw(scr, vs.windowHeight-1, x, rstat, cattr, w=vs.windowWidth-1)
+    finally:
+        if scr:
+            curses.doupdate()
+    return statuslen
+
+
 class StatusSheet(Sheet):
     precious = False
     rowtype = 'statuses'  # rowdef: (priority, args, nrepeats)
@@ -217,7 +221,8 @@ class StatusSheet(Sheet):
         ColumnItem('priority', 0, type=int, width=0),
         ColumnItem('nrepeats', 2, type=int, width=0),
         ColumnItem('args', 1, width=0),
-        Column('message', getter=lambda col,row: composeStatus(row[1], row[2])),
+        Column('message', width=50, getter=lambda col,row: composeStatus(row[1], row[2])),
+        ColumnItem('source', 3, max_help=1),
     ]
     colorizers = [
         RowColorizer(1, 'color_error', lambda s,c,r,v: r and r[0] == 3),
@@ -234,3 +239,7 @@ def statusHistorySheet(vd):
 
 
 BaseSheet.addCommand('^P', 'open-statuses', 'vd.push(vd.statusHistorySheet)', 'open Status History')
+
+vd.addMenuItems('''
+    View > Statuses > open-statuses
+''')