cetus 0.1.41 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0318abcc4c63333edf5206aa2437530ca07c4379cc4887e1634535db8d86d1b
-  data.tar.gz: 526dab38dce30caba04507bd473eddfadd308a4cea301278dc79826daffa6eb4
+  metadata.gz: 354100c7054b31bc96f5bcc0a34056b68dcb061181467f0555443e340eac7922
+  data.tar.gz: 66f325607b440d2ebc476246b136f8c8e7d7e70a76cd27822c4abb56ff26f44f
 SHA512:
-  metadata.gz: ab77bcbf1fc65397d1bc3afa2729b37bb60a7929468cc1d50eaebd1ac94a66c322e01f18dd8342f723d386dc319e935dfb9e5672c7722ce60a071a331ccec8c0
-  data.tar.gz: 83ff786fd0130ccd8417b4ab14a4a0c96f7801b20c376670fa905911e8032d2a1feb292a7a82254abf967d0f20c7e9445200f60c9a0e833347d0beb793c59b57
+  metadata.gz: c497713cbae448bdac329afa7f030046ad889f1a7053ce5e0c6debd55d60649107fca9b7d697193f6e7bbcbc2f028902c29c512cfc04008c75ed77450e73a6f9
+  data.tar.gz: d811607e119d64186c1c49b38e6d23c0e643c20a0fe9cafe95c83ab8144157a2e6f152e3039fbc441c3e4bca956d44fc445d5ea59eedd1cfdc38ddf6fd4d43cf

data/README.md

@@ -1,23 +1,31 @@
 cetus
 =====
 
-lightning-fast file navigator
+Lightning-fast file navigator.
 
-Tested with ruby 2.5
+Open or page a file using hotkeys, rather than pressing ARROW keys repetitively (although that is supported also.)
 
-Latest changes:
-2019-03-26 - Reading up 'LS_COLORS' and coloring filenames. v0.1.30
-2019-03-24 - Major refactoring and cleanup. v 0.1.29
-2019-03-04 - q is quit key, not Q
-           - show directories first, then files.
-           - trying not to pollute main screen/terminal with listings (i.e. use alt screen)
-           - C-s to select (toggle) current file
+Many file actions are supported.
 
-2018-03-12 - now using LEFT and RIGHT arrow keys to go down into a directory, or up to higher directory.
-Also, pressing RIGHT ARROW on a file with open the file.
-Previously RIGHT and LEFT arrows would move to next or previous columns, i have put this on left and right square bracket.
+Scripts may be executed for selected files thus extending functionality.
 
-2018-03-13 - unable to push new gem 0.1.16 to rubygems.
+
+Tested with ruby 2.6
+
+
+### Latest changes:
+
+* 2019-04-23 - Major cleanup and rewrite, once again show highlighted row. V 0.2.0
+* 2019-03-26 - Reading up 'LS_COLORS' and coloring filenames. v0.1.30
+* 2019-03-24 - Major refactoring and cleanup. v 0.1.29
+* 2019-03-04 - q is quit key, not Q
+           * show directories first, then files.
+           * C-s to select (toggle) current file
+
+* 2018-03-12 - now using LEFT and RIGHT arrow keys to go down into a directory, or up to higher directory.
+* pressing RIGHT ARROW on a file will open the file.
+
+* Previously RIGHT and LEFT arrows would move to next or previous columns, i have put this on left and right square bracket.
 
 
 ## Selecting a file
@@ -27,22 +35,26 @@ There are two ways of selecting a file.
 1. Pressing C-s on a file.
 2. Use hotkey (on left of file) to select without having to navigate.
 
-While using C-s marks a file as selected, pressing the hotkey will either open
+While using C-s marks a file as selected, OTOH pressing the hotkey will either open
 the file using PAGER or EDITOR depending on current mode.
 
 ## Multiple Selection of files
 
-1. Press C-s on multiple files.
-2. Press `@` to enter multiple select mode.
+1. Press C-s on multiple files. '*' toggles between multiple and single select mode.
+
+2. Press `*` (asterisk) to enter multiple select mode.
 Now press the hotkey (left of file) to select it.
 
+3. Visual Mode. Press `Ctrl-Space` to enter visual/range select. Now move the arrow keys
+up or down to select. Press `Ctrl-Space` again to end selection. Several ranges may be selected.
+
 To execute an action on multiple (or single) files, you may press `C-x` and choose
-an action such as move or delete, etc.
+an action such as move, delete, rename, copy, etc.
 
 You may also select all files with the same extension as current file. Invoke the
 filter menu using Tilde-F. Now select `x` or `:extension`.
 
-`Tilde-y` is the selection menu. M-a is select all, M-A is unselect all.
+`Tilde-s` is the selection menu. M-a is select all, M-A is unselect all.
 
 ## Moving multiple files
 
@@ -52,7 +64,7 @@ Now there are two ways to move selected files to another directory.
 
 1. Press `C-x m` and type the name of the directory at the prompt.
 
-2. Navigate to the target directory, and then press `C-x m` and type "." at the prompt.
+2. Or navigate to the target directory, and then press `C-x m` and type "." at the prompt.
 
 ## Copying files to another directory.
 
@@ -60,10 +72,31 @@ Use the same procedure as for moving files but press `C-x c`
 
 1. Press `C-x c` and then type the name of the target directory at the prompt.
 
-2. Navigate to the target directory, and press `C-x c`, and type '.' at the prompt.
+2. Select files, then navigate to the target directory, and press `C-x c`, and type '.' at the prompt.
+
+3. If copying a file, to the same directory, or if the file already exists, a unique name will be suggested (numeric suffix).
+
+## Scripts
+
+* Scripts access selected files and can take actions on them. Examples are scripts that remove spaces and brackets from selected files, or create a directory with the selected files, encrypt files, archive files, convert file format using `ffmpeg`, etc.
 
+* Scripts are located in the CONFIG folder, under `cetus/scripts`. Usually this is `.config` but can be configured via XDG_CONFIG_HOME.
 
-fork of lyra with a different hotkey idea. Use this for quickly navigating your file system using hotkeys
+* Selected files are located in `~/tmp/selected_files`
+
+* Scripts are also passed the filename under the cursor, and may act on it if no file has been selected.
+
+* Currently, scripts don't pass any messages back to the application. Suggestions welcome.
+
+## Generators
+
+Generators are used to generate a list of file names or directories that can be used for navigation, or paging/editing or other file actions.
+
+For example, a generator could generate filenames from `.viminfo` or `z` or `autojump`
+
+## More
+
+Fork of `lyra` with a different hotkey idea. Use this for quickly navigating your file system using hotkeys
 and bookmarks, and executing commands on single or multiple files easily.
 
 See https://github.com/rkumar/lyra for detailed info of usage.
@@ -76,11 +109,6 @@ only 60 files can be shown at a time on a screen.
 
 It also maps z and Z which are at a convenient location. If there are more than 24 then za-zz are used. if the file exceed even that, then the range Za-ZZ is used. This means that larger screens will be filled with file names (upto ROWS * 3), and the user can even specify the number of columns. I've tried with 6. The remainder files gets an index of "&rt;" (right arrow) which means that if one presses right arrow then the indexing starts from the second column. RIGHT and LEFT arrow can be used to move indexing.
 
-Experimentally added cursor movements which currently is only used if you get into a so-called visual mode, by pressing C-Space, moving up and down arrow and C-d and C-b will start adding to selection.
-I did this since I was selecting quite a few files to delete in some old directory and would have liked some range delete. One can, of course, select files for a regex by pressing "/" giving a regex, and then using M-a to select all. Clear selection with M-A (Alt-Shift-a).
-
-The cursor position shows up as a greater than sign, I hope not to implement all of zfm here. It's mainly used only to select multiple files that are contiguous.
-
 
 Press C-x to execute actions on selected files. A menu of actions is displayed.
 Or Press one of several commands after selecting files such as "D" for delete, or "M" to use your man-pager.
@@ -90,16 +118,20 @@ You can bind other capital letters to any external command. If there are selecte
 
 The rest is similar to lyra. Some key points are highlighted here.
 
-* Create bookmarks for often used directories using Alt-m. Then access them using single-quote and upper character.
+* Create bookmarks for often used directories using Alt-m. Then access them using single-quote and character.
   You have to be inside the directory when saving a new bookmark. e.g. `'P`. This is a fast way of jumping directories. I've got "P" mapped to projects, and "Z" to zfm, and so forth.
 
-* Single-quote and small letter jumps to the first file starting with given letter. e.g. `'s`
+* Single-quote and letter jumps to the first file starting with given letter. e.g. `'s`
+* Double-quote and letter jumps to the first file starting with given letter. e.g. `"s`
+
+* Numbers for bookmarks. The starting directory is automatically bookmarked as '0'.
+Pressing '0' from anywhere brings us to the starting directory. Pressing a number will create a bookmark for the current directory, or take us to that directory, if a bookmark exists. This is a quick way to make bookmarks and jump to them. Useful when moving or copying files.
 
 * Space-bar pages, also Alt n and p. Ctrl-d and Ctrl-b goes down 10 rows.
 
 * Backtick is the main menu, which has options for sorting, filtering, seeing often used dirs and files, choosing from dirs in the `z` database, choosing used files from the `.viminfo` file, etc.
 
-Other than using bookmarks, you can jump quickly to other directories or open files using BACKTICK and the releant option which should become part of muscle memory very fast.
+Other than using bookmarks, you can jump quickly to other directories or open files using BACKTICK and the relevant option which should become part of muscle memory very fast.
 
 * Use Alt-d and Alt-f to see used directories and used files. Used directories are those dirs in which you have opened a file, not all dirs you've traversed. Certain directories are added to this list to make it more useful such as GEM_HOME, RUBYPATH, GEM_PATH, RUBYLIB, PYTHONPATH and PYTHONHOME.
 

data/bin/cetus

@@ -8,7 +8,7 @@
 #       Author: rkumar http://github.com/rkumar/cetus/
 #         Date: 2013-02-17 - 17:48
 #      License: GPL
-#  Last update: 2019-04-22 12:37
+#  Last update: 2019-04-24 13:56
 # --------------------------------------------------------------------------- #
 #  cetus.rb  Copyright (C) 2012-2019 rahul kumar
 # == CHANGELOG
@@ -40,7 +40,7 @@ now = Time.now.strftime("%Y-%m-%d %H:%M:%S")
 # alias c=~/bin/cetus.rb
 # c
 
-VERSION = '0.1.41.0'
+VERSION = '0.2.0.0'
 CONFIG_PATH = ENV['XDG_CONFIG_HOME'] || File.join(ENV['HOME'], '.config')
 CONFIG_FILE = "#{CONFIG_PATH}/cetus/conf.yml"
 
@@ -333,6 +333,7 @@ PAGER_COMMAND = {
   text: 'most',
   image: 'open',
   zip: 'tar ztvf %% | most',
+  sqlite: 'sqlite3 %% .schema | most',
   unknown: 'open'
 }.freeze
 @dir_position = {}
@@ -348,6 +349,8 @@ PAGER_COMMAND = {
 @selected_files_escaped_flag = false
 @keys_to_clear = nil
 @ignore_case = true
+@highlight_row_flag = true # false
+@debug_flag = false
 
 # See toggle_value
 # we need to set these on startup
@@ -365,7 +368,8 @@ PAGER_COMMAND = {
   selection_mode: false, # typing hint adds to selection, does not open
   debug_flag: false,
   toggle_filename_status_line: true,
-  instant_search: true
+  instant_search: true,
+  highlight_row_flag: @highlight_row_flag
 }
 # var is name of variable to be set
 @options = {
@@ -385,6 +389,8 @@ BOLD       = "\e[1m"
 BOLD_OFF = "\e[22m"
 RED = "\e[31m"
 ON_RED = "\e[41m"
+ON_GREEN = "\e[42m"
+ON_YELLOW = "\e[43m"
 GREEN      = "\e[32m"
 YELLOW     = "\e[33m"
 BLUE       = "\e[1;34m"
@@ -393,6 +399,7 @@ CYAN       = "\e[36m"
 
 ON_BLUE    = "\e[44m"
 REVERSE    = "\e[7m"
+REVERSE_OFF = "\e[27m"
 UNDERLINE    = "\e[4m"
 CURSOR_COLOR = REVERSE
 
@@ -562,14 +569,17 @@ end
 def print_title
   # print help line and version
   print "#{GREEN}#{@help}  #{BLUE}cetus #{VERSION}#{CLEAR}\n"
+  @current_dir ||= Dir.pwd
 
   # print 1 of n files, sort order, filter etc details
-  @title ||= Dir.pwd.sub(ENV['HOME'], '~')
+  @title ||= @current_dir.sub(ENV['HOME'], '~')
 
   # Add bookmark next to name of dir, if exists
   # FIXME This should not happen in other listings like find selected files etc
-  bm = @bookmarks.key(Dir.pwd)
-  bm = " ('#{bm})" if bm
+  # bm = @bookmarks.key(Dir.pwd)
+  # Display multiple bookmarks. Can be calculated on changing directory ?
+  bm = @bookmarks.select { |k, v| v == @current_dir }.keys.join(',')
+  bm = " ('#{bm})" if bm && bm != ''
 
   fin = @sta + @viewport.size
   fl = @view.size
@@ -589,8 +599,12 @@ def print_title
   # don't exceed columns while printing
   t = t[t.size - @gcols..-1] if t.size >= @gcols
 
-  print "#{BOLD}#{t}#{CLEAR}\n"
-  print 'EMPTY' if fl.zero?
+  print "#{BOLD}#{t}#{CLEAR}"
+
+  tput_cup(-1, @gcols - @hk.length - 2)
+  puts '[' + @hk + ']'
+
+  print "#{CURSOR_COLOR}EMPTY#{CLEAR}" if fl == 0
 end
 # ------------- end of print_title --------------------------------#
 
@@ -680,12 +694,8 @@ def draw_directory
   clear_screen
   print_title
 
-  # add hint and format the line
-  buff = format_array @viewport
-
   # break viewport into as many columns as required
-  # This is where directories get their blue color
-  buff = columnate buff, @grows
+  buff = columnate @viewport, @grows
 
   # starts printing array on line 3
   buff.each { |line| print line, "\n" }
@@ -700,49 +710,45 @@ end
 # XXX i am not sure how to highlight the bg without rewriting the text.
 # I can get the filename but it has been truncated.
 # I can get the earlier filename but the color has to be determined again.
-# FIXME flinks after paging
-# FIXME color of original hint lost
-def place_cursor
-  # clear_cursor
-  # hint = get_shortcut(@cursor)
+# FIXME color of original hint lost if @highlight_row_flag.
+# we can even get the filename, but it has been formatted and could
+# be a long listing.
+# color can be CURSOR_COLOR or CLEAR
+# if CLEAR then we use original colors from get_formatted_filename.
+# Otherwise we need to use CURSOR_COLOR in place of current color
+def place_cursor color=CURSOR_COLOR
+  vps = @viewport.size
+
+  # empty directory
+  if vps == 0
+    tput_cup 0, 0
+    return
+  end
+
   c = @cursor - @sta
+  wid = get_width vps, @grows
   if c < @grows
-    # system "tput cup #{c + 2} 0"
-    # print "\e[#{c + 3};0H"
-    tput_cup c, 0
-    # print "#{CURSOR_COLOR}#{hint} >#{CLEAR}"
-    return
+    rows = c
+    cols = 0
+  else
+    rows = c % @grows
+    cols = (c / @grows) * wid
   end
-  wid = get_width @viewport.size, @grows
-  rows = c % @grows
-  cols = (c / @grows) * wid
-  # system "tput cup #{rows + 2} #{cols}"
-  # print "\e[#{rows + 3};#{cols + 1}H"
+
   tput_cup rows, cols
-  # print "#{CURSOR_COLOR}#{hint} >#{CLEAR}"
-end
+  return unless @highlight_row_flag
 
-# clear the earlier position when we move.
-# Currently not using until I can implement chgat here.
-def clear_cursor
-  return unless @old_cursor
+  color = nil if color == CLEAR # let it determine its own color
+  f = get_formatted_filename(c, wid)
 
-  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
-    # print "#{CURSOR_COLOR}#{hint} >#{CLEAR}"
-    print "#{hint}  "
-    return
-  end
-  wid = get_width @viewport.size, @grows
-  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}  "
+  f = color + f + CLEAR if color
+
+  # f = color + f if color # NOTE: this was causing 2 issues: color bleed onto
+  # status line and top line. And the highcolor of some rows would not go away.
+  # If REVERSE_OFF is used, then REVERSE_OFF must also be used
+  #
+  print f
+  tput_cup rows, cols # put it back at start
 end
 
 # place cursor on row and col taking first two rows into account
@@ -843,6 +849,7 @@ end
 
 def set_bookmark key, dir=Dir.pwd
   @bookmarks[key] = dir
+  @hk = @bookmarks.select { |k, _| k.match?(/[0-9]/)  }.keys.sort.join('')
 end
 
 ## write current dir to a file so we can ccd to it when exiting
@@ -872,13 +879,13 @@ end
 
 ## format date for file given stat
 def date_format t
-  t.strftime '%Y/%m/%d'
+  t.strftime '%Y/%m/%d %H:%M:%S'
 end
 
 ##
 #
 # print in columns
-# ary - array of data (viewport, not view)
+# ary - array of data (viewport, not view) with hint and mark, possibly long listing
 # siz  - how many lines should there be in one column
 #
 def columnate ary, siz
@@ -899,23 +906,7 @@ def columnate ary, siz
     ctr = 0
     while ctr < siz
 
-      f = ary[ix].dup # 2019-04-14 - frozen_string_literal
-      # f is not just filename but marker and hint
-
-      # check to see if we need to truncate
-      # 2019-03-18 - truncate from middle of string.
-      # 2019-03-24 - truncate and size to take care of color codes
-      # fsz = f.size
-      unformatted_len, = filename_len(f)
-      if unformatted_len > wid
-        # take the excess out from the center on both sides
-        f = truncate_formatted_filename(f, unformatted_len, wid)
-
-      elsif unformatted_len < wid
-
-        f << ' ' * (wid - unformatted_len)
-
-      end
+      f = get_formatted_filename(ix, wid)
 
       # if already a value in that line, append to it
       if buff[ctr]
@@ -944,13 +935,8 @@ def truncate_formatted_filename f, unformatted_len, wid
   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"
+        # FIXME: 2019-04-23 - do we need the control code at end ??
+        f[0..wid - 3] + "$ "
 
       when :center
 
@@ -969,14 +955,6 @@ def truncate_formatted_filename f, unformatted_len, wid
         # 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
@@ -985,75 +963,67 @@ def truncate_formatted_filename f, unformatted_len, wid
   return f
 end
 
-def get_width arysz, siz
-  ars = [@pagesize, arysz].min
-  d = 0
-  return @gcols - d if ars <= siz
+# given index (in viewport) get a formatted, displayable rendition of the filename
+# returns a String with hint, marks, filename (optional details) and color codes
+# truncated to correct width.
+def get_formatted_filename ix, wid
+  f = @viewport[ix]
 
-  tmp = (ars * 1.000 / siz).ceil
-  wid = @gcols / tmp - d
-  wid
-end
+  ind = get_shortcut(ix)
+  mark = get_mark(f)
+  # Handle separator before enhanced file list.
+  # We do lose a shortcut
+  ind = cur = mark = '-' if f == SEPARATOR
+  prefix = "#{ind}#{mark}#{cur}"
 
-# calculate length of filename without ANSI color codes
-def filename_len name
-  l = name.length
-  return l if name[0] != "\e"
+  # fullname = f[0] == '~' ? File.expand_path(f) : f
+  color ||= color_for(f)
 
-  # we have an escape code at the start of the name (and end, too)
-  index = name.index('m')
-  eindex = name.rindex("\e")
-  reall = eindex - index - 1
-  return reall, l
-end
+  f = format_long_listing(f) if @long_listing
 
-## formats the data with number, mark and details
-def format_array ary
-  # buff = Array.new
-  buff = Array.new(ary.size)
-  return buff if ary.nil? || ary.empty?
+  # replace unprintable chars with ?
+  f = f.gsub(/[^[:print:]]/, '?')
 
-  # 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, whereas we only
-  # show 60 at a time
-  ix = 0
-  ctr = 0
-  ary.each do |f|
-    ## ctr refers to the index in the column
-    mark = SPACE
-    cur = SPACE
-    ind = get_shortcut(ix)
+  f = "#{prefix}#{f}"
 
-    # Handle separator before enhanced file list.
-    # We do lost a shortcut
-    ind = cur = mark = '-' if f == SEPARATOR
+  unformatted_len = f.length
+  if unformatted_len > wid
+    # take the excess out from the center on both sides
+    # TODO clear this up since no color info here
+    f = truncate_formatted_filename(f, unformatted_len, wid)
+    f = "#{color}#{f}#{CLEAR}" if color
 
-    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])
+  elsif unformatted_len < wid
 
-    # take care of shortcuts in visited files and dirs
-    fullname = f[0] == '~' ? File.expand_path(f) : f
-    color = color_for fullname
+    # f << ' ' * (wid - unformatted_len)
+    f = "#{color}#{f}#{CLEAR}" + ' ' * (wid - unformatted_len)
+  end
+
+  return f
+end
+
+def get_width arysz, siz
+  ars = [@pagesize, arysz].min
+  d = 0
+  return @gcols - d if ars <= siz
 
-    f = format_long_listing(f) if @long_listing
+  tmp = (ars * 1.000 / siz).ceil
+  wid = @gcols / tmp - d
+  wid
+end
 
-    # 2019-03-31 - replace unprintable chars with ?
-    f = f.gsub(/[^[:print:]]/, '?')
+def get_mark file
+  return SPACE if @selected_files.empty? && @visited_files.empty?
 
-    # FIXME do in one operation. otherwise creating string 2 times
-    s = "#{ind}#{mark}#{cur}#{f}"
-    s = "#{color}#{s}#{CLEAR}" if color
+  @current_dir ||= Dir.pwd
+  fullname = File.join(@current_dir, file)
 
-    buff[ctr] = s
+  return GMARK if selected?(fullname)
+  return '+' if visited? fullname
 
-    ctr += 1
-    ix += 1
-  end
-  buff
+  SPACE
+  # cur = CURMARK if ix + @sta == @cursor # 2019-03-29 - removed reduced calls
+  # NOTE seems like f and ary[ix] are the same
 end
 
 def format_long_listing f
@@ -1088,8 +1058,9 @@ def format_long_listing f
 end
 
 # determine color for a filename based on extension, then pattern, then filetype
-def color_for fname
-  return nil if fname == SEPARATOR
+def color_for f
+  return nil if f == SEPARATOR
+  fname = f[0] == '~' ? File.expand_path(f) : f
 
   extension = File.extname(fname)
   color = @ls_color[extension]
@@ -1257,9 +1228,9 @@ def open_file f
     system(comm.to_s)
     setup_terminal
     # XXX maybe use absolute_path instead of hardcoding
-    f = Dir.pwd + '/' + f if f[0] != '/'
+    f = @current_dir + '/' + f if f[0] != '/'
     @visited_files.insert(0, f)
-    push_used_dirs Dir.pwd
+    push_used_dirs @current_dir
   else
     perror "open_file: (#{f}) not found"
     # could check home dir or CDPATH env variable DO
@@ -1352,6 +1323,7 @@ def change_dir f
 
   f = File.expand_path(f)
   Dir.chdir f
+  @current_dir = Dir.pwd # 2019-04-24 - earlier was in post_cd but too late
   read_directory
   post_cd
 
@@ -1574,7 +1546,7 @@ def print_help
     ary = columnate ary, (ary.size / 2) + 1
     ary.each { |line| file.puts line }
   end
-end
+end # print_help
 
 def page_stat_for_file
   stat = `stat #{current_file}`
@@ -1591,8 +1563,12 @@ def page_flags
   page_with_tempfile do |file|
     file.puts 'Values of toggles/flags'
     file.puts '-----------------------'
-    @toggles.keys.each do |flag|
-      value = instance_variable_get "@#{flag}"
+    @toggles.each_pair do |flag, v|
+      if instance_variable_defined? "@#{flag}"
+        value = instance_variable_get "@#{flag}"
+      else
+        value = v
+      end
       file.puts "#{flag} : #{value}"
     end
     file.puts '-----------------------'
@@ -1693,6 +1669,7 @@ def bookmark_menu
   h = {
     v: :view_bookmarks,
     c: :create_bookmark,
+    r: :remove_bookmark,
     g: :goto_bookmark
   }
   menu 'Bookmark Menu', h
@@ -1752,7 +1729,8 @@ def toggle_menu
         v: :visual_mode,
         t: :truncate_from,
         n: :enhanced_mode,
-        i: :instant_search }
+        i: :instant_search,
+        H: :highlight_row_flag }
   # TODO: add other values at end, what key ?
 
   _, menu_text = menu 'Toggle Menu', h
@@ -2100,7 +2078,6 @@ def post_cd
   @title = @patt = @message = nil
   @sta = @cursor = @stact = 0
   @visual_block_start = nil
-  @current_dir = Dir.pwd
   screen_settings
 
   # goto last position cursor was in this dir
@@ -2169,7 +2146,6 @@ def create_bookmark
   key = get_char
   # print "\e[?25l" # hide cursor
   if /^[0-9A-Za-z]$/.match?(key)
-    # @bookmarks[key] = "#{Dir.pwd}:#{@cursor}"
     set_bookmark key
     @modified = true
     message "Created bookmark #{key} for #{File.basename(Dir.pwd)}."
@@ -2178,6 +2154,20 @@ def create_bookmark
   end
 end
 
+def remove_bookmark
+  bmlist = @bookmarks.keys.sort.join('')
+  clear_last_line
+  print "Enter bookmark to delete: #{bmlist}:"
+  key = get_char
+  if bmlist.index(key)
+    @modified = true
+    @bookmarks.delete key
+    message "Deleted #{key} "
+  else
+    perror 'Bookmark does not exist'
+  end
+end
+
 # allow user to exit using :q :wq :x
 # Was this supposed to be augmented, or just remain limited like this
 # We should be able to do everything in the menus from here. TODO
@@ -3024,25 +3014,27 @@ end
 ## scroll cursor down
 def cursor_scroll_dn
   @cursor_movement = :down
-  moveto(pos + MSCROLL)
+  @old_cursor = @cursor
+  move_to(pos + MSCROLL)
 end
 
 def cursor_scroll_up
   @cursor_movement = :up
-  moveto(pos - MSCROLL)
+  @old_cursor = @cursor
+  move_to(pos - MSCROLL)
 end
 
 # move cursor down a line
 def cursor_dn
   @cursor_movement = :down
   @old_cursor = @cursor
-  moveto(pos + 1)
+  move_to(pos + 1)
 end
 
 def cursor_up
   @old_cursor = @cursor
   @cursor_movement = :up
-  moveto(pos - 1)
+  move_to(pos - 1)
 end
 
 # return cursor position
@@ -3051,8 +3043,9 @@ def pos
 end
 
 # move cursor to given position/line
-def moveto position
+def move_to position
   orig = @cursor
+  place_cursor(CLEAR) if @highlight_row_flag
   @cursor = position
   @cursor = [@cursor, @view.size - 1].min
   @cursor = [@cursor, 0].max
@@ -3081,10 +3074,11 @@ def moveto position
 
   @cursor_movement = nil if oldsta != @sta # we need to redraw
 
-  star = [orig, @cursor].min
-  fin = [orig, @cursor].max
+  # -------- return here --- only visual mode continues ---------------------#
   return unless @visual_mode
 
+  star = [orig, @cursor].min
+  fin = [orig, @cursor].max
   @cursor_movement = nil # visual mode needs to redraw page
 
   # PWD has to be there in selction
@@ -3103,19 +3097,15 @@ 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
+def visited? fullname
+  return @visited_files.index fullname
 end
 
 # ------------- selection related methods --------------------------------#
 
 # is given file in selected array
-def selected? file
-  @current_dir ||= Dir.pwd
-  file = File.join(@current_dir, file)
-  return @selected_files.index file
+def selected? fullname
+  return @selected_files.index fullname
 end
 
 # add given file/s to selected file list
@@ -3226,6 +3216,8 @@ def filetype f
   return :zip if s.index(/[Zz]ip/)
   return :zip if s.index('archive')
   return :image if s.index 'image'
+  return :sqlite if s.index 'SQLite'
+  # return :db if s.index 'database'
   return :text if s.index 'data'
 
   nil
@@ -3238,9 +3230,11 @@ def opener_for f
   # Get filetype, and check for command for type, else extn else unknown
   if !@editor_mode
     ft = filetype f
+    @log.debug "opener: #{ft} for #{f}"
     comm = PAGER_COMMAND[ft] if ft
     comm ||= PAGER_COMMAND[File.extname(f)]
     comm ||= PAGER_COMMAND[:unknown]
+    @log.debug "opener: #{comm}"
   else
     # 2019-04-10 - what does this mean, that in editor_mode, editor
     # opens everything? what of images etc
@@ -3490,6 +3484,7 @@ end
 def enhance_file_list
   # return unless cget(:enhanced_mode)
   return unless @enhanced_mode
+  @current_dir ||= Dir.pwd
 
   begin
     actr = @files.size
@@ -3523,7 +3518,7 @@ def enhance_file_list
     if @files.index('Gemfile') || !@files.grep(/\.gemspec/).empty?
       # usually the lib dir has only one file and one dir
       flg = false
-      @files.concat get_important_files(Dir.pwd)
+      @files.concat get_important_files(@current_dir)
       if @files.index('lib/')
         # get first five entries by modification time
         # f1 = `zsh -c 'print -rl -- lib/*(om[1,5]MN)'`.split("\n")
@@ -3535,7 +3530,7 @@ def enhance_file_list
         end
 
         # look into lib file for that project
-        dd = File.basename(Dir.pwd)
+        dd = File.basename(@current_dir)
         if f.index("lib/#{dd}/")
           # f1 = `zsh -c 'print -rl -- lib/#{dd}/*(om[1,5]MN)'`.split("\n")
           f = get_files_by_mtime("lib/#{dd}")&.first(5)
@@ -3747,20 +3742,13 @@ def print_on_right text
   col = @gcols - sz - 1
   col = 2 if col < 2
   text = text[0..@gcols - 3] if sz > @gcols - 2
-  # system "tput cup #{@glines} #{@gcols - sz - 1}"
-  system "tput cup #{@glines} #{col}"
-  # tput_cup @glines, @gcols - sz - 1
+  # 2019-04-22 - earlier direct system call to tput, now trying print
+  # system "tput cup #{@glines} #{col}"
+  tput_cup @glines, @gcols - sz - 1
   # print text
   print "\e[33;4#{@status_color_right}m#{text}\e[m"
 end
 
-# unused, should set bgcolor before printing
-def print_last_line text
-  # unused ??
-  last_line
-  print text
-end
-
 def clear_message
   if @keys_to_clear
     @keys_to_clear -= 1
@@ -3777,8 +3765,8 @@ def only_cursor_moved?
   return unless @cursor_movement && @old_cursor
 
   # if cursor has not moved (first or last item on screen)
-  # keep testing this out 2019-04-14 -
   if @old_cursor == @cursor
+    place_cursor # otherwise highlight vanishes if keep pressing UP on first row.
     @cursor_movement = false
     return true # next in the loop
   end

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.41'
+  spec.version       = '0.2.0'
   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.41
+  version: 0.2.0
 platform: ruby
 authors:
 - Rahul Kumar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-22 00:00:00.000000000 Z
+date: 2019-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler