cetus 0.1.32 → 0.1.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97704d648638971cc77d3f7f9b22e631893f7f176013da0acd95babf9dd69db1
-  data.tar.gz: fc1759b09b662da0f31a93593d1b9eee8859503e122a84927873830bec342603
+  metadata.gz: 6ff3303709b421f3fed64413d85fc6c78e7693e3fd57f4223da67a6044a302eb
+  data.tar.gz: 414a490eb02e8aa98701b86674cf67597fca22cc144a2aedb1c5bbd0c7c37789
 SHA512:
-  metadata.gz: d9975620b45a6b2a426af50e3c6d6afe48738d69a04d090aaf71090c8e647f1fe15fd17e3780eecd3dd7b4f749904432397f71aaaf66c140d67b2035432c75a6
-  data.tar.gz: af1b12d3aa62b1f8e5a828d62bbedee51b222c71b6aab9840f44799322499c838a2ff168ca3f14ba5e09255a49246d6daebc0eba1234fe0562e74c0f7e5629cf
+  metadata.gz: ab77cb6b97de0d32f4ec89540ea0c296164d54805f9d4a83c452d9b513712e2a6a2942a4a16071e3f5fb3c2add77077e179d7c1028cd36f8a0003d357b797377
+  data.tar.gz: def9fe901b105277bedcfd6e6c6cd9fd1a41bb25771bbd6306f1c457f8f6b380a51d248081d456f864be37618f32398c41e69e1e8e1267e968473a66b2810302

data/.gitignore

@@ -30,5 +30,6 @@ tada.txt
 todo
 todo.notes
 fix.txt
+old*
 deadlink
 livelink

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-04-06 10:15
+#  Last update: 2019-04-10 10:16
 # --------------------------------------------------------------------------- #
 #  cetus.rb  Copyright (C) 2012-2019 rahul kumar
 # == CHANGELOG
@@ -39,7 +39,7 @@ require 'logger'
 # alias c=~/bin/cetus.rb
 # c
 
-VERSION = '0.1.32.0'.freeze
+VERSION = '0.1.33.0'.freeze
 CONFIG_PATH = ENV['XDG_CONFIG_HOME'] || File.join(ENV['HOME'], '.config')
 CONFIG_FILE = "#{CONFIG_PATH}/cetus/conf.yml".freeze
 
@@ -48,7 +48,7 @@ $bindings = {
   '`' => 'main_menu',
   '=' => 'toggle_menu',
   'M-s' => 'selection_menu',
-  'M-o' => 'sort_menu',
+  'M-o' => 'order_menu',
   'ENTER' => 'select_current',
   'C-p' => 'page_current',
   'C-e' => 'edit_current',
@@ -56,7 +56,7 @@ $bindings = {
   'C-s' => 'toggle_select',
   'C-r' => 'reduce',
   'C-g' => 'debug_vars',
-  '@' => 'toggle_selection_mode',
+  '*' => 'toggle_selection_mode',
   'M-a' => 'select_all',
   'M-A' => 'unselect_all',
   '!' => 'execute',
@@ -99,6 +99,8 @@ $bindings = {
   'UP' => 'cursor_up',
   'DOWN' => 'cursor_dn',
   'C-SPACE' => 'visual_mode_toggle',
+  '@' => 'scripts',
+  '#' => 'generators',
 
   '?' => 'print_help',
   'F1' => 'print_help',
@@ -209,7 +211,8 @@ end
 
 # wrap readline so C-c can be ignored, but blank is taken as default
 def readline prompt='>'
-  last_line
+  clear_last_line
+  print "\r"
   # do we need to clear till end of line, see enter_regex commented
   # unhide cursor
   print "\e[?25h"
@@ -280,6 +283,7 @@ ensure
 end
 
 ## GLOBALS
+# hints or shortcuts to get to files without moving
 $IDX = ('a'..'y').to_a
 $IDX.delete 'q'
 $IDX.concat ('za'..'zz').to_a
@@ -309,6 +313,9 @@ $pager_command = {
 $dir_position = {}
 $movement = $old_cursor = nil  # cursor movement has happened only, don't repaint
 $selection_mode = 1 # single select
+@group_dirs = true
+# truncate long filenames from :right, :left or :center.
+@truncate_from = :center
 
 ## ----------------- CONSTANTS ----------------- ##
 GMARK = '*'.freeze
@@ -397,7 +404,7 @@ def read_directory
   $filterstr ||= 'M'
   # $files = `zsh -c 'print -rl -- *(#{$sorto}#{$hidden}#{$filterstr})'`.split("\n")
   $files = list_files
-  $files = sort_file_list $files
+  $files = group_directories_first($files) if @group_dirs
   return unless $enhanced_mode
 
   enhance_file_list
@@ -426,6 +433,8 @@ def list_files dir='*', sorto=$sorto, hidden=$hidden, filter=$filterstr
            :size
          when 'n'
            :path
+         when 'x'
+           :extname
          end
 
   # sort by time and then reverse so latest first.
@@ -442,7 +451,7 @@ def list_files dir='*', sorto=$sorto, hidden=$hidden, filter=$filterstr
       if File.exist? f
         File.send(func, f)
       else
-        sys_stat(f, func)
+        sys_stat(func, f)
       end
     end
   end
@@ -458,11 +467,13 @@ def list_files dir='*', sorto=$sorto, hidden=$hidden, filter=$filterstr
 end
 # ------------- end of read_directory --------------------------------#
 
-# this is just a tempo method to deal with dead links.
-# I should be doing a system stat and parsing that
-def sys_stat file, func
+# Deal with dead links.
+def sys_stat func, file
   return unless File.symlink? file
 
+  # lstat does not respond to path and extname
+  return File.send(func, file) unless File.lstat(file).respond_to? func
+
   return File.lstat(file).send(func)
 end
 
@@ -524,7 +535,7 @@ def status_line
     cf = current_file
     $message = ' | No matches. Press ESCAPE' if $patt && !cf
 
-    clear_status_line
+    clear_last_line
 
     # Print the filename at the right side of the status_line
     # sometimes due to search, there is no file
@@ -537,12 +548,23 @@ def status_line
       end
     end
     # move to beginning of line, reset text mode after printing
-    print "\r#{v_mm}#{$patt}#{$message}\e[m"
+    # patt and message are together, no gap, why not ? 2019-04-08 -
+    if $patt && $patt != ''
+      patt = "[/#{$patt}]"
+      patt[-1] = '/i]' if $ignorecase
+    end
+    # bring cursor to start of line
+    # add background color
+    # print mode
+    # print search pattern if any
+    # print message if any
+    # print "\r#{v_mm}#{patt}#{$message}\e[m"
+    print "\r\e[33;4#{$status_color}m#{v_mm}#{patt}#{$message}\e[m"
 
 end
 
 def print_debug_info cf=current_file()
-  print_on_right "= #{$sta},#{$cursor},#{$stact},#{$viewport.size},#{$grows} | #{cf}"
+  print_on_right "len:#{cf.length}/#{$temp_wid} = #{$sta},#{$cursor},#{$stact},#{$viewport.size},#{$grows} | #{cf}"
 end
 
 # should we do a read of the dir
@@ -645,16 +667,20 @@ end
 def redraw_required(flag=true) $redraw_required = flag; end
 
 def resolve_key key
+  ret = true
   if key.match?(/^[a-pr-zZ]$/)
     # hint mode
-    select_hint $viewport, key
+    ret = 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 == ''
+  elsif '0123456789'.include? key
+    resolve_numeric_key key
   else
     resolve_binding key
   end
+  ret
 end
 
 def resolve_binding key
@@ -675,6 +701,23 @@ def resolve_binding key
   end
 end
 
+# numbers represent quick bookmarks
+# if bookmark exists, go to else create it.
+def resolve_numeric_key key
+    d = $bookmarks[key]
+    if d
+      change_dir d
+      return
+    end
+
+    set_bookmark key
+    message "Created bookmark #{key}."
+end
+
+def set_bookmark key, dir=Dir.pwd
+  $bookmarks[key] = dir
+end
+
 ## write current dir to a file so we can ccd to it when exiting
 def write_curdir
   f = File.expand_path('~/.fff_d')
@@ -719,6 +762,7 @@ def columnate ary, siz
   # if less than sz then 1 col and full width
   #
   wid = get_width ary.size, siz
+  $temp_wid = wid
 
   # ix refers to the index in the complete file list, wherease we only show 60 at a time
   ix = 0
@@ -741,7 +785,7 @@ def columnate ary, siz
         f = truncate_formatted_filename(f, unformatted_len, wid)
 
 
-      else
+      elsif unformatted_len < wid
 
         # f = f.ljust(wid)
         f << ' ' * (wid - unformatted_len)
@@ -766,15 +810,54 @@ end
 
 # shorten the filename to wid
 # unformatted_len is the length without ANSI formatting
+# wid is the exact width every line should restrict itself to.
+# f is filename with hint and space and possible ANSI codes.
+# WARN: check for hint getting swallowed in case of 5 columns
 def truncate_formatted_filename f, unformatted_len, wid
   excess = unformatted_len - wid
-  center = unformatted_len / 2
-  excess_half = excess / 2
-  point = center + excess_half
-  point1 = point - excess
-  # the space comes after the ANSI formatting
-  f = f[0..(point1 - 1)] + '$' + f[point + 2 .. -1] + ' '
-  f
+
+  f = case @truncate_from
+
+      when :right
+        # text starts at 0, or 'm' if escape code
+        sindex = f[0] == "\e" ? f.index('m') : 0
+
+        # We show exactly `wid` characters, but escapes are not displayed
+        # so add that may characters
+        # Also, remove 2 for $ and space
+        f[0..wid + sindex - 2] + "$ \e[m"
+
+      when :center
+
+        # from central point calculate how much to remove in both directions
+        center = unformatted_len / 2
+        excess_half = excess / 2
+        point = center + excess_half
+        point1 = point - excess
+
+        # remove text between point1 and point
+        f[0..(point1 - 1)] + '$' + f[point + 2..-1] + ' '
+
+      when :left
+
+        # NOTE: we cannot remove the hint
+        # for single hints we need to add extra space
+        # there could be escape codes of varying length
+        sindex = f.index ' '
+        # if f[0] == "\e"
+          # mindex = f.index('m')
+          # hintsize = sindex - mindex - 1
+        # else
+          # hintsize = sindex - 1
+        # end
+        # f[0..sindex + 1] + '<' + f[-wid + hintsize..-1] + ' '
+        @log.debug "XXX #{excess}: #{f} / #{wid}"
+        # 4 = 2 for literals, 2 to get ahead of sindex+1
+        f[0..sindex + 1] + '<' + f[sindex + 4 + excess..-1] + ' '
+        # in some cases 29/32 we are actually overlapping 2 parts above
+        #  same for 34/32
+      end
+  return f
 end
 
 def get_width arysz, siz
@@ -813,7 +896,6 @@ def format_array(ary)
   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
@@ -971,10 +1053,10 @@ def select_hint view, key
   # if x or z take a key IF there are those many
   #
   ix = get_index(key, view.size)
-  return unless ix
+  return nil unless ix
 
   f = view[ix]
-  return unless f
+  return nil unless f
 
   $cursor = $sta + ix
 
@@ -985,6 +1067,7 @@ def select_hint view, key
   else
     open_file f
   end
+  true
 end
 
 ## toggle selection state of file
@@ -1093,16 +1176,14 @@ def run_command(f)
   when String
     files = Shellwords.escape(f)
   end
-  print "Run a command on #{files}: "
   begin
     # Readline::HISTORY.push(*values)
-    command = readline
+    command = readline "Run a command on #{files}: "
     # command = gets().chomp
     return if command.empty?
 
-    print 'Second part of command: '
     # command2 = gets().chomp
-    command2 = readline
+    command2 = readline 'Second part of command: '
     puts "#{command} #{files} #{command2}"
     system "#{command} #{files} #{command2}"
     setup_terminal
@@ -1168,7 +1249,7 @@ def refresh
 end
 
 # put directories first, then files
-def sort_file_list files
+def group_directories_first files
   dirs = files.select { |f| File.directory?(f) }
   # earlier I had File? which removed links, esp dead ones
   fi   = files.select { |f| !File.directory?(f) }
@@ -1195,7 +1276,7 @@ def goto_dir
     # path = gets.chomp
     path = readline 'Enter path to go to: '
     if path.nil? || path == ''
-      clear_status_line
+      clear_last_line
       return
     end
     # rescue => ex
@@ -1235,7 +1316,7 @@ def toggle_selection_mode
   else
     $selection_mode = 2
     $mode = 'SEL'
-    message 'Typing a hint selects the file. Toggling again will clear selection.  '
+    message 'Typing a hint selects the file. Typing again will clear   .  '
   end
 end
 
@@ -1285,16 +1366,8 @@ def goto_bookmark(key = nil)
   end
   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
     if d
-      if d.index(':')
-        ix = d.index(':')
-        nextpos = d[ix + 1..-1]
-        d = d[0, ix]
-      end
-      change_dir d #, nextpos
+      change_dir d
     else
       perror "#{key} not a bookmark"
     end
@@ -1416,7 +1489,6 @@ def main_menu
     :a => :ag,
     '/' => :ffind,
     :l => :locate,
-    :V => :viminfo,
     :v => :vidir,
     :z => :z_interface,
     :d => :child_dirs,
@@ -1425,15 +1497,11 @@ def main_menu
     '2' => :select_from_used_dirs,
     :t => :dirtree,
     '4' => :tree,
-    :o => :sort_menu,
+    :o => :order_menu,
     :F => :filter_menu,
-    :c => :command_menu,
+    :c => :create_menu,
     :b => :bookmark_menu,
     :s => :selection_menu,
-    :B => :bindkey_ext_command,
-    :M => :create_a_dir,
-    '%' => :create_a_file,
-    'S' => :scripts,
     :x => :extras
   }
   menu 'Main Menu', h
@@ -1444,7 +1512,7 @@ def selection_menu
     :a => :select_all,
     :u => :unselect_all,
     :s => :toggle_select,
-    '@' => 'toggle_selection_mode',
+    '*' => 'toggle_selection_mode',
     'x' => 'visual_mode_toggle',
     :v => :view_selected_files
   }
@@ -1469,7 +1537,17 @@ def menu title, h
   # h.each_pair { |k, v| puts " #{k}: #{v}" }
   # 2019-03-09 - trying out using `column` to print in cols
   ary = []
-  h.each_pair { |k, v| ary << " #{k}: #{v}" }
+
+  # 2019-04-07 - check $bindings for shortcut and get key, add global
+  #  binding in brackets
+  h.each_pair do |k, v|
+
+    # get global binding
+    scut = $bindings.key(v.to_s)
+    scut = " (#{scut})" if scut
+
+    ary << " #{k}: #{v} #{scut}"
+  end
   x = ary.join("\n")
   puts %x{echo "#{x}" | column}
 
@@ -1486,14 +1564,19 @@ def menu title, h
 end
 
 def toggle_menu
-  h = { :h => :toggle_hidden,
-        :c => :toggle_case,
-        :l => :toggle_long_list,
+  h = { h: :toggle_hidden,
+        c: :toggle_case,
+        l: :toggle_long_list,
         '1' => :toggle_columns,
+        d: :toggle_group_dirs,
         :p => :toggle_pager_mode,
-        :d => :toggle_debug_flag,
-        :m => :toggle_selection_mode,
-        :e => :toggle_enhanced_list }
+        :D => :toggle_debug_flag,
+        '8' => :toggle_selection_mode,
+        '*' => :toggle_selection_mode,
+        v: :visual_mode_toggle,
+        t: :toggle_truncate_from,
+        :e => :toggle_enhanced_list
+  }
 
   _, menu_text = menu 'Toggle Menu', h
   return unless menu_text
@@ -1508,11 +1591,13 @@ def toggle_menu
     message "Show hidden is now #{!$hidden.nil?}"
     rescan_required
   when :toggle_case
-    # $ignorecase = $ignorecase ? "" : "i"
     $ignorecase = !$ignorecase
-    # pause "Ignore Case is now #{$ignorecase}. Press a key."
     message "Ignore Case is now #{$ignorecase}"
     rescan_required
+  when :toggle_group_dirs
+    @group_dirs = !@group_dirs
+    message "Group Dirs First is now #{@group_dirs}"
+    rescan_required
   when :toggle_columns
     if $gviscols == 1
       $gviscols = 3
@@ -1535,7 +1620,7 @@ def toggle_menu
     message "Default command is #{$default_command}"
   when :toggle_enhanced_list
     $enhanced_mode = !$enhanced_mode
-    message "Enhanced mode is #{$long_listing}"
+    message "Enhanced mode is #{$enhanced_mode}"
     rescan_required
 
   when :toggle_long_list
@@ -1558,15 +1643,32 @@ def toggle_menu
   when :toggle_debug_flag
     @debug_flag = !@debug_flag
     message "Debug flag is #{@debug_flag}"
+
+  when :toggle_truncate_from
+    # if filename exceeds width cut from which direction
+    @truncate_from = case @truncate_from
+                     when :center
+                       :left
+                     when :left
+                       :right
+                     when :right
+                       :center
+                     else
+                       :center
+                     end
   end
+  message "Truncate long filenames from: #{@truncate_from}"
 end
 
-def sort_menu
+def order_menu
   # zsh o = order, O = reverse order
   # ruby mtime/atime/ctime come reversed so we have to change o to O
   lo = nil
   h = { m: :modified, a: :accessed, M: :oldest,
-        l: :largest, s: :smallest, n: :name, r: :rev_name, d: :dirs, c: :inode,
+        s: :largest, S: :smallest, n: :name, N: :rev_name,
+        # d: :dirs,
+        c: :inode,
+        x: :extension,
         z: :clear }
   _, menu_text = menu 'Sort Menu', h
   case menu_text
@@ -1584,6 +1686,8 @@ def sort_menu
     lo = 'oL'
   when :name
     lo = 'on'
+  when :extension
+    lo = 'ox'
   when :rev_name
     lo = 'On'
   when :dirs
@@ -1597,8 +1701,17 @@ def sort_menu
   rescan_required
 end
 
+def create_menu
+  h = { f: :create_a_file,
+        d: :create_a_dir,
+        b: :create_bookmark
+  }
+  _, menu_text = menu 'Create Menu', h
+end
+
 # thse need to be placed in correct position, some do nothing
 #  and some like ffind have no menu item
+# TODO FIXME uncalled now. look into this
 def command_menu
   #  since these involve full paths, we need more space, like only one column
   ## in these cases, getting back to the earlier dir, back to earlier listing
@@ -1649,7 +1762,15 @@ 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 }
+  h = { '1' => :one_column,
+        '2' => :multi_column,
+        :c => :columns,
+        s: :scripts,
+        g: :generators,
+        :B => :bindkey_ext_command,
+        :r => :config_read,
+        :w => :config_write
+  }
   key, menu_text = menu 'Extras Menu', h
   case menu_text
   when :one_column
@@ -1716,13 +1837,14 @@ def reduce pattern=nil
     pattern = gets.chomp
   end
   $title = "Filter: pattern #{pattern}"
-  $files = $files.select {|f| f.match(pattern)}
+  $files = $files.select { |f| f.match(pattern) }
 end
 
 def filter_for_current_extension
   extn = File.extname(current_file)
   return unless extn
-  reduce extn
+
+  $files = $files.select { |f| !File.directory?(f) && extn == File.extname(f) }
 end
 
 def select_from_used_dirs
@@ -1838,7 +1960,7 @@ def create_bookmark
   # print "\e[?25l" # hide cursor
   if key =~ /^[0-9A-Z]$/
     # $bookmarks[key] = "#{Dir.pwd}:#{$cursor}"
-    $bookmarks[key] = Dir.pwd
+    set_bookmark key
     $modified = true
     message "Created bookmark #{key}"
   else
@@ -1927,7 +2049,6 @@ def child_dirs
   $title = 'Directories in current directory'
   # M is MARK_DIRS option for putting trailing slash after dir
   # $files = `zsh -c 'print -rl -- *(/#{$sorto}#{$hidden}M)'`.split("\n")
-  # $files = Dir.glob("*", File::FNM_DOTMATCH).select {|f| File.directory?(f)} - %w[ . ..]
   $files = dirs
   message "#{$files.size} directories."
   # redraw
@@ -1999,7 +2120,7 @@ end
 # 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
+  clear_last_line
   last_line
   print "#{RED}#{text}. Press a key.#{CLEAR}"
   get_char
@@ -2011,15 +2132,25 @@ def pause text=' Press a key.'
   get_char
 end
 
-## return shortcut for an index (offset in file array)
-# use 2 more arrays to make this faster
-#  if z or Z take another key if there are those many in view
-#  Also, display ROWS * COLS so now we are not limited to 60.
-def get_shortcut(ix)
-  return '<' if ix < $stact
+## return shortcut/hint for an index (offset in file array)
+# ix is the index of a file in the complete array (view)
+def get_shortcut index
 
-  ix -= $stact
-  i = $IDX[ix]
+  # Case where user has panned to the right columns:
+  # Earlier, we showed '<' in left columns, if user has panned right.
+  # Now we show unused shortcuts after exhausting them.
+  # return '<' if index < $stact
+  if index < $stact
+    index = $viewport.size - $stact + index
+    i = $IDX[index]
+    return i if i
+
+    return '['
+  end
+
+  # Normal case (user has not panned columns)
+  index -= $stact
+  i = $IDX[index]
   return i if i
 
   '->'
@@ -2030,18 +2161,44 @@ end
 #  should we even ask for a second key if there are not enough rows
 #  What if we want to also trap z with numbers for other purposes
 def get_index(key, vsz = 999)
-  i = $IDX.index(key)
-  return i + $stact if i
+  # @log.debug "Etners get_index with #{key}"
+  i = convert_key_to_index key
+  return i if i
 
-  # sz = $IDX.size
-  zch = nil
   if vsz > 25
     if key == 'z' || key == 'Z'
+      last_line
       print key
       zch = get_char
       print zch
-      i = $IDX.index("#{key}#{zch}")
-      return i + $stact if i
+      i = convert_key_to_index("#{key}#{zch}")
+      @log.debug "convert returned #{i} for #{key}#{zch}"
+      return i if i
+      # i = $IDX.index
+      # return i + $stact if i
+    end
+  end
+  nil
+end
+
+# convert pressed key to an index in viewport.
+# Earlier this was simple, but now that we put hints/shortcuts
+#  in rows on the left after panning, we need to account for cycled hints.
+def convert_key_to_index key
+  i = $IDX.index(key)
+  if i
+    # @log.debug "get_index with #{key}: #{i}. #{$stact}. #{$viewport.size}"
+    vps = $viewport.size
+    return nil if $stact == 0 && i + $stact >= vps
+    # return nil if $stact > 0 && i + $stact >= vps && i + $stact - vps >= $stact
+    return nil if $stact > 0 && i + $stact >= vps && i - vps >= 0
+
+    if i + $stact >= vps
+      # panning case, hints are recycled
+      return (i + $stact) - vps
+    else
+      # regular hint
+      return i + $stact #if i
     end
   end
   nil
@@ -2196,7 +2353,7 @@ def file_actions(action = nil)
     view_selected_files if key == '?'
     return if key != 'y'
 
-    clear_status_line
+    clear_last_line
     print "\r deleting ..."
     system "#{delcommand} #{files}"
     refresh
@@ -2427,26 +2584,13 @@ def locate
   # redraw
 end
 
-## Displays files from .viminfo file, if you use some other editor which
-# tracks files opened then you can modify this accordingly.
-# Neovim does not use viminfo
-#
-def viminfo
-  file = File.expand_path('~/.viminfo')
-  return unless File.exist? file
-  $title = 'Files from ~/.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
 #   modify this accordingly
 #
 def z_interface
   file = File.expand_path('~/.z')
   return unless File.exist? file
+
   $title = 'Directories from ~/.z'
   $files = `sort -rn -k2 -t '|' ~/.z | cut -f1 -d '|'`.split("\n")
   home = ENV['HOME']
@@ -2462,7 +2606,9 @@ def vidir
   setup_terminal
 end
 
-## some cursor movement functions
+# ------------- movement related methods --------------------------------#
+
+## scroll cursor down
 def cursor_scroll_dn
   moveto(pos + MSCROLL)
 end
@@ -2471,6 +2617,7 @@ def cursor_scroll_up
   moveto(pos - MSCROLL)
 end
 
+# move cursor down a line
 def cursor_dn
   $movement = true
   $old_cursor = $cursor
@@ -2483,6 +2630,7 @@ def cursor_up
   moveto(pos - 1)
 end
 
+# return cursor position
 def pos
   $cursor
 end
@@ -2514,6 +2662,8 @@ def moveto(position)
   fin = [orig, $cursor].max
   return unless $visual_mode
 
+  $movement = nil # visual mode needs to redraw page
+
   # PWD has to be there in selction
   if selected? current_file
     # this depends on the direction
@@ -2528,21 +2678,25 @@ def moveto(position)
 # ensure
   # redraw
 end
+# --
 
 # is given file in selected array
-def selected?(file)
+def visited?(file)
   $current_dir ||= Dir.pwd
   file = File.join($current_dir, file)
-  return $selected_files.index file
+  return $visited_files.index file
 end
 
+# ------------- selection related methods --------------------------------#
+
 # is given file in selected array
-def visited?(file)
+def selected?(file)
   $current_dir ||= Dir.pwd
   file = File.join($current_dir, file)
-  return $visited_files.index file
+  return $selected_files.index file
 end
 
+# add given file/s to selected file list
 def add_to_selection(file)
   ff = file
   case file
@@ -2569,6 +2723,7 @@ def remove_from_selection(file)
   end
 end
 
+# ------------- visual mode methods --------------------------------#
 def visual_mode_toggle
   $mode = nil
   $visual_mode = !$visual_mode
@@ -2577,6 +2732,7 @@ def visual_mode_toggle
     $visual_block_start = $cursor
     add_to_selection current_file
   end
+  message "Visual mode is #{$visual_mode}"
 end
 
 def visual_block_clear
@@ -2589,7 +2745,11 @@ def visual_block_clear
   $visual_mode = nil
 end
 
-def file_starting_with(first_char)
+# ------------- file matching methods --------------------------------#
+# this is a bit silly because it only works with lower case chars, we
+#  cannot get to files starting with numbers or uppercase since it is not
+#  called in those cases !!
+def file_starting_with first_char
   ix = return_next_match(method(:file_matching?), "^#{first_char}")
   goto_line ix if ix
 end
@@ -2619,13 +2779,14 @@ end
 ##
 # position cursor on a specific line which could be on a nother page
 # therefore calculate the correct start offset of the display also.
-def goto_line(pos)
+def goto_line pos
   pages = ((pos * 1.00) / $pagesize).ceil
   pages -= 1
   $sta = pages * $pagesize + 1
   $cursor = pos
 end
 
+# ---
 def filetype(f)
   return nil unless f
 
@@ -2668,9 +2829,7 @@ def revert_dir_pos
 end
 
 def create_a_dir
-  print
-  print 'Enter directory name: '
-  str = readline
+  str = readline 'Enter directory name: '
   return if str == ''
 
   if File.exist? str
@@ -2687,9 +2846,7 @@ def create_a_dir
 end
 
 def create_a_file
-  print
-  print 'Enter file name: '
-  str = readline
+  str = readline 'Enter file name: '
   return if str.nil? || str == ''
 
   system %($EDITOR "#{str}")
@@ -2710,47 +2867,84 @@ def current_or_selected_files
 end
 
 # ------------------- scripts ------------------ #
-# prompt for scripts to execute, giving selected file names
-# NOTE: TODO 2019-03-21 - some scripts can output a filelist to display
+# prompt for scripts to execute, giving file name under cursor
 def scripts
-  write_selected_files
   # some scripts may work with the selected_files and not want to be called
   #  with filenames.
+  write_selected_files
+
   title = 'Select a script'
   script_path = '~/.config/cetus/scripts'
-  # TODO write selected files to a known file before calling
-  binding = `find #{script_path} -type f | fzf --prompt="#{title.to_s} :"`
-  return unless binding
+  binding = `find #{script_path} -type f | fzf --prompt="#{title} :"`.chomp
+  return if binding.nil? || binding == ''
 
-  binding = binding.chomp if binding
   # TODO: check if binding is a file and executable
   # xargs only seems to take the first file
   # cf = current_or_selected_files.join('\0')
   # cf = Shellwords.join(current_or_selected_files)
-  current_or_selected_files.each do |file|
-    system %( #{binding} "#{file}" )
-  end
+  # This was getting called repeatedly even if script used selected_files
+  # current_or_selected_files.each do |file|
+    # system %( #{binding} "#{file}" )
+  # end
+
+  # 2019-04-08 - to avoid confusion, we pass name of file under cursor
+  # script may ignore this and use selected_files
+  system %( #{binding} "#{current_file}" )
+
   # system %(echo "#{cf}" | xargs #{binding})
   pause
+  redraw_required
+end
+
+# allow user to select a script that generates filenames which
+#  will be displayed for selection or action.
+def generators
+  write_selected_files
+
+  title = 'Select a generator'
+  script_path = '~/.config/cetus/generators'
+  binding = `find #{script_path} -type f | fzf --prompt="#{title} :"`.chomp
+  return if binding.nil? || binding == ''
+
+  # call generator and accept list of files
+  $title = "Files from #{File.basename(binding)}"
+  $files = `#{binding} "#{current_file}"`.split("\n")
+
 end
 # ------------- end of scripts --------------------------------#
 
 # ------------------- view_selected_files ------------------ #
 def view_selected_files
   fname = write_selected_files
+
+  unless fname
+    message "No file selected.    "
+    return
+  end
+
   system "$PAGER #{fname}"
   setup_terminal
 end
 # ------------- end of view_selected_files --------------------------------#
 
 # write selected files to a file and return path
+# if no selected files then blank out the file, or else
+# script could use old selection again.
 def write_selected_files
+
   fname = File.join(File.dirname(CONFIG_FILE), 'selected_files')
   fname = File.expand_path(fname)
 
+  # remove file if no selection
+  unless $selected_files
+    File.unlink(fname)
+    return nil
+  end
+
   File.open(fname, 'w') do |file|
     $selected_files.each { |row| file.puts row }
   end
+
   return fname
 end
 ##
@@ -3031,7 +3225,9 @@ def gfb dir, func
   # File.directory?(f) ? f + '/' : f
   # end
 end
+
 # set message which will be displayed in status line
+# TODO: maybe we should pad it 2019-04-08 -
 def message mess
   $message = mess
 end
@@ -3042,22 +3238,34 @@ def last_line
   tput_cup $glines, 0
 end
 
-def clear_status_line
+def clear_last_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, " "]
+  # \e[m       - reset text mode
+  print "\e[33;4%sm%*s\e[m" % [$status_color || '1', $gcols, " "]
 end
 
+# print right aligned
+# FIXME: if text longer then width then does not print
 def print_on_right text
   sz = text.size
-  system "tput cup #{$glines} #{$gcols - sz - 1}"
+  col = $gcols - sz - 1
+  col = 2 if col < 2
+  if sz > $gcols - 2
+    text = text[0..$gcols-3]
+  end
+  # system "tput cup #{$glines} #{$gcols - sz - 1}"
+  system "tput cup #{$glines} #{col}"
   # tput_cup $glines, $gcols - sz - 1
-  print text
+  # print text
+  print "\e[33;4#{$status_color}m#{text}\e[m"
 end
 
+# unused, should set bgcolor before printing
 def print_last_line text
+  # unused ??
   last_line
   print text
 end
@@ -3073,6 +3281,7 @@ def run
   setup_terminal
   config_read
   parse_ls_colors
+  set_bookmark '0'
 
   redraw true
   place_cursor
@@ -3085,15 +3294,26 @@ def run
   loop do
 
     key = get_char
-    resolve_key key
+
+    unless resolve_key key # key did not map to file name, so don't redraw
+      place_cursor
+      next
+    end
+
+    # only movement has happened within this page, don't redraw
     if $movement && $old_cursor
-      clear_status_line
-      print_debug_info if @debug_flag
+
       # we may want to print debug info if flag is on
+      if @debug_flag
+        clear_last_line
+        print_debug_info
+      end
+
       place_cursor
       $movement = false
       next
     end
+
     redraw rescan?
     place_cursor
 

data/cetus.gemspec

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

data/generators/viminfo

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+## Displays files from .viminfo file, if you use some other editor which
+# tracks files opened then you can modify this accordingly.
+# Neovim does not use viminfo
+file = File.expand_path('~/.viminfo')
+return unless File.exist? file
+files = `grep '^>' ~/.viminfo | cut -d ' ' -f 2- `.split("\n")
+files.select! { |x| x = File.expand_path(x); File.exist?(x) }
+files.each { |f| puts f }

data/generators/z

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+# testing z interface
+
+file = File.expand_path('~/.z')
+return unless File.exist? file
+
+# $title = 'Directories from ~/.z'
+files = `sort -rn -k2 -t '|' ~/.z | cut -f1 -d '|'`.split("\n")
+home = ENV['HOME']
+# shorten file names
+files.collect! do |f|
+  f.sub(/#{home}/, '~')
+end
+files.each { |f| puts f }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cetus
 version: !ruby/object:Gem::Version
-  version: 0.1.32
+  version: 0.1.33
 platform: ruby
 authors:
 - Rahul Kumar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-06 00:00:00.000000000 Z
+date: 2019-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,6 +53,8 @@ files:
 - Rakefile
 - bin/cetus
 - cetus.gemspec
+- generators/viminfo
+- generators/z
 homepage: http://github.com/rkumar/cetus
 licenses:
 - MIT