cetus 0.1.28 → 0.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 021f5de97b41df8fb3438258356b924b9101033088180d6315579083793eae4a
-  data.tar.gz: a1d07c2f93633c2655a004b67dfbcdcc45429135cc7e6d2adc84d514a0331fb0
+  metadata.gz: a6bfd0c8210eacca8888f7c6f22e5682feff8c82f3a90d799849d8bb153fd5e9
+  data.tar.gz: 3ebbdd0708cd4cc6f75a3a77a2161f443a68d703f2c769ca870ffd37242f839e
 SHA512:
-  metadata.gz: d9fff90c5dc1e629e196dfafb880168450878ade3871093ddb908b5deaf3fb72d600f9766be3148318a1bbed35b8b80783ea621738dcb0f5ecf82180504f68bb
-  data.tar.gz: 4d53ac51c02fa54f5f002db9c54fd8083f406d7c498a66910f8095084880b2d284f1c3f1078aeba5e893dc831eb22d33cf13a4af5b9e2b9a2c62bf4697de0a7c
+  metadata.gz: f0425f755732c290eaf51aa0903a6785fef35f54d72b83f2fd281280e5c00064706cad9dd2d598419a1495d9625792a0b3e15dcb7e0edb1fc8c5f07d177fcc2a
+  data.tar.gz: 5d9c5f24e835a522adccfc91156469ff148b66013c49ac1c83fc5d41fd00da212500eb2786765593a0585baf4210c9a75f614914b34e1d2faa9ffca5ac7f2613

data/bin/cetus

@@ -6,7 +6,7 @@
 #       Author: rkumar http://github.com/rkumar/cetus/
 #         Date: 2013-02-17 - 17:48
 #      License: GPL
-#  Last update: 2019-03-22 00:12
+#  Last update: 2019-03-24 11:58
 # --------------------------------------------------------------------------- #
 #  cetus.rb  Copyright (C) 2012-2019 rahul kumar
 # == CHANGELOG
@@ -15,7 +15,10 @@
 # 2019-03-04 - changed quit to q (earlier Q)
 # 2019-03-04 - first dirs then files
 # 2019-03-10 - changing selected_files to have fullpath
+# 2019-03-22 - refactoring the code, esp run()
 #  == TODO
+#  FIXME how to check that redraw not called twice depending on where
+#  a method is called from. a menu or direct from key. e.g help
 #  To dirs add GEMHOME RUBYLIB PYTHONILB or PYTHONPATH,
 #  Make rubygem aware : gemspec or Gemfile the expand lib and bin
 #  fpath if existing
@@ -32,9 +35,7 @@ require 'fileutils'
 # alias c=~/bin/cetus.rb
 # c
 
-# 2019-02-20 - added so alt-screen is used
-system 'tput smcup'
-VERSION = '0.1.28.0'.freeze
+VERSION = '0.1.29.0'.freeze
 CONFIG_FILE = '~/.config/cetus/conf.yml'.freeze
 
 $bindings = {}
@@ -175,7 +176,8 @@ def reset_terminal
   # '\e[2J':   Clear the terminal.
   # '\e[;r':   Set the scroll region to its default value.
   #            Also sets cursor to (0,0).
-  print "\e[?7h\e[?25h\e[2J\e[;r"
+  # '\e[?1049l: Restore main screen buffer.
+  print "\e[?7h\e[?25h\e[2J\e[;r\e[?1049l"
 
   # Show user input.
   system 'stty echo'
@@ -185,12 +187,13 @@ end
 # call AFTER shelling to most or vim
 def setup_terminal
   # Setup the terminal for the TUI.
+  # '\e[?1049h': Use alternative screen buffer. smcup
   # '\e[?7l':    Disable line wrapping.
   # '\e[?25l':   Hide the cursor.
   # '\e[2J':     Clear the screen.
   # '\e[1;Nr':   Limit scrolling to scrolling area.
   #              Also sets cursor to (0,0).
-  printf("\e[?7l\e[?25l\e[2J\e[1;%sr", $glines)
+  printf("\e[?1049h\e[?7l\e[?25l\e[2J\e[1;%sr", $glines)
   # earlier glines was grows
 
   # Hide echoing of user input
@@ -209,7 +212,7 @@ def readline prompt='>'
     # hide cursor
     print "\e[?25l"
   end
-  target
+  target.chomp
 end
 
 ## get a character from user and return as a string
@@ -331,148 +334,168 @@ $status_color = 4 # status line, can be 2 3 4 5 6
 # Menubar on top of screen
 @help = "#{BOLD}?#{BOLD_OFF} Help   #{BOLD}`#{BOLD_OFF} Menu   #{BOLD}!#{BOLD_OFF} Execute   #{BOLD}=#{BOLD_OFF} Toggle   #{BOLD}C-x#{BOLD_OFF} File Actions  #{BOLD}q#{BOLD_OFF} Quit "
 
-## main loop which calls all other programs
-def run
-  home = ENV['HOME']
-  ctr = 0
-  config_read
-  $files = `zsh -c 'print -rl -- *(#{$sorto}#{$hidden}M)'`.split("\n")
+# ------------------- read_directory ------------------ #
+def read_directory
+  rescan_required false
+  # $files = `zsh -c 'print -rl -- *(#{$sorto}#{$hidden}M)'`.split("\n")
+  $filterstr ||= 'M'
+  $files = `zsh -c 'print -rl -- *(#{$sorto}#{$hidden}#{$filterstr})'`.split("\n")
   $files = sort_file_list $files
   enhance_file_list
   ## added by RK 2014-03-31 - 00:29 since too many duplicates
   $files = $files.uniq if $enhanced_mode
+end
+# ------------- end of read_directory --------------------------------#
 
-  fl = $files.size
-
-  $patt = nil
-  $sta = 0
-
-  # forever loop that prints dir and takes a key
-  loop do
-
-    # view consists of all files (filtered by pattern if necessary)
-    $view = if $patt
-              if $ignorecase
-                $files.grep(/#{$patt}/i)
-              else
-                $files.grep(/#{$patt}/)
-              end
+# ------------------- create_viewport ------------------ #
+def create_viewport
+  $view = if $patt
+            if $ignorecase
+              $files.grep(/#{$patt}/i)
             else
-              $files
+              $files.grep(/#{$patt}/)
             end
+          else
+            $files
+          end
 
-    fl = $view.size
-    $sta = 0 if $sta >= fl || $sta < 0
-    # 2019-03-18 - added to ensure cursor not going OOB when next_page
-    $cursor = 0 if $cursor >= fl || $cursor < 0
-
-    # NOTE if we make cursor zero, then it can be < sta so in the next line
-    #  it will be made equal to sta which we may not want
-    # $sta = $cursor if $sta > $cursor
-    $cursor = $sta if $sta > $cursor
-
-    # viewport are the files that are visible, subset of view
-    $viewport = $view[$sta, $pagesize]
-    fin = $sta + $viewport.size
-
-    # added 2019-03-20 - actually stact should be reduced not brought to zero
-    # 2019-03-21 - NOTE this may be redundant since I set to zero in next_page
-    #  due to various edge cases.
-    # $stact = 0 if $stact >= $viewport.size
-    if $stact >= $viewport.size
-      $stact -= $grows while $stact >= $viewport.size
-      $stact += $grows if $stact < 0
-    end
+  fl = $view.size
+  $sta = 0 if $sta >= fl || $sta < 0
+  $cursor = 0 if $cursor >= fl || $cursor < 0
 
-    $title ||= Dir.pwd.sub(home, '~')
-    clear_screen
+  # NOTE if we make cursor zero, then it can be < sta so in the next line
+  #  it will be made equal to sta which we may not want
+  $cursor = $sta if $sta > $cursor
 
+  # viewport are the files that are visible, subset of view
+  $viewport = $view[$sta, $pagesize]
+end
+# ------------- end of create_viewport --------------------------------#
 
-    # title
-    print "#{GREEN}#{@help}  #{BLUE}cetus #{VERSION}#{CLEAR}\n"
-    t = "#{$title}  #{$sta + 1} to #{fin} of #{fl}  #{$sorto} F:#{$filterstr}"
-    t = t[t.size - $gcols..-1] if t.size >= $gcols
-    print "#{BOLD}#{t}#{CLEAR}\n"
+# ------------------- print_title ------------------ #
+def print_title
 
-    # add hint and format the line
-    buff = _format $viewport
+  # print help line and version
+  print "#{GREEN}#{@help}  #{BLUE}cetus #{VERSION}#{CLEAR}\n"
 
-    # break into as many columns as required
-    buff = columnate buff, $grows
+  # print 1 of n files, sort order, filter etc details
+  $title ||= Dir.pwd.sub(ENV['HOME'], '~')
+  fin = $sta + $viewport.size
+  fl = $view.size
+  t = "#{$title}  #{$sta + 1} to #{fin} of #{fl}  #{$sorto} F:#{$filterstr}"
 
-    # needed the next line to see how much extra we were going in padding
-    # buff.each {|line| print "#{REVERSE}#{line}#{CLEAR}\n" }
-    buff.each { |line| print line, "\n" }
-    print
+  # don't exceed columns while printing
+  t = t[t.size - $gcols..-1] if t.size >= $gcols
+
+  print "#{BOLD}#{t}#{CLEAR}\n"
+end
+# ------------- end of print_title --------------------------------#
 
+# TODO clean this up and simplify it
+def status_line
     # prompt
     v_mm = $mode ? "[#{$mode}] " : ''
     cf = current_file
     $message = "No file highlighted (#{cf})" if cf and !$highlighted_a_column
     $message = ' | No matches. Press ESCAPE' if $patt && !cf
-    # 2019-03-19 - take cursor to last line
-    system "tput cup #{$glines} 0"
 
-    # print a colored line at bottom of screen
-    # \e[33;41m  - set color of status_line
-    # %*s        - set blank spaces for entire line
-    print "\e[33;4%sm%*s" % [$status_color || '1', $gcols, " "]
+    clear_status_line
 
     # Print the filename at the right side of the status_line
     # sometimes due to search, there is no file
     if cf
-      cfl = cf.size
-      # print right aligned
-      padding = @debug_flag ? 15 : 3
-      system "tput cup #{$glines} #{$gcols - cfl - padding}"
+      # cfl = cf.size
+      # print right aligned TODO REFACTOR THIS
+      # padding = @debug_flag ? 15 : 3
+      # system "tput cup #{$glines} #{$gcols - cfl - padding}"
       # print "#{REVERSE}#{cf}#{CLEAR}"
       if @debug_flag
-        print "#{$sta},#{$cursor},#{$stact},#{$viewport.size},#{$grows} | #{cf}"
+        print_on_right "#{$sta},#{$cursor},#{$stact},#{$viewport.size},#{$grows} | #{cf}"
       else
-        print "#{cf}"
+        print_on_right "#{cf}"
       end
     end
     # print "\r#{v_mm}#{$patt} #{GREEN}#{$message}#{CLEAR} >"
     # move to beginning of line, reset text mode after printing
     print "\r#{v_mm}#{$patt}#{$message}\e[m"
-    ch = get_char
-    # $highlighted_a_column = false
-    # puts
-    # break if ch == "q"
-    # elsif  ch =~ /^[1-9a-zA-Z]$/
-    # 2019-03-04 - ignore q since that is quit key now
-    # if  ch =~ /^[a-zZ]$/
-    if ch.match?(/^[a-pr-zZ]$/)
-      # hint mode
-      select_hint $viewport, ch
-      ctr = 0
-    elsif ch == 'BACKSPACE'
-      $patt = $patt[0..-2] if $patt && !$patt.empty?
-      $message = $patt = nil if $patt == ''
-      ctr = 0
-    else
-      # fetch binding for key
-      x = $bindings[ch]
-      # remove comment string so only binding is left
-      x, _ = x.split(':') if x
-      # split into binding and args
-      x = x.split if x
-      if x
-        binding = x.shift
-        args = x
-        send(binding, *args) if binding
-      else
-        perror "No binding for #{ch}"
-      end
-      # p ch
-    end
-    break if $quitting
+
+end
+
+# should we do a read of the dir
+def rescan?
+  $rescan_required
+end
+
+def rescan_required flag=true
+  $rescan_required = flag
+  redraw_required if flag
+end
+
+def redraw flag=false
+  read_directory if flag
+
+  draw_directory
+end
+
+def draw_directory
+  # all this seems to be happening for each keystroke even if
+  # not really required. FIXME maybe reduce and call when required
+
+
+  # view consists of all files (filtered by pattern if necessary)
+  # viewport is only that subset of view that is displayed on screen
+  create_viewport
+  clear_screen
+  print_title
+
+  # add hint and format the line
+  buff = _format $viewport
+
+  # break into as many columns as required
+  # This is where directories get their blue color
+  buff = columnate buff, $grows
+
+  buff.each { |line| print line, "\n" }
+  print
+
+  status_line
+end
+
+def redraw_required(flag=true) $redraw_required = flag; end
+
+def resolve_key key
+  if key.match?(/^[a-pr-zZ]$/)
+    # hint mode
+    select_hint $viewport, key
+  elsif key == 'BACKSPACE'
+    # do we really need this TODO
+    $patt = $patt[0..-2] if $patt && !$patt.empty?
+    $message = $patt = nil if $patt == ''
+  else
+    resolve_binding key
   end
-  write_curdir
-  puts 'bye'
-  config_write if $writing
 end
 
+def resolve_binding key
+  # fetch binding for key
+  x = $bindings[key]
+
+  # remove comment string so only binding is left
+  x, _ = x.split(':') if x
+
+  # split into binding and args
+  x = x.split if x
+  if x
+    binding = x.shift
+    args = x
+    send(binding, *args) if binding
+  else
+    perror "No binding for #{key}"
+  end
+end
+
+
+
 ## write current dir to a file so we can ccd to it when exiting
 def write_curdir
   f = File.expand_path('~/.fff_d')
@@ -603,6 +626,9 @@ end
 #  method and this overshadowed that method.
 #  NOTE: this does not do any coloring since the codes may get chopped by
 #   columnate method
+#   TODO 2019-03-23 - 23:30 we can do coloring here. columnate must check for color
+#   code at start of line, and check size accordingly. If it needs to truncate, then
+#   first take off the ANSI codes, truncate and put back.
 def _format(ary)
   # buff = Array.new
   buff = Array.new(ary.size)
@@ -611,15 +637,19 @@ def _format(ary)
   # determine width based on number of files to show
   # if less than sz then 1 col and full width
   #
-  # ix refers to the index in the complete file list, wherease we only show 60 at a time
+  # ix refers to the index in the complete file list, whereas we only
+  # show 60 at a time
   ix = 0
   ctr = 0
   ary.each do |f|
+    # raise "#{f} != #{ary[ix]}" if f != ary[ix]
     ## ctr refers to the index in the column
     ind = get_shortcut(ix)
     mark = SPACE
+    mark = '+' if visited? f
     cur = SPACE
     cur = CURMARK if ix + $sta == $cursor
+    # NOTE seems like f and ary[ix] are the same
     mark = GMARK if selected?(ary[ix])
 
     if $long_listing
@@ -659,11 +689,11 @@ def _format(ary)
 end
 
 ## select file based on key pressed
-def select_hint(view, ch)
+def select_hint view, key
   # a to y is direct
   # if x or z take a key IF there are those many
   #
-  ix = get_index(ch, view.size)
+  ix = get_index(key, view.size)
   return unless ix
 
   f = view[ix]
@@ -678,7 +708,6 @@ def select_hint(view, ch)
   else
     open_file f
   end
-  # selectedix=ix
 end
 
 ## toggle selection state of file
@@ -690,6 +719,8 @@ def toggle_select(f=current_file)
   else
     add_to_selection f
   end
+  # XXX is it possible to just redraw this line
+  redraw_required
 end
 
 ## open file or directory
@@ -711,6 +742,7 @@ def open_file(f)
     save_dir_pos
     change_dir f, nextpos
   elsif File.readable? f
+    # TODO: looks complex pls simplify !! XXX
     $default_command ||= '$PAGER'
     if !$editor_mode
       ft = filetype f
@@ -740,6 +772,7 @@ def open_file(f)
     perror "open_file: (#{f}) not found"
     # could check home dir or CDPATH env variable DO
   end
+  redraw_required
 end
 
 # regardless of mode, view the current file using pager
@@ -808,25 +841,35 @@ def run_command(f)
   get_char
 end
 
-## cd to a dir and go to position if specified
-def change_dir(f, pos = nil)
+## cd to a dir.
+# Also, position cursor on child directory that we changed from if second param
+# is true.
+def change_dir f, position_cursor=false
   unless File.directory? f
-    perror "#{p} is not a directory, or does not exist."
+    perror "#{f} is not a directory, or does not exist."
     return
   end
-  $visited_dirs.insert(0, Dir.pwd)
-  save_dir_pos # added 2019-03-20 - so we get to same file
+
+  # before leaving a dir we save it in the list, as well as the cursor
+  # position, so we can restore that position when we return
+  dir_from = Dir.pwd
+  $visited_dirs.insert(0, dir_from)
+  save_dir_pos
+
   f = File.expand_path(f)
   Dir.chdir f
-  $filterstr ||= 'M'
-  $files = `zsh -c 'print -rl -- *(#{$sorto}#{$hidden}#{$filterstr})'`.split("\n")
-  $files = sort_file_list $files
+  read_directory
   post_cd
-  if pos
-    # convert curpos to sta also
-    # $cursor = pos.to_i
-    goto_line pos.to_i
+
+  # position the cursor on the previous directory
+  # This happens when we go to parent directory
+  if position_cursor
+    # get the position of the previous directory
+    pos = index_of(File.basename(dir_from) + '/')
+    $cursor = pos if pos
   end
+
+  redraw_required
 end
 
 def goto_previous_dir
@@ -835,6 +878,10 @@ def goto_previous_dir
   change_dir prev_dir
 end
 
+def index_of dir
+  $files.index(dir)
+end
+
 ## clear sort order and refresh listing, used typically if you are in some view
 #  such as visited dirs or files
 def escape
@@ -850,12 +897,9 @@ end
 
 ## refresh listing after some change like option change, or toggle
 def refresh
-  $filterstr ||= 'M'
-  $files = `zsh -c 'print -rl -- *(#{$sorto}#{$hidden}#{$filterstr})'`.split("\n")
-  # first put dirs then files
-  $files = sort_file_list $files
   $patt = nil
   $title = nil
+  rescan_required
 end
 
 # put directories first, then files
@@ -879,18 +923,22 @@ end
 
 ## accept dir to goto and change to that ( can be a file too)
 def goto_dir
-  print "\e[?25h"
-  print 'Enter path: '
+  # print "\e[?25h"
+  print_last_line 'Enter path: '
   begin
     # path = gets.chomp
     path = readline
-    return if path == ''
+    if path.nil? || path == ''
+      clear_status_line
+      return
+    end
     # rescue => ex
   rescue StandardError => ex
+    # Nope, already caught interrupt and sent back nil
     perror 'Cancelled cd, press a key'
     return
   ensure
-    print "\e[?25l"
+    # print "\e[?25l"
   end
   f = File.expand_path(path)
   unless File.directory? f
@@ -939,14 +987,17 @@ end
 def goto_parent_dir
   # 2019-03-20 - when changing to parent, we need to keep cursor on
   #  parent dir, not first
-  curr = File.basename(Dir.pwd)
+  # curr = File.basename(Dir.pwd)
 
-  change_dir '..'
+  change_dir '..', true
 
+  # TODO 2019-03-24 - we can revert to old thing and remove second arg from cd
+  # FIXME 2019-03-23 - too late to change the cursor here since change_dir
+  #  now does a redraw !!! XXX
   # get index of child dir in this dir, and set cursor to it.
-  index = $files.index(curr + '/')
-  pause "WARNING: Could not find #{curr} in this directory." unless index
-  $cursor = index if index
+  # index = $files.index(curr + '/')
+  # pause "WARNING: Could not find #{curr} in this directory." unless index
+  # $cursor = index if index
 end
 
 def goto_home_dir
@@ -969,13 +1020,13 @@ end
 
 # Goes to directory bookmarked with number or upper case char.
 # If lower case character given, then go to first file starting with char.
-def goto_bookmark(ch = nil)
-  unless ch
+def goto_bookmark(key = nil)
+  unless key
     print 'Enter bookmark char: '
-    ch = get_char
+    key = get_char
   end
-  if ch =~ /^[0-9A-Z]$/
-    d = $bookmarks[ch]
+  if key =~ /^[0-9A-Z]$/
+    d = $bookmarks[key]
     # this is if we use zfm's bookmarks which have a position
     # this way we leave the position as is, so it gets written back
     nextpos = nil
@@ -987,11 +1038,11 @@ def goto_bookmark(ch = nil)
       end
       change_dir d, nextpos
     else
-      perror "#{ch} not a bookmark"
+      perror "#{key} not a bookmark"
     end
   else
-    # goto_entry_starting_with ch
-    file_starting_with ch
+    # goto_entry_starting_with key
+    file_starting_with key
   end
 end
 
@@ -1013,6 +1064,7 @@ def next_page
   #  FIXME: 2019-03-20 - if cursor is panned to 3rd column and then we page,
   #   then after a while no hints show up since stact is high.
   $stact = 0
+  redraw_required
   # next just does not work on the last page when it should
   #  perhaps viewport has not yet been adjusted, that's why
   # $stact = 0 if $stact >= $viewport.size
@@ -1024,6 +1076,7 @@ end
 def prev_page
   $sta -= $pagesize
   $cursor -= $pagesize
+  redraw_required
 end
 
 def print_help
@@ -1090,6 +1143,7 @@ def debug_vars
     file.puts "grows          #{$grows}"
     file.puts "file   #{current_file}"
   end
+  redraw_required
 end
 
 def view_bookmarks
@@ -1098,8 +1152,8 @@ def view_bookmarks
   $bookmarks.each_pair { |k, v| puts "#{k.ljust(7)}  =>  #{v}" }
   puts
   print 'Enter bookmark to goto: '
-  ch = get_char
-  goto_bookmark(ch) if ch =~ /^[0-9A-Z]$/
+  key = get_char
+  goto_bookmark(key) if key =~ /^[0-9A-Z]$/
 end
 
 # MENU MAIN -- keep consistent with zfm
@@ -1153,7 +1207,7 @@ def bookmark_menu
 end
 
 # Create a menu using title, and hash of key and binding
-def menu(title, h)
+def menu title, h
   return unless h
 
   pbold title.to_s
@@ -1164,15 +1218,16 @@ def menu(title, h)
   x = ary.join("\n")
   puts %x{echo "#{x}" | column}
 
-  ch = get_char
-  binding = h[ch]
-  binding ||= h[ch.to_sym]
+  key = get_char
+  binding = h[key]
+  binding ||= h[key.to_sym]
   # TODO: 2019-03-21 - menu's do not have comments, they are symbols
   # binding, _ = binding.split(':')
   if binding
     send(binding) if respond_to?(binding, true)
   end
-  [ch, binding]
+  redraw_required
+  [key, binding]
 end
 
 def toggle_menu
@@ -1184,15 +1239,15 @@ def toggle_menu
   case menu_text
   when :toggle_hidden
     $hidden = $hidden ? nil : 'D'
-    pause "Show hidden files is now #{!$hidden.nil?}"
+    # pause "Show hidden files is now #{!$hidden.nil?}. Press a key."
     message "Show hidden is now #{!$hidden.nil?}"
-    refresh
+    rescan_required
   when :toggle_case
     # $ignorecase = $ignorecase ? "" : "i"
     $ignorecase = !$ignorecase
-    pause "Ignore Case is now #{$ignorecase}"
+    # pause "Ignore Case is now #{$ignorecase}. Press a key."
     message "Ignore Case is now #{$ignorecase}"
-    refresh
+    rescan_required
   when :toggle_columns
     # FIXME: 2019-03-20 - if 3 then 1
     # adjust stact and sta, if moving from panned position
@@ -1205,6 +1260,7 @@ def toggle_menu
     x = $grows * $gviscols
     $pagesize = $pagesize == x ? $grows : x
     message "Visible columns now set to #{$gviscols}"
+    rescan_required
   when :toggle_pager_mode
     $editor_mode = !$editor_mode
     $default_command = if $editor_mode
@@ -1217,6 +1273,7 @@ def toggle_menu
   when :toggle_enhanced_list
     $enhanced_mode = !$enhanced_mode
     message "Enhanced mode is #{$long_listing}"
+    rescan_required
 
   when :toggle_long_list
     $long_listing = !$long_listing
@@ -1235,7 +1292,7 @@ def toggle_menu
       $stact = 0 # in case user was panned 2019-03-20 -
     end
     message "Long listing is #{$long_listing}, vis cols is #{$gviscols}"
-    refresh
+    rescan_required
   end
 end
 
@@ -1243,7 +1300,7 @@ def sort_menu
   lo = nil
   h = { m: :modified, a: :accessed, M: :oldest,
         l: :largest, s: :smallest, n: :name, r: :rev_name, d: :dirs, c: :clear }
-  ch, menu_text = menu 'Sort Menu', h
+  _, menu_text = menu 'Sort Menu', h
   case menu_text
   when :modified
     lo = 'om'
@@ -1266,8 +1323,10 @@ def sort_menu
   end
   ## This needs to persist and be a part of all listings, put in change_dir.
   $sorto = lo
-  $files = `zsh -c 'print -rl -- *(#{lo}#{$hidden}M)'`.split("\n") if lo
-  $title = nil
+  message "Sorted on #{menu_text}"
+  rescan_required
+  # $files = `zsh -c 'print -rl -- *(#{lo}#{$hidden}M)'`.split("\n") if lo
+  # $title = nil
   # $files =$(eval "print -rl -- ${pattern}(${MFM_LISTORDER}$filterstr)")
 end
 
@@ -1300,6 +1359,7 @@ def command_menu
   when :locate
     locate
   when :today
+    # FIXME use filterstring
     $files = `zsh -c 'print -rl -- *(#{$hidden}Mm0)'`.split("\n")
     $title = "Today's files"
   when :default_command
@@ -1316,12 +1376,13 @@ def command_menu
       $default_command = nil
     end
   end
+  # redraw
 end
 
 # This is quite badly placed and named. Maybe these should go elsewhere
 def extras
   h = { '1' => :one_column, '2' => :multi_column, :c => :columns, :r => :config_read, :w => :config_write }
-  ch, menu_text = menu 'Extras Menu', h
+  key, menu_text = menu 'Extras Menu', h
   case menu_text
   when :one_column
     $pagesize = $grows
@@ -1330,10 +1391,10 @@ def extras
     $pagesize = $grows * $gviscols
   when :columns
     print "How many columns to show: 1-6 [current #{$gviscols}]? "
-    ch = get_char
-    ch = ch.to_i
-    if ch > 0 && ch < 7
-      $gviscols = ch.to_i
+    key = get_char
+    key = key.to_i
+    if key > 0 && key < 7
+      $gviscols = key.to_i
       $pagesize = $grows * $gviscols
     end
   end
@@ -1342,7 +1403,7 @@ end
 def filter_menu
   h = { :d => :dirs, :f => :files, :e => :emptydirs, '0' => :emptyfiles,
   :r => :reduce_list, :x => :extension}
-  ch, menu_text = menu 'Filter Menu', h
+  _, menu_text = menu 'Filter Menu', h
   files = nil
   case menu_text
   when :dirs
@@ -1369,6 +1430,8 @@ def filter_menu
   if files
     $files = files
     $stact = 0
+    $message = "Filtered on #{menu_text}"
+    # redraw
   end
 end
 
@@ -1391,6 +1454,7 @@ def select_from_used_dirs
   $title = 'Used Directories'
   home = File.expand_path '~'
   $files = $used_dirs.uniq.map { |path| path.sub("#{home}", '~') }
+  # redraw
 end
 
 def select_from_visited_files
@@ -1398,6 +1462,7 @@ def select_from_visited_files
   $title = 'Visited Files'
   home = File.expand_path '~'
   $files = $visited_files.uniq.map { |path| path.sub("#{home}", '~') }
+  # redraw
 end
 
 # maybe unused ??? XXX
@@ -1416,32 +1481,28 @@ def pop_dir
   ## XXX make sure the dir exists, cuold have been deleted. can be an error or crash otherwise
   $visited_dirs.push d
   Dir.chdir d
-  $filterstr ||= 'M'
-  $files = `zsh -c 'print -rl -- *(#{$sorto}#{$hidden}#{$filterstr})'`.split("\n")
-  $files = sort_file_list $files
+  # $filterstr ||= 'M'
+  # $files = `zsh -c 'print -rl -- *(#{$sorto}#{$hidden}#{$filterstr})'`.split("\n")
+  # $files = sort_file_list $files
   post_cd
+  rescan_required
 end
 
 # after changing directory
 def post_cd
-  $patt = nil
-  $sta = $cursor = 0
-  $title = nil
-  $message = nil
+  $title = $patt = $message = nil
+  $sta = $cursor = $stact = 0
   $visual_block_start = nil
-  $stact = 0
   $current_dir = Dir.pwd # 2019-03-10 - so i don't keep doing in functions
   screen_settings
-  # i think this will screw with the dir_pos since it is not filename based.
-  enhance_file_list
-  ## added by RK 2014-03-31 - 00:29 since too many duplicates
-  $files = $files.uniq if $enhanced_mode
+
+  # goto last position cursor was in this dir
+  # THis only makes sense if called after read_directory but before redraw
   revert_dir_pos
 end
 
 ## read dirs and files and bookmarks from file
 def config_read
-  # f =  File.expand_path("~/.zfminfo")
   f = File.expand_path(CONFIG_FILE)
   return unless File.readable? f
 
@@ -1499,16 +1560,20 @@ end
 
 ## accept a character to save this dir as a bookmark
 def create_bookmark
+
   print 'Enter A to Z or 0-9 to create a bookmark: '
-  ch = get_char
-  if ch =~ /^[0-9A-Z]$/
-    # $bookmarks[ch] = "#{Dir.pwd}:#{$cursor}"
-    $bookmarks[ch] = Dir.pwd
+  print "\e[?25h" # unhide cursor
+  key = get_char
+  print "\e[?25l" # hide cursor
+  if key =~ /^[0-9A-Z]$/
+    # $bookmarks[key] = "#{Dir.pwd}:#{$cursor}"
+    $bookmarks[key] = Dir.pwd
     $modified = true
-    message "Created bookmark #{ch}"
+    message "Created bookmark #{key}"
   else
     perror 'Bookmark must be upper-case character or number.'
   end
+  # redraw
 end
 
 # allow user to exit using :q :wq :x
@@ -1519,17 +1584,18 @@ def subcommand
   begin
     command = readline
     return if command == ''
-  rescue StandardError => ex
+  rescue StandardError
     return
   end
   if command == 'q'
+    # FIXME: 2019-03-22 - should this not call quit_command ?
     if $modified
       print 'Do you want to save bookmarks? (y/n): '
-      ch = get_char
-      if ch == 'y'
+      key = get_char
+      if key == 'y'
         $writing = true
         $quitting = true
-      elsif ch == 'n'
+      elsif key == 'n'
         $quitting = true
         print 'Quitting without saving bookmarks'
       else
@@ -1556,18 +1622,19 @@ def subcommand
   else
     perror "Don't know about command #{command}. Try :h or :help"
   end
+  # redraw
 end
 
 def quit_command
   if $modified
     puts 'Press w to save bookmarks before quitting ' if $modified
     print 'Press another q to quit '
-    ch = get_char
+    key = get_char
   else
     $quitting = true
   end
-  $quitting = true if ch == 'q'
-  $quitting = $writing = true if ch == 'w'
+  $quitting = true if key == 'q'
+  $quitting = $writing = true if key == 'w'
 end
 
 def views
@@ -1579,16 +1646,21 @@ def views
   $viewctr = 0 if $viewctr > views.size
 
   $files = `zsh -c 'print -rl -- *(#{$sorto}#{$hidden}M)'`.split("\n")
+  # redraw
 end
 
 def child_dirs
-  $title = 'Child directories'
+  $title = 'Directories in current directory'
   $files = `zsh -c 'print -rl -- *(/#{$sorto}#{$hidden}M)'`.split("\n")
+  message "#{$files.size} files."
+  # redraw
 end
 
 def dirtree
-  $title = 'Child directories'
+  $title = 'Child directories with depth'
   $files = `zsh -c 'print -rl -- **/*(/#{$sorto}#{$hidden}M)'`.split("\n")
+  message "#{$files.size} files."
+  # redraw
 end
 
 #
@@ -1598,6 +1670,8 @@ def tree
   # Caution: use only for small projects, don't use in root.
   $title = 'Full Tree'
   $files = `zsh -c 'print -rl -- **/*(#{$sorto}#{$hidden}M)'`.split("\n")
+  message "#{$files.size} files."
+  # redraw
 end
 
 # lists recent files in current dir
@@ -1606,6 +1680,7 @@ def recent_files
   # print -rl -- **/*(Dom[1,10])
   $title = 'Recent files'
   $files = `zsh -c 'print -rl -- **/*(Dom[1,15])'`.split("\n").reject {|f| f[0] == '.'}
+  # redraw
 end
 
 def select_current
@@ -1622,16 +1697,20 @@ def push_used_dirs(d = Dir.pwd)
   $used_dirs.insert(0, d)
 end
 
-def pbold(text)
+def pbold text
   puts "#{BOLD}#{text}#{BOLD_OFF}"
 end
 
-def perror(text)
-  puts "#{RED}#{text}#{CLEAR}"
+# This is supposed to print on the status line
+# but prints on next line.FIXME 2019-03-24 - 00:08
+def perror text
+  clear_status_line
+  last_line
+  print "#{RED}#{text}. Press a key.#{CLEAR}"
   get_char
 end
 
-def pause(text = ' Press a key ...')
+def pause text=' Press a key.'
   print text
   get_char
 end
@@ -1707,10 +1786,10 @@ end
 #
 def ask_hint(deflt = nil)
   f = nil
-  ch = get_char
-  return deflt if ch == 'ENTER'
+  key = get_char
+  return deflt if key == 'ENTER'
 
-  ix = get_index(ch, $viewport.size)
+  ix = get_index(key, $viewport.size)
   f = $viewport[ix] if ix
   f
 end
@@ -1726,11 +1805,12 @@ def screen_settings
   $pagesize = $grows * $gviscols
 end
 
-## moves column offset so we can reach unindexed columns or entries
+## Tabs to next column in multi-column displays.
+#  Moves column offset so we can reach unindexed columns or entries,
+#  or those with double letters
 # 0 forward and any other back/prev
-# direction is 0 (forward) or 1 (backward)
-# TODO 2019-03-18 - $cursor should also move
-def column_next(direction = 0)
+# direction is 0 (forward) or '1' (backward)
+def column_next direction=0
   # right movement or panning cycles back to first column
   # leftward movement stops at first column.
   if direction == 0
@@ -1753,6 +1833,7 @@ def column_next(direction = 0)
     # We are trying to maintain offset
     $cursor += $grows if $cursor < 0
   end
+  # redraw
 end
 
 # currently i am only passing the action in from the list there as a key
@@ -1796,12 +1877,12 @@ def file_actions(action = nil)
     files = Shellwords.escape(file)
   end
 
-  ch = nil
+  key = nil
   if action
     menu_text = action
   else
-    ch, menu_text = menu "File Menu for #{text}", h
-    menu_text = :quit if ch == 'q'
+    key, menu_text = menu "File Menu for #{text}", h
+    menu_text = :quit if key == 'q'
   end
   return unless menu_text # pressed some wrong key
 
@@ -1812,9 +1893,9 @@ def file_actions(action = nil)
   when :delete
     delcommand = 'rmtrash'
     print "#{delcommand} #{text} ?[yn?]: "
-    ch = get_char
-    view_selected_files if ch == '?'
-    return if ch != 'y'
+    key = get_char
+    view_selected_files if key == '?'
+    return if key != 'y'
 
     system "#{delcommand} #{files}"
     refresh
@@ -1969,11 +2050,11 @@ def bindkey_ext_command
   print
   pbold 'Bind a capital letter to an external command'
   print 'Enter a capital letter to bind: '
-  ch = get_char
-  return if ch == 'Q'
+  key = get_char
+  return if key == 'Q'
 
-  if ch =~ /^[A-Z]$/
-    print "Enter an external command to bind to #{ch}: "
+  if key =~ /^[A-Z]$/
+    print "Enter an external command to bind to #{key}: "
     com = gets.chomp
     if com != ''
       print 'Enter prompt for command (blank if same as command): '
@@ -1982,7 +2063,7 @@ def bindkey_ext_command
     end
     print 'Pause after output [y/n]: '
     yn = get_char
-    $bindings[ch] = "command_file #{pro} #{yn} #{com}"
+    $bindings[key] = "command_file #{pro} #{yn} #{com}"
   end
 end
 
@@ -2009,6 +2090,7 @@ def ag
     return
   end
   $files = files
+  # redraw
 end
 
 def ffind
@@ -2023,6 +2105,7 @@ def ffind
   else
     $files = files
   end
+  # redraw
 end
 
 def locate
@@ -2038,6 +2121,7 @@ def locate
   else
     $files = files
   end
+  # redraw
 end
 
 ## Displays files from .viminfo file, if you use some other editor which
@@ -2051,6 +2135,7 @@ def viminfo
   # $files = `grep '^>' ~/.viminfo | cut -d ' ' -f 2- | sed "s#~#$HOME#g"`.split("\n")
   $files = `grep '^>' ~/.viminfo | cut -d ' ' -f 2- `.split("\n")
   $files.select! { |x| x = File.expand_path(x); File.exist?(x) }
+  # redraw
 end
 
 ##  takes directories from the z program, if you use autojump you can
@@ -2066,35 +2151,27 @@ def z_interface
   $files.collect! do |f|
     f.sub(/#{home}/, '~')
   end
+  # redraw
 end
 
 def vidir
   system 'vidir'
   setup_terminal
 end
-## there is no one consisten way i am getting.
-#  i need to do a shell join if I am to pipe ffiles to say: xargs ls -t
-#  but if i want to pipe names to grep xxx then i need to join with newlines
-# def pipe; end
 
 ## some cursor movement functions
-# TODO: 2019-03-18 - cursor should also be updated
-# sta is not updated when cursor > viewport.size and sta is still 0
 def cursor_scroll_dn
   moveto(pos + MSCROLL)
 end
 
-# TODO: 2019-03-18 - cursor should also be updated
 def cursor_scroll_up
   moveto(pos - MSCROLL)
 end
 
-# TODO: 2019-03-18 - cursor and sta should also be updated if page changes
 def cursor_dn
   moveto(pos + 1)
 end
 
-# TODO: 2019-03-18 - cursor and sta should also be updated if page changes
 def cursor_up
   moveto(pos - 1)
 end
@@ -2104,7 +2181,6 @@ def pos
 end
 
 # move cursor to given position/line
-# $sta should also move
 def moveto(position)
   orig = $cursor
   $cursor = position
@@ -2139,6 +2215,8 @@ def moveto(position)
     # $selected_files.concat $view[star..fin]
     add_to_selection $view[star..fin]
   end
+ensure
+  # redraw
 end
 
 # is given file in selected array
@@ -2148,6 +2226,13 @@ def selected?(file)
   return $selected_files.index file
 end
 
+# is given file in selected array
+def visited?(file)
+  $current_dir ||= Dir.pwd
+  file = File.join($current_dir, file)
+  return $visited_files.index file
+end
+
 # TODO: can be array
 def add_to_selection(file)
   ff = file
@@ -2366,8 +2451,8 @@ def remove_from_list
   unless $selected_files.empty?
     sz = $selected_files.size
     print "Remove #{sz} files from used list (y)?: "
-    ch = get_char
-    return if ch != 'y'
+    key = get_char
+    return if key != 'y'
 
     arr = $selected_files.map { |path| File.expand_path(path) }
 
@@ -2378,12 +2463,14 @@ def remove_from_list
     refresh
     return
   end
+
+  # no file selected, use file under cursor
   print
   ## what if selected some rows
   file = $view[$cursor]
   print "Remove #{file} from used list (y)?: "
-  ch = get_char
-  return if ch != 'y'
+  key = get_char
+  return if key != 'y'
 
   file = File.expand_path(file)
   if File.directory? file
@@ -2489,20 +2576,26 @@ def insert_into_list(_dir, file)
   $files.push(*file)
 end
 
-def get_important_files(dir)
+# 2019-03-23 - not exactly clear what is happening XXX
+# this gets a directory (containing '/' at end)
+def get_important_files dir
   # checks various lists like visited_files and bookmarks
   # to see if files from this dir or below are in it.
   # More to be used in a dir with few files.
   list = []
   l = dir.size + 1
+  # 2019-03-23 - i think we are getting the basename of the file
+  #  if it is present in the given directory XXX
   $visited_files.each do |e|
     list << e[l..-1] if e.index(dir) == 0
   end
-  # bookmarks have : which needs to be removed
-  # list1 = $bookmarks.values.select do |e|
-  # e.index(dir) == 0
-  # end
-  # list.concat list1
+  # bookmarks if it starts with this directory then add it
+  # FIXME it puts same directory cetus into the list with full path
+  # We need to remove the base until this dir. get relative part
+  list1 = $bookmarks.values.select do |e|
+    e.index(dir) == 0 && e != dir
+  end
+  list.concat list1
   list
 end
 
@@ -2511,13 +2604,60 @@ def message mess
   $message = mess
 end
 
-Signal.trap('EXIT') do
-  reset_terminal
-  # system 'tput rmcup'
-  exit
+def last_line
+  system "tput cup #{$glines} 0"
+end
+
+def clear_status_line
+  last_line
+  # print a colored line at bottom of screen
+  # \e[33;41m  - set color of status_line
+  # %*s        - set blank spaces for entire line
+  print "\e[33;4%sm%*s" % [$status_color || '1', $gcols, " "]
+end
+def print_on_right text
+  sz = text.size
+  system "tput cup #{$glines} #{$gcols - sz -1}"
+  print text
+end
+
+def print_last_line text
+  last_line
+  print text
+end
+
+# main loop which calls all other programs
+def run
+
+  Signal.trap('EXIT') do
+    reset_terminal
+    exit
+  end
+
+  setup_terminal
+  config_read
+
+  redraw true
+
+  # do we need this, have they changed after redraw
+  $patt = nil
+  $sta = 0
+
+  # forever loop that prints dir and takes a key
+  loop do
+
+    # moved the printing out of here
+    # TODO we need to call it from where required
+
+    key = get_char
+    resolve_key key
+    redraw rescan?
+
+    break if $quitting
+  end
+  write_curdir
+  puts 'bye'
+  config_write if $writing
 end
 
-setup_terminal
 run
-# 2019-02-20 - added so alt-screen is used
-system 'tput rmcup'

data/cetus.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'cetus'
-  spec.version       = '0.1.28'
+  spec.version       = '0.1.29'
   spec.authors       = ['Rahul Kumar']
   spec.email         = ['oneness.univ@gmail.com']
   spec.description   = %q{lightning fast file navigator}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cetus
 version: !ruby/object:Gem::Version
-  version: 0.1.28
+  version: 0.1.29
 platform: ruby
 authors:
 - Rahul Kumar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-22 00:00:00.000000000 Z
+date: 2019-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler