cetus 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b9d18e0f61df366b1977e94b4492e2d5d89db8459082859c96325bb30459cc4
-  data.tar.gz: 698d7c3e64d40e533d3fe1d028e2e2425d2fcd4db09cebb5803d9d64450009d5
+  metadata.gz: fe8c1244b0c3e4c41eb6f186f13a2145330c3243de099db9a91bac5a87f0b1c6
+  data.tar.gz: e732da1943a5b7ab651c736a6d56bd645ce9d58b9dbf1857efcb97713563c2e1
 SHA512:
-  metadata.gz: 55a5c875ecf98f26123a9d3f7dac5e8cdc8731fede1c3767cad9f84a117827473ccb598f2ca5fc96f2e839a5bdfd2a50ce739a16c65f4aa1205afb20d0bfa053
-  data.tar.gz: c444a54d8675e4c7d6953f3da43e07d1ac8f464b4f6cd835ec5e51da625e0e9ee55067ddb6fb00d8ed4cc78583515db23fca11c9b35bfe2d49eb10c2e16f3642
+  metadata.gz: 16cab047cb3fa5b2a9de8b25a8c3fe450ef9527896b19af2b5cd9d6ff5b554381c8b012dd21b2f9477ff8f00e080b3cf25d359e5c85103c3a777faa0ae1c171c
+  data.tar.gz: 106ccedd0121858ddd1a867a9d2c875c8ab9fd1b6cba34062fbeed6ec256c80032f23b9363ea78c018ab861d8eb189c91bde3b373d1963ea16b656a1c0e40597

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-16 10:17
+#  Last update: 2019-03-18 14:02
 # --------------------------------------------------------------------------- #
 #  cetus.rb  Copyright (C) 2012-2019 rahul kumar
 # == CHANGELOG
@@ -35,7 +35,7 @@ require 'fileutils'
 
 # 2019-02-20 - added so alt-screen is used
 system 'tput smcup'
-VERSION = '0.1.23.0'.freeze
+VERSION = '0.1.24.0'.freeze
 O_CONFIG = true
 # CONFIG_FILE = '~/.lyrainfo'.freeze
 CONFIG_FILE = '~/.config/cetus/conf.yml'.freeze
@@ -45,11 +45,13 @@ $bindings = {
   '`' => 'main_menu',
   '=' => 'toggle_menu',
   'M-y' => 'selection_menu',
+  'M-s' => 'sort_menu',
   'ENTER' => 'select_current',
   'C-p' => 'page_current',
   'C-e' => 'edit_current',
   'C-o' => 'edit_current',
   'C-s' => 'toggle_select',
+  'C-r' => 'reduce',
   '@' => 'selection_mode_toggle',
   'M-a' => 'select_all',
   'M-A' => 'unselect_all',
@@ -366,25 +368,34 @@ def run
     fin = $sta + $viewport.size
     $title ||= Dir.pwd.sub(home, '~')
     clear_screen
+
+
     # title
     print "#{GREEN}#{$help}  #{BLUE}cetus #{VERSION}#{CLEAR}\n"
     t = "#{$title}  #{$sta + 1} to #{fin} of #{fl}  #{$sorto} F:#{$filterstr}"
     t = t[t.size - $gcols..-1] if t.size >= $gcols
     print "#{BOLD}#{t}#{CLEAR}\n"
+
+
     ## nilling the title means a superimposed one gets cleared.
     # $title = nil
     # split into 2 procedures so columnate can e clean and reused.
     buff = _format $viewport
+
+    # break into as many columns as required
     buff = columnate buff, $grows
+
     # needed the next line to see how much extra we were going in padding
     # buff.each {|line| print "#{REVERSE}#{line}#{CLEAR}\n" }
     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} >"
+    print "\r#{_mm}#{$patt} #{GREEN}#{$message}#{CLEAR} >"
     ch = get_char
     # puts
     # break if ch == "q"
@@ -487,18 +498,42 @@ def columnate(ary, sz)
     while ctr < sz
 
       f = ary[ix]
+      # f is not just filename but marker and hint
+      # Check last char to see if directory
+      linecolor = nil
+      linecolor = BLUE if f[-1] == '/'
+
+      # check to see if we need to truncate
+      # TODO 2019-03-18 - truncate from middle of string.
       fsz = f.size
       if fsz > wid
-        f = f[0, wid - 2] + '$ '
+        fromstart = wid - 8
+        # f = f[0, wid - 2] + '$ '
+        # 2019-03-18 - trying to truncate from center
+        f = f[0, fromstart] + '$' + f[-6..-1] + ' '
         ## we do the coloring after trunc so ANSI escpe seq does not get get
-        f = "#{CURSOR_COLOR}#{f}#{CLEAR}" if ix + $sta == $cursor
+        if ix + $sta == $cursor
+          f = "#{CURSOR_COLOR}#{f}#{CLEAR}"
+        elsif linecolor
+          f = "#{linecolor}#{f}#{CLEAR}"
+        end
+
       else
-        ## we do the coloring before padding so the entire line does not get padded, only file name
-        f = "#{CURSOR_COLOR}#{f}#{CLEAR}" if ix + $sta == $cursor
+
+        ## we do the coloring before padding so the entire line does not get
+        # padded, only file name
+        # f = "#{CURSOR_COLOR}#{f}#{CLEAR}" if ix + $sta == $cursor
+        if ix + $sta == $cursor
+          f = "#{CURSOR_COLOR}#{f}#{CLEAR}"
+        else
+          f = "#{linecolor}#{f}#{CLEAR}"  if linecolor
+        end
         # f = f.ljust(wid)
         f << ' ' * (wid - fsz)
+
       end
 
+      # if already a value in that line, append to it
       if buff[ctr]
         buff[ctr] += f
       else
@@ -517,6 +552,8 @@ end
 ## formats the data with number, mark and details
 # 2019-03-09 - at some time this got renamed to `format` which is a kernel
 #  method and this overshadowed that method.
+#  NOTE: this does not do any coloring since the codes may get chopped by
+#   columnate method
 def _format(ary)
   # buff = Array.new
   buff = Array.new(ary.size)
@@ -534,8 +571,6 @@ def _format(ary)
     mark = SPACE
     cur = SPACE
     cur = CURMARK if ix + $sta == $cursor
-    # TODO: add full path TESTME
-    # mark = GMARK if $selected_files.index(ary[ix])
     mark = GMARK if selected?(ary[ix])
 
     if $long_listing
@@ -543,6 +578,7 @@ def _format(ary)
         if File.exist? f
           stat = File.stat(f)
         else
+          # remove last character and get stat
           last = f[-1]
           stat = File.stat(f.chop) if last == ' ' || last == '@' || last == '*'
         end
@@ -554,7 +590,8 @@ def _format(ary)
     end
 
     s = "#{ind}#{mark}#{cur}#{f}"
-    # I cannot color the current line since format does the chopping
+
+    # NOTE: I cannot color the current line since _format does the chopping
     # so not only does the next lines alignment get skewed,
     # but also if the line is truncated
     # then the color overflows.
@@ -678,6 +715,7 @@ def run_on_current(command)
   reset_terminal
   comm = "#{command} #{f}"
   system(comm.to_s)
+  push_used_dirs
   setup_terminal
 end
 
@@ -721,7 +759,7 @@ def run_command(f)
   get_char
 end
 
-## cd to a dir
+## cd to a dir and go to position if specified
 def change_dir(f, pos = nil)
   unless File.directory? f
     perror "#{p} is not a directory, or does not exist."
@@ -755,6 +793,7 @@ def escape
   $viewctr = 0
   $title = nil
   $filterstr = 'M'
+  $message = nil
   visual_block_clear
   refresh
 end
@@ -769,6 +808,7 @@ def refresh
   $title = nil
 end
 
+# put directories first, then files
 def sort_file_list(_files)
   _dirs = $files.select { |f| File.directory?(f) }
   _files = $files.select { |f| File.file?(f) }
@@ -783,7 +823,6 @@ end
 
 ## select all files
 def select_all
-  # TODO: add path TESTME
   dir = Dir.pwd
   $selected_files = $view.map { |file| File.join(dir, file) }
 end
@@ -834,6 +873,7 @@ end
 # 2019-03-15 - TODO FIXME preferable when we go into command mode
 #  run a command on current or selected files. But then is it a mode, do we remain
 #  there, or come out immediately ?
+#  2019-03-17 - have removed this altogether. not required
 def command_mode
   if $mode == 'COM'
     $mode = nil
@@ -917,10 +957,12 @@ def print_help
     file.puts '    HELP'
 
     file.puts
-    file.puts 'To open a file or dir press 1-9 a-z A-Z '
+    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 = []
     $bindings.each_pair { |k, v| ary.push "#{k.ljust(7)}  =>  #{v}" }
@@ -1042,19 +1084,21 @@ end
 def toggle_menu
   h = { :h => :toggle_hidden, :c => :toggle_case, :l => :toggle_long_list, '1' => :toggle_columns,
         :p => :toggle_pager_mode, :e => :toggle_enhanced_list }
-  ch, menu_text = menu 'Toggle Menu', h
+  _, menu_text = menu 'Toggle Menu', h
   # NOTE fzfmenu returns string not symbol
   return unless menu_text
 
   case menu_text
   when :toggle_hidden
     $hidden = $hidden ? nil : 'D'
-    pause "Hidden is now #{$hidden}"
+    pause "Show hidden files is now #{!$hidden.nil?}"
+    message "Show hidden is now #{!$hidden.nil?}"
     refresh
   when :toggle_case
     # $ignorecase = $ignorecase ? "" : "i"
     $ignorecase = !$ignorecase
-    pause "Ignore Case  is now #{$ignorecase}"
+    pause "Ignore Case is now #{$ignorecase}"
+    message "Ignore Case is now #{$ignorecase}"
     refresh
   when :toggle_columns
     $gviscols = 3 if $gviscols == 1
@@ -1070,8 +1114,10 @@ def toggle_menu
                        else
                          ENV['MANPAGER'] || ENV['PAGER']
                        end
+    message "Default command is #{$default_command}"
   when :toggle_enhanced_list
     $enhanced_mode = !$enhanced_mode
+    message "Enhanced mode is #{$long_listing}"
 
   when :toggle_long_list
     $long_listing = !$long_listing
@@ -1082,6 +1128,7 @@ def toggle_menu
       x = $grows * $gviscols
       $pagesize = $pagesize == x ? $grows : x
     end
+    message "Long listing is #{$long_listing}"
     refresh
   end
 end
@@ -1187,7 +1234,8 @@ def extras
 end
 
 def filter_menu
-  h = { :d => :dirs, :f => :files, :e => :emptydirs, '0' => :emptyfiles }
+  h = { :d => :dirs, :f => :files, :e => :emptydirs, '0' => :emptyfiles,
+  :r => :reduce_list, :x => :extension}
   ch, menu_text = menu 'Filter Menu', h
   files = nil
   case menu_text
@@ -1207,6 +1255,10 @@ def filter_menu
     $filterstr = '.L0'
     files = `zsh -c 'print -rl -- *(#{$sorto}#{$hidden}.L0)'`.split("\n")
     $title = 'Filter: empty files'
+  when :reduce_list
+    files = reduce
+  when :extension
+    files = filter_for_current_extension
   end
   if files
     $files = files
@@ -1214,6 +1266,21 @@ def filter_menu
   end
 end
 
+def reduce pattern=nil
+  unless pattern
+    print 'Enter a pattern to reduce current list: '
+    pattern = gets.chomp
+  end
+  $title = "Filter: pattern #{pattern}"
+  $files = $files.select {|f| f.match(pattern)}
+end
+
+def filter_for_current_extension
+  extn = File.extname(current_file)
+  return unless extn
+  reduce extn
+end
+
 def select_used_dirs
   $title = 'Used Directories'
   home = File.expand_path '~'
@@ -1253,6 +1320,7 @@ def post_cd
   $patt = nil
   $sta = $cursor = 0
   $title = nil
+  $message = nil
   $visual_block_start = nil
   $stact = 0
   $current_dir = Dir.pwd # 2019-03-10 - so i don't keep doing in functions
@@ -1302,6 +1370,7 @@ def config_write
   hash['BOOKMARKS'] = $bookmarks #.select {|file| File.exist? file}
   writeYML hash, f1
   $writing = $modified = false
+  message "Saved #{f1}"
 end
 
 # {{{ YML
@@ -1320,13 +1389,16 @@ def writeYML obj, filename
   end
 end
 # }}}
+
 ## accept a character to save this dir as a bookmark
 def create_bookmark
   print 'Enter A to Z or 0-9 to create a bookmark: '
   ch = get_char
   if ch =~ /^[0-9A-Z]$/
-    $bookmarks[ch] = "#{Dir.pwd}:#{$cursor}"
+    # $bookmarks[ch] = "#{Dir.pwd}:#{$cursor}"
+    $bookmarks[ch] = Dir.pwd
     $modified = true
+    message "Created bookmark #{ch}"
   else
     perror 'Bookmark must be upper-case character or number.'
   end
@@ -1437,7 +1509,10 @@ end
 
 ## create a list of dirs in which some action has happened, for saving
 def push_used_dirs(d = Dir.pwd)
-  $used_dirs.index(d) || $used_dirs.push(d)
+  # $used_dirs.index(d) || $used_dirs.push(d)
+  return if $used_dirs[0] == d
+  $used_dirs.delete(d) if $used_dirs.index(d)
+  $used_dirs.insert(0, d)
 end
 
 def pbold(text)
@@ -1545,13 +1620,30 @@ end
 
 ## moves column offset so we can reach unindexed columns or entries
 # 0 forward and any other back/prev
-def column_next(dir = 0)
-  if dir == 0
+# direction is 0 (forward) or 1 (backward)
+# TODO 2019-03-18 - $cursor should also move
+def column_next(direction = 0)
+  # right movement or panning cycles back to first column
+  # leftward movement stops at first column.
+  if direction == 0
     $stact += $grows
     $stact = 0 if $stact >= $viewport.size
+    $cursor += $grows
+    # 2019-03-18 - zero loses offset. we need to maintain it
+    # $cursor = 0 if $cursor >= $viewport.size
+    if $cursor >= $viewport.size
+      while $cursor > 0
+        $cursor -= $grows
+      end
+      $cursor += $grows if $cursor < 0
+    end
   else
     $stact -= $grows
+    $cursor -= $grows
     $stact = 0 if $stact < 0
+    # setting cursor as zero loses the position or offset
+    # We are trying to maintain offset
+    $cursor += $grows if $cursor < 0
   end
 end
 
@@ -1636,6 +1728,7 @@ def file_actions(action = nil)
     if File.directory? target
       begin
         FileUtils.mv file, target
+        message "Moved #{text} to #{target}"
       rescue StandardError => exc
         perror exc.to_s
       end
@@ -1658,6 +1751,7 @@ def file_actions(action = nil)
     if File.directory? target
       begin
         FileUtils.cp file, target
+        message "Copied #{text} to #{target}"
       rescue StandardError => exc
         perror exc.to_s
       end
@@ -1830,8 +1924,9 @@ def locate
   end
 end
 
-## Displays files from .viminfo file, if you use some other editor which tracks files opened
-#  then you can modify this accordingly.
+## Displays files from .viminfo file, if you use some other editor which
+# tracks files opened then you can modify this accordingly.
+# Neovim does not use viminfo
 #
 def viminfo
   file = File.expand_path('~/.viminfo')
@@ -1852,6 +1947,7 @@ def z_interface
     $title = 'Directories from ~/.z'
     $files = `sort -rn -k2 -t '|' ~/.z | cut -f1 -d '|'`.split("\n")
     home = ENV['HOME']
+    # shorten file names
     $files.collect! do |f|
       f.sub(/#{home}/, '~')
     end
@@ -1889,6 +1985,7 @@ def pos
   $cursor
 end
 
+# move cursor to given position/line
 def moveto(pos)
   orig = $cursor
   $cursor = pos
@@ -1898,7 +1995,6 @@ def moveto(pos)
   fin = [orig, $cursor].max
   if $visual_mode
     # PWD has to be there in selction
-    # TODO: add full path TESTME
     if selected? current_file
       # this depends on the direction
       # $selected_files = $selected_files - $view[star..fin]
@@ -1948,11 +2044,11 @@ def remove_from_selection(file)
 end
 
 def visual_mode_toggle
+  $mode = nil
   $visual_mode = !$visual_mode
   if $visual_mode
+    $mode = 'VIS'
     $visual_block_start = $cursor
-    # TODO: add full path TESTME
-    # $selected_files.push $view[$cursor]
     add_to_selection current_file
   end
 end
@@ -1961,8 +2057,6 @@ def visual_block_clear
   if $visual_block_start
     star = [$visual_block_start, $cursor].min
     fin = [$visual_block_start, $cursor].max
-    # TODO: add full path TESTME
-    # $selected_files = $selected_files - $view[star..fin]
     remove_from_selection $view[star..fin]
   end
   $visual_block_start = nil
@@ -2077,8 +2171,7 @@ def newfile
   refresh
 end
 
-
-
+# convenience method to return file under cursor
 def current_file
   $view[$cursor]
 end
@@ -2271,6 +2364,10 @@ def get_important_files(dir)
   list
 end
 
+def message mess
+  $message = mess
+end
+
 Signal.trap('EXIT') do
   reset_terminal
   # system 'tput rmcup'

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.23'
+  spec.version       = '0.1.24'
   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.23
+  version: 0.1.24
 platform: ruby
 authors:
 - Rahul Kumar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-16 00:00:00.000000000 Z
+date: 2019-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler