visidata 3.0__tar.gz → 3.0.1__tar.gz

{visidata-3.0 → visidata-3.0.1}/MANIFEST.in

@@ -6,6 +6,7 @@ include visidata/man/visidata.1
 include visidata/ddw/input.ddw
 include visidata/ddw/regex.ddw
 include visidata/tests/sample.tsv
+include visidata/tests/benchmark.csv
 include visidata/desktop/visidata.desktop
 include visidata/experimental/noahs_tapestry/*.json
 include visidata/experimental/noahs_tapestry/*.md

{visidata-3.0/visidata.egg-info → visidata-3.0.1}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: visidata
-Version: 3.0
+Version: 3.0.1
 Summary: terminal interface for exploring and arranging tabular data
 Home-page: https://visidata.org
-Download-URL: https://github.com/saulpw/visidata/tarball/3.0
+Download-URL: https://github.com/saulpw/visidata/tarball/3.0.1
 Author: Saul Pwanson
 Author-email: visidata@saul.pw
 License: GPLv3
@@ -26,7 +26,7 @@ Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE.gpl3
 
-# VisiData v3.0
+# VisiData v3.0.1
 
 [![Tests](https://github.com/saulpw/visidata/workflows/visidata-ci-build/badge.svg)](https://github.com/saulpw/visidata/actions/workflows/main.yml)
 [![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/saulpw/visidata)

{visidata-3.0 → visidata-3.0.1}/README.md

@@ -1,4 +1,4 @@
-# VisiData v3.0
+# VisiData v3.0.1
 
 [![Tests](https://github.com/saulpw/visidata/workflows/visidata-ci-build/badge.svg)](https://github.com/saulpw/visidata/actions/workflows/main.yml)
 [![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/saulpw/visidata)

{visidata-3.0 → visidata-3.0.1}/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup
 
 # tox can't actually run python3 setup.py: https://github.com/tox-dev/tox/issues/96
 # from visidata import __version__
-__version__ = "3.0"
+__version__ = "3.0.1"
 
 setup(
     name="visidata",
@@ -51,7 +51,7 @@ setup(
     package_data={
         "visidata.man": ["vd.1", "vd.txt"],
         "visidata.ddw": ["input.ddw", "regex.ddw"],
-        "visidata.tests": ["sample.tsv"],
+        "visidata.tests": ["sample.tsv", "benchmark.csv"],
         "visidata.desktop": ["visidata.desktop"],
         "visidata.experimenta.noahs_tapestry": [
             "clues.json",

{visidata-3.0 → visidata-3.0.1}/visidata/__init__.py

@@ -1,6 +1,6 @@
 'VisiData: a curses interface for exploring and arranging tabular data'
 
-__version__ = '3.0'
+__version__ = '3.0.1'
 __version_info__ = 'VisiData v' + __version__
 __author__ = 'Saul Pwanson <vd@saul.pw>'
 __status__ = 'Production/Stable'

{visidata-3.0 → visidata-3.0.1}/visidata/aggregators.py

@@ -7,7 +7,20 @@ import statistics
 from visidata import Progress, Sheet, Column, ColumnsSheet, VisiData
 from visidata import vd, anytype, vlen, asyncthread, wrapply, AttrDict
 
-vd.help_aggregators = '# Aggregators Help\nHELPTODO'
+vd.help_aggregators = '''# Choose Aggregators
+Start typing an aggregator name or description.
+Multiple aggregators can be added by separating spaces.
+
+- `Enter` to select top aggregator.
+- `Tab` to highlight top aggregator.
+
+## When Aggregator Highlighted
+
+- `Tab`/`Shift+Tab` to cycle highlighted aggregator.
+- `Enter` to select aggregators.
+- `Space` to add highlighted aggregator.
+- `0-9` to add numbered aggregator.
+'''
 
 vd.option('null_value', None, 'a value to be counted as null', replay=True)
 

{visidata-3.0 → visidata-3.0.1}/visidata/basesheet.py

@@ -18,6 +18,9 @@ class LazyChainMap:
                 if k not in self.objs:
                     self.objs[k] = obj
 
+    def __iter__(self):
+        return iter(self.objs)
+
     def __contains__(self, k):
         return k in self.objs
 
@@ -175,7 +178,7 @@ class BaseSheet(DrawablePane):
     @property
     def displaySource(self):
         if isinstance(self.source, BaseSheet):
-            return f'the *{self.source[0]}* sheet'
+            return f'the *{self.source}* sheet'
 
         if isinstance(self.source, (list, tuple)):
             if len(self.source) == 1:
@@ -283,7 +286,7 @@ class BaseSheet(DrawablePane):
 
     def evalExpr(self, expr, **kwargs):
         'Evaluate Python expression *expr* in the context of *kwargs* (may vary by sheet type).'
-        return eval(expr, vd.getGlobals(), None)
+        return eval(expr, vd.getGlobals(), dict(sheet=self))
 
     def formatString(self, fmt, **kwargs):
         'Return formatted string with *sheet* and *vd* accessible to expressions.  Missing expressions return empty strings instead of error.'

{visidata-3.0 → visidata-3.0.1}/visidata/column.py

@@ -111,7 +111,7 @@ class Column(Extensible):
         return self.__copy__()  # no separate deepcopy
 
     def __getstate__(self):
-        return {k:getattr(self, k) for k in 'name typestr width height expr keycol formatter fmtstr voffset hoffset aggstr'.split() if hasattr(self, k)}
+        return {k:getattr(self, k) for k in 'name typestr width height expr keycol formatter displayer fmtstr voffset hoffset aggstr'.split() if hasattr(self, k)}
 
     def __setstate__(self, d):
         for attr, v in d.items():

{visidata-3.0 → visidata-3.0.1}/visidata/errors.py

@@ -1,6 +1,6 @@
 import traceback
 
-from visidata import vd, VisiData, options
+from visidata import vd, VisiData
 
 vd.option('debug', False, 'exit on error and display stacktrace', max_help=0)
 

{visidata-3.0 → visidata-3.0.1}/visidata/extensible.py

@@ -30,14 +30,7 @@ class Extensible:
                 ret = oldcopy(self, *args, **kwargs)
             else:
                 ret = super(cls, self).__copy__(*args, **kwargs)
-
-            if not hasattr(ret, membername):
-                if copy and hasattr(self, membername):
-                    v = getattr(self, membername)
-                else:
-                    v = initfunc()
-                setattr(ret, membername, v)
-
+            setattr(ret, membername, getattr(self, membername) if copy and hasattr(self, membername) else initfunc())
             return ret
         cls.__copy__ = wraps(oldcopy)(newcopy) if oldcopy else newcopy
 

{visidata-3.0 → visidata-3.0.1}/visidata/features/cmdpalette.py

@@ -6,6 +6,19 @@ from visidata import DrawablePane, BaseSheet, vd, VisiData, CompleteKey, clipdra
 vd.theme_option('color_cmdpalette', 'black on 72', 'base color of command palette')
 vd.theme_option('disp_cmdpal_max', 10, 'max number of suggestions for command palette')
 
+vd.help_longname = '''# Choose Command
+Start typing a command longname or keyword in its helpstring.
+
+- `Enter` to execute top command.
+- `Tab` to highlight top command.
+
+## When Command Highlighted
+
+- `Tab`/`Shift+Tab` to cycle highlighted command.
+- `Enter` to execute highlighted command.
+- `0-9` to execute numbered command.
+'''
+
 def add_to_input(v, i, value=''):
     items = list(v.split())
     if not v or v.endswith(' '):
@@ -19,6 +32,17 @@ def add_to_input(v, i, value=''):
 def accept_input(v, i, value=None):
     raise AcceptInput(v if value is None else value)
 
+def accept_input_if_subset(v, i, value=''):
+    # if no input, accept value under cmd palette cursor
+    if not v:
+        raise AcceptInput(value)
+
+    # if the last item is a partial match, replace it with the full value
+    parts = v.split()
+    if value and value.startswith(parts[-1]):
+        v = ' '.join(parts[:-1] + [value])
+
+    raise AcceptInput(v)
 
 @VisiData.lazy_property
 def usedInputs(vd):
@@ -86,7 +110,7 @@ def inputPalette(sheet, prompt, items,
             palrows.append((None, None))
 
         for i, (m, item) in enumerate(palrows):
-            trigger_key = ' '
+            trigger_key = ''
             if tabitem >= 0 and item:
                 trigger_key = f'{i+1}'[-1]
                 bindings[trigger_key] = partial(add_to_input if multiple else accept_input, value=item[value_key])
@@ -95,13 +119,17 @@ def inputPalette(sheet, prompt, items,
 
             if tabitem < 0 and palrows:
                 _ , topitem = palrows[0]
-                bindings['^J'] = partial(accept_input, value=None)
                 if multiple:
                     bindings[' '] = partial(add_to_input, value=topitem[value_key])
+                    bindings['^J'] = partial(accept_input_if_subset, value=topitem[value_key])
+                else:
+                    bindings['^J'] = partial(accept_input, value=topitem[value_key])
             elif item and i == tabitem:
-                bindings['^J'] = partial(accept_input, value=None)
                 if multiple:
+                    bindings['^J'] = partial(accept_input_if_subset, value=item[value_key])
                     bindings[' '] = partial(add_to_input, value=item[value_key])
+                else:
+                    bindings['^J'] = partial(accept_input, value=item[value_key])
                 attr = colors.color_menu_spec
 
             match_summary = formatter(m, item, trigger_key) if item else ' '
@@ -137,11 +165,16 @@ def inputLongname(sheet):
     def _fmt_cmdpal_summary(match, row, trigger_key):
         keystrokes = this_sheets_help.revbinds.get(row.longname, [None])[0] or ' '
         formatted_longname = match.formatted.get('longname', row.longname) if match else row.longname
-        formatted_name = f'[:onclick {row.longname}]{formatted_longname}[/]'
+        formatted_name = f'[:longname][:onclick {row.longname}]{formatted_longname}[/][/]'
         if vd.options.debug and match:
             keystrokes = f'[{match.score}]'
         r = f' [:keystrokes]{keystrokes.rjust(len(prompt)-5)}[/]  '
-        r += f'[:keystrokes]{trigger_key}[/] {formatted_name}'
+        if trigger_key:
+            r += f'[:keystrokes]{trigger_key}[/]'
+        else:
+            r += ' '
+
+        r += f' {formatted_name}'
         if row.description:
             formatted_desc = match.formatted.get('description', row.description) if match else row.description
             r += f' - {formatted_desc}'
@@ -150,6 +183,7 @@ def inputLongname(sheet):
     return sheet.inputPalette(prompt, this_sheets_help.cmdlist,
                               value_key='longname',
                               formatter=_fmt_cmdpal_summary,
+                              help=vd.help_longname,
                               type='longname')
 
 

{visidata-3.0 → visidata-3.0.1}/visidata/features/slide.py

@@ -100,6 +100,8 @@ vd.addMenuItems('''
 
 ## tests
 
+sample_path = vd.pkg_resources_files(visidata) / 'tests/sample.tsv'
+benchmark_path = vd.pkg_resources_files(visidata) / 'tests/benchmark.csv'
 
 def make_tester(setup_vdx):
     def t(vdx, golden):
@@ -114,8 +116,8 @@ def make_tester(setup_vdx):
     return t
 
 def test_slide_keycol_1(vd):
-    t = make_tester('''
-            open-file sample_data/sample.tsv
+    t = make_tester(f'''
+            open-file {sample_path}
             +::OrderDate key-col
             +::Region key-col
             +::Rep key-col
@@ -139,12 +141,12 @@ def test_slide_keycol_1(vd):
 
 
 def test_slide_leftmost(vd):
-    t = make_tester('''open-file sample_data/benchmark.csv''')
+    t = make_tester(f'''open-file {benchmark_path}''')
 
     t('+::Paid slide-leftmost', 'Paid Date Customer SKU Item Quantity Unit')
 
-    t = make_tester('''
-         open-file sample_data/benchmark.csv
+    t = make_tester(f'''
+         open-file {benchmark_path}
          +::Date key-col
     ''')
 

{visidata-3.0 → visidata-3.0.1}/visidata/guide.py

@@ -18,6 +18,7 @@ CommandsSheet ("How to find the command you want run")
 
 #  real barebones basics
 MovementGuide ("Movement and Search")
+InputGuide ("Input keystrokes")
 SortGuide ("Sorting")
 TypesSheet ("The basic type system")
 CommandLog  ("Undo and Replay")
@@ -116,6 +117,9 @@ class CommandHelpGetter:
         self.helpsheet.ensureLoaded()
 
     def __getattr__(self, k):
+        return self.__getitem__(k)
+
+    def __getitem__(self, k):
         longname = k.replace('_', '-')
         binding = self.helpsheet.revbinds.get(longname, [None])[0]
         # cmddict has a SheetClass associated with each command
@@ -173,6 +177,22 @@ def getGuide(vd, name): # -> GuideSheet()
 
 BaseSheet.addCommand('', 'open-guide-index', 'vd.push(GuideIndex("VisiData_Guide"))', 'open VisiData guides table of contents')
 
+@VisiData.api
+def inputKeys(vd, prompt):
+    return vd.input(prompt, help=f'''
+                # Input Keystrokes
+                - Press `Ctrl+N` and then press another keystroke to spell out that keystroke.
+                - Press `Ctrl+C` to cancel the input.
+                - Press `Enter` to accept the input.
+            ''')
+
+@BaseSheet.api
+def getCommandInfo(sheet, keys):
+    cmd = sheet.getCommand(keys)
+    return CommandHelpGetter(type(sheet))[cmd.longname]
+
+vd.addCommand('', 'show-command-info', 'status(getCommandInfo(inputKeys("get command for keystrokes: ")))', 'show longname and helpstring for keybinding')
+
 vd.addMenuItems('''
         Help > VisiData Feature Guides > open-guide-index
 ''')

{visidata-3.0 → visidata-3.0.1}/visidata/keys.py

@@ -48,6 +48,9 @@ visidata.vd.prettykeys_trdict = {
         'KEY_SNEXT': 'Shift+PgDn',
 
         'KEY_BACKSPACE': 'Bksp',
+        'BUTTON1_RELEASED': 'LeftBtnUp',
+        'BUTTON2_RELEASED': 'MiddleBtnUp',
+        'BUTTON3_RELEASED': 'RightBtnUp',
         'BUTTON1_PRESSED': 'LeftClick',
         'BUTTON2_PRESSED': 'MiddleClick',
         'BUTTON3_PRESSED': 'RightClick',

{visidata-3.0 → visidata-3.0.1}/visidata/loaders/api_reddit.py

@@ -1,12 +1,12 @@
 '''# RedditSheet
 
-- [:keys]Ctrl+O[/] to open a browser tab to [:code]{sheet.cursorRow.display_name_prefixed}[/]
-- [:keys]g Ctrl+O[/] to open browser windows for {sheet.nSelectedRows} selected subreddits
+- [:keystrokes]Ctrl+O[/] to open a browser tab to [:code]{sheet.cursorRow.display_name_prefixed}[/]
+- [:keystrokes]g Ctrl+O[/] to open browser windows for {sheet.nSelectedRows} selected subreddits
 
-- [:keys]Enter[/] to open sheet with top ~1000 submissions for [:code]{sheet.cursorRow.display_name_prefixed}[/]
-- [:keys]g Enter[/] to open sheet with top ~1000 submissions for {sheet.nSelectedRows} selected subreddits
+- [:keystrokes]Enter[/] to open sheet with top ~1000 submissions for [:code]{sheet.cursorRow.display_name_prefixed}[/]
+- [:keystrokes]g Enter[/] to open sheet with top ~1000 submissions for {sheet.nSelectedRows} selected subreddits
 
-- [:keys]ga[/] to append more subreddits matching input by name or description
+- [:keystrokes]ga[/] to append more subreddits matching input by name or description
 '''
 
 import visidata

{visidata-3.0 → visidata-3.0.1}/visidata/loaders/html.py

@@ -77,7 +77,7 @@ class HtmlLinksSheet(Sheet):
         lxml = vd.importExternal('lxml')
         from lxml.html import iterlinks
         root = self.source.getroot()
-        root.make_links_absolute(self.source.docinfo.URL)
+        root.make_links_absolute(self.source.docinfo.URL, handle_failures='ignore')
         yield from iterlinks(root)
 
     def openRow(self, row):
@@ -131,7 +131,11 @@ class HtmlTableSheet(Sheet):
                 if isinstance(cell, lxml.etree.CommentBase):
                     continue
                 cellval = ' '.join(x.strip() for x in cell.itertext())  # text only without markup
-                links = [urllib.parse.urljoin(self.source.base_url, x.get('href')) for x in cell.iter('a')]
+                links = [
+                    vd.callNoExceptions(urllib.parse.urljoin, self.source.base_url, x.get('href')) or x.get('href')
+                        for x in cell.iter('a')
+                ]
+
                 maxlinks[colnum] = max(maxlinks.get(colnum, 0), len(links))
 
                 if is_header(cell):

{visidata-3.0 → visidata-3.0.1}/visidata/main.py

@@ -2,7 +2,7 @@
 # Usage: $0 [<options>] [<input> ...]
 #        $0 [<options>] --play <cmdlog> [--batch] [-w <waitsecs>] [-o <output>] [field=value ...]
 
-__version__ = '3.0'
+__version__ = '3.0.1'
 __version_info__ = 'saul.pw/VisiData v' + __version__
 
 from copy import copy

{visidata-3.0 → visidata-3.0.1}/visidata/man/vd.1

@@ -1,4 +1,4 @@
-.Dd December 29, 2023
+.Dd January 7, 2024
 .Dt vd \&1 "Quick Reference Guide"
 .Os Linux/MacOS
 .
@@ -101,7 +101,7 @@ toggle sidebar
 .No redo the most recent undo ( requires enabled Sy options.undo Ns )
 .Pp
 .It Ic "Space" Ar longname
-.No open command palette; execute command by its Ar longname
+.No open command palette; Sy Enter No to execute top command by its Ar longname
 .El
 .Ss "  Command Palette"
 .Bl -tag -width XXXXXXXXXXXXXXX -compact -offset XXX
@@ -1056,7 +1056,7 @@ device ID associated with matrix login
 client_id for reddit api
 .It Sy --reddit-client-secret Ns = Ns Ar "str  " No ""
 client_secret for reddit api
-.It Sy --reddit-user-agent Ns = Ns Ar "str     " No "3.0"
+.It Sy --reddit-user-agent Ns = Ns Ar "str     " No "3.0.1"
 user_agent for reddit api
 .It Sy --zulip-batch-size Ns = Ns Ar "int      " No "-100"
 number of messages to fetch per call (<0 to fetch before anchor)
@@ -1280,7 +1280,7 @@ color of code sample
 color of header
 .It Sy "color_guide_unwritten" No "243 on black"
 color of unwritten guides in GuideGuide
-.It Sy "disp_rstatus_fmt   " No "{sheet.threadStatus} {sheet.keystrokeStatus}   {sheet.longname}  {sheet.nRows:9d} {sheet.rowtype} {sheet.modifiedStatus}{sheet.selectedStatus}{vd.replayStatus}"
+.It Sy "disp_rstatus_fmt   " No "{sheet.threadStatus} {sheet.keystrokeStatus}   [:longname]{sheet.longname}[/]  {sheet.nRows:9d} {sheet.rowtype} {sheet.modifiedStatus}{sheet.selectedStatus}{vd.replayStatus}"
 right-side status format string
 .It Sy "disp_status_fmt    " No "[:onclick sheets-stack]{sheet.shortcut}\[u203A] {sheet.name}[/]| "
 status line prefix
@@ -1289,7 +1289,9 @@ maximum length of left status line
 .It Sy "disp_status_sep    " No "\[u2502]"
 separator between statuses
 .It Sy "color_keystrokes   " No "bold white on 237"
-color of input keystrokes on status line
+color of input keystrokes
+.It Sy "color_longname     " No "bold 52 on 114 green"
+color of command longnames
 .It Sy "color_keys         " No "bold"
 color of keystrokes in help
 .It Sy "color_status       " No "bold on 238"
@@ -1394,8 +1396,6 @@ max number of suggestions for command palette
 
 .It Sy "color_colname      " No "underline"
 
-.It Sy "color_longname     " No "bold 52 on 114 green"
-
 .It Sy "disp_scroll_context" No "0"
 minimum number of lines to keep visible above/below cursor when scrolling
 .It Sy "disp_sparkline     " No "\[u2581]\[u2582]\[u2583]\[u2584]\[u2585]\[u2586]\[u2587]"

{visidata-3.0 → visidata-3.0.1}/visidata/man/vd.txt

@@ -53,7 +53,8 @@ DESCRIPTION
        R              redo the most recent undo (requires enabled
                       options.undo)
 
-     Space longname   open command palette; execute command by its longname
+     Space longname   open command palette; Enter to execute top command by
+                      its longname
 
      Command Palette
         Tab              Move to command palette, and cycle through commands
@@ -743,7 +744,7 @@ COMMANDLINE OPTIONS
      --reddit-client-id=str                          client_id for reddit api
      --reddit-client-secret=str                      client_secret for reddit
                                                      api
-     --reddit-user-agent=str      3.0                user_agent for reddit api
+     --reddit-user-agent=str      3.0.1              user_agent for reddit api
      --zulip-batch-size=int       -100               number of messages to
                                                      fetch per call (<0 to
                                                      fetch before anchor)
@@ -962,7 +963,7 @@ COMMANDLINE OPTIONS
      color_guide_unwritten 243 on black      color of unwritten guides in
                                              GuideGuide
      disp_rstatus_fmt    {sheet.threadStatus} {sheet.keystrokeStatus}
-                                             {sheet.longname}
+                                             [:longname]{sheet.longname}[/]
                                              {sheet.nRows:9d} {sheet.rowtype}
                                              {sheet.modifiedStatus}{sheet.selectedStatus}{vd.replayStatus}
                                              right-side status format string
@@ -972,8 +973,9 @@ COMMANDLINE OPTIONS
      disp_lstatus_max    0                   maximum length of left status
                                              line
      disp_status_sep     │                   separator between statuses
-     color_keystrokes    bold white on 237   color of input keystrokes on sta‐
-                                             tus line
+     color_keystrokes    bold white on 237   color of input keystrokes
+     color_longname      bold 52 on 114 green
+                                             color of command longnames
      color_keys          bold                color of keystrokes in help
      color_status        bold on 238         status line color
      color_error         202 1               error message color
@@ -1045,8 +1047,6 @@ COMMANDLINE OPTIONS
                                              command palette
      color_shellcmd      21 on 114 green
      color_colname       underline
-     color_longname      bold 52 on 114 green
-
      disp_scroll_context 0                   minimum number of lines to keep
                                              visible above/below cursor when
                                              scrolling
@@ -1157,4 +1157,4 @@ SUPPORTED SOURCES
 AUTHOR
      VisiData was made by Saul Pwanson <vd@saul.pw>.
 
-Linux/MacOS                    December 29, 2023                   Linux/MacOS
+Linux/MacOS                     January 7, 2024                    Linux/MacOS

{visidata-3.0 → visidata-3.0.1}/visidata/man/visidata.1

@@ -1,4 +1,4 @@
-.Dd December 29, 2023
+.Dd January 7, 2024
 .Dt vd \&1 "Quick Reference Guide"
 .Os Linux/MacOS
 .
@@ -101,7 +101,7 @@ toggle sidebar
 .No redo the most recent undo ( requires enabled Sy options.undo Ns )
 .Pp
 .It Ic "Space" Ar longname
-.No open command palette; execute command by its Ar longname
+.No open command palette; Sy Enter No to execute top command by its Ar longname
 .El
 .Ss "  Command Palette"
 .Bl -tag -width XXXXXXXXXXXXXXX -compact -offset XXX
@@ -1056,7 +1056,7 @@ device ID associated with matrix login
 client_id for reddit api
 .It Sy --reddit-client-secret Ns = Ns Ar "str  " No ""
 client_secret for reddit api
-.It Sy --reddit-user-agent Ns = Ns Ar "str     " No "3.0"
+.It Sy --reddit-user-agent Ns = Ns Ar "str     " No "3.0.1"
 user_agent for reddit api
 .It Sy --zulip-batch-size Ns = Ns Ar "int      " No "-100"
 number of messages to fetch per call (<0 to fetch before anchor)
@@ -1280,7 +1280,7 @@ color of code sample
 color of header
 .It Sy "color_guide_unwritten" No "243 on black"
 color of unwritten guides in GuideGuide
-.It Sy "disp_rstatus_fmt   " No "{sheet.threadStatus} {sheet.keystrokeStatus}   {sheet.longname}  {sheet.nRows:9d} {sheet.rowtype} {sheet.modifiedStatus}{sheet.selectedStatus}{vd.replayStatus}"
+.It Sy "disp_rstatus_fmt   " No "{sheet.threadStatus} {sheet.keystrokeStatus}   [:longname]{sheet.longname}[/]  {sheet.nRows:9d} {sheet.rowtype} {sheet.modifiedStatus}{sheet.selectedStatus}{vd.replayStatus}"
 right-side status format string
 .It Sy "disp_status_fmt    " No "[:onclick sheets-stack]{sheet.shortcut}\[u203A] {sheet.name}[/]| "
 status line prefix
@@ -1289,7 +1289,9 @@ maximum length of left status line
 .It Sy "disp_status_sep    " No "\[u2502]"
 separator between statuses
 .It Sy "color_keystrokes   " No "bold white on 237"
-color of input keystrokes on status line
+color of input keystrokes
+.It Sy "color_longname     " No "bold 52 on 114 green"
+color of command longnames
 .It Sy "color_keys         " No "bold"
 color of keystrokes in help
 .It Sy "color_status       " No "bold on 238"
@@ -1394,8 +1396,6 @@ max number of suggestions for command palette
 
 .It Sy "color_colname      " No "underline"
 
-.It Sy "color_longname     " No "bold 52 on 114 green"
-
 .It Sy "disp_scroll_context" No "0"
 minimum number of lines to keep visible above/below cursor when scrolling
 .It Sy "disp_sparkline     " No "\[u2581]\[u2582]\[u2583]\[u2584]\[u2585]\[u2586]\[u2587]"

{visidata-3.0 → visidata-3.0.1}/visidata/pyobj.py

@@ -229,19 +229,20 @@ def openCellPyobj(sheet, col, rowidx):
 
 
 @BaseSheet.api
-def pyobj_expr(sheet):
+def inputPythonExpr(sheet):
     def launch_repl(v, i):
         import code
         with SuspendCurses():
             code.InteractiveConsole(locals=locals()).interact()
         return v, i
-    expr = vd.input("eval: ", "expr", completer=visidata.CompleteExpr(), bindings={'^X': launch_repl})
-    vd.push(PyobjSheet(expr, source=sheet.evalExpr(expr)))
+    return vd.input("eval: ", "expr", completer=visidata.CompleteExpr(), bindings={'^X': launch_repl})
 
-BaseSheet.addCommand('^X', 'pyobj-expr', 'pyobj_expr()', 'evaluate Python expression and open result as Python object')
+BaseSheet.addCommand('^X', 'pyobj-expr', 'expr=inputPythonExpr(); vd.push(PyobjSheet(expr, source=sheet.evalExpr(expr)))', 'evaluate Python expression and open result as Python object')
 BaseSheet.addCommand('', 'exec-python', 'expr = input("exec: ", "expr", completer=CompleteExpr()); exec(expr, getGlobals(), LazyChainMap(sheet, *vd.contexts, locals=vd.getGlobals()))', 'execute Python statement with expression scope')
 BaseSheet.addCommand('g^X', 'import-python', 'modname=input("import: ", type="import_python"); exec("import "+modname, getGlobals())', 'import Python module in the global scope')
 BaseSheet.addCommand('z^X', 'pyobj-expr-row', 'expr = input("eval over current row: ", "expr", completer=CompleteExpr()); vd.push(PyobjSheet(expr, source=evalExpr(expr, row=cursorRow)))', 'evaluate Python expression, in context of current row, and open result as Python object')
+BaseSheet.addCommand('', 'assert-expr', 'expr=inputPythonExpr(); assert sheet.evalExpr(expr), f"{expr} not true"', 'eval Python expression and assert result is truthy')
+BaseSheet.addCommand('', 'assert-expr-row', 'expr=inputPythonExpr(); assert sheet.evalExpr(expr, row=cursorRow), f"{expr} not true"', 'eval Python expression in context of current row, and assert result is truthy')
 
 Sheet.addCommand('^Y', 'pyobj-row', 'status(type(cursorRow).__name__); vd.push(openRowPyobj(cursorRowIndex))', 'open current row as Python object')
 Sheet.addCommand('z^Y', 'pyobj-cell', 'status(type(cursorValue).__name__); vd.push(openCellPyobj(cursorCol, cursorRowIndex))', 'open current cell as Python object')

{visidata-3.0 → visidata-3.0.1}/visidata/sheets.py

@@ -65,8 +65,15 @@ class LazyComputeRow:
             lcmobj._lcm = LazyChainMap(self.sheet, self.col, *vd.contexts)
         return lcmobj._lcm
 
+    def __iter__(self):
+        yield from self.sheet._ordered_colnames
+        yield from self._lcm.keys()
+        yield 'row'
+        yield 'sheet'
+        yield 'col'
+
     def keys(self):
-        return self.sheet._ordered_colnames + self._lcm.keys() + ['row', 'sheet', 'col']
+        return list(self.__iter__())
 
     def __str__(self):
         return str(self.as_dict())
@@ -165,6 +172,8 @@ class TableSheet(BaseSheet):
         self._colorizers = self.classColorizers
         self.recalc()  # set .sheet on columns and start caches
 
+        self._ordering = []  # list of (col:Column, reverse:bool)
+
         self.__dict__.update(kwargs)  # also done earlier in BaseSheet.__init__
 
     @property
@@ -363,7 +372,7 @@ class TableSheet(BaseSheet):
             # contexts are cached by sheet/rowid for duration of drawcycle
             contexts = vd._evalcontexts.setdefault((self, self.rowid(row), col), LazyComputeRow(self, row, col=col))
         else:
-            contexts = None
+            contexts = dict(sheet=self)
 
         return eval(expr, vd.getGlobals(), contexts)
 
@@ -864,7 +873,7 @@ class TableSheet(BaseSheet):
                     for i, chunks in enumerate(lines):
                         y = ybase+i
 
-                        if vcolidx == self.rightVisibleColIndex:  # right edge of sheet
+                        if vcolidx == self.nVisibleCols-1:  # right edge of sheet
                             if len(lines) == 1:
                                 sepchars = endsep
                             else:
@@ -1105,8 +1114,6 @@ def async_deepcopy(sheet, rowlist):
 
 BaseSheet.init('pane', lambda: 1)
 
-Sheet.init('_ordering', list, copy=False)  # (col:Column, reverse:bool)
-
 
 BaseSheet.addCommand('^R', 'reload-sheet', 'preloadHook(); reload()', 'Reload current sheet')
 Sheet.addCommand('^G', 'show-cursor', 'status(statusLine)', 'show cursor position and bounds of current sheet on status line')

{visidata-3.0 → visidata-3.0.1}/visidata/statusbar.py

@@ -11,12 +11,13 @@ 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}   {sheet.longname}  {sheet.nRows:9d} {sheet.rowtype} {sheet.modifiedStatus}{sheet.selectedStatus}{vd.replayStatus}', 'right-side status format string')
+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.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 on status line')
+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_status', 'bold on 238', 'status line color')
 vd.theme_option('color_error', '202 1', 'error message color')