cetus 0.1.24 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe8c1244b0c3e4c41eb6f186f13a2145330c3243de099db9a91bac5a87f0b1c6
-  data.tar.gz: e732da1943a5b7ab651c736a6d56bd645ce9d58b9dbf1857efcb97713563c2e1
+  metadata.gz: e330d082b6cacb3bc2bb8294f240e1dbe52c020f67036e7749c23975ad74315e
+  data.tar.gz: 233d66a84c34f2909ced5d9d0c2a7ee9b6f251f812190cd51fa74df0a7d685ad
 SHA512:
-  metadata.gz: 16cab047cb3fa5b2a9de8b25a8c3fe450ef9527896b19af2b5cd9d6ff5b554381c8b012dd21b2f9477ff8f00e080b3cf25d359e5c85103c3a777faa0ae1c171c
-  data.tar.gz: 106ccedd0121858ddd1a867a9d2c875c8ab9fd1b6cba34062fbeed6ec256c80032f23b9363ea78c018ab861d8eb189c91bde3b373d1963ea16b656a1c0e40597
+  metadata.gz: 167c052b0de647248274ae297dd0dc7ec02a1ed597abd93622a53ca65b06de13723f466d0476ef52aba505ebe2b5d44eb59ecd8c095d47b7bea792d8041ea5e9
+  data.tar.gz: f83e861550b178f4eedc21138645df39fea00f55fd450353f12c6e797137f1902646859bb273238f1219611bfb092292646c3befd7b421757bdc3f4a193c9f6a

data/bin/cetus

@@ -6,7 +6,7 @@
 #       Author: rkumar http://github.com/rkumar/cetus/
 #         Date: 2013-02-17 - 17:48
 #      License: GPL
-#  Last update: 2019-03-18 14:02
+#  Last update: 2019-03-20 11:43
 # --------------------------------------------------------------------------- #
 #  cetus.rb  Copyright (C) 2012-2019 rahul kumar
 # == CHANGELOG
@@ -35,9 +35,7 @@ require 'fileutils'
 
 # 2019-02-20 - added so alt-screen is used
 system 'tput smcup'
-VERSION = '0.1.24.0'.freeze
-O_CONFIG = true
-# CONFIG_FILE = '~/.lyrainfo'.freeze
+VERSION = '0.1.26.0'.freeze
 CONFIG_FILE = '~/.config/cetus/conf.yml'.freeze
 
 $bindings = {}
@@ -52,6 +50,7 @@ $bindings = {
   'C-o' => 'edit_current',
   'C-s' => 'toggle_select',
   'C-r' => 'reduce',
+  'C-g' => 'debug_vars',
   '@' => 'selection_mode_toggle',
   'M-a' => 'select_all',
   'M-A' => 'unselect_all',
@@ -281,10 +280,10 @@ $bookmarks = {}
 $mode = nil
 $glines = `tput lines`.to_i
 $gcols = `tput cols`.to_i
-$grows = $glines - 3
-$pagesize = 60
+$grows = $glines - 3  # can be a func
+# $pagesize = 60
 $gviscols = 3
-$pagesize = $grows * $gviscols
+$pagesize = $grows * $gviscols # can be a func
 $stact = 0
 # $editor_mode = true
 $editor_mode = false # changed 2018-03-12 - so we start in pager mode
@@ -328,8 +327,10 @@ $default_sort_order = 'om'
 $sorto = $default_sort_order
 $viewctr = 0
 $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
 # $help = "#{BOLD}1-9a-zA-Z#{BOLD_OFF} Select #{BOLD}/#{BOLD_OFF} Grep #{BOLD}'#{BOLD_OFF} First char  #{BOLD}M-n/p#{BOLD_OFF} Paging  #{BOLD}!#{BOLD_OFF} Execute #{BOLD}@#{BOLD_OFF} Selection Mode  #{BOLD}q#{BOLD_OFF} Quit"
 
 # Menubar on top of screen
@@ -348,22 +349,28 @@ def run
 
   fl = $files.size
 
-  selectedix = nil
-  $patt = ''
+  # selectedix = nil
+  # $patt = ''
+  $patt = nil
   $sta = 0
   loop do
-    i = 0
+    # i = 0
     $view = if $patt
               if $ignorecase
                 $files.grep(/#{$patt}/i)
               else
                 $files.grep(/#{$patt}/)
-                      end
+              end
             else
               $files
             end
     fl = $view.size
     $sta = 0 if $sta >= fl || $sta < 0
+    # 2019-03-18 - added to ensure cursor not going OOB when next_page
+    $cursor = 0 if $cursor >= fl || $cursor < 0
+    # $sta = $cursor if $sta > $cursor
+    $cursor = $sta if $sta > $cursor
+
     $viewport = $view[$sta, $pagesize]
     fin = $sta + $viewport.size
     $title ||= Dir.pwd.sub(home, '~')
@@ -390,13 +397,31 @@ def run
     buff.each { |line| print line, "\n" }
     print
 
-
     # prompt
     # print "#{$files.size}, #{view.size} sta=#{sta} (#{patt}): "
-    _mm = ''
-    _mm = "[#{$mode}] " if $mode
-    print "\r#{_mm}#{$patt} #{GREEN}#{$message}#{CLEAR} >"
+    v_mm = ''
+    v_mm = "[#{$mode}] " if $mode
+    cf = current_file
+    $message = "No file highlighted (#{cf})" if cf and !$highlighted_a_column
+    $message = ' | No matches. Press ESCAPE' if $patt && !cf
+    # 2019-03-19 - take cursor to last line
+    system "tput cup #{$glines} 0"
+    # system "tput cup #{$glines} #{$gcols - cfl - 10}"
+    print "\e[33;4%sm%*s" % [$status_color || '1', $gcols, " "]
+
+    # sometimes due to search, there is no file
+    if cf
+      cfl = cf.size
+      # print right alighed
+      system "tput cup #{$glines} #{$gcols - cfl - 10}"
+      # print "#{REVERSE}#{cf}#{CLEAR}"
+      print "#{cf}"
+    end
+    # print "\r#{v_mm}#{$patt} #{GREEN}#{$message}#{CLEAR} >"
+    # move to beginning of line, reset text mode after printing
+    print "\r#{v_mm}#{$patt}#{$message}\e[m"
     ch = get_char
+    $highlighted_a_column = false
     # puts
     # break if ch == "q"
     # elsif  ch =~ /^[1-9a-zA-Z]$/
@@ -408,6 +433,7 @@ def run
       ctr = 0
     elsif ch == 'BACKSPACE'
       $patt = $patt[0..-2] if $patt && !$patt.empty?
+      $message = $patt = nil if $patt == ''
       ctr = 0
     else
       # binding = $bindings[ch]
@@ -469,6 +495,9 @@ def columnate(ary, sz)
   buff = []
   return buff if ary.nil? || ary.empty?
 
+  # 2019-03-19 - just to make sure highlighted column is visible
+  $highlighted_a_column = false
+
   # determine width based on number of files to show
   # if less than sz then 1 col and full width
   #
@@ -514,6 +543,7 @@ def columnate(ary, sz)
         ## we do the coloring after trunc so ANSI escpe seq does not get get
         if ix + $sta == $cursor
           f = "#{CURSOR_COLOR}#{f}#{CLEAR}"
+          $highlighted_a_column = true
         elsif linecolor
           f = "#{linecolor}#{f}#{CLEAR}"
         end
@@ -525,6 +555,7 @@ def columnate(ary, sz)
         # f = "#{CURSOR_COLOR}#{f}#{CLEAR}" if ix + $sta == $cursor
         if ix + $sta == $cursor
           f = "#{CURSOR_COLOR}#{f}#{CLEAR}"
+          $highlighted_a_column = true
         else
           f = "#{linecolor}#{f}#{CLEAR}"  if linecolor
         end
@@ -582,6 +613,8 @@ def _format(ary)
           last = f[-1]
           stat = File.stat(f.chop) if last == ' ' || last == '@' || last == '*'
         end
+        # this is for saved directories etc which are shortened
+        stat ||= File.stat(File.expand_path(f))
         f = format('%10s  %s  %s', readable_file_size(stat.size, 1),
                    date_format(stat.mtime), f)
       rescue Exception => e
@@ -766,6 +799,7 @@ def change_dir(f, pos = nil)
     return
   end
   $visited_dirs.insert(0, Dir.pwd)
+  save_dir_pos # added 2019-03-20 - so we get to same file
   f = File.expand_path(f)
   Dir.chdir f
   $filterstr ||= 'M'
@@ -882,8 +916,18 @@ def command_mode
   $mode = 'COM'
 end
 
+# go to parent dir, and maintain cursor on the dir we came out of
 def goto_parent_dir
+  # 2019-03-20 - when changing to parent, we need to keep cursor on
+  #  parent dir, not first
+  curr = File.basename(Dir.pwd)
+
   change_dir '..'
+
+  # get index of child dir in this dir, and set cursor to it.
+  index = $files.index(curr + '/')
+  pause "WARNING: Could not find #{curr} in this directory." unless index
+  $cursor = index if index
 end
 
 def goto_home_dir
@@ -934,23 +978,31 @@ end
 
 ## take regex from user, to run on files on screen, user can filter file names
 def enter_regex
-  print 'Enter (regex) pattern: '
-  # $patt = gets().chomp
-  $patt = Readline.readline('>', true)
-  ctr = 0
+  # print 'Enter (regex) pattern: '
+  # move to beginning of line, and clear till EOL
+  print "\r\e[K"
+  $patt = Readline.readline('/', true)
 end
 
+# page/scroll down.
+# TODO: 2019-03-18 - cursor needs to be updated
 def next_page
   $sta += $pagesize
+  $cursor += $pagesize
+  $sta = $cursor if $sta > $cursor
+  # FIXME this is sometimes correct, but in short  cases, cursor no longer refers
+  #  to a file. also after cycling, it no longer has a file.
 end
 
+# TODO: 2019-03-18 - cursor needs to be updated
 def prev_page
   $sta -= $pagesize
+  $cursor -= $pagesize
 end
 
 # print help on key-bindings
 # 2019-03-08 - write to temp file and user PAGER
-def print_help
+def old_print_help
   require 'tempfile'
   file = Tempfile.new('help')
   begin
@@ -974,7 +1026,67 @@ def print_help
     file.close
     file.unlink
   end
-end #
+end
+
+def print_help
+  page_with_tempfile do |file|
+    file.puts '    HELP'
+
+    file.puts
+    file.puts 'To open a file or dir press 1-9 a-z A-Z (on left of file)'
+    file.puts 'Ctrl-s to select file under cursor'
+    file.puts 'Selection Mode: Each selection adds to selection list (toggles)'
+    file.puts '   Execute commands on selected files. e.g D C-x   '
+    file.puts '   Upon exiting mode, selection is cleared'
+    file.puts 'Use left and right arrows to move through directories'
+    file.puts
+    ary = []
+    # TODO: 2019-03-19 -  replace _ with space in value
+    # TODO: 2019-03-19 -  if : then show text after colon
+    $bindings.each_pair { |k, v| ary.push "#{k.ljust(7)}  =>  #{v}" }
+    # FIXME this works but not properly when long_listing is true.
+    # We should avoid using columnate as there are several file related things.
+    ary = columnate ary, (ary.size/2)+1
+    ary.each { |line| file.puts line }
+  end
+end
+
+def page_stat_for_file
+  stat = %x[ stat #{current_file} ]
+  return unless stat
+
+  page_with_tempfile do |file|
+    file.puts stat
+  end
+
+end
+
+def page_with_tempfile
+  require 'tempfile'
+  file = Tempfile.new('cetus')
+  begin
+    yield file
+    file.flush
+    system "$PAGER #{file.path}"
+  rescue
+    file.close
+    file.unlink
+  end
+end
+
+def debug_vars
+  page_with_tempfile do |file|
+    file.puts 'DEBUG VARIABLES ARE:'
+    file.puts
+    file.puts "sta    #{$sta}"
+    file.puts "cursor #{$cursor}"
+    file.puts "stact  #{$stact}"
+    file.puts "viewport.size  #{$viewport.size}"
+    file.puts "pagesize       #{$pagesize}"
+    file.puts "view.size      #{$view.size}"
+    file.puts "file   #{current_file}"
+  end
+end
 
 def view_bookmarks
   puts
@@ -1441,7 +1553,7 @@ def subcommand
     $writing = true if $modified
   elsif command == 'e'
     edit_current
-  elsif command == 'h' or command == 'help' or command = '?'
+  elsif command == 'h' or command == 'help' or command == '?'
     print_help
   elsif command == 'p'
     system 'echo $PWD | pbcopy'
@@ -1613,7 +1725,7 @@ def screen_settings
   $glines = `tput lines`.to_i
   $gcols = `tput cols`.to_i
   $grows = $glines - 3
-  $pagesize = 60
+  # $pagesize = 60
   # $gviscols = 3
   $pagesize = $grows * $gviscols
 end
@@ -1654,8 +1766,8 @@ end
 def file_actions(action = nil)
   # only add dtrx for gz
   h = { d: :delete, m: :move, r: :rename, v: ENV['EDITOR'] || :vim,
-        c: :copy, C: :chdir, W: :remspace, e: :execute,
-        l: :less, s: :most, f: :file, o: :open, x: :dtrx, z: :zip }
+        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
@@ -1822,6 +1934,10 @@ def file_actions(action = nil)
     refresh
   when :execute
     execute
+  when :page_stat_for_file
+    1
+    # already been executed by menu
+    # We could have just put 'stat' in the menu but that doesn't look so nice
   else
     return unless menu_text
 
@@ -1963,20 +2079,23 @@ end
 def pipe; end
 
 ## some cursor movement functions
-##
-#
+# TODO: 2019-03-18 - cursor should also be updated
+# sta is not updated when cursor > viewport.size and sta is still 0
 def cursor_scroll_dn
   moveto(pos + MSCROLL)
 end
 
+# TODO: 2019-03-18 - cursor should also be updated
 def cursor_scroll_up
   moveto(pos - MSCROLL)
 end
 
+# TODO: 2019-03-18 - cursor and sta should also be updated if page changes
 def cursor_dn
   moveto(pos + 1)
 end
 
+# TODO: 2019-03-18 - cursor and sta should also be updated if page changes
 def cursor_up
   moveto(pos - 1)
 end
@@ -1986,25 +2105,40 @@ def pos
 end
 
 # move cursor to given position/line
-def moveto(pos)
+# $sta should also move
+def moveto(position)
   orig = $cursor
-  $cursor = pos
+  $cursor = position
   $cursor = [$cursor, $view.size - 1].min
   $cursor = [$cursor, 0].max
+  # 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
+  # sta goes to 0 but cursor remains at 70
+  # viewport.size may be wrong here, maybe should be pagesize only
+  if $cursor - $sta >= $pagesize
+    $sta += $pagesize
+  # elsif $sta - $cursor >= $viewport.size
+  end
+  if $sta > $cursor
+    $sta -= $pagesize
+    # $sta = $cursor
+  end
+
   star = [orig, $cursor].min
   fin = [orig, $cursor].max
-  if $visual_mode
-    # PWD has to be there in selction
-    if selected? current_file
-      # this depends on the direction
-      # $selected_files = $selected_files - $view[star..fin]
-      remove_from_selection $view[star..fin]
-      ## current row remains in selection always.
-      add_to_selection current_file
-    else
-      # $selected_files.concat $view[star..fin]
-      add_to_selection $view[star..fin]
-    end
+  return unless $visual_mode
+
+  # PWD has to be there in selction
+  if selected? current_file
+    # this depends on the direction
+    # $selected_files = $selected_files - $view[star..fin]
+    remove_from_selection $view[star..fin]
+    ## current row remains in selection always.
+    add_to_selection current_file
+  else
+    # $selected_files.concat $view[star..fin]
+    add_to_selection $view[star..fin]
   end
 end
 
@@ -2120,12 +2254,15 @@ def filetype(f)
   nil
 end
 
+# save offset in directory so we can revert to it when we return
 def save_dir_pos
-  return if $sta == 0 && $cursor == 0
+  # the next line meant that it would not save first directory.
+  # return if $sta == 0 && $cursor == 0
 
   $dir_position[Dir.pwd] = [$sta, $cursor]
 end
 
+# revert to the position we were at in this directory
 def revert_dir_pos
   $sta = 0
   $cursor = 0

data/cetus.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'cetus'
-  spec.version       = '0.1.24'
+  spec.version       = '0.1.26'
   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.24
+  version: 0.1.26
 platform: ruby
 authors:
 - Rahul Kumar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-18 00:00:00.000000000 Z
+date: 2019-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler