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

visidata/form.py

@@ -1,16 +1,16 @@
 import functools
-from visidata import clipdraw, colors, BaseSheet, VisiData, VisiDataMetaSheet, vd, EscapeException, AttrDict, ENTER
+from visidata import clipdraw, colors, BaseSheet, VisiData, VisiDataMetaSheet, vd, EscapeException, AttrDict, ENTER, dispwidth, AcceptInput
 
 
 @VisiData.api
 def open_mnu(vd, p):
-    return FormSheet(p.name, source=p)
+    return FormSheet(p.base_stem, source=p)
 
 
 vd.save_mnu=vd.save_tsv
 
 class FormSheet(VisiDataMetaSheet):
-    rowtype='labels' # rowdef: { .x .y .text .color .command .input .underline}
+    rowtype='labels' # rowdef: { .x .y .text .color .command .input .key}
 
 @VisiData.api
 def replayCommand(vd, longname, sheet=None, col='', row=''):
@@ -18,9 +18,16 @@ def replayCommand(vd, longname, sheet=None, col='', row=''):
 
 
 class FormCanvas(BaseSheet):
-    rowtype='labels'
-    def click(self, r):
-        vd.replayCommand(r.command, sheet=self)
+    rowtype = 'labels'
+    pressedLabel = None
+
+    def onPressed(self, r):
+        if r.key:
+            self.pressedLabel = r
+
+    def onReleased(self, r):
+        if self.pressedLabel is r:
+            raise AcceptInput(r.key)
 
     def reload(self):
         self.rows = self.source.rows
@@ -38,12 +45,17 @@ class FormCanvas(BaseSheet):
             y = int(y)
             if y < 0: y += h
             if x < 0: x += w
-            clipdraw(scr, y, x, r.text, colors[r.color])
-            # underline first occurrence of r.underline in r.text
-            if hasattr(r, 'underline') and r.underline:
-                index = r.text.find(r.underline)
-                clipdraw(scr, y, x+index, r.text[index:len(r.underline)+1], colors[r.color + " underline"])
-            vd.onMouse(scr, y, x, 1, len(r.text), BUTTON1_RELEASED=lambda y,x,key,r=r,sheet=self: sheet.click(r))
+            color = r.color
+            if r is self.pressedLabel:
+                color += ' reverse'
+            clipdraw(scr, y, x, r.text, colors[color])
+            # underline first occurrence of r.key in r.text
+            if hasattr(r, 'key') and r.key:
+                index = r.text.find(r.key)
+                clipdraw(scr, y, x+index, r.text[index:len(r.key)+1], colors[color + " underline"])
+            vd.onMouse(scr, x, y, dispwidth(r.text), 1,
+                    BUTTON1_PRESSED=lambda y,x,key,r=r,sheet=self: sheet.onPressed(r),
+                    BUTTON1_RELEASED=lambda y,x,key,r=r,sheet=self: sheet.onReleased(r))
 
     def run(self, scr):
         vd.setWindows(vd.scrFull)
@@ -53,35 +65,52 @@ class FormCanvas(BaseSheet):
         maxh = max(int(r.y) for r in drawnrows)
         h, w = vd.scrFull.getmaxyx()
         y, x = max(0, (h-maxh)//2-1), max(0, (w-maxw)//2-1)
-        self.scrForm = vd.scrFull.derwin(min(h-1, maxh+2), min(w-1, maxw+1), y, x)
+        self.scrForm = vd.subwindow(vd.scrFull, x, y, min(w-1, maxw+1), min(h-1, maxh+2))
         self.scrForm.keypad(1)
         curinput = inputs[0] if inputs else None
-        while True:
-            vd.draw_all()
+        vd.draw_all()
 
-            self.scrForm.erase()
-            self.scrForm.border()
-            self.draw(self.scrForm)
+        self.scrForm.erase()
+        self.scrForm.border()
+        self.draw(self.scrForm)
 
+        while True:
             k = vd.getkeystroke(self.scrForm, self)
             if k in ['^C', '^Q', '^[', 'q']:
                 return {}
             if curinput and k in curinput.keystrokes:
                 return {curinput.input: k}
+            if k == 'KEY_MOUSE':
+                r = vd.parseMouse(form=self.scrForm)
+                if r.found:
+                    f = vd.getMouse(r.x, r.y, r.keystroke)
+                    if f:
+                        try:
+                            f(r.y, r.x, r.keystroke)
+                        except AcceptInput as e:
+                            return {curinput.input: e.args[0]}
+                        except Exception as e:
+                            vd.exceptionCaught(e)
+                            break
+
+                if r.keystroke == 'BUTTON1_RELEASED':
+                    self.pressedLabel = None
+
+                self.draw(self.scrForm)
 
 
 @functools.wraps(VisiData.confirm)
 @VisiData.api
 def confirm(vd, prompt, exc=EscapeException):
     'Display *prompt* on status line and demand input that starts with "Y" or "y" to proceed.  Raise *exc* otherwise.  Return True.'
-    if vd.options.batch:
+    if vd.options.batch and not vd.options.interactive:
         return vd.fail('cannot confirm in batch mode: ' + prompt)
 
     form = FormSheet('confirm', rows=[
         AttrDict(x=2, y=0, text=' confirm ', color='yellow'),
         AttrDict(x=2, y=1, text=prompt, color='yellow'),
-        AttrDict(x=.25, y=2, text=' yes ', color='black on yellow bold', underline='y'),
-        AttrDict(x=.75, y=2, text=' no ', color='black on yellow bold', underline='n'),
+        AttrDict(x=.25, y=2, text=' yes ', color='black on yellow bold', key='y'),
+        AttrDict(x=.75, y=2, text=' no ', color='black on yellow bold', key='n'),
         AttrDict(input='yn', keystrokes=['y', 'n', ENTER]),
     ])
 

visidata/freqtbl.py

@@ -5,8 +5,7 @@ from visidata import vd, asyncthread, vlen, VisiData, Column, AttrColumn, Sheet,
 from visidata.pivot import PivotSheet, PivotGroupRow
 
 
-vd.option('disp_histogram', '■', 'histogram element character')
-vd.option('disp_histolen', 50, 'width of histogram column')
+vd.theme_option('disp_histogram', '■', 'histogram element character')
 vd.option('histogram_bins', 0, 'number of bins for histogram of numeric columns')
 vd.option('numeric_binning', False, 'bin numeric columns into ranges', replay=True)
 
@@ -14,7 +13,7 @@ vd.option('numeric_binning', False, 'bin numeric columns into ranges', replay=Tr
 @VisiData.api
 def valueNames(vd, discrete_vals, numeric_vals):
     ret = [ '+'.join(str(x) for x in discrete_vals) ]
-    if numeric_vals != (0, 0):
+    if isinstance(numeric_vals, tuple) and numeric_vals != (0, 0):
         ret.append('%s-%s' % numeric_vals)
 
     return '+'.join(ret)
@@ -22,18 +21,37 @@ def valueNames(vd, discrete_vals, numeric_vals):
 class HistogramColumn(Column):
     def calcValue(col, row):
         histogram = col.sheet.options.disp_histogram
-        histolen = col.sheet.options.disp_histolen
+        histolen = col.width-2
         return histogram*(histolen*len(row.sourcerows)//col.sheet.largest)
 
 
+def makeFreqTable(sheet, *groupByCols):
+    return FreqTableSheet(sheet.name,
+                          '%s_freq' % '-'.join(col.name for col in groupByCols),
+                          groupByCols=groupByCols,
+                          source=sheet)
+
+
 class FreqTableSheet(PivotSheet):
     'Generate frequency-table sheet on currently selected column.'
+    guide = '''# Frequency Table
+This is a *frequency analysis* of _{sheet.groupByColsName}_ from the *{sheet.groupByCols[0].sheet}* sheet.
+
+Each row on this sheet corresponds to a *bin* of rows on the source sheet that have a distinct value.  The _count_ and _percent_ columns show how many rows on the source sheet are in this bin.
+
+- `Enter` to open a copy of the source sheet, with only the rows in the current bin.
+- `g Enter` to open a copy of the source sheet, with a combination of the rows from all selected bins.
+
+## Tips
+
+- Use `+` on the source sheet, to add aggregators on other columns, and those metrics will appear as separate columns here.
+- Selecting bins on this sheet will select those rows on the source sheet.
+'''
     rowtype = 'bins'  # rowdef FreqRow(keys, sourcerows)
 
-    def __init__(self, sheet, *groupByCols):
-        fqcolname = '%s_%s_freq' % (sheet.name, '-'.join(col.name for col in groupByCols))
-        super().__init__(fqcolname, groupByCols, [], source=sheet)
-        self.largest = 1
+    @property
+    def groupByColsName(self):
+        return '+'.join(c.name for c in self.groupByCols)
 
     def selectRow(self, row):
         self.source.select(row.sourcerows)     # select all entries in the bin on the source sheet
@@ -46,10 +64,8 @@ class FreqTableSheet(PivotSheet):
     def updateLargest(self, grouprow):
         self.largest = max(self.largest, len(grouprow.sourcerows))
 
-    @asyncthread
-    def reload(self):
-        'Generate frequency table then reverse-sort by length.'
-        super().initCols()
+    def resetCols(self):
+        super().resetCols()
 
         # add default bonus columns
         for c in [
@@ -58,34 +74,39 @@ class FreqTableSheet(PivotSheet):
         ]:
             self.addColumn(c)
 
-        if self.options.disp_histolen and self.options.disp_histogram:
-            c = HistogramColumn('histogram', type=str, width=self.options.disp_histolen+2)
+        if self.options.disp_histogram:
+            c = HistogramColumn('histogram', type=str, width=self.options.default_width*2)
             self.addColumn(c)
 
+        # if non-numeric grouping, reverse sort by count at end of load
+        if not any(vd.isNumeric(c) for c in self.groupByCols):
+            self._ordering = [('count', True)]
+
+    def loader(self):
+        'Generate frequency table.'
         # two more threads
         vd.sync(self.addAggregateCols(),
                 self.groupRows(self.updateLargest))
 
+    def afterLoad(self):
+        super().afterLoad()
         if self.nCols > len(self.groupByCols)+3:  # hide percent/histogram if aggregations added
             self.column('percent').hide()
             self.column('histogram').hide()
 
-        if not [c for c in self.groupByCols if vd.isNumeric(c)]:
-            self.orderBy(self.column('count'), reverse=True)
-
     def openRow(self, row):
         'open copy of source sheet with rows that are grouped in current row'
         if row.sourcerows:
             vs = copy(self.source)
-            vs.name += "_"+vd.valueNames(row.discrete_keys, row.numeric_key)
+            vs.names = vs.names + [vd.valueNames(row.discrete_keys, row.numeric_key)]
             vs.rows=copy(row.sourcerows)
-            vs.source=self.source
             return vs
         vd.warning("no source rows")
 
     def openRows(self, rows):
         vs = copy(self.source)
-        vs.name += "_several"
+        vs.names = vs.names + ["several"]
+        vs.source = self
         vs.rows = list(itertools.chain.from_iterable(row.sourcerows for row in rows))
         return vs
 
@@ -94,23 +115,50 @@ class FreqTableSheet(PivotSheet):
 
 
 class FreqTableSheetSummary(FreqTableSheet):
-    'Append a PivotGroupRow to FreqTable with only selectedRows.'
-    @asyncthread
-    def reload(self):
-        FreqTableSheet.reload.__wrapped__(self)
+    'Append a PivotGroupRow to FreqTableSheet with only selectedRows.'
+    def afterLoad(self):
         self.addRow(PivotGroupRow(['Selected'], (0,0), self.source.selectedRows, {}))
+        super().afterLoad()
 
-Sheet.addCommand('F', 'freq-col', 'vd.push(FreqTableSheet(sheet, cursorCol))', 'open Frequency Table grouped on current column, with aggregations of other columns')
-Sheet.addCommand('gF', 'freq-keys', 'vd.push(FreqTableSheet(sheet, *keyCols))', 'open Frequency Table grouped by all key columns on source sheet, with aggregations of other columns')
-Sheet.addCommand('zF', 'freq-summary', 'vd.push(FreqTableSheetSummary(sheet, Column("Total", sheet=sheet, getter=lambda col, row: "Total")))', 'open one-line summary for all rows and selected rows')
 
-ColumnsSheet.addCommand(ENTER, 'freq-row', 'vd.push(FreqTableSheet(source[0], cursorRow))', 'open a Frequency Table sheet grouped on column referenced in current row')
+def makeFreqTableSheetSummary(sheet, *groupByCols):
+    return FreqTableSheetSummary(sheet.name,
+                          '%s_freq' % '-'.join(col.name for col in groupByCols),
+                          groupByCols=groupByCols,
+                          source=sheet)
+
+
+@VisiData.api
+class FreqTablePreviewSheet(Sheet):
+    @property
+    def rows(self):
+        return self.source.cursorRow.sourcerows
+
+
+FreqTableSheet.addCommand('', 'open-preview', 'vd.push(FreqTablePreviewSheet(sheet.name, "preview", source=sheet, columns=source.columns), pane=2); vd.options.disp_splitwin_pct=50', 'open split preview of source rows at cursor')
+
+Sheet.addCommand('F', 'freq-col', 'vd.push(makeFreqTable(sheet, cursorCol))', 'open Frequency Table grouped on current column, with aggregations of other columns')
+Sheet.addCommand('gF', 'freq-keys', 'vd.push(makeFreqTable(sheet, *keyCols))', 'open Frequency Table grouped by all key columns on source sheet, with aggregations of other columns')
+Sheet.addCommand('zF', 'freq-summary', 'vd.push(makeFreqTableSheetSummary(sheet, Column("Total", sheet=sheet, getter=lambda col, row: "Total")))', 'open one-line summary for all rows and selected rows')
+
+ColumnsSheet.addCommand(ENTER, 'freq-row', 'vd.push(makeFreqTable(source[0], cursorRow))', 'open a Frequency Table sheet grouped on column referenced in current row')
 vd.addMenuItem('Data', 'Frequency table', 'current row', 'freq-row')
 
 FreqTableSheet.addCommand('gu', 'unselect-rows', 'unselect(selectedRows)', 'unselect all source rows grouped in current row')
 FreqTableSheet.addCommand('g'+ENTER, 'dive-selected', 'vd.push(openRows(selectedRows))', 'open copy of source sheet with rows that are grouped in selected rows')
-
-vd.addGlobals({
-    'FreqTableSheet': FreqTableSheet,
-    'FreqTableSheetSummary': FreqTableSheetSummary,
-})
+FreqTableSheet.addCommand('', 'select-first', 'for r in rows: source.select([r.sourcerows[0]])', 'select first source row in each bin')
+
+FreqTableSheet.init('largest', lambda: 1)
+
+vd.addGlobals(
+    makeFreqTable=makeFreqTable,
+    makeFreqTableSheetSummary=makeFreqTableSheetSummary,
+    FreqTableSheet=FreqTableSheet,
+    FreqTableSheetSummary=FreqTableSheetSummary,
+    HistogramColumn=HistogramColumn,
+)
+
+vd.addMenuItems('''
+    Data > Frequency table > current column > freq-col
+    Data > Frequency table > key columns > freq-keys
+''')