visidata 2.11.1__py3-none-any.whl → 3.0__py3-none-any.whl

visidata/features/reload_every.py

@@ -0,0 +1,55 @@
+import os
+import time
+
+from visidata import vd, BaseSheet, Sheet, asyncthread, Path, ScopedSetattr
+
+
+@BaseSheet.api
+@asyncthread
+def reload_every(sheet, seconds:int):
+    while True:
+        sheet.reload()
+        time.sleep(seconds)
+
+
+@BaseSheet.api
+@asyncthread
+def reload_modified(sheet):
+    'Spawn thread to call sheet.reload_rows when sheet.source mtime has changed.'
+    p = sheet.source
+    assert isinstance(p, Path)
+    assert not p.is_url()
+
+    mtime = os.stat(p).st_mtime
+    while True:
+        time.sleep(1)
+        t = os.stat(p).st_mtime
+        if t != mtime:
+            mtime = t
+            sheet.reload_rows()
+
+
+@Sheet.api
+@asyncthread
+def reload_rows(self):
+    'Reload rows from ``self.source``, keeping current columns intact.  Async.'
+    with (ScopedSetattr(self, 'loading', True),
+          ScopedSetattr(self, 'checkCursor', lambda: True),
+          ScopedSetattr(self, 'cursorRowIndex', self.cursorRowIndex)):
+            self.beforeLoad()
+            try:
+                self.loader()
+                vd.status("finished loading rows")
+            finally:
+                self.afterLoad()
+
+
+BaseSheet.addCommand('', 'reload-every', 'sheet.reload_every(input("reload interval (sec): ", value=1))', 'schedule sheet reload every N seconds') #683
+BaseSheet.addCommand('', 'reload-modified', 'sheet.reload_modified()', 'reload sheet when source file modified (tail-like behavior)')  #1686
+BaseSheet.addCommand('z^R', 'reload-rows', 'preloadHook(); reload_rows(); status("reloaded")', 'Reload current sheet')
+
+vd.addMenuItems('''
+    File > Reload > rows only > reload-rows
+    File > Reload > every N seconds > reload-every
+    File > Reload > when source modified > reload-modified
+''')

visidata/features/rename_col_cascade.py

@@ -0,0 +1,30 @@
+import ast
+
+from visidata import vd, Column, ExprColumn, Sheet
+
+vd.option('rename_cascade', False, 'cascade column renames into expressions')  #2088
+
+
+class Renamer(ast.NodeTransformer):
+    def __init__(self, find, replace):
+        self.find = find
+        self.replace = replace
+
+    def visit_Name(self, node):
+        if node.id == self.find:
+            node.id = self.replace
+
+        return node
+
+
+@Column.before
+def setName(col, newname):
+    if col.sheet and col.sheet.options.rename_cascade:
+        for c in col.sheet.columns:
+            if isinstance(c, ExprColumn):
+                parsed_expr = ast.parse(c.expr)
+                canon_expr = ast.unparse(parsed_expr)
+                new_expr = ast.unparse(Renamer(col.name, newname).visit(parsed_expr))
+                if new_expr != canon_expr:
+                    vd.addUndo(setattr, c, 'expr', c.expr)
+                    c.expr = new_expr

visidata/features/scroll_context.py

@@ -0,0 +1,60 @@
+'''
+Enables two functions:
+1. options.disp_scroll_context: the minimum number of lines to keep visible above and below the cursor when scrolling
+2. toggle-scrollfix: Lock the cursor to a particular row number in the view
+
+Allows the user to fix the position on the page where they would like the
+cursor to "stick". Helps to provide context about surrounding rows when
+near the top and bottom of the page.
+
+Usage: scroll a few lines down, `toggle-scrollfix' and scroll again!
+
+NOTE:
+    - disables scroll-middle command (zz)
+'''
+
+__author__ = 'Geekscrapy'
+__version__ = '1.2'
+
+from visidata import vd, Sheet
+
+vd.option('disp_scroll_context', 0, 'minimum number of lines to keep visible above/below cursor when scrolling')
+vd.optalias('disp_scrolloff', 'disp_scroll_context')
+
+@Sheet.after
+def checkCursor(sheet):
+    nctx = sheet.options.disp_scroll_context
+    if nctx:
+        if nctx >= int(sheet.nScreenRows/2):
+            if sheet.cursorRowIndex+1 > int(sheet.nScreenRows/2):
+                sheet.topRowIndex = sheet.cursorRowIndex - int(sheet.nScreenRows/2)
+        else:
+            if sheet.cursorRowIndex-sheet.topRowIndex < nctx:
+                sheet.topRowIndex = max(0, sheet.cursorRowIndex-nctx)
+
+            if sheet.bottomRowIndex-sheet.cursorRowIndex < nctx:
+                sheet.bottomRowIndex = sheet.cursorRowIndex+nctx
+
+    nfix = getattr(sheet, 'disp_scrollfix', 0)
+    if nfix > 0:
+        cursorViewIndex = sheet.cursorRowIndex - sheet.topRowIndex
+        if cursorViewIndex > nfix:
+            sheet.topRowIndex += abs(nfix - cursorViewIndex)
+        if cursorViewIndex < nfix and sheet.topRowIndex > 0:
+            sheet.topRowIndex -= abs(nfix - cursorViewIndex)
+
+
+@Sheet.api
+def toggle_scrollfix(sheet):
+    if getattr(sheet, 'disp_scrollfix', -1) >= 0:
+        sheet.disp_scrollfix = -1
+        vd.status("cursor unlocked")
+    else:
+        sheet.disp_scrollfix = sheet.cursorRowIndex - sheet.topRowIndex
+        vd.status(f"cursor locked to screen row {sheet.disp_scrollfix}")
+
+
+Sheet.addCommand('', 'toggle-scrollfix', 'toggle_scrollfix()', helpstr='toggle cursor lock to current screen row')
+
+
+vd.addMenuItems('''View > Toggle display > lock cursor to screen row > toggle-scrollfix''')

visidata/features/select_equal_selected.py

@@ -0,0 +1,11 @@
+from visidata import Sheet, asyncthread, Progress
+
+
+@Sheet.api
+@asyncthread
+def select_equal_selected(sheet, col):
+    selectedVals = set(col.getDisplayValue(row) for row in Progress(sheet.selectedRows))
+    sheet.select(sheet.gatherBy(lambda r,c=col,vals=selectedVals: c.getDisplayValue(r) in vals), progress=False)
+
+
+Sheet.addCommand('', 'select-equal-selected', 'select_equal_selected(cursorCol)', 'select rows with values in current column in already selected rows')

visidata/features/setcol_fake.py

@@ -0,0 +1,65 @@
+# to anonymize a column in vd: do "setcol-fake" with e.g. 'name' 'isbn10' or any of the functions on Faker()
+
+import json
+
+from visidata import vd, Column, Sheet, asyncthread, Progress, VisiData
+
+vd.option('faker_locale', 'en_US', 'default locale to use for Faker', replay=True)
+vd.option('faker_extra_providers', None, 'list of additional Provider classes to load via add_provider()', replay=True)
+vd.option('faker_salt', '', 'Use a non-empty string to enable deterministic fakes')
+
+def addFakerProviders(fake, providers):
+    '''
+    Add custom providers to Faker. Provider classes typically derive from
+    faker.providers.BaseProvider, so check for that here. This helps to
+    highlight likely misconfigurations instead of hiding them.
+
+    See also: https://faker.readthedocs.io/en/master/communityproviders.html
+
+    fake: Faker object
+    providers: List of provider classes to add
+    '''
+    faker = vd.importExternal('faker', 'Faker')
+    if isinstance(providers, str):
+        providers = [ getattr(faker.providers, p) for p in providers.split() ]
+
+    if not isinstance(providers, list):
+        vd.fail('options.faker_extra_providers must be a list')
+
+    for provider in providers:
+        if not issubclass(provider, faker.providers.BaseProvider):
+            vd.warning('"{}" not a Faker Provider'.format(provider.__name__))
+            continue
+        fake.add_provider(provider)
+
+@Column.api
+@asyncthread
+def setValuesFromFaker(col, faketype, rows):
+    faker = vd.importExternal('faker', 'Faker')
+    fake = faker.Faker(col.sheet.options.faker_locale)
+    if col.sheet.options.faker_extra_providers:
+        addFakerProviders(fake, col.sheet.options.faker_extra_providers)
+    fakefunc = getattr(fake, faketype, None) or vd.fail(f'no such faker "{faketype}"')
+
+    fakeMap = {}
+    fakeMap[None] = None
+    fakeMap[col.sheet.options.null_value] = col.sheet.options.null_value
+
+    vd.addUndoSetValues([col], rows)
+    salt = col.sheet.options.faker_salt
+
+    for r in Progress(rows):
+        v = col.getValue(r)
+        if v in fakeMap:
+            newv = fakeMap[v]
+        else:
+            if salt:
+                # Reset the Faker seed for each value. For a given salt string,
+                # the same cell value will always generate the same fake value.
+                fake.seed_instance(json.dumps(v) + salt)
+            newv = fakefunc()
+            fakeMap[v] = newv
+        col.setValue(r, newv)
+
+
+Sheet.addCommand(None, 'setcol-fake', 'cursorCol.setValuesFromFaker(input("faketype: ", type="faketype"), selectedRows)', 'replace values in current column for selected rows with fake values')

visidata/{slide.py → features/slide.py}

@@ -1,6 +1,7 @@
 '''slide rows/columns around'''
 
-from visidata import Sheet, moveListItem, globalCommand, vd
+import visidata
+from visidata import Sheet, moveListItem, vd
 
 @Sheet.api
 def slide_col(sheet, colidx, newcolidx):
@@ -19,26 +20,6 @@ def slide_row(sheet, rowidx, newcolidx):
     return moveListItem(sheet.rows, rowidx, newcolidx)
 
 
-@Sheet.api
-def onClick(sheet, vcolidx, rowidx):
-    pass
-
-@Sheet.api
-def onRelease(sheet, vcolidx, rowidx, destx, desty):
-    newvcolidx = sheet.visibleColAtX(destx)
-    newrowidx = sheet.visibleRowAtY(desty)
-
-    if newvcolidx is not None and newvcolidx != vcolidx:
-        sheet.cursorVisibleColIndex = sheet.slide_col(vcolidx, newvcolidx)
-
-    # else: only move row if within same column (if column not moved above)
-    elif newrowidx is not None and newrowidx != rowidx:
-        sheet.cursorRowIndex = sheet.slide_row(rowidx, newrowidx)
-
-    else:
-        sheet.onClick(vcolidx, rowidx)
-
-
 def moveKeyCol(sheet, fromKeyColIdx, toKeyColIdx):
     'Move key column to another key column position in sheet.'
     if not (1 <= toKeyColIdx <= len(sheet.keyCols)):
@@ -101,3 +82,76 @@ Sheet.bindkey('gKEY_SLEFT', 'slide-leftmost')
 Sheet.bindkey('gkDN', 'slide-bottom')
 Sheet.bindkey('gkUP', 'slide-top')
 Sheet.bindkey('gKEY_SRIGHT', 'slide-rightmost')
+
+vd.addMenuItems('''
+    Edit > Slide > Row > up > slide-up
+    Edit > Slide > Row > up N > slide-up-n
+    Edit > Slide > Row > down > slide-down
+    Edit > Slide > Row > down N > slide-down-n
+    Edit > Slide > Row > to top > slide-top
+    Edit > Slide > Row > to bottom > slide-bottom
+    Edit > Slide > Column > left > slide-left
+    Edit > Slide > Column > left N > slide-left-n
+    Edit > Slide > Column > leftmost > slide-leftmost
+    Edit > Slide > Column > right > slide-right
+    Edit > Slide > Column > right N > slide-right-n
+    Edit > Slide > Column > rightmost > slide-rightmost
+''')
+
+## tests
+
+
+def make_tester(setup_vdx):
+    def t(vdx, golden):
+        global vd
+        vd = visidata.vd.resetVisiData()
+        vd.runvdx(setup_vdx)
+
+        vd.runvdx(vdx)
+        colnames = [c.name for c in vd.sheet.visibleCols]
+        assert colnames == golden.split(), ' '.join(colnames)
+
+    return t
+
+def test_slide_keycol_1(vd):
+    t = make_tester('''
+            open-file sample_data/sample.tsv
+            +::OrderDate key-col
+            +::Region key-col
+            +::Rep key-col
+        ''')
+
+    t('',                             'OrderDate Region Rep Item Units Unit_Cost Total')
+    t('+::Rep slide-leftmost',        'Rep OrderDate Region Item Units Unit_Cost Total')
+    t('+::OrderDate slide-rightmost', 'Region Rep OrderDate Item Units Unit_Cost Total')
+    t('+::Rep slide-left',            'OrderDate Rep Region Item Units Unit_Cost Total')
+    t('+::OrderDate slide-right',     'Region OrderDate Rep Item Units Unit_Cost Total')
+
+    t('''
+        +::Item key-col
+        +::Item slide-left
+        slide-left
+        slide-right
+        slide-right
+        slide-left
+        slide-left
+    ''', 'OrderDate Item Region Rep Units Unit_Cost Total')
+
+
+def test_slide_leftmost(vd):
+    t = make_tester('''open-file sample_data/benchmark.csv''')
+
+    t('+::Paid slide-leftmost', 'Paid Date Customer SKU Item Quantity Unit')
+
+    t = make_tester('''
+         open-file sample_data/benchmark.csv
+         +::Date key-col
+    ''')
+
+    t('', 'Date Customer SKU Item Quantity Unit Paid')
+    t('''+::Item slide-leftmost''', 'Date Item Customer SKU Quantity Unit Paid')
+    t('''+::SKU key-col
+         +::Quantity slide-leftmost''', 'Date SKU Quantity Customer Item Unit Paid')
+    t('''+::Date slide-leftmost''', 'Date Customer SKU Item Quantity Unit Paid')
+    t('''+::Item slide-leftmost
+         +::SKU slide-leftmost''', 'Date SKU Item Customer Quantity Unit Paid')

visidata/features/sparkline.py

@@ -0,0 +1,48 @@
+"""
+Generate sparkline column for numeric columns
+"""
+
+from visidata import vd, Column, Sheet
+
+__author__ = 'Lucas Messenger @layertwo'
+
+vd.theme_option('disp_sparkline', '▁▂▃▄▅▆▇', 'characters to display sparkline')
+
+
+def sparkline(*values):
+    """
+    From *values generate string sparkline
+    """
+    lines = vd.options.disp_sparkline
+    values = [v for v in values if isinstance(v, (int, float))]
+    mx = max(values)
+    mn = min(values)
+    w = (mx - mn) / len(lines)
+    bounds = [(mn + w * i) for i in range(len(lines))]
+
+    output = ''
+    for val in values:
+        for b in bounds:
+            if mn == 0 and val == 0:
+                output += ' '
+                break
+            if val < b:
+                output += lines[bounds.index(b) - 1]
+                break
+        else:
+            output += max(lines)
+    return output
+
+
+@Sheet.api
+def addcol_sparkline(sheet, sourceCols):
+    """
+    Add sparkline column
+    """
+    c = Column('sparkline',
+               sourceCols=sourceCols,
+               getter=lambda c,r: sparkline(*tuple(c.getTypedValue(r) for c in c.sheet.sourceCols)))
+    sheet.addColumn(c)
+
+
+Sheet.addCommand(None, 'addcol-sparkline', 'addcol_sparkline(numericCols(nonKeyVisibleCols))', 'add sparkline of all numeric columns')

visidata/features/status_source.py

@@ -0,0 +1,20 @@
+import inspect
+
+import visidata
+from visidata import VisiData
+
+@VisiData.api
+def getStatusSource(vd):
+    stack = inspect.stack()
+    for i, sf in enumerate(stack):
+        if sf.function in 'status aside'.split():
+            if stack[i+1].function in 'error fail warning debug'.split():
+                sf = stack[i+2]
+            else:
+                sf = stack[i+1]
+            break
+
+    fn = sf.filename
+    if fn.startswith(visidata.__path__[0]):
+        fn = visidata.__package__ + fn[len(visidata.__path__[0]):]
+    return f'{fn}:{sf.lineno}:{sf.function}'

visidata/{sysedit.py → features/sysedit.py}

@@ -17,7 +17,8 @@ def syseditCells_async(sheet, cols, rows, filetype=None):
 
     import tempfile
     with tempfile.NamedTemporaryFile() as temp:
-        p = Path(temp.name+'.'+filetype)
+        temp.close()  #2118
+        p = Path(temp.name)
 
         vd.status(f'copying {vs.nRows} {vs.rowtype} to {p} as {filetype}')
         vd.sync(vd.saveSheets(p, vs))

visidata/features/sysopen_mailcap.py

@@ -0,0 +1,46 @@
+''' Plugin for viewing files with appropriate mailcap-specified application.
+Add mailcap-view and mailcap-view-selected commands to DirSheet.
+
+mimetype can be given explicitly with `mimetype` option; will be guessed by filename otherwise.
+
+Usage:
+   - add `import experimental.mailcap_view` to .visidatarc
+   - on the DirSheet, `Ctrl+V` or `gCtrl+V` to view file(s) using mailcap entry for the guessed (or given via options) mimetype
+'''
+
+import os
+from visidata import vd, DirSheet, SuspendCurses
+
+vd.option('mailcap_mimetype', '', 'force mimetype for sysopen-mailcap')
+vd.optalias('mimetype', 'mailcap_mimetype')
+
+
+@DirSheet.api
+def run_mailcap(sheet, p, key='view'):
+    import mailcap
+    import mimetypes
+
+    mimetype = sheet.options.mailcap_mimetype
+    if not mimetype:
+        mimetype, encoding = mimetypes.guess_type(str(p))
+
+    if not mimetype:
+        vd.fail('no mimetype given and no guess')
+
+    caps = mailcap.getcaps()
+
+    plist = [f'{k}={v}' for k, v in sheet.options.getall('mailcap_').items() if k != 'mailcap_mimetype']
+    cmdline, mcap_entry = mailcap.findmatch(caps, mimetype, key=key, filename=str(p), plist=plist)
+
+    with SuspendCurses():
+        os.system(cmdline)
+
+
+DirSheet.addCommand('', 'sysopen-mailcap', 'run_mailcap(cursorRow)', 'open using mailcap entry for current row, guessing mimetype')
+DirSheet.addCommand('', 'sysopen-mailcap-selected', 'for r in selectedRows: run_mailcap(r)', 'open selected files in succession, using mailcap')
+
+
+vd.addMenuItems('''
+    File > Open > using mailcap > file at cursor > sysopen-mailcap
+    File > Open > using mailcap > selected files > sysopen-mailcap-selected
+''')

visidata/features/term_extras.py

@@ -0,0 +1,13 @@
+import os
+
+from visidata import VisiData
+
+
+@VisiData.api
+def ansi(*args):
+    os.write(1, b'\x1b'+b''.join([str(x).encode('utf-8') for x in args]))
+
+
+@VisiData.api
+def set_titlebar(vd, title:str):
+    ansi(']2;', title, '\x07')

visidata/{transpose.py → features/transpose.py}

@@ -1,10 +1,9 @@
-from visidata import VisiData, Sheet, asyncthread, Progress, Column
+from visidata import vd, VisiData, Sheet, asyncthread, Progress, Column
 
 # rowdef: Column
 @VisiData.api
 class TransposeSheet(Sheet):
-    @asyncthread
-    def reload(self):
+    def beforeLoad(self):
         # key rows become column names
         col = Column('_'.join(c.name for c in self.source.keyCols),
                 getter=lambda c,origcol: origcol.name)
@@ -13,7 +12,7 @@ class TransposeSheet(Sheet):
         self.columns = [col]
         self.setKeys(self.columns)
 
-
+    def loader(self):
         # rows become columns
         for row in Progress(self.source.rows, 'transposing'):
             self.addColumn(Column('_'.join(map(str, self.source.rowkey(row))),
@@ -23,3 +22,5 @@ class TransposeSheet(Sheet):
         self.rows = list(self.source.nonKeyVisibleCols)
 
 Sheet.addCommand('T', 'transpose', 'vd.push(TransposeSheet(name+"_T", source=sheet))', 'open new sheet with rows and columns transposed')
+
+vd.addMenuItems('Data > Transpose > transpose')

visidata/features/type_ipaddr.py

@@ -0,0 +1,73 @@
+"""
+Column types and utility commands related to IP addresses.
+"""
+from ipaddress import ip_address, ip_network, _BaseNetwork
+
+from visidata import vd
+from visidata.sheets import Column, TableSheet
+
+
+vd.addType(ip_address, icon=":", formatter=lambda fmt, ip: str(ip))
+vd.addType(ip_network, icon="/", formatter=lambda fmt, ip: str(ip))
+
+
+def isSupernet(cell, network, isNull):
+    """Is `cell` a supernet of `network`?
+
+    Treat nulls as false, and perform conversions to IP network objects only
+    if necessary.
+    """
+    if isNull(cell):
+        return False
+    if not isinstance(cell, _BaseNetwork):
+        try:
+            cell = ip_network(str(cell).strip())
+        except ValueError:
+            return False
+    return cell.supernet_of(network)
+
+
+@Column.api
+def selectSupernets(col, ip):
+    """Select rows based on network containment
+
+    Given an IP address (e.g. 10.0.0.0) or network (e.g. 10.0.0.0/8) as input,
+    select rows whose network address space completely contains the input network.
+    """
+    if not ip:
+        return
+
+    sheet = col.sheet
+    network = ip_network(ip.strip())
+    isNull = sheet.isNullFunc()
+
+    vd.status(f'selecting rows where {col.name} is a supernet of "{str(network)}"')
+    sheet.select(
+        [
+            row
+            for row in sheet.rows
+            if isSupernet(col.getTypedValue(row), network, isNull)
+        ]
+    )
+
+
+TableSheet.addCommand(
+    None,
+    "type-ipaddr",
+    "cursorCol.type=ip_address",
+    "set type of current column to IP address",
+)
+TableSheet.addCommand(
+    None,
+    "type-ipnet",
+    "cursorCol.type=ip_network",
+    "set type of current column to IP network",
+)
+TableSheet.addCommand(
+    None,
+    "select-supernets",
+    'cursorCol.selectSupernets(input("ip or cidr block: "))',
+    "select rows where the CIDR block value includes the input address space",
+)
+
+vd.addGlobals(ip_address=ip_address, ip_network=ip_network)

visidata/features/type_url.py

@@ -0,0 +1,11 @@
+from visidata import Sheet, Column, DisplayWrapper
+
+
+@Column.api
+def displayer_url(self, dw:DisplayWrapper, width=None):
+    'Display cell text as clickable url'
+    yield ('onclick '+dw.text, dw.text)
+
+
+Sheet.addCommand("", "type-url", "sheet.cursorCol.displayer = 'url'", "set column to open URLs in $BROWSER on mouse click")
+Sheet.addCommand("", "open-url", "vd.launchBrowser(sheet.cursorValue)", "open current cursor value in $BROWSER")

visidata/{unfurl.py → features/unfurl.py}

@@ -7,7 +7,7 @@ Credit to Jeremy Singer-Vine for the idea and original implementation.
 '''
 
 from collections.abc import Iterable, Mapping
-from visidata import vd, Progress, Sheet, Column, ColumnItem, SettableColumn, SubColumnFunc, asyncthread, clean_to_id
+from visidata import vd, Progress, Sheet, Column, ColumnItem, SettableColumn, SubColumnFunc, asyncthread
 from visidata import stacktrace, TypedExceptionWrapper
 
 
@@ -16,8 +16,7 @@ vd.option('unfurl_empty', False, 'if unfurl includes rows for empty containers',
 
 class UnfurledSheet(Sheet):
     # rowdef: [row, key, sub_value]
-    @asyncthread
-    def reload(self):
+    def resetCols(self):
         # Copy over base sheet, using SubColumnFunc
         self.columns = []
         for col in self.source.columns:
@@ -29,7 +28,7 @@ class UnfurledSheet(Sheet):
             else:
                 self.addColumn(SubColumnFunc(col.name, col, 0, keycol=col.keycol))
 
-        self.rows = []
+    def iterload(self):
         unfurl_empty = self.options.unfurl_empty
         for row in Progress(self.source.rows):
             try:
@@ -39,7 +38,7 @@ class UnfurledSheet(Sheet):
                 if unfurl_empty:
                     # TypedExceptionWrapper allows the use of z^E to see the stacktrace
                     # the exception on its own lacks clarity
-                    self.addRow([row, TypedExceptionWrapper(None, exception=e), TypedExceptionWrapper(None, exception=e)])
+                    yield [row, TypedExceptionWrapper(None, exception=e), TypedExceptionWrapper(None, exception=e)]
                 else:
                     vd.exceptionCaught(e)
                 continue
@@ -54,17 +53,18 @@ class UnfurledSheet(Sheet):
 
             nadded = 0
             for key, sub_value in gen:
-                new_row = [ row, key, sub_value ]
-                self.addRow(new_row)
+                yield [ row, key, sub_value ]
                 nadded += 1
 
             if unfurl_empty and not nadded:
-                self.addRow([row, None, None])
+                yield [row, None, None]
 
 
 @Sheet.api
 def unfurl_col(sheet, col):
-    return UnfurledSheet(sheet.name, clean_to_id(col.name), 'unfurled', source=sheet, source_col=col)
+    return UnfurledSheet(sheet.name, vd.cleanName(col.name), 'unfurled', source=sheet, source_col=col)
 
 
 Sheet.addCommand("zM", "unfurl-col", "vd.push(unfurl_col(cursorCol))", "row-wise expand current column of lists (e.g. [2]) or dicts (e.g. {3}) within that column")
+
+vd.addMenuItems('Data > Unfurl column > unfurl-col')

visidata/{window.py → features/window.py}

@@ -47,10 +47,10 @@ def addcol_window(sheet, curcol):
 
 @Sheet.api
 def select_around(sheet, n):
-    sheet.select(list(itertools.chain(*(winrows for row, winrows in sheet.window(n, n) if sheet.isSelected(row)))))
+    sheet.select(list(itertools.chain(*(winrows for row, winrows in sheet.window(int(n), int(n)) if sheet.isSelected(row)))))
 
 
 Sheet.addCommand('w', 'addcol-window', 'addcol_window(cursorCol)', 'add column where each row contains a list of that row, nBefore rows, and nAfter rows')
-Sheet.addCommand('', 'select-around-n', 'select_around(input("select rows around selected: ", value=1))')
+Sheet.addCommand('', 'select-around-n', 'select_around(input("select rows around selected: ", value=1))', 'select additional N rows before/after each selected row')
 
 vd.addMenuItem('Row', 'Select', 'N rows around each selected row', 'select-around-n')