typr 1.1.2 → 1.2.0

data/lib/curses.rb

@@ -1,8 +1,6 @@
-#!/usr/bin/ruby
-
 require 'ncursesw'
 require_relative 'frontend'
-  
+
 module Visuals
 
   include Ncurses
@@ -11,142 +9,115 @@ module Visuals
   KEY_TAB = 9
   KEY_PAGEDOWN = KEY_NPAGE
   KEY_PAGEUP = KEY_PPAGE
-  KEY_INSERT = KEY_IC
-  KEY_DELETE = KEY_DC
-  
+
   $colors = COLORS.keys
   $pairs = []
-#  COLORS = %w[ black red green yellow blue magenta cyan white grey]
-#  KEY_TAB = 9
-#  HEIGHT,WIDTH = IO.console.winsize
 
-%w[color pair].each{ |name| method = <<STR 
-  def %s_for obj; #return unless obj
+%w[color pair].each{ |name| method = <<STR
+  def %s_for obj;
     if id = $%ss.index( obj ) then return id
     else last = ( $%ss << obj.dup ).count - 1
-      Ncurses.init_%s( last, *obj ) 
+      Ncurses.init_%s( last, *obj )
       return last
     end
   end
 STR
 eval( method % ([name]*4) )
 }
-  
+
   def self.width;  Ncurses.COLS end
   def self.height; Ncurses.LINES end
-  def self.row; Ncurses.getcury $creen end
-  def self.column; Ncurses.getcurx $creen end
-  
+  def self.row; Ncurses.getcury $screen end
+  def self.column; Ncurses.getcurx $screen end
+
   def self.exit
     Ncurses.echo
     Ncurses.nocbreak
     Ncurses.nl
     Ncurses.endwin
-#    system "reset"
   end
 
-  def read input 
+  def read input
     case input
       when :key
-        key = Ncurses.getch 
-        key = key.chr if key.between? 32, 126 
+        key = Ncurses.getch
+        key = key.chr if key.between? 32, 126
         return key
-      when :line #string
-        Ncurses.echo
-        Ncurses.curs_set 1        
-#        Ncurses.getstr str=""
-        str = Readline.readline
-        Ncurses.curs_set 0
-        Ncurses.noecho
+      when :line
+        str = ''
+        until (key = Ncurses.getch) == KEY_RETURN
+          return nil if key == KEY_ESCAPE
+          if [KEY_BACKSPACE, 127, 8].include? key
+            str.chop!
+          else
+            str << key.chr if key.between? 32, 126
+          end
+        end
         return str
     end
   end
 
   def move x=0,y=0; Ncurses.move y, x end
   def refresh; Ncurses.refresh end
-  def enable attr; Ncurses.attron attr end
-  def disable attr; Ncurses.attroff attr end
-  def clear type=:screen; 
-    case type 
+  def clear type=:screen;
+    case type
       when :screen; Ncurses.erase
       when :line; Ncurses.clrtoeol
       when :down; Ncurses.clrtobot
-    end 
+    end
   end
   def change; Ncurses.color_set pair_for( $color ), 0 end
-  def show string; Ncurses.addstr string.to_s end
+  def draw string; Ncurses.addstr string.to_s end
 
   def get_background; $color[1] end
   def get_foreground; $color[0] end
-  def background color; 
-    $color[1] = (color ? color_for( color ) : $default[1]); change  
+  def background color;
+    $color[1] = (color ? color_for( color ) : $default[1]); change
   end
-  def foreground color; 
-    $color[0] = (color ? color_for( color ) : $default[0]); change 
+  def foreground color;
+    $color[0] = (color ? color_for( color ) : $default[0]); change
   end
 
   def color c
     c = [c] unless c.is_a? Array and c.count == 2
-    foreground c[0] if c[0] 
-    background c[1] if c[1] 
+    foreground c[0] if c[0]
+    background c[1] if c[1]
   end
 
-#  def color_pair pair
-#    if id = $color_pairs.index( pair ) return id
-#    else last = ( $color_pairs << c ).count - 1
-#      Ncurses.init_pair( last, *pair ) 
-#      return last
-#    end
-#    pair = p.map{ |col| 
-#      unless id = $colors.index( col ) 
-#        id = ($colors << col).count - 1 
-#        Ncurses.init_color id, *col
-#      end
-#      id
-#    }      
-#    unless ( id = $color_pairs.index( pair ) ) 
-#      id = ( $color_pairs << pair ).count - 1
-#      Ncurses.init_pair id, *pair
-#    end
-#    id
-#  end
-
-  def self.init args={} 
-#    SCREEN = Ncurses.initscr
+  def self.init args={}
     $creen = Ncurses.initscr
-    Ncurses.cbreak           # provide unbuffered input
-    Ncurses.noecho             # turn on input echoing
-    Ncurses.nl             # turn on newline translation
-#    Ncurses.nonl             # turn off newline translation
+    Ncurses.cbreak
+    Ncurses.noecho
+    Ncurses.nl
     Ncurses.curs_set 0
     Ncurses.start_color
-    Ncurses.stdscr.intrflush(false) # turn off flush-on-interrupt
-    Ncurses.stdscr.keypad(true)     # turn on keypad mode
+    Ncurses.stdscr.intrflush(false)
+    Ncurses.stdscr.keypad(true)
 
-    $default = [ 
-      color_for( args[:foreground] || :grey80 ), 
+    $default = [
+      color_for( args[:foreground] || :grey80 ),
       color_for( args[:background] || :grey10 ) ]
     $color = $default.dup
 
-    COLORS.each_with_index{ |c,i| 
-      $pairs << [ i, $default[1] ] 
-      Ncurses.init_color i, *c[1] 
+    COLORS.each_with_index{ |c,i|
+      $pairs << [ i, $default[1] ]
+      Ncurses.init_color i, *c[1]
       Ncurses.init_pair i, i, $default[1] }
-    
+
     Ncurses.bkgd Ncurses::COLOR_PAIR( pair_for $default )
 
-  end  
+  end
 
 end
 
 if __FILE__ == $0
   include Visuals
-  Visuals.init #background: :blue
+  Visuals.init
   characters = (32..126).map(&:chr).join
   loop do
     clear
-    $colors.each_with_index{ |c,i| 
-      foreground c; move 0,i; show characters }
+    $colors.each_with_index{ |c,i|
+      foreground c; move 0,i; draw characters }
     refresh
     exit if read(:key) == KEY_ESCAPE
   end

data/lib/frontend.rb

@@ -1,19 +1,6 @@
-require 'readline'
-
 module Visuals
 
-#   COLORS = { 
-#     black:   [   0,    0,    0],
-#     red:     [ 700,  400,  400],
-#     green:   [ 400,  700,  400],
-#     yellow:  [ 700,  700,  400],
-#     blue:    [ 400,  400,  700],
-#     magenta: [ 700,  400,  700],
-#     cyan:    [ 400,  700,  700],
-#     white:   [ 999,  999,  999],
-#     grey:    [ 618,  618,  618] }
- 
-  COLORS = { 
+  COLORS = {
     black:   [   0,    0,    0],
     red:     [ 180,  100,  100],
     green:   [ 100,  180,  100],
@@ -22,12 +9,15 @@ module Visuals
     magenta: [ 180,  100,  180],
     cyan:    [ 100,  180,  180],
     white:   [ 255,  255,  255],
-    grey:    [ 158,  158,  158] }
-
-  COLORS.merge! 1.upto(9).map{ |i| 
-    ["grey#{ i*10 }".to_sym, [i*25]*3 ] }.to_h  
+    grey:    [ 158,  158,  158],
+    dark_red:     [  90,   30,   30],
+    dark_green:   [  30,   90,   30],
+    dark_yellow:  [  90,   80,   30],
+    dark_blue:    [  30,   30,   90],
+    dark_magenta: [  90,   30,   90],
+    dark_cyan:    [  30,   80,   80] }
 
-  # COLORS.merge! 1.upto(9).map{ |i| 
-  #   ["grey#{ i*10 }".to_sym, [i*100]*3 ] }.to_h  
+  COLORS.merge! 1.upto(9).map{ |i|
+    ["grey#{ i*10 }".to_sym, [i*25]*3 ] }.to_h
 
 end

data/lib/graphical.rb

@@ -1,22 +1,16 @@
-#!/usr/bin/ruby
 require 'sdl2'
-#require 'io/console'
-#require 'readline'
 require_relative 'frontend'
-  
+
 module Visuals
   include SDL2
 
-public 
-  i=-1
-#  SDL2.init(SDL2::INIT_EVERYTHING)
   SDL2.init(SDL2::INIT_VIDEO)
   TTF.init
-  WINDOW = Window.create("visuals", 
-    Window::POS_CENTERED, #POS_UNDEFINED,
-    Window::POS_CENTERED, #POS_UNDEFINED,
+  WINDOW = Window.create("visuals",
+    Window::POS_CENTERED,
+    Window::POS_CENTERED,
     1324, 768, 0)
-  GO = WINDOW.create_renderer(-1, 
+  GO = WINDOW.create_renderer(-1,
     Renderer::Flags::ACCELERATED|Renderer::Flags::TARGETTEXTURE)
   Key.constants.each{ |c| c = c.to_s
     eval 'KEY_'+c.upcase+'=Key::'+c }
@@ -27,8 +21,7 @@ public
   def self.column; $col end
   def self.x; $x end
   def self.y; $y end
-  
-  
+
   def color_for c
     return unless c
     c = COLORS[c] if c.is_a?( Symbol )
@@ -39,136 +32,90 @@ public
   def get_foreground; $color[0] end
   def background color; return unless color
     $color[1] = color_for( color ) end
-  def foreground color; 
+  def foreground color;
     $color[0] = (color ? color_for( color ) : $default[0]) end
 
-  def color c 
-    c = [c] unless c.is_a? Array and c.count == 2 #.flatten
+  def color c
+    c = [c] unless c.is_a? Array and c.count == 2
     foreground c[0]
     background c[1]
-#    $letters[c] = (32.upto 126).map{ |n| n = n.chr
-#      [n, $font.render_blended( n, c )] }.to_h unless $letters[c]
   end
 
   def move col, row
-    $x = ($col = col) * $charsize[1] #width
-    $y = ($row = row) * $charsize[0] #$height 
+    $x = ($col = col) * $charsize[1]
+    $y = ($row = row) * $charsize[0]
   end
 
-  def clear type = :screen #bg=
-    GO.draw_color = $default[1] #bg
-    case type 
-#      when Array; GO.fill_rect Rect.new() 
-      when :screen; GO.fill_rect Rect.new(0, 0, *WINDOW.size) 
+  def clear type = :screen
+    GO.draw_color = $default[1]
+    case type
+      when :screen; GO.fill_rect Rect.new(0, 0, *WINDOW.size)
       when :line; GO.fill_rect Rect.new(
         Visuals.x, Visuals.y, WINDOW.size[0], Visuals.y+$charsize[0])
       when :down; GO.fill_rect Rect.new(
         0, Visuals.y, *WINDOW.size)
     end
   end
-   
-  def show( str ) #solid_blended_shaded(
+
+  def draw( str )
     return unless str
-#    chars = str.chars.map{ |char| $letters[foreground][char] }
-#    width = chars.map( &:w ).sum 
-#    if $color[1] != $default[1] #get_background
     if get_background
       GO.draw_color = get_background
-      GO.fill_rect Rect.new($x, $y, str.size*$charsize[1], $charsize[0]) 
+      GO.fill_rect Rect.new($x, $y, str.size*$charsize[1], $charsize[0])
     end
-#    GO.fill_rect Rect.new($x, $y, width, $charsize[0]) 
-#    text = Surface.new( width, $charsize[0], 32, 0, 0, 0, 0 )
-#    x=0
-#    for char in chars #.each{|c| 
-#      Surface.blit char, nil, text, Rect.new( x, 0, char.w, char.h )
-#      x += char.w
-#    end
-#    GO.copy GO.create_texture_from(text),nil,Rect.new($x, $y, width, $charsize[0])
     text = str.rstrip
     unless text.empty?
       image = $font.render_blended( text, get_foreground )
       GO.copy GO.create_texture_from( image ), nil,
-        Rect.new($x, $y, image.w, $charsize[0]) 
-    end 
+        Rect.new($x, $y, image.w, $charsize[0])
+    end
     move $col+str.size, $row
   end
 
   def refresh; GO.present end
 
-  def read input 
+  def read input
     case input
       when :event then e = Event.poll until e
-      when :key then 
+      when :key then
         e = Event.poll until e.is_a? Event::KeyDown
-        return e.sym.between?(32, 126) ? e.sym.chr : e.sym 
-      when :line#; line = ''              
-#        File.mkfifo( 'input' ) unless File.exist? 'input'
-#        Readline.output=input=open('input')
-#        Readline.output=input=StringIO.new
-#        fork{ Readline.readline }
-        x, y = Visuals.row, Visuals.column
-        listen = Thread.new{ 
-#          until (char = input.read) == $/
-#          until (line = Readline.line_buffer)[-1] == $/
-          loop do
-            move x, y
-            show line
-            sleep 0.1 
-          end        
-        } 
-        line = Readline.readline 
-        listen.terminate
-#        until input.string[-1]==$/
-        return line
-#        until (key = read :key) == KEY_RETURN
-#          str << key if key.is_a? String
-#        end
-#
-#        text = ""
-#        TextInput.start
-#        loop do
-##          ev = Event.poll
-#          case ev = read( :event )
-#            when Event::KeyDown
-#              if ev.sym == KEY_RETURN
-#                TextInput.stop
-#                return text 
-#              end
-#            when Event::TextInput 
-#              text += ev.text 
-#              show ev.text
-#              p ev.text
-#          end
-#        end
+        return e.sym.between?(32, 126) ? e.sym.chr : e.sym
+      when :line
+        str = ''
+        loop do
+          e = Event.poll
+          next unless e.is_a? Event::KeyDown
+          return nil if e.sym == KEY_ESCAPE
+          return str if e.sym == KEY_RETURN
+          str << e.sym.chr if e.sym.between? 32, 126
+        end
     end
   end
 
   def self.exit
   end
 
-  def self.init args={} 
-    $default = [ 
-      color_for( args[:foreground] || :grey80 ), 
+  def self.init args={}
+    $default = [
+      color_for( args[:foreground] || :grey80 ),
       color_for( args[:background] || :grey10 ) ]
     $color = $default.dup
     $charsize = args[:charsize] || [18,11]
     $font = TTF.open( args[:font] || "/usr/share/fonts/X11/TTF/VeraMono.ttf", $charsize[0] )
     move 0, 0
   end
-  
+
 end
 
 if __FILE__ == $0
-#  require_relative 'base'
   include Visuals
-  Visuals.init font:ARGV[0] #[[200,200,200],[20,20,20]], [80,50]
+  Visuals.init font:ARGV[0]
   characters = (32..126).map(&:chr).join
   loop do
     clear
-    COLORS.keys.each_with_index{ |c,i| 
-      foreground c; move 0,i; show characters }
+    COLORS.keys.each_with_index{ |c,i|
+      foreground c; move 0,i; draw characters }
     refresh
-#    GO.present
     exit if read(:key) == KEY_ESCAPE
   end
 end

data/lib/grid.rb

@@ -1,7 +1,3 @@
-#!/usr/bin/env ruby
-# coding: utf-8
-# frozen_string_literal: true
-
 require_relative 'space.rb'
 
 module Typr
@@ -13,16 +9,16 @@ module Typr
   #     input:  [ ["Alice", 30], ["Bob", 25] ],
   #     header: [:name, :age],
   #     format: [:max, :right]
-  #   )
-  #   grid.draw
-  #
+#   )
+#   grid.show
+#
   # Column format tokens: +Integer+ (fixed width), +:min+ (auto), +:max+ (fill remaining).
   #
   # Built-in procs: +:filetree+, +:datetime+, +:magnitudes+, +:convert+.
 
   class Grid < Stack # Table
     attr_accessor :format, :procs, :filters, :data, :map
-    attr_accessor :align, :rawsort, :rawfilter
+    attr_accessor :align, :rawsort, :rawfilter, :reverse
     attr_writer :sequence
 
     ##
@@ -127,8 +123,9 @@ module Typr
     # @param h [Array<String, Symbol>]
 
     def header=( h ); super
-      h.each_with_index{ |h,i| Typr.module_eval h.upcase+?=+i.to_s } if
-        h.is_a? Array
+      h.each_with_index{ |h,i|
+        Typr.const_set(h.upcase, i) unless Typr.const_defined?(h.upcase)
+      } if h.is_a? Array
     end
 
     ##
@@ -143,7 +140,7 @@ module Typr
     def reset type=:all
       case type
         when :display; @map = nil; @sort = nil; @filters.clear
-        when :format; @widths.clear; @maxed = false
+        when :format; @widths.clear
         when :all; reset [:display, :format]
       end
       super
@@ -180,10 +177,11 @@ module Typr
     end
 
     ##
-    # Add a column filter (substring or regex).
+    # Add a column filter (substring or regex). +:all+ matches any column.
     #
     #   grid.add_filter(0, "Ali")    # name contains "Ali"
     #   grid.add_filter(1, /^\d{2}$/) # age matches regex
+    #   grid.add_filter(:all, "ip")  # any column contains "ip"
     #
     # @param column [Integer, Symbol]
     # @param query [String, Regexp]
@@ -205,8 +203,10 @@ module Typr
 
     def check row
       @filters.reject{ |column,query|
-        ( (@procs[column] and not @rawfilter[column]) ?
-          @layer : @data )[row][column].to_s[query] }.empty?
+        cols = column == :all ? @data[row].each_index.to_a : [column]
+        cols.any?{ |col|
+          ( (@procs[col] and not @rawfilter[col]) ?
+            @layer : @data )[row][col].to_s[query] } }.empty?
     end
 
     ##
@@ -240,6 +240,57 @@ module Typr
 
     def sorted_by name=false; (name and @sort) ? @header[@sort] : @sort end
 
+    ##
+    # Pick a row with live-filtering.
+    #
+    # When column is given, `Grid` overrides `Stack#pick` to add interactive
+    # text filtering of rows by the given column. Filter text is shown at the
+    # bottom of the grid. Passes through to `super` for all other types or
+    # when no column is given.
+    #
+    #   grid.pick :row, 0, column: :name
+    #   grid.pick :row, 0, column: :all   # match any column
+    #
+    # @param type [Symbol] type is ignored (always :row); passed to super otherwise
+    # @param column [Symbol, String] column name to filter on, or :all (default nil)
+
+    def pick type = :row, row=0, column: nil
+      return super(type, row) unless column
+
+      saved = [@filters.dup, @map, @start]
+      base = @map || ids
+      @filters = [[column, '']]
+      @map = base.select{ |id| check id }
+      @start = 0
+      show
+      draw_hints
+      result = Typr.read_line '/', left: left, top: self.bottom + 1,
+        &->(key, query, _) {
+          if key.is_a?(String) and idx = @hints[0..height-@hints_start-1].index(key)
+            return page.to_a[idx + @hints_start]
+          end
+          if key.is_a?(String) and !key.each_char.all?{ |c| c.ord.between?(32, 126) } and
+            @keymap.values.include?(key) and ![KEY_BACKSPACE, "\b"].include?(key)
+            send key
+          else
+            @filters = [[column, query]]
+            @map = base.select{ |id| check id }
+            @start = 0
+          end
+          show
+          draw_hints
+          nil
+        }
+      case result
+      when nil;      @filters, @map, @start = saved
+      when Integer; return result
+      else
+        @filters = result.empty? ? saved[0] : saved[0] + [[column, result]]
+        filter :all
+      end
+      return
+    end
+
     ##
     # Sort by column (toggle direction on repeat).
     #
@@ -263,8 +314,9 @@ module Typr
     def sort
       return false unless @sort
       data = (@procs[@sort] and not @rawsort[@sort]) ? @layer : @data
-      @map = ids.sort{ |a,b| (data[a][@sort] <=> data[b][@sort]) || 0 }
+      @map = (0...@data.size).to_a.sort{ |a,b| (data[a][@sort] <=> data[b][@sort]) || 0 }
       @map.reverse! if @reverse
+      @map = @map.select{ |id| check id } unless @filters.empty?
       return
     end
 
@@ -296,11 +348,11 @@ module Typr
     ##
     # Compute column widths from visible data and render the grid.
     #
-    #   grid.draw
+    #   grid.show
     #
     # @return [void]
 
-    def draw
+    def show
       if not @data or @data.empty? or ( @map and @map.empty? )
         @widths = [ width/columns ] * columns if @widths.count < columns
         @rest = 0
@@ -352,20 +404,20 @@ module Typr
     def print row=nil
       return super unless row
       header = ( row == :header )
-      return show @header[0..width-1].ljust(width) if
+      return draw @header[0..width-1].ljust(width) if
         header and @header.is_a? String
       fields = (header ? @header : @data[row] ).dup
       @layer[row].each{ |col,value| fields[col] = value } if
         @layer[row] if @layer unless header
   	    for col,id in sequence.each_with_index
-        show @separator unless id == 0
+        draw @separator unless id == 0
         select = ( @selected[:columns].include? col or
           @selected[:fields].include? [row,col] ) unless
             @selected[:rows].include?(row) or header
         color( @colors[:fields][[row,col]] ||
           @colors[:columns][col] || @colors[:default] ) unless header
         background @colors[:selected] if select
-        show prepare( fields[col].to_s, width_for( id ), @align[col] )
+        draw prepare( fields[col].to_s, width_for( id ), @align[col] )
         background @colors[:default][1] if select
       end
     end
@@ -404,22 +456,17 @@ module Typr
       @columns,@functions = 0,{}
       @ignore,@rawfilter,@rawsort,@reverse = [],[],[],false
       @filters,@procs = [],{}
-      @align,@format,@widths,@totals = [],[],[],[]
-      super #args
+      @align,@format,@widths = [],[],[]
+      super
       @colors = { columns: [], fields: {} }.merge ( @colors  )
       @selected = { fields:[], columns:[] }.merge @selected
       @functions = {
-        filetree: Proc.new{ |f| f.gsub /.*\/[^$]/, ' ' },
+        filetree: Proc.new{ |f| ' ' * [(d = f.count('/') - 1), 0].max + '└' + File.basename(f) },
         datetime: Proc.new{|sec|Time.at(sec).strftime"%y-%m-%d %H:%M" rescue ??},
         magnitudes: Proc.new{ |size| mag = (size.to_s.length-1) / 3
           mag>0 ? (size.to_s.insert -(mag*3+1), ?.)[0..4] + %w[B K M G T][mag] :
           size rescue size },
-        convert:  Proc.new{ |value|
-          case value.to_s
-            when /^[\d]+$/ then value.to_s.to_i
-            when /^\d*[\.\,]\d+$/ then value.to_s.to_f
-            else value
-          end } }
+        convert:  Proc.new{ |value| coerce_type value } }
 
       if @input
         self << @input