visidata 3.2__py3-none-any.whl → 3.3__py3-none-any.whl

visidata/loaders/archive.py

@@ -2,6 +2,7 @@ import pathlib
 import tarfile
 import zipfile
 import datetime
+import os.path
 from visidata.loaders import unzip_http
 
 from visidata import vd, VisiData, asyncthread, Sheet, Progress, Menu, options
@@ -84,13 +85,13 @@ Commands:
             return vd.openSource(Path(fi.filename, fp=fp, filesize=fi.file_size), filetype=options.filetype)
 
     def extract(self, *rows, path=None):
-        path = path or pathlib.Path('.')
+        path = path or Path('.')
 
         files = []
         for row in rows:
             r, _ = row
             vd.confirmOverwrite(path/r.filename)  #1452
-            self.extract_async(row)
+            self.extract_async(row, path=path)
 
     def sysopen_row(self, row):
         'Extract file in row to tempdir and launch $EDITOR.  Modifications will be discarded.'
@@ -112,6 +113,12 @@ Commands:
             if '://' in str(self.source):
                 unzip_http.warning = vd.warning
                 self._zfp = unzip_http.RemoteZipFile(str(self.source))
+            elif isinstance(self.source, Path):
+                if self.source.has_fp():  #when opening a zip inside tar or zip
+                    fp = self.source.open('rb')
+                else:
+                    fp = self.source
+                self._zfp = zipfile.ZipFile(fp, 'r')
             else:
                 self._zfp = zipfile.ZipFile(str(self.source), 'r')
 
@@ -122,18 +129,35 @@ Commands:
             yield [zi, Path(zi.filename)]
 
 
+#from https://docs.python.org/3/library/tarfile.html#tarfile.REGTYPE
+tarfile_type_names = {
+    tarfile.REGTYPE:"file",
+    tarfile.AREGTYPE:"file",
+    tarfile.LNKTYPE:"hard link",
+    tarfile.SYMTYPE:"symbolic link",
+    tarfile.CHRTYPE:"character device",
+    tarfile.BLKTYPE:"block device",
+    tarfile.DIRTYPE:"directory",
+    tarfile.FIFOTYPE:"FIFO",
+    tarfile.CONTTYPE:"contiguous file",
+    tarfile.GNUTYPE_LONGNAME:"GNU tar longname",
+    tarfile.GNUTYPE_LONGLINK:"GNU tar longlink",
+    tarfile.GNUTYPE_SPARSE:"GNU tar sparse file",
+}
 class TarSheet(Sheet):
     'Wrapper for `tarfile` library.'
     rowtype = 'files' # rowdef TarInfo
     columns = [
         ColumnAttr('name'),
+        Column('ext', getter=lambda col,row: row.isdir() and '/' or os.path.splitext(row.name)[1][1:]),
         ColumnAttr('size', type=int),
         ColumnAttr('mtime', type=date),
-        ColumnAttr('type', type=int),
+        Column('type', getter=lambda col, row: tarfile_type_names.get(row.type, 'unknown')),
         ColumnAttr('mode', type=int),
         ColumnAttr('uname'),
         ColumnAttr('gname')
     ]
+    nKeys=1
 
     def openRow(self, fi):
             tfp = tarfile.open(name=str(self.source))

visidata/loaders/csv.py

@@ -12,6 +12,13 @@ vd.option('csv_lineterminator', '\r\n', 'lineterminator passed to csv.writer', r
 vd.option('safety_first', False, 'sanitize input/output to handle edge cases, with a performance cost', replay=True)
 
 
+@VisiData.api
+def guess_csv_delimiter(vd, p):
+    'If csv_delimiter option has been modified from default, assume CSV format.'
+    
+    if vd.options.csv_delimiter != vd.options.getdefault('csv_delimiter'):
+        return dict(filetype='csv', _likelihood=2)
+
 @VisiData.api
 def guess_csv(vd, p):
     import csv

visidata/macros.py

@@ -40,7 +40,7 @@ class MacroSheet(IndexSheet):
     def putChanges(self):
         self.commitDeletes()  #1569  apply deletes early for saveSheets below
 
-        vd.saveSheets(self.source, self, confirm_overwrite=False)
+        vd.sync(vd.saveSheets(self.source, self, confirm_overwrite=False))
         self._deferredDels.clear()
         self.reload()
 

visidata/main.py

@@ -2,7 +2,7 @@
 # Usage: $0 [<options>] [<input> ...]
 #        $0 [<options>] --play <cmdlog> [--batch] [-w <waitsecs>] [-o <output>] [field=value ...]
 
-__version__ = '3.2'
+__version__ = '3.3'
 __version_info__ = 'saul.pw/VisiData v' + __version__
 
 from copy import copy
@@ -255,7 +255,11 @@ def main_vd():
                         optval = sys.argv[i+1]
                         i += 1
 
-            current_args[optname] = optval
+            # batch and interactive are only meaningful when applied globally,
+            # so exclude them from sheet-specific options. Those would
+            # override any later change to vd.options.batch in global settings.
+            if optname not in ('batch', 'interactive'):
+                current_args[optname] = optval
             if flGlobal:
                 global_args[optname] = optval
         elif arg.startswith('+'):  # position cursor at start
@@ -285,7 +289,7 @@ def main_vd():
     # fetch motd *after* options parsing/setting
     vd.domotd()
 
-    if args.batch:
+    if options.batch:
         if not vd.options.interactive:
             options.undo = False
             options.quitguard = False
@@ -316,7 +320,7 @@ def main_vd():
     for vs in reversed(sources):
         vd.push(vs, load=False) #1471, 1555
 
-    if not vd.sheets and not args.play and not args.batch:
+    if not vd.sheets and not args.play and not options.batch:
         if 'filetype' in current_args:
             newfunc = getattr(vd, 'new_' + current_args['filetype'], vd.getGlobals().get('new_' + current_args['filetype']))
             datestr = datetime.date.today().strftime('%Y-%m-%d')
@@ -333,14 +337,14 @@ def main_vd():
             vd.cmdlog.openHook(vd.currentDirSheet, vd.currentDirSheet.source)
 
     if not args.play:
-        if args.batch:
+        if options.batch:
             if sources:
                 vd.push(sources[0])
 
         for (f, *parms) in after_config:
             f(sources, *parms)
 
-        if not args.batch:
+        if not options.batch:
             run(vd.sheets[0])
     else:
         if args.play == '-':
@@ -351,7 +355,7 @@ def main_vd():
             vdfile = Path(args.play)
 
         vs = eval_vd(vdfile, *fmtargs, **fmtkwargs)
-        if args.batch:
+        if options.batch:
             if not args.debug:
                 vd.outputProgressThread = visidata.VisiData.execAsync(vd, vd.outputProgressEvery, vs, seconds=0.5, sheet=BaseSheet())  #1182
             vd.reloadMacros()

visidata/mainloop.py

@@ -167,7 +167,7 @@ def mainloop(vd, scr):
     numTimeouts = 0
     prefixWaiting = False
     vd.scrFull = scr
-    if vd.options.disp_expert >= 5:
+    if not vd.wantsHelp('help'):
         vd.disp_help = -1
 
     vd.keystrokes = ''

visidata/man/vd.1

@@ -1029,7 +1029,7 @@ source of randomized startup messages
 folder recursion depth on DirSheet
 .It Sy --dir-hidden No "                False"
 load hidden files on DirSheet
-.It Sy --config Ns = Ns Ar "Path               " No "/home/saul/.visidatarc"
+.It Sy --config Ns = Ns Ar "Path               " No "/home/anja/.visidatarc"
 config file to exec in Python
 .It Sy --play Ns = Ns Ar "str                  " No ""
 file.vdj to replay
@@ -1063,7 +1063,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.2"
+.It Sy --reddit-user-agent Ns = Ns Ar "str     " No "3.3"
 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)
@@ -1397,8 +1397,17 @@ charset to render vertical reference lines on graph
 charset to render horizontal reference lines on graph
 .It Sy "disp_graph_multiple_reflines_char" No "\[u2592]"
 char to render multiple parallel reflines
-.It Sy "disp_expert        " No "0"
-max level of options and columns to include
+.It Sy "disp_help_flags    " No "cmdpalette guides help hints inputfield inputkeys nometacols sidebar"
+list of helper features to enable (space-separated):
+    - "cmdpalette": exec-longname suggestions
+    - "guides": guides in sidebar
+    - "help": help sidebar collapsed by default
+    - "hints": context-sensitive hints on menu line
+    - "inputfield": context-sensitive help for each input field
+    - "inputkeys": input quick reference in sidebar
+    - "nometacols": hide expert columns on metasheets
+    - "sidebar": context-sensitive sheet help in sidebar
+    - "all": enable all helper features
 .It Sy "color_add_pending  " No "green"
 color for rows pending add
 .It Sy "color_change_pending" No "reverse yellow"

visidata/man/vd.txt

@@ -709,7 +709,7 @@ COMMANDLINE OPTIONS
                                                      DirSheet
      --dir-hidden                 False              load hidden files on
                                                      DirSheet
-     --config=Path                /home/saul/.visidatarc
+     --config=Path                /home/anja/.visidatarc
                                                      config file to exec in
                                                      Python
      --play=str                                      file.vdj to replay
@@ -746,7 +746,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.2                user_agent for reddit api
+     --reddit-user-agent=str      3.3                user_agent for reddit api
      --zulip-batch-size=int       -100               number of messages to
                                                      fetch per call (<0 to
                                                      fetch before anchor)
@@ -1061,8 +1061,27 @@ COMMANDLINE OPTIONS
                                              erence lines on graph
      disp_graph_multiple_reflines_char ▒     char to render multiple parallel
                                              reflines
-     disp_expert         0                   max level of options and columns
-                                             to include
+     disp_help_flags     cmdpalette guides help hints inputfield inputkeys
+                                             nometacols sidebar
+                                             list of helper features to enable
+                                             (space-separated):
+                                                 - "cmdpalette": exec-longname
+                                             suggestions
+                                                 - "guides": guides in sidebar
+                                                 - "help": help sidebar col‐
+                                             lapsed by default
+                                                 - "hints": context-sensitive
+                                             hints on menu line
+                                                 - "inputfield": context-sen‐
+                                             sitive help for each input field
+                                                 - "inputkeys": input quick
+                                             reference in sidebar
+                                                 - "nometacols": hide expert
+                                             columns on metasheets
+                                                 - "sidebar": context-sensi‐
+                                             tive sheet help in sidebar
+                                                 - "all": enable all helper
+                                             features
      color_add_pending   green               color for rows pending add
      color_change_pending reverse yellow     color for cells pending modifica‐
                                              tion

visidata/menu.py

@@ -25,7 +25,7 @@ vd.menuRunning = False
 
 @VisiData.property
 def hintStatus(vd):
-    if vd.options.disp_expert <= 0:
+    if vd.wantsHelp('hints'):
         if int(time.time()/60) % 2 == 0:
             return 'Alt+H for help menu'
         else:

visidata/mouse.py

@@ -13,6 +13,8 @@ BaseSheet.init('mouseY', int)
 
 @VisiData.after
 def initCurses(vd):
+    if not getattr(curses, 'mousemask', None):
+      return
     curses.MOUSE_ALL = 0xffffffff
     curses.mousemask(curses.MOUSE_ALL if vd.options.mouse_interval else 0)
     curses.def_prog_mode()

visidata/movement.py

@@ -84,9 +84,12 @@ def moveToNextRow(vs, func, reverse=False, msg='no different value up this colum
 def visibleWidth(self):
     'Width of column as is displayed in terminal'
     vcolidx = self.sheet.visibleCols.index(self)
-    if vcolidx not in self.sheet._visibleColLayout:
-        self.sheet.calcSingleColLayout(vcolidx)
-    return self.sheet._visibleColLayout[vcolidx][1]
+    if vcolidx in self.sheet._visibleColLayout:
+        w = self.sheet._visibleColLayout[vcolidx][1]
+    else:  #this case should never happen in normal use
+        #the width can be inaccurate if the column is not at x=0
+        w = self.sheet.calcSingleColLayout(vcolidx)
+    return w
 
 
 Sheet.addCommand(None, 'go-left',  'cursorRight(-1)', 'go left', replay=False)

visidata/save.py

@@ -85,6 +85,8 @@ def getDefaultSaveName(sheet):
     if hasattr(src, 'scheme') and src.scheme:
         return src.name + src.suffix
     if isinstance(src, Path):
+        if src.given == '-':
+            return f'stdin.{sheet.options.save_filetype}'
         if sheet.options.is_set('save_filetype', sheet):
             # if save_filetype is over-ridden from default, use it as the extension
             return str(src.with_suffix('')) + '.' + sheet.options.save_filetype
@@ -109,7 +111,9 @@ def saveCols(vd, cols):
 
 @VisiData.api
 def saveSheets(vd, givenpath, *vsheets, confirm_overwrite=True):
-    'Save all *vsheets* to *givenpath*.'
+    '''Save all *vsheets* to *givenpath*. Async.
+    Callers should be careful not to call reload() while saveSheets is still running.
+    Use vd.sync(saveSheets) to wait for the save to finish.'''
 
     if not vsheets: # blank tuple
         vd.warning('no sheets to save')

visidata/settings.py

@@ -447,12 +447,16 @@ def loadConfigAndPlugins(vd, args=AttrDict()):
     args_plugins_autoload = args.plugins_autoload if 'plugins_autoload' in args else True
     if not args.nothing and args_plugins_autoload and vd.options.plugins_autoload:
         from importlib.metadata import entry_points
+        eps_visidata = []
         try:
             eps = entry_points()
-            eps_visidata = eps.select(group='visidata.plugins') if 'visidata.plugins' in eps.groups else []
+            vp = 'visidata.plugins'
+            if hasattr(eps, 'groups'): #Python >= 3.10
+                eps_visidata = eps.select(group=vp)
+            else:                      #Python <  3.10
+                eps_visidata = eps.get(vp, [])
         except Exception as e:
-            eps_visidata = []
-            vd.warning('plugin autoload failed; see issue #1529')
+            vd.warning(f'plugin autoload failed; see issue #1529:  {e}')
 
         for ep in eps_visidata:
             try:

visidata/sheets.py

@@ -8,6 +8,7 @@ from visidata import (options, Column, namedlist, SettableColumn, AttrDict, Disp
 TypedExceptionWrapper, BaseSheet, UNLOADED, wrapply,
 clipdraw, clipdraw_chunks, ColorAttr, update_attr, colors, undoAttrFunc, vlen, dispwidth)
 import visidata
+from visidata.utils import colname_letters
 
 
 vd.activePane = 1   # pane numbering starts at 1; pane 0 means active pane
@@ -190,6 +191,7 @@ class TableSheet(BaseSheet):
 
         # list of all columns in display order
         self.initialCols = kwargs.pop('columns', None) or type(self).columns
+        self.colname_ctr = 0
         self.resetCols()
 
         self._ordering = list(type(self)._ordering)  #2254
@@ -290,11 +292,11 @@ class TableSheet(BaseSheet):
         pass
 
     def resetCols(self):
-        'Reset columns to class settings'
+        'Reset columns to class settings or constructor settings'
         self.columns = []
         for c in self.initialCols:
             self.addColumn(deepcopy(c))
-            if self.options.disp_expert < c.disp_expert:
+            if c.disp_expert and vd.wantsHelp('nometacols'):
                 c.hide()
 
         self.setKeys(self.columns[:self.nKeys])
@@ -560,7 +562,6 @@ class TableSheet(BaseSheet):
     def cursorRight(self, n=1):
         'Move cursor right `n` visible columns (or left if `n` is negative).'
         self.cursorVisibleColIndex += n
-        self.calcColLayout()
 
     def addColumn(self, *cols, index=None):
         '''Insert all *cols* into columns at *index*, or append to end of columns if *index* is None.
@@ -656,30 +657,44 @@ class TableSheet(BaseSheet):
         elif self.topRowIndex > self.nRows-1:
             self.topRowIndex = self.nRows-1
 
+        self.adjustColLayout()
+
+        # calculations that rely on nScreenRows, like bottomRowIndex, need to be done after
+        # col layout has been adjusted. nScreenRows requires an accurate count of
+        # allAggregators, which requires knowing col visibility.
         # check bounds, scroll if necessary
         if self.topRowIndex > self.cursorRowIndex:
             self.topRowIndex = self.cursorRowIndex
         elif self.bottomRowIndex < self.cursorRowIndex:
             self.bottomRowIndex = self.cursorRowIndex
 
-        if self.cursorCol and self.cursorCol.keycol:
-            return
-
-        if self.leftVisibleColIndex >= self.cursorVisibleColIndex:
+    def adjustColLayout(self):
+        '''Move the left visible column to try to keep the cursorCol visible.
+        though the cursorCol cannot be visible when screen is totally filled by keycols.
+        Run calcColLayout() at least once.'''
+        # jumping to a column left of the previously on-screen columns:   put cursorCol as leftmost col
+        # jumping to a column right of the previously on-screen columns:  put cursorCol as far right as possible
+        if self.leftVisibleColIndex > self.cursorVisibleColIndex:        # e.g. when jumping/moving left
             self.leftVisibleColIndex = self.cursorVisibleColIndex
-        else:
-            while True:
-                if self.leftVisibleColIndex == self.cursorVisibleColIndex:  # not much more we can do
-                    break
+        elif self.leftVisibleColIndex < self.cursorVisibleColIndex:      # e.g. when jumping/moving right
+            #move leftVisibleCol until the cursor column fits fully on screen
+            while self.leftVisibleColIndex < self.cursorVisibleColIndex:  #ensures termination even if screen is completely filled by keycols
                 self.calcColLayout()
                 if not self._visibleColLayout:
                     break
+
+                # If the cursor is outside the visible columns currently laid out (1 window wide).
+                # One way to trigger this is with zc, jump to a column never seen yet.
                 mincolidx, maxcolidx = min(self._visibleColLayout.keys()), max(self._visibleColLayout.keys())
                 if self.cursorVisibleColIndex < mincolidx:
-                    self.leftVisibleColIndex -= max((self.cursorVisibleColIndex - mincolidx)//2, 1)
-                    continue
+                    # This case is expected never to occur. _visibleColLayout keys are enumerated from 0,
+                    # so mincolidx is always 0. and cursorVisibleColIndex is kept >= 0 (by checkCursor).
+                    self.leftVisibleColIndex = self.cursorVisibleColIndex
+                    break
                 elif self.cursorVisibleColIndex > maxcolidx:
-                    self.leftVisibleColIndex += max((maxcolidx - self.cursorVisibleColIndex)//2, 1)
+                    # some cases:  1) jumping rightward, so cursor has just moved to a column that is offscreen to the right
+                    #              2) when keycols fill entire screen
+                    self.leftVisibleColIndex += 1
                     continue
 
                 cur_x, cur_w = self._visibleColLayout[self.cursorVisibleColIndex]
@@ -687,9 +702,12 @@ class TableSheet(BaseSheet):
                     break
                 self.leftVisibleColIndex += 1  # once within the bounds, walk over one column at a time
 
+        if self.leftVisibleColIndex == self.cursorVisibleColIndex:  #will happen after cursor: jumped left, jumped right, or stayed in place
+            self.calcColLayout()
+
     def calcColLayout(self):
-        'Set right-most visible column, based on calculation.'
-        vd.clearCaches()
+        '''Set right-most visible column, based on calculation.
+        Assign x coordinates and width to every column that fits on screen, visible or hidden.'''
         minColWidth = dispwidth(self.options.disp_more_left)+dispwidth(self.options.disp_more_right)+2
         sepColWidth = dispwidth(self.options.disp_column_sep)
         winWidth = self.windowWidth
@@ -698,18 +716,28 @@ class TableSheet(BaseSheet):
         vcolidx = 0
         for vcolidx, col in enumerate(self.availCols):
             width = self.calcSingleColLayout(col, vcolidx, x, minColWidth)
-            if width:
-                x += width+sepColWidth
-            if x > winWidth-1:
+            if width is not None:
+                if x < winWidth-1:
+                    self._visibleColLayout[vcolidx] = [x, width]
+                    x += width+sepColWidth
+            if x >= winWidth-1:
                 break
 
         self.rightVisibleColIndex = vcolidx
 
     def calcSingleColLayout(self, col:Column, vcolidx:int, x:int=0, minColWidth:int=4):
-            if col.width is None and len(self.visibleRows) > 0:
-                vrows = self.visibleRows if self.nRows > 1000 else self.rows[:1000]  #1964
+            '''Return the width, for key columns, or for columns that are rightward of
+            the leftmost visibleCol, even if they are offscreen or hidden. Return
+            None for columns left of cursorVisibleColIndex, if they are not key columns.'''
+            # We use a slice of rows that is similar to self.visibleRows but simpler,
+            # and larger. The goal is to avoid using nFooterRows. Because nFooterRows
+            # cannot in general be calculated properly until after calcColLayout() has
+            # determined which columns are visible.
+            vrows = self.rows[self.topRowIndex:self.topRowIndex+self.windowHeight]
+            if col.width is None and len(vrows) > 0:
+                measure_rows = vrows if self.nRows > 1000 else self.rows[:1000]  #1964
                 # handle delayed column width-finding
-                col.width = max(col.getMaxWidth(vrows), minColWidth)
+                col.width = max(col.getMaxWidth(measure_rows), minColWidth)
                 if vcolidx < self.nVisibleCols-1:  # let last column fill up the max width
                     col.width = min(col.width, self.options.default_width)
 
@@ -719,10 +747,10 @@ class TableSheet(BaseSheet):
             if vcolidx >= self.nVisibleCols and vcolidx == self.cursorVisibleColIndex:
                 width = self.options.default_width
 
+            #subtract 1 character of empty space from windowWidth, for the margin to the right of the sheet
+            width = min(width, self.windowWidth-x-1)
             width = max(width, 1)
             if col in self.keyCols or vcolidx >= self.leftVisibleColIndex:  # visible columns
-                #subtract 1 character of empty space from windowWidth, for the margin to the right of the sheet
-                self._visibleColLayout[vcolidx] = [x, max(min(width, self.windowWidth-x-1), 1)]
                 return width
 
 
@@ -798,8 +826,6 @@ class TableSheet(BaseSheet):
         'Return dict of aggname -> list of cols with that aggregator.'
         allaggs = collections.defaultdict(list) # aggname -> list of cols with that aggregator
         for vcolidx, (x, colwidth) in sorted(self._visibleColLayout.items()):
-            if vcolidx >= len(self.availCols):
-                break  #2607 #2763
             col = self.availCols[vcolidx]
             if not col.hidden:
                 for aggr in col.aggregators:
@@ -1024,6 +1050,11 @@ class TableSheet(BaseSheet):
 
             return height
 
+    def incremented_colname(self):
+        vd.addUndo(setattr, self, 'colname_ctr', self.colname_ctr)
+        self.colname_ctr += 1
+        return colname_letters(self.colname_ctr)
+
 vd.rowNoters = [
     # f(sheet, row) -> character to be displayed on the left side of row
 ]
@@ -1163,14 +1194,16 @@ def confirmQuit(vs, verb='quit'):
 def preloadHook(sheet):
     'Override to setup for reload().'
     sheet.confirmQuit('reload')
+
     sheet.hasBeenModified = False
-    sheet.calcColLayout()
 
 
 @VisiData.api
 def newSheet(vd, name, ncols, **kwargs):
-    return Sheet(name, columns=[SettableColumn(width=vd.options.default_width) for i in range(ncols)], **kwargs)
-
+    cols = [SettableColumn(width=vd.options.default_width, name=f'{colname_letters(i+1)}') for i in range(ncols)]
+    vs = Sheet(name, columns=cols, **kwargs)
+    vs.colname_ctr = ncols
+    return vs
 
 @BaseSheet.api
 def quitAndReleaseMemory(vs):
@@ -1208,12 +1241,27 @@ def async_deepcopy(sheet, rowlist):
     _async_deepcopy(ret, rowlist)
     return ret
 
+@Sheet.api
+def reload_or_replace(sheet):
+    sheet.preloadHook()
+    if isinstance(sheet.source, visidata.Path) and \
+       sheet.source.is_url() and sheet.source.scheme != 'file':  #2825
+        #retrieve data again, because the earlier data saved in sheet.source may be outdated
+        vs = vd.openSource(visidata.Path(sheet.source.given))
+        if type(vs) != type(sheet):  #new data may have a different filetype
+            vd.push(vs)
+            vd.remove(sheet)
+            #user needs feedback that sheet changed, since the new sheet has a different shortcut
+            vd.status('replaced sheet due to changed filetype')
+            return
+        sheet.source = vs.source
+    sheet.reload()
 
 
 BaseSheet.init('pane', lambda: 1)
 
 
-BaseSheet.addCommand('^R', 'reload-sheet', 'preloadHook(); reload()', 'Reload current sheet')
+BaseSheet.addCommand('^R', 'reload-sheet', 'reload_or_replace()', 'Reload current sheet')
 Sheet.addCommand('', 'show-cursor', 'status(statusLine)', 'show cursor position and bounds of current sheet on status line')
 
 Sheet.addCommand('!', 'key-col', 'exec_longname("key-col-off") if cursorCol.keycol else exec_longname("key-col-on")', 'toggle current column as a key column', replay=False)
@@ -1245,7 +1293,7 @@ BaseSheet.addCommand('^I', 'splitwin-swap', 'vd.activePane = 1 if sheet.pane ==
 BaseSheet.addCommand('g^I', 'splitwin-swap-pane', 'vd.options.disp_splitwin_pct=-vd.options.disp_splitwin_pct', 'swap panes onscreen')
 BaseSheet.addCommand('zZ', 'splitwin-input', 'vd.options.disp_splitwin_pct = input("% height for split window: ", value=vd.options.disp_splitwin_pct)', 'set split pane to specific size')
 
-BaseSheet.addCommand('^L', 'redraw', 'sheet.refresh(); vd.redraw()', 'Refresh screen')
+BaseSheet.addCommand('^L', 'redraw', 'sheet.refresh(); vd.redraw(); vd.draw_all()', 'Refresh screen')
 BaseSheet.addCommand(None, 'guard-sheet', 'options.set("quitguard", True, sheet); status("guarded")', 'Set quitguard on current sheet to confirm before quit')
 BaseSheet.addCommand(None, 'guard-sheet-off', 'options.set("quitguard", False, sheet); status("unguarded")', 'Unset quitguard on current sheet to not confirm before quit')
 BaseSheet.addCommand(None, 'open-source', 'vd.replace(source)', 'jump to the source of this sheet')

visidata/sidebar.py

@@ -15,11 +15,12 @@ vd.theme_option('color_sidebar_title', 'black on yellow', 'color of sidebar titl
 @VisiData.api
 class AddedHelp:
     '''Context manager to add help text/screen to list of available sidebars.'''
-    def __init__(self, text:Union[str,'HelpPane'], title=''):
+    def __init__(self, text:Union[str,'HelpPane'], title='', help_flag=''):
+        self.helpfunc = None
         if text:
+            if not vd.wantsHelp(help_flag):
+                return
             self.helpfunc = lambda: (text, title)
-        else:
-            self.helpfunc = None
 
     def __enter__(self):
         if self.helpfunc:
@@ -33,7 +34,7 @@ class AddedHelp:
             vd.clearCaches()
 
 
-@BaseSheet.property
+@BaseSheet.lazy_property
 def formatter_helpstr(sheet):
     return AttrDict(commands=CommandHelpGetter(type(sheet)),
                     options=OptionHelpGetter())
@@ -73,7 +74,7 @@ def help_sidebars(sheet) -> 'list[Callable[[], tuple[str,str]]]':
 @VisiData.cached_property
 def sidebarStatus(vd) -> str:
     if vd.sheet.help_sidebars:
-        if vd.options.disp_sidebar and vd.disp_help >= 0:
+        if vd.wantsHelp('sidebar') and vd.disp_help >= 0:
             n = vd.disp_help+1
             return f'[:onclick sidebar-toggle][:sidebar][{n}/{len(vd.sheet.help_sidebars)}][/]'
         else:
@@ -111,7 +112,7 @@ def drawSidebar(vd, scr, sheet):
     bottommsg = ''
     overflowmsg = '[:reverse] Ctrl+P to view all status messages [/]'
     try:
-        if not sidebar and vd.options.disp_sidebar and vd.disp_help >= 0:
+        if not sidebar and vd.options.disp_sidebar and vd.wantsHelp('guides') and sheet.help_sidebars:
             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)

visidata/tests/test_cliptext.py

@@ -103,6 +103,19 @@ class TestClipText:
         assert clips == clippeds
         assert clipw == clippedw
 
+    @pytest.mark.parametrize('s, w, truncator, clippeds, clippedw', [
+        ('first\nsecond\n\nthird\n\n\n', 22, '',  'first·second··third···', 22),
+        ('first\nsecond\n\nthird\n\n\n', 22, '…', 'first·second··third···', 22),
+        ('first\nsecond\n\nthird\n\n\n', 21, '',  'first·second··third··', 21),
+        ('first\nsecond\n\nthird\n\n\n', 21, '…', 'first·second··third·…', 21),
+        (''.join([chr(i) for i in range(256)]), 256, '',
+            '································ !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~··································¡¢£¤¥¦§¨©ª«¬\xad®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ', 256),
+    ])
+    def test_clipstr_unprintable(self, s, w, truncator, clippeds, clippedw):
+        clips, clipw = visidata.clipstr(s, w, truncator=truncator, oddspace='·')
+        assert clips == clippeds
+        assert clipw == clippedw
+
     @pytest.mark.parametrize('s, w, clippeds, clippedw', [
         ('b to', 4, 'b to', 4),
         ('abcde', 8, 'abcde', 5),

visidata/tests/test_commands.py

@@ -30,6 +30,7 @@ nonTested = (
         'breakpoint',
         'redraw',
         'menu',
+        'sysedit',
         'sysopen',
         'open-memusage',
         )