cetus 0.1.38 → 0.1.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0adbfa483176301769749c1f1756cf6ae616ee572ad5b2ca56c28b2339f0386f
-  data.tar.gz: 2506a1e5264337d8648022083d7c37a6616d36e1be12b65d29b5172211cbdc67
+  metadata.gz: 501ef34e9afd0b98b8cfda66aa5c98fb46d6529f507e95c18951833edc467a0f
+  data.tar.gz: 722a4926a42bd426cfac568b2166c041b6a4dda63939e04ea5b6e5c2f3127de6
 SHA512:
-  metadata.gz: 7e18775e80ebc7cf5367e4040fb27c73eb2cff2e0cabac603afd1958de18cc1a82055b51c3b13eaaef2b03c0937b9aeff045a29f255b4ab8f7221821e0dc97f0
-  data.tar.gz: d7efa83ac9196fc74768e6fad5e87df973ec9ba49a44921310462cfe834cd53bb288be52d76f92d7ca6d45b9363e0545dac584ea5a3e47dad28e2fd0344c0daa
+  metadata.gz: b19bc7bbf440a8c9df34165c35e5b19134e9b3e3023e348e8eec52a770e784359ca02b7d8618d3b311b9bb802676f252274c8fe8e228a1ddf825fd0016a438eb
+  data.tar.gz: 41ad81c2cda30e5a20cc35ea22d4ec0e96630d3e907053713f733d3d61b6ba0fb42a6d9e1de8e367733aeca8a26cb2465f5af3dd7e1848a79cc8a78027640881

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-19 09:51
+#  Last update: 2019-04-21 23:46
 # --------------------------------------------------------------------------- #
 #  cetus.rb  Copyright (C) 2012-2019 rahul kumar
 # == CHANGELOG
@@ -19,6 +19,7 @@
 # 2019-03-04 - changed quit to q (earlier Q)
 # 2019-03-04 - first dirs then files
 # 2019-03-22 - refactoring the code, esp run()
+# 2019-04-21 - search_as_you_type
 #  == TODO
 
 require 'readline'
@@ -29,6 +30,8 @@ require 'shellwords'
 require 'fileutils'
 require 'logger'
 @log = Logger.new(File.expand_path('~/tmp/log.txt'))
+now = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+@log.info "========== cetus started at : #{now} ================= ----------"
 # @log = Logger.new('log.txt')
 
 ## INSTALLATION
@@ -36,7 +39,7 @@ require 'logger'
 # alias c=~/bin/cetus.rb
 # c
 
-VERSION = '0.1.38.0'
+VERSION = '0.1.39.0'
 CONFIG_PATH = ENV['XDG_CONFIG_HOME'] || File.join(ENV['HOME'], '.config')
 CONFIG_FILE = "#{CONFIG_PATH}/cetus/conf.yml"
 
@@ -64,7 +67,7 @@ CONFIG_FILE = "#{CONFIG_PATH}/cetus/conf.yml"
   ':' => 'subcommand',
   "'" => 'goto_bookmark',
   '"' => 'file_starting_with',
-  '/' => 'enter_regex',
+  '/' => 'ask_regex',
   'M-p' => 'prev_page',
   'M-n' => 'next_page',
   'PgUp' => 'prev_page',
@@ -191,6 +194,20 @@ def reset_terminal
   # Show user input.
   system 'stty echo'
 end
+# Call before shelling to editor pager and when exiting
+def partial_reset_terminal
+  # Reset the terminal to a useable state (undo all changes).
+  # '\e[?7h':  Re-enable line wrapping.
+  # '\e[?25h': Unhide the cursor.
+  # '\e[2J':   Clear the terminal.
+  # '\e[;r':   Set the scroll region to its default value.
+  #            Also sets cursor to (0,0).
+  # '\e[?1049l: Restore main screen buffer.
+  print "\e[?7h\e[?25h\e[;r\e[?1049l"
+
+  # Show user input.
+  system 'stty echo'
+end
 
 # copied from fff
 # call AFTER shelling to most or vim
@@ -215,7 +232,7 @@ end
 def readline prompt='>'
   clear_last_line
   print "\r"
-  # do we need to clear till end of line, see enter_regex commented
+  # do we need to clear till end of line, see ask_regex commented
   # unhide cursor
   print "\e[?25h"
   system 'stty echo'
@@ -318,7 +335,7 @@ PAGER_COMMAND = {
   unknown: 'open'
 }.freeze
 @dir_position = {}
-@movement = @old_cursor = nil # cursor movement has happened only, don't repaint
+@cursor_movement = @old_cursor = nil # cursor movement has happened only, don't repaint
 ## FLAGS
 @multiple_selection = true # single select
 @group_dirs = true
@@ -345,7 +362,8 @@ PAGER_COMMAND = {
   editor_mode: false,
   selection_mode: false, # typing hint adds to selection, does not open
   debug_flag: false,
-  toggle_filename_status_line: true
+  toggle_filename_status_line: true,
+  instant_search: true
 }
 # @cycles = { truncate_from: :center,
             # show_hidden: nil }
@@ -662,8 +680,6 @@ def redraw flag=false
 end
 
 def draw_directory
-  # all this seems to be happening for each keystroke even if
-  # not really required. FIXME maybe reduce and call when required
 
   # view consists of all files (filtered by pattern if necessary)
   # viewport is only that subset of view that is displayed on screen
@@ -751,13 +767,15 @@ def resolve_key key
   ret = true
   clear_message
 
+  return true if search_as_you_type(key)
+
   if key.match?(/^[a-pr-zZ]$/)
     # hint mode
     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 == ''
+    @title = nil unless @patt
   elsif '0123456789'.include? key
     resolve_numeric_key key
   else
@@ -798,6 +816,70 @@ def resolve_numeric_key key
   message "Created bookmark #{key}."
 end
 
+IGNORE_KEY = true
+PROCESS_KEY = false
+
+# Display search results as user types search pattern.
+# returning false allows these keys to be processed
+# returning true means that these keys will be ignored
+def search_as_you_type key
+  return false unless @searching
+
+  # @log.info "sayt: #{key}, patt: #{@patt}"
+
+  # escape should nil patt and come out of search.
+  if key == 'ESCAPE'
+    exit_search
+    return IGNORE_KEY
+  end
+
+  # We exit the search but screen shows search results.
+  if key == 'ENTER' # || key == 'TAB'
+    @searching = false
+    redraw_required true # ??? any effect ?
+    @mode = 'NORM'
+    # nilifying patt means we will not see searched results. we want to stay there.
+    @title = 'Search Results (ESCAPE to return)'
+    message ' '
+    status_line
+    return IGNORE_KEY
+  end
+
+  if key == 'BACKSPACE' && @patt
+    @patt = @patt[0..-2]
+    exit_search if @patt == ''
+    return IGNORE_KEY
+  end
+
+  # XXX should not changing directory cancel the search ?
+  if key == 'UP' || key == 'DOWN' || key == 'RIGHT' || key == 'LEFT'
+    return PROCESS_KEY
+  end
+
+  # if key is not one of allowed keys, then cancel the search.
+  # No, we allow it as in toggle or menu ?
+  unless key.match?(/^[a-zA-Z0-9\. _]$/)
+    # exit_search
+    # @mode = @title = nil
+    # redraw_required true
+    return PROCESS_KEY
+  end
+
+  @mode = 'INST'
+  @title = 'Search results: Use ENTER to return, ESCAPE to cancel.'
+  @patt ||= '' + '' # rubocop suggestion to get unfrozen string
+  @patt += key
+  message "> #{@patt}         "
+  redraw_required true
+
+  return IGNORE_KEY
+end
+
+def exit_search
+  @searching = @mode = @title = @patt = nil
+  status_line
+end
+
 def set_bookmark key, dir=Dir.pwd
   @bookmarks[key] = dir
 end
@@ -870,7 +952,6 @@ def columnate ary, siz
 
       elsif unformatted_len < wid
 
-        # f = f.ljust(wid)
         f << ' ' * (wid - unformatted_len)
 
       end
@@ -1335,7 +1416,9 @@ def escape
   @viewctr = 0
   @title = nil
   @filterstr = 'M'
+  @searching = false
   @message = nil
+  @mode = nil
   visual_block_clear
   refresh
 end
@@ -1465,11 +1548,21 @@ def goto_bookmark key=nil
 end
 
 ## take regex from user, to run on files on screen, user can filter file names
-def enter_regex
-  # print 'Enter (regex) pattern: '
-  # move to beginning of line, and clear till EOL
-  # print "\r\e[K"
-  @patt = readline '/'
+def ask_regex
+  unless cget(:instant_search)
+    @log.info "Inside ask_regex readline."
+    @patt = readline '/'
+    @title = 'Search Results: (Press Escape to return)'
+    @mode = 'SEARCH'
+    return
+  end
+
+  # this is the instant search as you type thingie
+  @patt = nil
+  @log.info "Inside ask_regex instant."
+  message 'I/'
+  @searching = true
+  status_line
 end
 
 # page/scroll down.
@@ -1684,7 +1777,8 @@ def toggle_menu
         'S' => :selection_mode,
         v: :visual_mode,
         t: :truncate_from,
-        n: :enhanced_mode }
+        n: :enhanced_mode,
+        i: :instant_search }
   # TODO: add other values at end, what key ?
 
   _, menu_text = menu 'Toggle Menu', h
@@ -1971,7 +2065,6 @@ def filter_menu
     @files = files
     @stact = 0
     @message = "Filtered on #{menu_text}. Press ESC to return."
-    # redraw
   else
     perror 'Sorry, No files. '
     @title = nil
@@ -1998,7 +2091,6 @@ def select_from_used_dirs
   @title = 'Used Directories'
   home = File.expand_path '~'
   @files = @used_dirs.uniq.map { |path| path.sub(home.to_s, '~') }
-  # redraw
 end
 
 def select_from_visited_files
@@ -2006,7 +2098,6 @@ def select_from_visited_files
   @title = 'Visited Files'
   home = File.expand_path '~'
   @files = @visited_files.uniq.map { |path| path.sub(home.to_s, '~') }
-  # redraw
 end
 
 # maybe unused ??? XXX
@@ -2110,7 +2201,6 @@ def create_bookmark
   else
     perror 'Bookmark must be alpha character or number.'
   end
-  # redraw
 end
 
 # allow user to exit using :q :wq :x
@@ -2163,10 +2253,15 @@ def subcommand
   else
     perror "Don't know about command #{command}. Try :h or :help"
   end
-  # redraw
 end
 
 def quit_command
+  # if we are in some mode, like search results then 'q' should come out.
+  if @mode
+    escape
+    return
+  end
+
   if @modified
     last_line
     puts 'Press y to save bookmarks before quitting ' if @modified
@@ -2188,7 +2283,6 @@ def views
   @viewctr = 0 if @viewctr > views.size
 
   @files = `zsh -c 'print -rl -- *(#{@sorto}#{@hidden}M)'`.split("\n")
-  # redraw
 end
 
 def child_dirs
@@ -2197,7 +2291,6 @@ def child_dirs
   # @files = `zsh -c 'print -rl -- *(/#{@sorto}#{@hidden}M)'`.split("\n")
   @files = dirs
   message "#{@files.size} directories."
-  # redraw
 end
 
 def dirs dir='*'
@@ -2218,7 +2311,6 @@ def dirtree
   # files1 = `zsh -c 'print -rl -- **/*(/#{@sorto}#{@hidden}M)'`.split("\n")
   @files = Dir['**/']
   message "#{@files.size} files."
-  # redraw
 end
 
 #
@@ -2230,7 +2322,6 @@ def tree
   # @files = `zsh -c 'print -rl -- **/*(#{@sorto}#{@hidden}M)'`.split("\n")
   @files = Dir['**/*']
   message "#{@files.size} files."
-  # redraw
 end
 
 # lists recent files in current dir
@@ -2241,7 +2332,6 @@ def recent_files
   # zsh D DOT_GLOB, show dot files
   # zsh om order on modification time
   @files = `zsh -c 'print -rl -- **/*(Dom[1,15])'`.split("\n").reject { |f| f[0] == '.' }
-  # redraw
 end
 
 def select_current
@@ -2702,7 +2792,6 @@ def column_next direction=0
     # We are trying to maintain offset
     @cursor += @grows if @cursor < 0
   end
-  # redraw
 end
 
 # currently i am only passing the action in from the list there as a key
@@ -2901,7 +2990,6 @@ def ag
     return
   end
   @files = files
-  # redraw
 end
 
 def ffind
@@ -2917,7 +3005,6 @@ def ffind
   else
     @files = files
   end
-  # redraw
 end
 
 def locate
@@ -2933,7 +3020,6 @@ def locate
   else
     @files = files
   end
-  # redraw
 end
 
 ##  takes directories from the z program, if you use autojump you can
@@ -2950,7 +3036,6 @@ def z_interface
   @files.collect! do |f|
     f.sub(/#{home}/, '~')
   end
-  # redraw
 end
 
 def vidir
@@ -2963,25 +3048,25 @@ end
 
 ## scroll cursor down
 def cursor_scroll_dn
-  @movement = :down
+  @cursor_movement = :down
   moveto(pos + MSCROLL)
 end
 
 def cursor_scroll_up
-  @movement = :up
+  @cursor_movement = :up
   moveto(pos - MSCROLL)
 end
 
 # move cursor down a line
 def cursor_dn
-  @movement = :down
+  @cursor_movement = :down
   @old_cursor = @cursor
   moveto(pos + 1)
 end
 
 def cursor_up
   @old_cursor = @cursor
-  @movement = :up
+  @cursor_movement = :up
   moveto(pos - 1)
 end
 
@@ -2999,8 +3084,8 @@ def moveto position
 
   # try to stop it from landing on separator
   if current_file == SEPARATOR
-    @cursor += 1 if @movement == :down
-    @cursor -= 1 if @movement == :up
+    @cursor += 1 if @cursor_movement == :down
+    @cursor -= 1 if @cursor_movement == :up
     return
   end
 
@@ -3019,13 +3104,13 @@ def moveto position
     # @sta = @cursor
   end
 
-  @movement = nil if oldsta != @sta # we need to redraw
+  @cursor_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
+  @cursor_movement = nil # visual mode needs to redraw page
 
   # PWD has to be there in selction
   if selected? current_file
@@ -3039,8 +3124,6 @@ def moveto position
     add_to_selection @view[star..fin]
   end
   message "#{@selected_files.count} files selected.   "
-  # ensure
-  # redraw
 end
 # --
 
@@ -3262,7 +3345,8 @@ def scripts binding=nil
 
   unless binding
     title = 'Select a script'
-    script_path = '~/.config/cetus/scripts'
+    # script_path = '~/.config/cetus/scripts'
+    script_path = File.join(CONFIG_PATH, 'cetus', 'scripts')
     binding = `find #{script_path} -type f | fzf --prompt="#{title} :"`.chomp
     return if binding.nil? || binding == ''
   end
@@ -3284,7 +3368,7 @@ def scripts binding=nil
   # script may ignore this and use selected_files
 
   # reset clears the screen, we don't want that. just unhide cursor and echo keys TODO
-  reset_terminal
+  partial_reset_terminal
   system %( #{binding} "#{current_file}" )
 
   # system %(echo "#{cf}" | xargs #{binding})
@@ -3297,9 +3381,13 @@ end
 # this is quite important and should not be left to a script
 # example of calling a script from somewhere directly without selection
 def execute_script filename
-  script_path = '~/.config/cetus/scripts'
-  script = File.expand_path(File.join(script_path, 'filename'))
-  return unless File.exist? script
+  # script_path = '~/.config/cetus/scripts'
+  script_path = File.join(CONFIG_PATH, 'cetus', 'scripts')
+  script = File.expand_path(File.join(script_path, filename))
+  unless File.exist? script
+    perror "Unable to find #{filename}: #{script}"
+    return
+  end
 
   scripts script
 end
@@ -3316,6 +3404,7 @@ def generators
 
   title = 'Select a generator'
   script_path = '~/.config/cetus/generators'
+  script_path = File.join(CONFIG_PATH, 'cetus', 'generators')
   binding = `find #{script_path} -type f | fzf --prompt="#{title} :"`.chomp
   return if binding.nil? || binding == ''
 
@@ -3714,12 +3803,12 @@ end
 # returns true if only cursor moved and redrawing not required
 def only_cursor_moved?
   # only movement has happened within this page, don't redraw
-  return unless @movement && @old_cursor
+  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
-    @movement = false
+    @cursor_movement = false
     return true # next in the loop
   end
 
@@ -3732,10 +3821,15 @@ def only_cursor_moved?
   end
 
   place_cursor
-  @movement = false
+  @cursor_movement = false
   return true # next in the loop
 end
 
+# indicate that only cursor moved, so don't redraw or rescan
+def only_cursor_moved flag=true
+  @cursor_movement = flag
+end
+
 # main loop which calls all other programs
 def run
   Signal.trap('EXIT') do
@@ -3751,7 +3845,7 @@ def run
   redraw true
   place_cursor
 
-  # do we need this, have they changed after redraw
+  # do we need this, have they changed after redraw XXX
   @patt = nil
   @sta = 0
 
@@ -3764,12 +3858,15 @@ def run
       next
     end
 
+    break if @quitting
+
     next if only_cursor_moved?
 
+    next unless @redraw_required # no change, or ignored key
+
     redraw rescan?
     place_cursor
 
-    break if @quitting
   end
   write_curdir
   puts 'bye'

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