visidata 3.0.1__py3-none-any.whl → 3.1__py3-none-any.whl

visidata/shell.py

@@ -41,6 +41,12 @@ def exec_shell(*args):
 
 @VisiData.api
 def open_dir(vd, p):
+    if p.is_dir():
+        return DirSheet(p.base_stem, source=p)
+    if p.is_file():
+        vd.status(f'opening {p.given} as txt')
+        return vd.open_txt(p)
+    vd.warning(f'could not determine file type for {p.given}')
     return DirSheet(p.base_stem, source=p)
 
 @VisiData.api
@@ -48,8 +54,8 @@ def open_fdir(vd, p):
     return FileListSheet(p.base_stem, source=p)
 
 @VisiData.api
-def addShellColumns(vd, cmd, sheet):
-    shellcol = ColumnShell(cmd, source=sheet, width=0)
+def addShellColumns(vd, cmd, sheet, curcol=None):
+    shellcol = ColumnShell(cmd, source=sheet, width=0, curcol=curcol)
     sheet.addColumnAtCursor(
             Column(cmd+'_stdout', type=bytes.rstrip, srccol=shellcol, getter=lambda col,row: col.srccol.getValue(row)[0]),
             Column(cmd+'_stderr', type=bytes.rstrip, srccol=shellcol, getter=lambda col,row: col.srccol.getValue(row)[1]),
@@ -57,23 +63,23 @@ def addShellColumns(vd, cmd, sheet):
 
 
 class ColumnShell(Column):
-    def __init__(self, name, cmd=None, **kwargs):
+    def __init__(self, name, cmd=None, curcol=None, **kwargs):
         super().__init__(name, **kwargs)
         self.expr = cmd or name
+        self.curcol = curcol
 
     @asynccache(lambda col,row: (col, col.sheet.rowid(row)))
     def calcValue(self, row):
         try:
             import shlex
             args = []
-            context = LazyComputeRow(self.source, row)
+            context = LazyComputeRow(self.source, row, curcol=self.curcol)
             for arg in shlex.split(self.expr):
                 if arg.startswith('$'):
-                    args.append(shlex.quote(str(context[arg[1:]])))
-                else:
-                    args.append(arg)
+                    arg = shlex.quote(str(context[arg[1:]]))
+                args.append(arg)
 
-            p = subprocess.Popen([os.getenv('SHELL', 'bash'), '-c', ' '.join(args)],
+            p = subprocess.Popen([os.getenv('SHELL', 'bash'), '-c', shlex.join(args)],
                     stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
             return p.communicate()
         except Exception as e:
@@ -88,20 +94,19 @@ class DirSheet(Sheet):
 
         - {help.commands.open_row_file}
         - {help.commands.open_rows}
-        - (`open-dir-parent`) to open parent directory
+        - {help.commands.open_dir_parent}
         - {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 = [
         Column('directory',
-            getter=lambda col,row: str(row.parent) if str(row.parent) == '.' else str(row.parent) + '/',
+            getter=lambda col,row: str(row.parent) if str(row.parent) in ('.', '/') else str(row.parent) + '/',
             setter=lambda col,row,val: col.sheet.moveFile(row, val)),
         Column('filename',
             getter=lambda col,row: row._path.name,
@@ -248,15 +253,18 @@ def inputShell(vd):
 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-shell', '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, curcol=cursorCol)', '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')
 DirSheet.addCommand('^O', 'sysopen-row', 'launchEditor(cursorRow)', 'open current file in external $EDITOR')
 DirSheet.addCommand('g^O', 'sysopen-rows', 'launchEditor(*selectedRows)', 'open selected files in external $EDITOR')
 
-DirSheet.addCommand('y', 'copy-row', 'copy_files([cursorRow], inputPath("copy to dest: "))', 'copy file to given directory')
-DirSheet.addCommand('gy', 'copy-selected', 'copy_files(selectedRows, inputPath("copy to dest: ", value=cursorRow.given))', 'copy selected files to given directory')
+DirSheet.addCommand('y', 'copy-row', 'copy_files([cursorRow], inputPath("copy to dest: "))', 'copy file to given directory *path*')
+DirSheet.addCommand('gy', 'copy-selected', 'copy_files(selectedRows, inputPath("copy to dest: ", value=cursorRow.given))', 'copy selected files to given directory *path*')
+
+DirSheet.addCommand('z'+ENTER, 'open-row-filetype', 'ft = input("filetype: ", type="filetype", value=options.filetype or LazyComputeRow(sheet, cursorRow).ext); vd.push(openSource(cursorRow, filetype=ft) or fail(f"file {cursorDisplay} does not exist"))', 'open file in current row as input filetype')
+
 
 @DirSheet.api
 @asyncthread
@@ -282,4 +290,5 @@ vd.addGlobals({
 
 vd.addMenuItems('''
     Column > Add column > shell > addcol-shell
+    Open > file in row > open-row-filetype
 ''')

visidata/sidebar.py

@@ -6,25 +6,81 @@ 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.option('disp_sidebar_fmt', '', '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')
 
+@VisiData.api
+class AddedHelp:
+    '''Context manager to add help text/screen to list of available sidebars.'''
+    def __init__(self, text:Union[str,'HelpPane'], title=''):
+        if text:
+            self.helpfunc = lambda: (text, title)
+        else:
+            self.helpfunc = None
+
+    def __enter__(self):
+        if self.helpfunc:
+            vd._help_sidebars.insert(0, self.helpfunc)
+            vd.clearCaches()
+        return self
+
+    def __exit__(self, *args):
+        if self.helpfunc:
+            vd._help_sidebars.remove(self.helpfunc)
+            vd.clearCaches()
+
+
 @BaseSheet.property
 def formatter_helpstr(sheet):
     return AttrDict(commands=CommandHelpGetter(type(sheet)),
                     options=OptionHelpGetter())
 
 
-@BaseSheet.property
+@BaseSheet.cached_property
 def default_sidebar(sheet):
     'Default to format options.disp_sidebar_fmt.  Overridable.'
     fmt = sheet.options.disp_sidebar_fmt
+    if not fmt: return ''
     return sheet.formatString(fmt, help=sheet.formatter_helpstr)
 
 
+@VisiData.api
+def cycleSidebar(vd, n:int=1):
+    if vd.sheet.help_sidebars:
+        vd.disp_help += n
+        if vd.disp_help >= len(vd.sheet.help_sidebars):
+            vd.disp_help = -1
+
+        vd.options.disp_sidebar = (vd.disp_help >= 0)
+    else:
+        vd.disp_help = -1
+    vd.clearCaches()
+
+
+@BaseSheet.cached_property
+def help_sidebars(sheet) -> 'list[Callable[[], tuple[str,str]]]':
+    r = []
+    if sheet.default_sidebar:
+        r.append(lambda: (sheet.default_sidebar, ''))
+    if sheet.guide:
+        r.append(lambda: (sheet.formatString(sheet.guide, help=sheet.formatter_helpstr), ''))
+    return r + vd._help_sidebars
+
+
+@VisiData.cached_property
+def sidebarStatus(vd) -> str:
+    if vd.sheet.help_sidebars:
+        if vd.options.disp_sidebar and vd.disp_help >= 0:
+            n = vd.disp_help+1
+            return f'[:onclick sidebar-toggle][:sidebar][{n}/{len(vd.sheet.help_sidebars)}][/]'
+        else:
+            return f'[:onclick sidebar-toggle][:sidebar][{len(vd.sheet.help_sidebars)}][/]'
+
+    return ''
+
 @VisiData.property
 def recentStatusMessages(vd) -> str:
     r = ''
@@ -51,27 +107,24 @@ def recentStatusMessages(vd) -> str:
 @VisiData.api
 def drawSidebar(vd, scr, sheet):
     sidebar = vd.recentStatusMessages
+    title = ''
     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[/] [:]'
+        if not sidebar and vd.options.disp_sidebar and vd.disp_help >= 0:
+            sidebar, title = sheet.help_sidebars[vd.disp_help%len(sheet.help_sidebars)]()
+
+#            bottommsg = sheet.formatString('[:onclick sidebar-toggle][:reverse] {help.commands.sidebar_toggle} [:]', help=sheet.formatter_helpstr)
+#            overflowmsg = '[:reverse] see full sidebar with [:code]gb[/] [:]'
+
+            overflowmsg = '[:onclick open-sidebar]…↓…[/]'
     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)
+    return sheet.drawSidebarText(scr, text=sheet.current_sidebar, title=title, overflowmsg=overflowmsg, bottommsg=bottommsg)
 
 @BaseSheet.api
 def drawSidebarText(sheet, scr, text:Union[None,str,'HelpPane'], title:str='', overflowmsg:str='', bottommsg:str=''):
@@ -136,7 +189,7 @@ def drawSidebarText(sheet, scr, text:Union[None,str,'HelpPane'], title:str='', o
     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)
+        clipdraw(sidebarscr, h-1, winw-dispwidth(bottommsg)-4, '|'+bottommsg+'|', cattr)
 
     sidebarscr.refresh()
 
@@ -152,11 +205,13 @@ class SidebarSheet(TextSheet):
         - `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('b', 'sidebar-toggle', 'vd.options.disp_sidebar = not vd.options.disp_sidebar', 'toggle sidebar')
 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')
+BaseSheet.addCommand('^G', 'sidebar-cycle', 'vd.cycleSidebar()', 'cycle through available sidebar panels')
 
 
 vd.addMenuItems('''
     View > Sidebar > toggle > sidebar-toggle
+    View > Sidebar > cycle > sidebar-cycle
     View > Sidebar > open in new sheet > open-sidebar
 ''')

visidata/sort.py

@@ -35,18 +35,27 @@ class Reversor:
         return other.obj < self.obj
 
 
-@Sheet.api
-def sortkey(self, r):
+
+@Sheet.cached_property
+def ordering(sheet) -> 'list[tuple[Column, bool]]':
     ret = []
-    for col, reverse in self._ordering:
+    for col, reverse in sheet._ordering:
         if isinstance(col, str):
-            col = self.column(col)
+            col = sheet.column(col)
+        ret.append((col, reverse))
+    return ret
+
+
+@Sheet.api
+def sortkey(sheet, r, ordering:'list[tuple[Column, bool]]'=[]):
+    ret = []
+    for col, reverse in (ordering or sheet.ordering):
         val = col.getTypedValue(r)
         ret.append(Reversor(val) if reverse else val)
 
-
     return ret
 
+
 @Sheet.api
 @asyncthread
 def sort(self):
@@ -55,8 +64,14 @@ def sort(self):
         return
     try:
         with Progress(gerund='sorting', total=self.nRows) as prog:
+            # replace ambiguous colname strings with unambiguous Column objects  #2494
+            self._ordering = self.ordering
+            def _sortkey(r):
+                prog.addProgress(1)
+                return self.sortkey(r, ordering=self._ordering)
+
             # must not reassign self.rows: use .sort() instead of sorted()
-            self.rows.sort(key=lambda r,self=self,prog=prog: (prog.addProgress(1), self.sortkey(r))[1])
+            self.rows.sort(key=_sortkey)
     except TypeError as e:
         vd.warning('sort incomplete due to TypeError; change column type')
         vd.exceptionCaught(e, status=False)

visidata/statusbar.py

@@ -11,14 +11,16 @@ 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.threadStatus} {sheet.keystrokeStatus}   [:longname]{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.option('disp_rstatus_fmt', '{sheet.threadStatus} {sheet.keystrokeStatus}   [:longname_status]{sheet.longname}[/]  {sheet.nRows:9d} {sheet.rowtype} {sheet.modifiedStatus}{sheet.selectedStatus}{vd.replayStatus}{vd.sidebarStatus}', 'right-side status format string')
+vd.option('disp_status_fmt', '{sheet.sheetlist}| ', 'left-side status format string')
 vd.theme_option('disp_lstatus_max', 0, 'maximum length of left status line')
 vd.theme_option('disp_status_sep', '│', 'separator between statuses')
 
 vd.theme_option('color_keystrokes', 'bold white on 237', 'color of input keystrokes')
-vd.theme_option('color_longname', '6', 'color of command longnames')
-vd.theme_option('color_keys', 'bold', 'color of keystrokes in help')
+vd.theme_option('color_longname_guide', '237', 'color of command longnames')
+vd.theme_option('color_longname_status', 'white', 'color of command longnames')
+vd.theme_option('color_keys', 'bold reverse', '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')
@@ -29,6 +31,41 @@ vd.theme_option('color_highlight_status', 'black on green', 'color of highlighte
 
 BaseSheet.init('longname', lambda: '')
 
+def fitWithin(s, n=10):
+    if len(s) > n:
+        return s[:n//2-1] + '…' + s[-n//2+1:]
+    return s
+
+@BaseSheet.property
+def ancestors(sheet):
+    if isinstance(sheet.source, BaseSheet):
+        return sheet.source.ancestors + [sheet.source]
+    else:
+        return []
+
+@BaseSheet.property
+def sheetlist(sheet):
+    leafsheets = []
+    parents = set()
+
+    sheetstack = vd.sheetstack(sheet.pane)
+    sheets = [x for x in vd.allSheets if x in sheetstack]+ [x for x in sheetstack if x not in vd.allSheets]
+
+    sheetnames = []
+    for vs in sheets:
+        if isinstance(vs, BaseSheet):
+            shortcut = ' '
+            if vs.shortcut in '1 2 3 4 5 6 7 8 9 10'.split():
+                shortcut = vs.shortcut[-1] + '›'
+            if vs is vd.sheet:
+                sheetnames.append(f'[:menu_active]{shortcut}{vs.name}[:]')
+            else:
+                sheetnames.append(f'[:onclick jump-sheet-{vs.shortcut}]' + fitWithin(f'{shortcut}{vs.name}', 20) + '[:]')
+        else:
+            sheetnames.append(vs)
+
+    return ' | '.join(sheetnames)
+
 @BaseSheet.api
 def _updateStatusBeforeExec(sheet, cmd, args, ks):
     sheet.longname = cmd.longname
@@ -223,7 +260,7 @@ class StatusSheet(Sheet):
         ColumnItem('nrepeats', 2, type=int, width=0),
         ColumnItem('args', 1, width=0),
         Column('message', width=50, getter=lambda col,row: composeStatus(row[1], row[2])),
-        ColumnItem('source', 3, max_help=1),
+        ColumnItem('source', 3, width=0),
     ]
     colorizers = [
         RowColorizer(1, 'color_error', lambda s,c,r,v: r and r[0] == 3),

visidata/stored_list.py

@@ -13,8 +13,11 @@ class StoredList(list):
     @property
     def path(self):
         vdpath = Path(vd.options.visidata_dir)
-        if vdpath.exists():
-            return vdpath/(self.name + '.jsonl')
+        if not vdpath.exists():
+            if vd.options.nothing:
+                return
+            vdpath.mkdir(parents=True)
+        return vdpath/(self.name + '.jsonl')
 
     def reload(self):
         p = self.path

visidata/tests/conftest.py

@@ -10,6 +10,7 @@ def curses_setup():
     import visidata
 
     curses.curs_set = lambda v: None
+    curses.doupdate = lambda: None
     visidata.options.overwrite = 'always'
 
 

visidata/tests/test_commands.py

@@ -56,6 +56,7 @@ inputLines = { 'save-sheet': 'jetsam.csv',  # save to some tmp file
                  'exec-python': 'import time',
                  'unselect-cols-regex': '.',
                  'go-col-regex': 'Units',          # column name in sample
+                 'go-col-name': 'Units',           # column name in sample
                  'go-col-number': '2',
                  'go-row-number': '5',              # go to row 5
                  'addcol-bulk': '1',
@@ -67,6 +68,7 @@ inputLines = { 'save-sheet': 'jetsam.csv',  # save to some tmp file
                  'setcol-incr-step': '2',
                  'setcol-iter': 'range(1, 100)',
                  'setcol-format-enum': '1=cat',
+                 'open-ping': 'github.com',
                  'setcol-input': '5',
                  'show-expr': 'OrderDate',
                  'setcol-expr': 'OrderDate',
@@ -92,7 +94,8 @@ inputLines = { 'save-sheet': 'jetsam.csv',  # save to some tmp file
                  'expand-cols-depth': '0',
                  'save-cmdlog': 'test_commands.vdj',
                  'aggregate-col': 'mean',
-                 'memo-aggregate': 'mean',
+                 'memo-aggregate': 'count',
+                 'memo-cell': 'memoname',
                  'addcol-shell': '',
                  'theme-input': 'light',
                  'add-rows': '1',
@@ -170,12 +173,17 @@ class TestCommands:
 
         sample_file = vd.pkg_resources_files(visidata) / 'tests/sample.tsv'
         vs = visidata.TsvSheet('test_commands', source=visidata.Path(sample_file))
+        cmd = vs.getCommand(longname)
+        if not cmd:
+            vd.warning(f'command cannot be tested on TsvSheet, skipping:  {longname}')
+            return
         vs.reload.__wrapped__(vs)
         vs.vd = vd
         vd.sheets = [vs]
         vd.allSheets = [vs]
         vs.mouseX, vs.mouseY = (4, 4)
         vs.draw(mock_screen)
+        vs._scr = mock_screen
         if longname in inputLines:
             vd.currentReplayRow = vd.cmdlog.newRow(longname=longname, input=inputLines[longname])
         else:

visidata/tests/test_completer.py

@@ -0,0 +1,18 @@
+import pytest
+import visidata
+
+class TestCompleteExpr:
+    def test_completer(self):
+        vs = visidata.DirSheet('test', source=visidata.Path('.'))
+        vs.reload()
+        cexpr = visidata.CompleteExpr(vs)
+        assert cexpr('fi', 0) == 'filename'  # visible column first
+        assert cexpr('fi', 1) == 'filetype'  # hidden column second
+        assert cexpr('logn', 0) == 'lognormvariate'  # global from math
+        assert cexpr('a+logn', 0) == 'a+lognormvariate'
+
+        assert cexpr('testv', 0) == 'testv'  # no match returns same
+
+        visidata.vd.memoValue('testvalue', 42, '42')
+        cexpr = visidata.CompleteExpr(vs)
+        assert cexpr('testv', 0) == 'testvalue'

visidata/tests/test_edittext.py

@@ -46,9 +46,10 @@ class TestEditText:
         self.chars.extend(keys.split())
 
         exception = kwargs.pop('exception', None)
+        widget = visidata.InputWidget(**kwargs)
         if exception:
             with pytest.raises(exception):
-                visidata.vd.editline(mock_screen, 0, 0, 0, attr=visidata.ColorAttr(), **kwargs)
+                widget.editline(mock_screen, 0, 0, 0, attr=visidata.ColorAttr())
         else:
-            r = visidata.vd.editline(mock_screen, 0, 0, 0, attr=visidata.ColorAttr(), **kwargs)
+            r = widget.editline(mock_screen, 0, 0, 0, attr=visidata.ColorAttr())
             assert r == result

visidata/text_source.py

@@ -2,7 +2,7 @@ import re
 
 from visidata import vd, BaseSheet
 
-vd.option('regex_skip', '', 'regex of lines to skip in text sources', help='regex')
+vd.option('regex_skip', '', 'regex of lines to skip in text sources', help='regex', replay=True)
 vd.option('regex_flags', 'I', 'flags to pass to re.compile() [AILMSUX]', replay=True)
 
 @BaseSheet.api
@@ -44,9 +44,12 @@ class FilterFile:
 
 
 @BaseSheet.api
-def open_text_source(sheet):
-    'Open sheet source as text, using sheet options for encoding and regex_skip.'
-    fp = sheet.source.open(encoding=sheet.options.encoding, encoding_errors=sheet.options.encoding_errors)
+def open_text_source(sheet, **kwargs):
+    'Open sheet source as text, passing **kwargs to .open() (default to sheet options for encoding and regex_skip).'
+    openkwargs = dict(encoding=sheet.options.encoding,
+                      encoding_errors=sheet.options.encoding_errors)
+    openkwargs.update(kwargs)
+    fp = sheet.source.open(**openkwargs)
     regex_skip = sheet.options.regex_skip
     if regex_skip:
         return FilterFile(fp, regex_skip, sheet.regex_flags())

visidata/textsheet.py

@@ -1,12 +1,12 @@
 import textwrap
 
 from visidata import vd, BaseSheet, options, Sheet, ColumnItem, asyncthread
-from visidata import Column, ColumnItem, vlen
+from visidata import Column, vlen
 from visidata import globalCommand, VisiData
 import visidata
 
 
-vd.option('wrap', False, 'wrap text to fit window width on TextSheet', max_help=0)
+vd.option('wrap', False, 'wrap text to fit window width on TextSheet')
 vd.option('save_filetype', 'tsv', 'specify default file type to save as', replay=True)
 
 
@@ -32,7 +32,7 @@ class TextSheet(Sheet):
                 for i, L in enumerate(textwrap.wrap(str(text), width=winWidth)):
                     yield [startingLine+i+1, L]
             else:
-                yield [startingLine+1, text.strip()]
+                yield [startingLine+1, text]
 
     def sysopen(sheet, linenum=0):
         @asyncthread
@@ -55,8 +55,23 @@ class TextSheet(Sheet):
 # .source is list of source text lines to 'load'
 # .sourceSheet is Sheet error came from
 class ErrorSheet(TextSheet):
+    columns = [
+        ColumnItem('linenum', 0, type=int, width=0),
+        ColumnItem('error', 1),
+    ]
+    guide = '''# Error Sheet'''
     precious = False
 
+class ErrorCellSheet(ErrorSheet):
+    columns = [
+        ColumnItem('linenum', 0, type=int, width=0),
+        ColumnItem('cell_error', 1),
+    ]
+    guide = '''# Error Cell Sheet
+This sheet shows the error that occurred when calculating a cell.
+- `q` to quit this error sheet.
+'''
+
 
 class ErrorsSheet(Sheet):
     columns = [
@@ -83,15 +98,14 @@ def recentErrorsSheet(self):
 BaseSheet.addCommand('^E', 'error-recent', 'vd.lastErrors and vd.push(recentErrorsSheet) or status("no error")', 'view traceback for most recent error')
 BaseSheet.addCommand('g^E', 'errors-all', 'vd.push(vd.allErrorsSheet)', 'view traceback for most recent errors')
 
-Sheet.addCommand(None, 'view-cell', 'vd.push(ErrorSheet("%s[%s].%s" % (name, cursorRowIndex, cursorCol.name), sourceSheet=sheet, source=cursorDisplay.splitlines()))', 'view contents of current cell in a new sheet')
-Sheet.addCommand('z^E', 'error-cell', 'vd.push(ErrorSheet(sheet.name+"_cell_error", sourceSheet=sheet, source=getattr(cursorCell, "error", None) or fail("no error this cell")))', 'view traceback for error in current cell')
+Sheet.addCommand('z^E', 'error-cell', 'vd.push(ErrorCellSheet(sheet.name+"_cell_error", sourceSheet=sheet, source=getattr(cursorCell, "error", None) or fail("no error this cell")))', 'view traceback for error in current cell')
 
 TextSheet.addCommand('^O', 'sysopen-sheet', 'sheet.sysopen(sheet.cursorRowIndex)', 'open copy of text sheet in $EDITOR and reload on exit')
 
 
 TextSheet.options.save_filetype = 'txt'
 
-vd.addGlobals({'TextSheet': TextSheet, 'ErrorSheet': ErrorSheet})
+vd.addGlobals({'TextSheet': TextSheet, 'ErrorSheet': ErrorSheet, 'ErrorCellSheet': ErrorCellSheet})
 
 vd.addMenuItems('''
     View > Errors > recent > error-recent

visidata/themes/ascii8.py

@@ -13,10 +13,10 @@ vd.themes['ascii8'] = dict(
     disp_ambig_width=1,
 
     disp_pending='',
-    note_pending=':',
-    note_format_exc='?',
-    note_getter_exc='!',
-    note_type_exc='!',
+    disp_note_pending=':',
+    disp_note_fmtexc='?',
+    disp_note_getexc='!',
+    disp_note_typeexc='!',
 
     color_note_pending='bold magenta',
     color_note_type='yellow',
@@ -68,7 +68,8 @@ vd.themes['ascii8'] = dict(
     color_top_status='underline',
     color_active_status='black on cyan',
     color_inactive_status='8 on black',
-    color_working='green',
+    color_working='bold white',
+    color_longname_status='black on cyan',
 
     color_menu='black on cyan',
     color_menu_active='yellow on black',
@@ -80,5 +81,7 @@ vd.themes['ascii8'] = dict(
     disp_menu_input='_',
     disp_menu_fmt='7-bit ASCII 3-bit color',
     plot_colors = 'white',
-    disp_histogram='*'
+    disp_histogram='*',
+    disp_graph_lines_x_charset='||||',
+    disp_graph_lines_y_charset='----'
 )

visidata/themes/asciimono.py

@@ -13,10 +13,10 @@ vd.themes['asciimono'] = dict(
     disp_ambig_width=1,
 
     disp_pending='',
-    note_pending=':',
-    note_format_exc='?',
-    note_getter_exc='!',
-    note_type_exc='!',
+    disp_note_pending=':',
+    disp_note_fmtexc='?',
+    disp_note_getexc='!',
+    disp_note_typeexc='!',
 
     color_note_pending='bold',
     color_note_type='',
@@ -48,9 +48,13 @@ vd.themes['asciimono'] = dict(
     color_hidden_col='8',
     color_selected_row='',
     color_edit_cell='',
+    color_edit_unfocused='',
     color_graph_hidden='',
     color_graph_selected='bold',
     color_status_replay='',
+    color_currency_neg='',
+    color_match='',
+    color_cmdpalette='',
 
     color_graph_axis='bold',
     color_sidebar='reverse',
@@ -69,6 +73,12 @@ vd.themes['asciimono'] = dict(
     color_active_status='reverse',
     color_inactive_status='8',
     color_working='',
+    color_longname='',
+    color_highlight_status='',
+    color_sidebar_title='',
+    color_heading='',
+    color_guide_unwritten='',
+    color_code='',
 
     color_menu='reverse',
     color_menu_active='',