cetus 0.1.34 → 0.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 443d16e21b148f67cc9f5e946cd30c208849851d3f00d61654f9397608d9efc2
-  data.tar.gz: e313ebd0039f87472eff95115a56484bb2fa298e2a94783ea52bdeb804fcaeed
+  metadata.gz: 273d25acae029a8c12d1e07bd80396c7f6eeb05f6136b112be702a7cebd7a01d
+  data.tar.gz: 25891b9fc8105132be8cb4325f23767fc2abf79096b98bcee9c11a41f0ffb612
 SHA512:
-  metadata.gz: fc89827c004339856387fa481fd88ae15bf5a0d0eb0ae75fc4a7837ea055adc9f19e96b6ac128897c2655beeaedc0bdbbc72b023155b0dbd1ee9322f0ae818c1
-  data.tar.gz: b72d9d557dba6c150720362053ba247df1745c018a53c387ef857f63d2b6937931f59668b2fa2b518456a6972353f228cc975e8c760ebecf00f4a07faf1ecd8e
+  metadata.gz: 905206ed55286799c28ef2e3c9fee6fc1eedc34730ac4632138c117ce747be62da7ed377c44414ba8499f3cfc2a2b539c4fb2b868522ef9ffc775aa0528b1d43
+  data.tar.gz: 53e8235558e298e9f08dbaefd5f65fcde07a821e8052ee630db51bc74e340a56ddae0abc430028dfda702700c659686ad449c342250d4cc9a26ef5387eadb98c

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-10 11:18
+#  Last update: 2019-04-14 19:11
 # --------------------------------------------------------------------------- #
 #  cetus.rb  Copyright (C) 2012-2019 rahul kumar
 # == CHANGELOG
@@ -16,13 +16,8 @@
 # 2019-03-04 - change clear to go to 0,0 and clear down to reduce pollution
 # 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
-#  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
 
 require 'readline'
 require 'io/wait'
@@ -39,11 +34,10 @@ require 'logger'
 # alias c=~/bin/cetus.rb
 # c
 
-VERSION = '0.1.34.0'.freeze
+VERSION = '0.1.36.0'.freeze
 CONFIG_PATH = ENV['XDG_CONFIG_HOME'] || File.join(ENV['HOME'], '.config')
 CONFIG_FILE = "#{CONFIG_PATH}/cetus/conf.yml".freeze
 
-# $bindings = {}
 $bindings = {
   '`' => 'main_menu',
   '=' => 'toggle_menu',
@@ -52,7 +46,7 @@ $bindings = {
   'ENTER' => 'select_current',
   'C-p' => 'page_current',
   'C-e' => 'edit_current',
-  'C-o' => 'edit_current',
+  'C-o' => 'open_current',
   'C-s' => 'toggle_select',
   'C-r' => 'reduce',
   'C-g' => 'debug_vars',
@@ -83,7 +77,8 @@ $bindings = {
   'C-i' => 'views',
   # '?' => 'dirtree',
   'D' => 'delete_file',
-  'M' => 'file_actions most',
+  # 'M' => 'file_actions most',
+  'M' => 'move_instant',
   'q' => 'quit_command', # was Q now q 2019-03-04 -
   # "RIGHT"   => "column_next",
   'RIGHT' => 'select_current', # changed 2018-03-12 - for faster navigation
@@ -305,24 +300,31 @@ $stact = 0 # used when panning a folder to next column
 $editor_mode = false # changed 2018-03-12 - so we start in pager mode
 $enhanced_mode = true
 $visual_block_start = nil
-$pager_command = {
+PAGER_COMMAND = {
   text: 'most',
   image: 'open',
   zip: 'tar ztvf %% | most',
   unknown: 'open'
 }
 $dir_position = {}
-$movement = $old_cursor = nil  # cursor movement has happened only, don't repaint
+@movement = @old_cursor = nil  # cursor movement has happened only, don't repaint
 $selection_mode = 1 # single select
+## FLAGS
 @group_dirs = true
 # truncate long filenames from :right, :left or :center.
 @truncate_from = :center
+@filename_status_line = true
+@display_file_stats = true
+@selected_files_fullpath_flag = false
+@selected_files_escaped_flag = false
+@keys_to_clear = nil
 
 ## ----------------- CONSTANTS ----------------- ##
 GMARK = '*'.freeze
 CURMARK = '>'.freeze
 MSCROLL = 10
 SPACE = ' '.freeze
+SEPARATOR = '-------'.freeze
 CLEAR      = "\e[0m".freeze
 BOLD       = "\e[1m".freeze
 BOLD_OFF = "\e[22m".freeze
@@ -355,6 +357,7 @@ $ls_color = {
   '.zip' => MAGENTA,
   '.torrent' => GREEN,
   '.srt' => GREEN,
+  '.part' =>  "\e[40;31;01m",
   '.sh' => CYAN
 }
 # This hash contains colors for file patterns, updated from LS_COLORS
@@ -387,7 +390,8 @@ $history = []
 ## sta is where view (viewport) begins, cursor is current row/file
 $sta = $cursor = 0
 $visual_mode = false
-$status_color = 4 # status line, can be 2 3 4 5 6
+@status_color = 4 # status line, can be 2 3 4 5 6
+@status_color_right = 8 # status line right part
 
 # 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 "
@@ -511,14 +515,25 @@ def print_title
 
   # print 1 of n files, sort order, filter etc details
   $title ||= Dir.pwd.sub(ENV['HOME'], '~')
+
+  # Add bookmark next to name of dir, if exists
+  bm = $bookmarks.key(Dir.pwd)
+  bm = " ('#{bm})" if bm
+
   fin = $sta + $viewport.size
   fl = $view.size
-  if fl.zero?
-    t = "#{$title}  No files."
-  else
-    t = "#{$title}  #{$sta + 1} to #{fin} of #{fl}  #{$sorto} F:#{$filterstr}"
+
+  # fix count of entries so separator and enhanced entries don't show up
+  if $enhanced_mode
+    ix = $viewport.index SEPARATOR
+    fin = $sta + ix if ix
+
+    ix = $view.index SEPARATOR
+    fl = ix if ix
   end
 
+  t = fl.zero? ? "#{$title}#{bm}  No files." : "#{$title}#{bm}  #{$sta + 1} to #{fin} of #{fl}  #{$sorto} F:#{$filterstr}"
+
   # don't exceed columns while printing
   t = t[t.size - $gcols..-1] if t.size >= $gcols
 
@@ -530,6 +545,7 @@ end
 # TODO: clean this up and simplify it
 # NOTE: earlier this was called on every key (up-arow down arrow, now only
 # called when page changes, so we only put directory name)
+# NOTE: called only from draw_directory.
 def status_line
     # prompt
     v_mm = $mode ? "[#{$mode}] " : ''
@@ -538,14 +554,15 @@ def status_line
 
     clear_last_line
 
-    # Print the filename at the right side of the status_line
+    # Print the filename at the right side of the status line
     # sometimes due to search, there is no file
     if cf
       if @debug_flag
         # XXX this will not work on file basis FIXME
         print_debug_info cf
       else
-        print_on_right "#{Dir.pwd}"
+        # print_on_right "#{Dir.pwd}"
+        print_filename_status_line if @filename_status_line
       end
     end
     # move to beginning of line, reset text mode after printing
@@ -560,7 +577,7 @@ def status_line
     # 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"
+    print "\r\e[33;4#{@status_color}m#{v_mm}#{patt}#{$message}\e[m"
 
 end
 
@@ -568,6 +585,25 @@ def print_debug_info cf=current_file()
   print_on_right "len:#{cf.length}/#{$temp_wid} = #{$sta},#{$cursor},#{$stact},#{$viewport.size},#{$grows} | #{cf}"
 end
 
+def print_filename_status_line cf=current_file
+  if @display_file_stats
+    ff = if cf[0] == '~'
+           File.expand_path(cf)
+         else
+           cf
+         end
+
+    mtime = if !File.exist? ff
+              # take care of dead links lstat TODO
+              date_format(File.lstat(ff).mtime) if File.symlink?(ff)
+            else
+              date_format(File.stat(ff).mtime)
+            end
+  end
+  # print size and mtime only if more data requested.
+  print_on_right "| #{mtime} | #{cf}".rjust(40)
+end
+
 # should we do a read of the dir
 def rescan?
   $rescan_required
@@ -640,26 +676,27 @@ end
 # clear the earlier position when we move.
 # Currently not using until I can implement chgat here.
 def clear_cursor
-  return unless $old_cursor
+  return unless @old_cursor
 
-  hint = get_shortcut($old_cursor)
-  if $old_cursor < $grows
+  hint = get_shortcut(@old_cursor)
+  if @old_cursor < $grows
     # FIXME: faster way of getting here ? see fff
-    # system "tput cup #{$old_cursor + 2} 0"
-    tput_cup $old_cursor, 0
+    # system "tput cup #{@old_cursor + 2} 0"
+    tput_cup @old_cursor, 0
     # print "#{CURSOR_COLOR}#{hint} >#{CLEAR}"
     print "#{hint}  "
     return
   end
   wid = get_width $viewport.size, $grows
-  rows = $old_cursor % $grows
-  cols = ($old_cursor / $grows) * wid
+  rows = @old_cursor % $grows
+  cols = (@old_cursor / $grows) * wid
   # system "tput cup #{rows + 2} #{cols}"
   tput_cup rows, cols
   # print "#{CURSOR_COLOR}#{hint} >#{CLEAR}"
   print "#{hint}  "
 end
 
+# place cursor on row and col taking first two rows into account
 def tput_cup row, col
   # we add 3: 2 is for the help and directory line. 1 is since tput is 1 based
   print "\e[#{row + 3};#{col + 1}H"
@@ -669,6 +706,8 @@ def redraw_required(flag=true) $redraw_required = flag; end
 
 def resolve_key key
   ret = true
+  clear_message
+
   if key.match?(/^[a-pr-zZ]$/)
     # hint mode
     ret = select_hint $viewport, key
@@ -852,7 +891,7 @@ def truncate_formatted_filename f, unformatted_len, wid
           # hintsize = sindex - 1
         # end
         # f[0..sindex + 1] + '<' + f[-wid + hintsize..-1] + ' '
-        @log.debug "XXX #{excess}: #{f} / #{wid}"
+        # @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
@@ -898,10 +937,18 @@ def format_array(ary)
   ctr = 0
   ary.each do |f|
     ## ctr refers to the index in the column
-    ind = get_shortcut(ix)
     mark = SPACE
-    mark = '+' if visited? f
     cur = SPACE
+    ind = get_shortcut(ix)
+
+
+    # Handle separator before enhanced file list.
+    # We do lost a shortcut
+    if f == SEPARATOR
+      ind = cur = mark = '-'
+    end
+
+    mark = '+' if visited? f
     # cur = CURMARK if ix + $sta == $cursor # 2019-03-29 - removed reduced calls
     # NOTE seems like f and ary[ix] are the same
     mark = GMARK if selected?(ary[ix])
@@ -952,6 +999,8 @@ end
 
 # determine color for a filename based on extension, then pattern, then filetype
 def color_for fname
+  return nil if fname == SEPARATOR
+
   extension = File.extname(fname)
   color = $ls_color[extension]
   return color if color
@@ -1050,20 +1099,20 @@ end
 
 ## select file based on key pressed
 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(key, view.size)
   return nil unless ix
 
   f = view[ix]
   return nil unless f
+  return nil if f == SEPARATOR
 
   $cursor = $sta + ix
 
   if $mode == 'SEL'
     toggle_select f
   elsif $mode == 'COM'
+    # not being called any longer I think
     run_command f
   else
     open_file f
@@ -1103,19 +1152,8 @@ def open_file(f)
     change_dir f #, nextpos
   elsif File.readable? f
     # TODO: looks complex pls simplify !! XXX
-    $default_command ||= '$PAGER'
-    if !$editor_mode
-      ft = filetype f
-      if ft
-        comm = $pager_command[ft]
-      else
-        comm = $pager_command[File.extname(f)]
-        comm ||= $pager_command['unknown']
-      end
-    else
-      comm = $default_command
-    end
-    comm ||= $default_command
+    comm = opener_for f
+    # '%%' will be substituted with the filename. See zip
     comm = if comm.index('%%')
              comm.gsub('%%', Shellwords.escape(f))
            else
@@ -1125,6 +1163,7 @@ def open_file(f)
     reset_terminal
     system(comm.to_s)
     setup_terminal
+    # XXX maybe use absolute_path instead of hardcoding
     f = Dir.pwd + '/' + f if f[0] != '/'
     $visited_files.insert(0, f)
     push_used_dirs Dir.pwd
@@ -1148,9 +1187,15 @@ def edit_current
   $visited_files.insert(0, current_file)
 end
 
+def open_current
+  opener = /darwin/ =~ RUBY_PLATFORM ? 'open' : 'xdg-open'
+  run_on_current opener
+  $visited_files.insert(0, current_file)
+end
+
 # run given command on current file
 def run_on_current(command)
-  f = $view[$cursor]
+  f = current_file
   return unless f
   f = File.expand_path(f)
   return unless File.readable?(f)
@@ -1163,40 +1208,39 @@ def run_on_current(command)
   setup_terminal
 end
 
-## run command on given file/s
-#   Accepts command from user
+## run system command on given file/s
+#   Accepts external command from user
 #   After putting readline in place of gets, pressing a C-c has a delayed effect.
 #   It goes into exception block after executing other commands and still
 #   does not do the return !
 def run_command(f)
-  files = nil
-  case f
-  when Array
-    # escape the contents and create a string
-    files = Shellwords.join(f)
-  when String
-    files = Shellwords.escape(f)
-  end
+  files = Shellwords.join(f)
+  count = f.count
+  text = if count > 1
+           "#{count} files"
+         else
+           files[0..40]
+         end
   begin
-    # Readline::HISTORY.push(*values)
-    command = readline "Run a command on #{files}: "
-    # command = gets().chomp
+    command = readline "Run a command on #{text}: "
     return if command.empty?
 
     # command2 = gets().chomp
     command2 = readline 'Second part of command: '
-    puts "#{command} #{files} #{command2}"
+    pause "#{command} #{files} #{command2}"
+
+    reset_terminal
     system "#{command} #{files} #{command2}"
     setup_terminal
   rescue StandardError => ex
-    perror "Canceled command, (#{ex}) press a key"
+    perror "Canceled or failed command, (#{ex}) press a key."
+    @log.warn "RUNCOMMAND: #{ex.to_s}"
     return
   end
 
   refresh
-  puts 'Press a key ...'
   push_used_dirs Dir.pwd
-  get_char
+  # should we clear selection also ?
 end
 
 ## cd to a dir.
@@ -1243,6 +1287,7 @@ def escape
 end
 
 ## refresh listing after some change like option change, or toggle
+# Should we check selected_files array also for deleted/renamed files
 def refresh
   $patt = nil
   $title = nil
@@ -1263,7 +1308,7 @@ def unselect_all
   $visual_mode = nil
 end
 
-## select all files
+## select all entries (files and directories)
 def select_all
   dir = Dir.pwd
   $selected_files = $view.map { |file| File.join(dir, file) }
@@ -1340,7 +1385,7 @@ def goto_parent_dir
 end
 
 def goto_home_dir
-  change_dir '~'
+  change_dir ENV['HOME']
 end
 
 
@@ -1374,14 +1419,14 @@ def next_page
   $cursor += $pagesize
   $sta = $cursor if $sta > $cursor
   $stact = 0
-  $old_cursor = nil
+  @old_cursor = nil
   redraw_required
 end
 
 def prev_page
   $sta -= $pagesize
   $cursor -= $pagesize
-  $old_cursor = nil
+  @old_cursor = nil
   # FIXME: check cursor sanity and if not changed then no redraw
   redraw_required
 end
@@ -1447,7 +1492,9 @@ def debug_vars
     file.puts "pagesize       #{$pagesize}"
     file.puts "view.size      #{$view.size}"
     file.puts "grows          #{$grows}"
-    file.puts "file   #{current_file}"
+    file.puts "File: #{current_file}"
+    file.puts
+    file.puts "Opener: #{opener_for(current_file)}"
     file.puts
     file.puts `file "#{current_file}"`
     file.puts
@@ -1457,7 +1504,7 @@ def debug_vars
 end
 
 def view_bookmarks
-  puts
+  clear_last_line
   puts 'Bookmarks: '
   $bookmarks.each_pair { |k, v| puts "#{k.ljust(7)}  =>  #{v}" }
   puts
@@ -1515,7 +1562,7 @@ end
 def menu title, h
   return unless h
 
-  last_line # 2019-03-30 - required since cursor is not longer at bottom
+  clear_last_line # 2019-03-30 - required since cursor is not longer at bottom
   pbold title.to_s
   # h.each_pair { |k, v| puts " #{k}: #{v}" }
   # 2019-03-09 - trying out using `column` to print in cols
@@ -1993,6 +2040,8 @@ def subcommand
     $writing = true if $modified
   elsif command == 'e'
     edit_current
+  elsif command == 'o'
+    open_current
   elsif command == 'h' or command == 'help' or command == '?'
     print_help
   elsif command == 'p'
@@ -2105,7 +2154,7 @@ end
 # but prints on next line.FIXME 2019-03-24 - 00:08
 def perror text
   clear_last_line
-  print "\r#{RED}#{text}. Press a key.#{CLEAR}"
+  puts "\r#{RED}#{text}. Press a key.#{CLEAR}"
   get_char
 end
 
@@ -2155,7 +2204,7 @@ def get_index(key, vsz = 999)
       zch = get_char
       print zch
       i = convert_key_to_index("#{key}#{zch}")
-      @log.debug "convert returned #{i} for #{key}#{zch}"
+      # @log.debug "convert returned #{i} for #{key}#{zch}"
       return i if i
       # i = $IDX.index
       # return i + $stact if i
@@ -2172,9 +2221,14 @@ def convert_key_to_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
+    # TODO: if very high key given, consider going to last file ?
+    #  that way one can press zz or ZZ to go to last file.
+    # 2019-04-11 - XXX actually this doesnt place the cursor on last file
+    #  it opens it, which may not be what we want
+    retnil = nil # vps - 1 # nil
+    return retnil 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
+    return retnil if $stact > 0 && i + $stact >= vps && i - vps >= 0
 
     if i + $stact >= vps
       # panning case, hints are recycled
@@ -2191,6 +2245,71 @@ def delete_file
   file_actions :delete
 end
 
+def move_instant
+  # FIXME: cannot be in target directory and do auto update
+
+  if $selected_files.empty?
+    target = readline "Enter target directory for moving files (#{@move_target}):"
+    return unless target
+    return if target == '' && @move_target.nil?
+
+    # take default value if user presses Enter
+    target = @move_target if target == ''
+    return unless target
+
+    # current dir if dot pressed FIXME you cannot move to current dir !!!
+    target = Dir.pwd if target == '.'
+    target = File.expand_path(target)
+    unless File.directory? target
+      perror "#{target} not a directory."
+      return
+    end
+    begin
+      f = current_file
+      FileUtils.mv f, target
+      @move_target = target
+      message "#{f} moved to #{File.basename(target)}. Target set."
+      @log.info "1.#{f} moved to #{target}."
+    rescue StandardError => exc
+      @log.warn "Case 1:"
+      @log.warn "Target is #{target}, file was #{f}"
+      @log.warn exc.to_s
+    end
+    refresh
+    return
+  end
+
+  # files selected. Use earlier target if there, else ask
+  target = @move_target
+  if target.nil? || target == ''
+    target = readline "Enter directory for moving files #{@move_target}:"
+    return unless target
+  end
+  target = File.expand_path(target)
+  unless File.directory? target
+    perror "#{target} not a directory."
+    return
+  end
+
+  files = $selected_files
+  # todo: shellwords
+  ccount = 0
+  files.each do |f|
+    FileUtils.mv f, target
+    @log.info "2.#{f} moved to #{target}."
+    ccount += 1
+  rescue StandardError => exc
+    @log.warn "Case 2:"
+    @log.warn "Target is #{target}, file was #{f}"
+    @log.warn exc.to_s
+    perror exc.to_s
+  end
+  @move_target = target
+  clean_selected_files
+  message "#{ccount} files moved to #{target}."
+  refresh
+end
+
 ## generic external command program
 #  prompt is the user friendly text of command such as list for ls, or extract for dtrx, page for less
 #  pauseyn is whether to pause after command as in file or ls
@@ -2220,7 +2339,7 @@ end
 
 ## prompt user for file shortcut and return file or nil
 #
-def ask_hint(deflt = nil)
+def ask_hint deflt=nil
   f = nil
   key = get_char
   return deflt if key == 'ENTER'
@@ -2279,43 +2398,53 @@ end
 # 2019-03-08 - TODO when a file name changes or moves it must be removed
 #  from selection
 def file_actions(action = nil)
-  # only add dtrx for gz
-  h = { d: :delete, D: '/bin/rm', m: :move, r: :rename, v: ENV['EDITOR'] || :vim,
-        c: :copy, C: :chdir, W: :remspace, e: :execute, s: :page_stat_for_file,
-        l: :less, p: :most, f: :file, o: :open, x: :dtrx, z: :zip }
-  # acttext = h[action.to_sym] || action
-  acttext = action || ''
-  file = nil
-
-  sct = $selected_files.size
-  if sct > 0
-    text = "#{sct} files"
-    file = $selected_files
-  else
-    # 2019-03-07 - trying out direct deletes
-    # why were we aksing to select a file when user is on a file
-    # print "[#{acttext}] Choose a file [#{$view[$cursor]}]: "
-    # file = ask_hint $view[$cursor]
-    file = $view[$cursor]
-    unless file
-      file = ask_hint $view[$cursor]
+  h = { d: :delete, D: '/bin/rm', m: :move, v: ENV['EDITOR'] || :vim,
+        c: :copy, e: :execute,
+        l: :less, p: :most, o: :open }
+
+  rbfiles = current_or_selected_files # use with ruby FileUtils
+  return if rbfiles.nil? || rbfiles.empty?
+
+  count = rbfiles.count
+  first = rbfiles.first
+  if count == 1
+    h[:r] = :rename
+
+    # add chdir if dir of file under cursor is not same as current dir
+    h[:C] = :chdir if File.dirname(File.expand_path(first)) != Dir.pwd
+
+    h[:s] = :page_stat_for_file
+    h[:f] = :file
+    if filetype(first) == :zip
+      h[:x] = :dtrx
+      h[:u] = :unzip
     end
-    return unless file
+    h[:g] = if File.extname(first) == '.gz'
+              :gunzip
+            else
+              :gzip
+            end
 
-    text = file
   end
-  # 2019-03-07 - NOTE at this point file can be one or more files.
-  # 2019-03-07 - text can be a file or count of files, so unreliable !!! FIXME
+  h[:M] = :set_move_target if File.directory?(current_file)
+  h[:z] = :zip unless filetype(first) == :zip
 
-  case file
-  when Array
-    # escape the contents and create a string
-    files = Shellwords.join(file)
-  when String
-    files = Shellwords.escape(file)
-  end
+  # if first file has spaces then add remspace method
+  # TODO: put this in scripts
+  # take care that directories can have spaces
+  h[:W] = :remspace if File.basename(first).index ' '
+
+  text = count == 1 ? File.basename(first) : "#{count} files"
+  shfiles = Shellwords.join(rbfiles)
+
+  # --------------------------------------------------------------
+  # Use 'text' for display
+  # Use 'shfiles' for system actions, these are escaped
+  # Use 'rbfiles' for looping and ruby FileUtils, system commands can bork on unescaped names
+  # Use 'count' for how many files, in case of single file operation.
+  # --------------------------------------------------------------
 
-  key = nil
+  # if no action passed, then ask for action
   if action
     menu_text = action
   else
@@ -2330,7 +2459,7 @@ def file_actions(action = nil)
 
   when :delete
     delcommand = 'rmtrash'
-    last_line
+    clear_last_line
     print "#{delcommand} #{text} ? [yn?]: "
     key = get_char
     view_selected_files if key == '?'
@@ -2338,119 +2467,176 @@ def file_actions(action = nil)
 
     clear_last_line
     print "\r deleting ..."
-    system "#{delcommand} #{files}"
+    system "#{delcommand} #{shfiles}"
+    message "Deleted #{text}."
     refresh
 
   when :move
-    # 2019-03-07 - NOTE this will only work with single file selection
-    # target = gets().chomp
-    # target = Readline.readline('>', true)
-    target = readline "Move #{text} to : "
+    # multiple files can only be moved to a directory
+    default = @move_target.nil? ? '.' : @move_target
+    target = readline "Move #{text} to (#{default}): "
     return unless target
 
-    target = '.' if target == ''
-    # 2019-03-07 - NOTE cannot use text if multiple files
-    # text = File.expand_path(text)
+    target = default if target == ''
     target = File.expand_path(target)
     return if target == ''
 
-    if File.directory? target
-      begin
-        FileUtils.mv file, target
-        message "Moved #{text} to #{target}"
-      rescue StandardError => exc
-        perror exc.to_s
-      end
-      # 2019-03-08 - TODO if success remove from selection
-      refresh
-    else
-      perror 'Target not a dir'
+    if count > 1 && !File.directory?(target)
+      perror 'Move target must be a directory for multiple files.'
+      return
     end
 
+    if count == 1 && !File.directory?(target) && File.exist?(target)
+      perror "Target #{target} exists."
+      return
+    end
+
+    begin
+      FileUtils.mv rbfiles, target
+      message "Moved #{text} to #{target}."
+    rescue StandardError => exc
+      @log.warn "C-x move: #{exc.to_s}."
+      @log.warn "MOVE: files: #{rbfiles}, target:#{target}"
+      perror exc.to_s
+    end
+    # 2019-03-08 - TODO if success remove from selection
+    refresh
+
   when :copy
-    # Target must be directory
-    target = readline "Copy #{text} to : "
+    # Target must be directory for multiple files.
+    # NOTE: target should not be same as source dir but there can be files
+    #  from multiple directories
+    default = @move_target.nil? ? '.' : @move_target
+    target = readline "Copy #{text} to (#{default}): "
     return unless target # C-c
 
-    target = '.' if target == ''
+    target = default if target == ''
     target = File.expand_path(target)
     return if target == ''
 
-    if File.directory? target
-      begin
-        FileUtils.cp file, target
-        message "Copied #{text} to #{target}"
-      rescue StandardError => exc
-        perror exc.to_s
-      end
-      refresh
-    else
-      perror 'Copy target must be a dir'
+    if count > 1 && !File.directory?(target)
+      perror 'Copy target must be a directory for multiple files.'
+      return
     end
 
+    if count == 1 && !File.directory?(target) && File.exist?(target)
+      perror "Target #{target} exists."
+      return
+    end
+
+    begin
+      FileUtils.cp rbfiles, target
+      message "Copied #{text} to #{target}."
+    rescue StandardError => exc
+      perror exc.to_s
+    end
+    refresh
+
   when :chdir
-    change_dir File.dirname(text)
+    # will only work if one selected. Check this out
+    # This works if you have searched for files and got a list
+    #  with different paths.
+    #  This should not be shown in regular listings XXX
+    if count == 1
+      change_dir File.dirname(File.expand_path(rbfiles.first))
+    end
+
+  when :set_move_target
+    set_move_target current_file
 
   when :zip
-    # target = gets().chomp
+
     target = readline 'Archive name: '
     return unless target
     return if target == ''
 
-    # don't want a blank space or something screwing up
-    if target && target.size > 3
-      if File.exist? target
-        perror "Target (#{target}) exists"
-      else
-        system "tar zcvf #{target} #{files}"
-        setup_terminal
-        refresh
-      end
+    if File.exist? target
+      perror "Target (#{target}) exists"
+      return
+    end
+    if target && target.size < 4
+      perror 'Use target of more than 4 characters.'
+      return
     end
 
+    # convert absolute paths to relative ones in this zip
+    require 'pathname'
+    base = Pathname.new Dir.pwd
+    relfiles = rbfiles.map {|f| p = Pathname.new(f); p.relative_path_from(base) }
+    zfiles = Shellwords.join relfiles
+
+    # the problem with zip is that we have full paths
+    # so the zip file has full paths and extraction sucks
+
+    # pause "(#{target}).zipping #{relfiles.count}: #{zfiles}"
+    system "tar zcvf #{target} #{zfiles}"
+    message "Created #{target} with #{relfiles.count} files."
+    setup_terminal
+    refresh
+
   when :rename
-    # 2019-03-07 NOTE works for single file FIXME
-    # 2019-03-07 - TODO for n files replace pattern with string
+    if count > 1
+      perror 'Select only one file for rename.'
+      return
+    end
+
     target = readline "Rename #{text} to : "
-    return if target == ''
+    return if target == '' || target == '.' || target == '..'
 
-    text = File.expand_path(text)
-    target = File.basename(text) if target == '.'
+    # file = File.expand_path(files)
+    # target = File.basename(file) if target == '.'
     if File.exist? target
-      perror "Target (#{target}) exists"
-    else
-      FileUtils.mv text, target
-      refresh
+      perror "Target (#{target}) exists."
+      return
+    end
+
+    begin
+      FileUtils.mv first, target
+      message "Renamed #{first} to #{target}."
+    rescue StandardError => exc
+      @log.warn exc.to_s
+      @log.warn "RENAME: files: #{first}, target:#{target}"
+      pause exc.to_s
     end
+    refresh
+
   when :most, :less, :vim
-    system "#{menu_text} #{files}"
+
+    system "#{menu_text} #{shfiles}"
     setup_terminal
     # should we remove from selection ?
 
   when :remspace
-    # 2019-03-08 - 00:07 added replace space with underscore in filename
-    print "Remove spaces from #{file}"
-    pause
-    farray = nil
-
-    # stupidly using one variable for scalar and array DUH !
-    case file
-    when String
-      farray = [file]
-    when Array
-      farray = file
-    end
+    # replace space with underscore in filename
+    # Issue. in many cases directory may have spaces,
+    #  so we are using basename only. So use in one directory.
+    #  TODO: move to script
+    clear_last_line
+    pause "Remove spaces from #{text}."
 
-    farray.each do |f|
-      if f.index ' '
-        nname = f.tr(' ', '_')
-        FileUtils.mv f, nname unless File.exist? nname
-        # if success then remove from selection
+    ccount = 0
+    rbfiles.each do |name|
+      f = File.basename(name)
+      next unless File.exist?(f)
+      next unless f.index ' '
+
+      target = f.tr(' ', '_')
+      next if File.exist? target
+
+      begin
+        FileUtils.mv f, target
+        ccount += 1
+      rescue StandardError => exc
+        @log.warn "REMSPACE: #{exc.to_s}"
+        perror exc.to_s
       end
     end
+    message "Renamed #{ccount} files."
     refresh
+
   when :execute
     execute
+
   when :page_stat_for_file
     1
     # already been executed by menu
@@ -2458,21 +2644,38 @@ def file_actions(action = nil)
   else
     return unless menu_text
 
-    @log.debug "#{menu_text} #{files}"
-    last_line
-    pause "#{menu_text} #{files}"
-    system "#{menu_text} #{files}"
+    clear_last_line
+    pause "#{menu_text} #{shfiles} "
+    system "#{menu_text} #{shfiles}"
+    pause # putting this back 2019-04-13 - file doesn't show anything
+    message "Ran #{menu_text}."
     setup_terminal
     refresh
   end
 
-  # remove non-existent files from select list due to move or delete
-  #  or rename or whatever
-  if sct > 0
-    $selected_files.select! { |x| x = File.expand_path(x); File.exist?(x) }
-  end
+  return if count == 0
+
+  clean_selected_files
+
+end
+
+# remove non-existent files from select list due to move or delete
+#  or rename or whatever
+def clean_selected_files
+  $selected_files.select! { |x| x = File.expand_path(x); File.exist?(x) }
+end
+
+# set the default target for further moves
+# We need to also be able to set it to current dir in which user is. TODO
+def set_move_target cf=current_file
+  ff = File.expand_path(cf)
+  return unless File.directory? ff
+
+  @move_target = ff
+  message "Move target set to #{cf}."
 end
 
+
 # increase or decrease column
 def columns_incdec(howmany)
   $gviscols += howmany.to_i
@@ -2505,11 +2708,7 @@ end
 
 # execute a command on selected or current file
 def execute
-  if $selected_files.empty?
-    run_command current_file
-    return
-  end
-  run_command $selected_files
+  run_command current_or_selected_files
 end
 
 def ag
@@ -2593,23 +2792,25 @@ end
 
 ## scroll cursor down
 def cursor_scroll_dn
+  @movement = :down
   moveto(pos + MSCROLL)
 end
 
 def cursor_scroll_up
+  @movement = :up
   moveto(pos - MSCROLL)
 end
 
 # move cursor down a line
 def cursor_dn
-  $movement = true
-  $old_cursor = $cursor
+  @movement = :down
+  @old_cursor = $cursor
   moveto(pos + 1)
 end
 
 def cursor_up
-  $old_cursor = $cursor
-  $movement = true
+  @old_cursor = $cursor
+  @movement = :up
   moveto(pos - 1)
 end
 
@@ -2619,11 +2820,19 @@ def pos
 end
 
 # move cursor to given position/line
-def moveto(position)
+def moveto position
   orig = $cursor
   $cursor = position
   $cursor = [$cursor, $view.size - 1].min
   $cursor = [$cursor, 0].max
+
+  # try to stop it from landing on separator
+  if current_file == SEPARATOR
+    $cursor += 1 if @movement == :down
+    $cursor -= 1 if @movement == :up
+    return
+  end
+
   # 2019-03-18 - adding sta
   # $sta = position - only when page flips and file not visible
   # FIXME not correct, it must stop at end or correctly cycle
@@ -2639,13 +2848,13 @@ def moveto(position)
     # $sta = $cursor
   end
 
-  $movement = nil if oldsta != $sta # we need to redraw
+  @movement = nil if oldsta != $sta # we need to redraw
 
   star = [orig, $cursor].min
   fin = [orig, $cursor].max
   return unless $visual_mode
 
-  $movement = nil # visual mode needs to redraw page
+  @movement = nil # visual mode needs to redraw page
 
   # PWD has to be there in selction
   if selected? current_file
@@ -2658,6 +2867,7 @@ def moveto(position)
     # $selected_files.concat $view[star..fin]
     add_to_selection $view[star..fin]
   end
+  message "#{$selected_files.count} files selected.   "
 # ensure
   # redraw
 end
@@ -2715,9 +2925,10 @@ def visual_mode_toggle
     $visual_block_start = $cursor
     add_to_selection current_file
   end
-  message "Visual mode is #{$visual_mode}"
+  message "Visual mode is #{$visual_mode}."
 end
 
+# Called from Escape key only. Clears selection.
 def visual_block_clear
   if $visual_block_start
     star = [$visual_block_start, $cursor].min
@@ -2726,6 +2937,7 @@ def visual_block_clear
   end
   $visual_block_start = nil
   $visual_mode = nil
+  $mode = nil if $mode == 'VIS'
 end
 
 # ------------- file matching methods --------------------------------#
@@ -2771,27 +2983,44 @@ def goto_line pos
   $cursor = pos
 end
 
-# ---
-def filetype(f)
+# return filetype of file using `file` external command.
+# NOTE: Should we send back executable as separate type or allow
+#  it to be nil, so it will be paged.
+def filetype f
   return nil unless f
 
   f = Shellwords.escape(f)
   s = `file #{f}`
-  if s.index 'text'
-    return :text
-  elsif s.index(/[Zz]ip/)
-    return :zip
-  elsif s.index('archive')
-    return :zip
-  elsif s.index 'image'
-    return :image
-  elsif s.index 'data'
-    return :text
-  end
+  return :text if s.index 'text'
+  return :zip if s.index(/[Zz]ip/)
+  return :zip if s.index('archive')
+  return :image if s.index 'image'
+  return :text if s.index 'data'
 
   nil
 end
 
+def opener_for f
+  # by default, default command is nil. Changed in toggle_pager_mode
+  $default_command ||= '$PAGER'
+  # by default mode, is false, changed in toggle_pager_mode
+  # Get filetype, and check for command for type, else extn else unknown
+  if !$editor_mode
+    ft = filetype f
+    comm = PAGER_COMMAND[ft] if ft
+    comm ||= PAGER_COMMAND[File.extname(f)]
+    comm ||= PAGER_COMMAND[:unknown]
+  else
+    # 2019-04-10 - what does this mean, that in editor_mode, editor
+    # opens everything? what of images etc
+    # TODO use editor only for text, otherwise use filetype or another hash
+    # like editor_command
+    comm = $default_command
+  end
+  comm ||= $default_command
+  comm
+end
+
 # save offset in directory so we can revert to it when we return
 def save_dir_pos
   # the next line meant that it would not save first directory.
@@ -2846,7 +3075,7 @@ def current_file
 end
 
 def current_or_selected_files
-  return $selected_files if $selected_files.size > 0
+  return $selected_files if !$selected_files.empty?
 
   return [current_file]
 end
@@ -2874,11 +3103,13 @@ def scripts
 
   # 2019-04-08 - to avoid confusion, we pass name of file under cursor
   # script may ignore this and use selected_files
+  reset_terminal
   system %( #{binding} "#{current_file}" )
 
   # system %(echo "#{cf}" | xargs #{binding})
   pause
-  redraw_required
+  setup_terminal
+  refresh
 end
 
 # allow user to select a script that generates filenames which
@@ -2917,17 +3148,32 @@ end
 # script could use old selection again.
 def write_selected_files
 
-  fname = File.join(File.dirname(CONFIG_FILE), 'selected_files')
+  require 'pathname'
+  # fname = File.join(File.dirname(CONFIG_FILE), 'selected_files')
+  # 2019-04-10 - changed to ~/tmp otherwise confusion about location
+  fname = File.join('~/tmp/', 'selected_files')
   fname = File.expand_path(fname)
 
   # remove file if no selection
-  unless $selected_files
-    File.unlink(fname)
+  if $selected_files.empty?
+    File.unlink(fname) if File.exist?(fname)
     return nil
   end
 
+  # TODO : what if user does not want full path e,g zip
+  # TODO: what if unix commands need escaped files ?
+  base = Pathname.new Dir.pwd
   File.open(fname, 'w') do |file|
-    $selected_files.each { |row| file.puts row }
+    $selected_files.each do |row|
+
+      # use relative filename. Otherwise things like zip and tar run into issues
+      unless @selected_files_fullpath_flag
+        p = Pathname.new(row)
+        row = p.relative_path_from(base)
+      end
+      row = Shellwords.escape(row) if @selected_files_escaped_flag
+      file.puts row
+    end
   end
 
   return fname
@@ -2979,36 +3225,40 @@ end
 # include files.
 def enhance_file_list
   return unless $enhanced_mode
+  begin
+    actr = $files.size
 
   # zshglob: M = MARK_DIRS with slash
   # zshglob: N = NULL_GLOB no error if no result, this is causing space to split
   #  file sometimes for single file.
 
+  # FIXME: append only if we are adding.
+  # FIXME: this makes it possible to select this row,
+  # FIXME: and count it as a file !!
+  # $files.append SEPARATOR
+
   # if only one entry and its a dir
   # get its children and maybe the recent mod files a few
   # FIXME: simplify condition into one
   if $files.size == 1
     # its a dir, let give the next level at least
-    if $files.first[-1] == '/'
-      d = $files.first
-      # zshglob: 'om' = ordered on modification time
-      # f1 = `zsh -c 'print -rl -- #{d}*(omM)'`.split("\n")
-      f = get_files_by_mtime(d)
+    return unless $files.first[-1] == '/'
 
-      # @log.warn "f1:#{f1} != f:#{f} in #{d}" if f1 != f
-      # order returned by zsh and ruby are different since the time is the same
+    d = $files.first
+    # zshglob: 'om' = ordered on modification time
+    # f1 = `zsh -c 'print -rl -- #{d}*(omM)'`.split("\n")
+    f = get_files_by_mtime(d)
 
-      # TODO: use ruby this throws errors if not files
-      if f && !f.empty?
-        # @log.debug "CONCAT: #{f}" if @debug_flag
-        $files.concat f
-        $files.concat get_important_files(d)
-        return
-      end
-    else
-      # just a file, not dirs here
-      return
+    # @log.warn "f1:#{f1} != f:#{f} in #{d}" if f1 != f
+    # order returned by zsh and ruby are different since the time is the same
+
+    # TODO: use ruby this throws errors if not files
+    if f && !f.empty?
+      # @log.debug "CONCAT: #{f}" if @debug_flag
+      $files.concat f
+      $files.concat get_important_files(d)
     end
+    return
   end
   #
   # check if a ruby project dir, although it could be a backup file too,
@@ -3114,18 +3364,22 @@ def enhance_file_list
     # If you access the latest mod dir, then come back you get only one, since mod and accessed
     # are the same dir, so we need to find the second modified dir
   end
+  ensure
+    # if any files were added, then add a separator
+    bctr = $files.size
+    if actr < bctr
+      $files.insert actr, SEPARATOR
+    end
+  end
 end
 
 # insert important files to end of $files
 def insert_into_list _dir, file
-  # ix = $files.index(dir)
-  # raise "something wrong can find #{dir}." unless ix
-  # $files.insert ix, *file
-  # 2013-03-19 - 19:42 adding at end to avoid confusion
-  # $files.concat file
   $files.push(*file)
 end
 
+# Get visited files and bookmarks that are inside this directory
+#  at a lower level.
 # 2019-03-23 - not exactly clear what is happening XXX
 # this gets a directory (containing '/' at end)
 def get_important_files dir
@@ -3206,15 +3460,13 @@ def gfb dir, func
   # add slash to directories
   sorted_files = add_slash sorted_files
   return sorted_files
-  # sorted_files.map do |f|
-  # 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
+  @keys_to_clear = 2 if mess
 end
 
 def last_line
@@ -3230,11 +3482,13 @@ def clear_last_line
   # %*s        - set blank spaces for entire line
   # \e[m       - reset text mode
   # \r         - bring to start of line since callers will print.
-  print "\e[33;4%sm%*s\e[m\r" % [$status_color || '1', $gcols, " "]
+  print "\e[33;4%sm%*s\e[m\r" % [@status_color || '1', $gcols, ' ']
 end
 
 # print right aligned
-# FIXME: if text longer then width then does not print
+# XXX does not clear are, if earlier text was longer then that remains.
+# TODO: 2019-04-10 - this should update a variable, and status_line
+# should clear and reprint mode, message, patt and right text
 def print_on_right text
   sz = text.size
   col = $gcols - sz - 1
@@ -3246,7 +3500,7 @@ def print_on_right text
   system "tput cup #{$glines} #{col}"
   # tput_cup $glines, $gcols - sz - 1
   # print text
-  print "\e[33;4#{$status_color}m#{text}\e[m"
+  print "\e[33;4#{@status_color_right}m#{text}\e[m"
 end
 
 # unused, should set bgcolor before printing
@@ -3256,6 +3510,15 @@ def print_last_line text
   print text
 end
 
+def clear_message
+  if @keys_to_clear
+    @keys_to_clear -= 1
+    if @keys_to_clear == 0
+      message nil
+      @keys_to_clear = nil
+    end
+  end
+end
 # main loop which calls all other programs
 def run
 
@@ -3281,22 +3544,25 @@ def run
 
     key = get_char
 
+
     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
+    if @movement && @old_cursor
 
       # we may want to print debug info if flag is on
       if @debug_flag
         clear_last_line
         print_debug_info
+      else
+        status_line
       end
 
       place_cursor
-      $movement = false
+      @movement = false
       next
     end