cetus 0.1.39 → 0.1.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 501ef34e9afd0b98b8cfda66aa5c98fb46d6529f507e95c18951833edc467a0f
-  data.tar.gz: 722a4926a42bd426cfac568b2166c041b6a4dda63939e04ea5b6e5c2f3127de6
+  metadata.gz: e0318abcc4c63333edf5206aa2437530ca07c4379cc4887e1634535db8d86d1b
+  data.tar.gz: 526dab38dce30caba04507bd473eddfadd308a4cea301278dc79826daffa6eb4
 SHA512:
-  metadata.gz: b19bc7bbf440a8c9df34165c35e5b19134e9b3e3023e348e8eec52a770e784359ca02b7d8618d3b311b9bb802676f252274c8fe8e228a1ddf825fd0016a438eb
-  data.tar.gz: 41ad81c2cda30e5a20cc35ea22d4ec0e96630d3e907053713f733d3d61b6ba0fb42a6d9e1de8e367733aeca8a26cb2465f5af3dd7e1848a79cc8a78027640881
+  metadata.gz: ab77bcbf1fc65397d1bc3afa2729b37bb60a7929468cc1d50eaebd1ac94a66c322e01f18dd8342f723d386dc319e935dfb9e5672c7722ce60a071a331ccec8c0
+  data.tar.gz: 83ff786fd0130ccd8417b4ab14a4a0c96f7801b20c376670fa905911e8032d2a1feb292a7a82254abf967d0f20c7e9445200f60c9a0e833347d0beb793c59b57

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-21 23:46
+#  Last update: 2019-04-22 12:37
 # --------------------------------------------------------------------------- #
 #  cetus.rb  Copyright (C) 2012-2019 rahul kumar
 # == CHANGELOG
@@ -20,6 +20,7 @@
 # 2019-03-04 - first dirs then files
 # 2019-03-22 - refactoring the code, esp run()
 # 2019-04-21 - search_as_you_type
+# 2019-04-22 - new search_as_you_type
 #  == TODO
 
 require 'readline'
@@ -39,7 +40,7 @@ now = Time.now.strftime("%Y-%m-%d %H:%M:%S")
 # alias c=~/bin/cetus.rb
 # c
 
-VERSION = '0.1.39.0'
+VERSION = '0.1.41.0'
 CONFIG_PATH = ENV['XDG_CONFIG_HOME'] || File.join(ENV['HOME'], '.config')
 CONFIG_FILE = "#{CONFIG_PATH}/cetus/conf.yml"
 
@@ -338,7 +339,7 @@ PAGER_COMMAND = {
 @cursor_movement = @old_cursor = nil # cursor movement has happened only, don't repaint
 ## FLAGS
 @multiple_selection = true # single select
-@group_dirs = true
+@group_directories = :first
 # truncate long filenames from :right, :left or :center.
 @truncate_from = :center
 @filename_status_line = true
@@ -346,6 +347,7 @@ PAGER_COMMAND = {
 @selected_files_fullpath_flag = false
 @selected_files_escaped_flag = false
 @keys_to_clear = nil
+@ignore_case = true
 
 # See toggle_value
 # we need to set these on startup
@@ -365,16 +367,10 @@ PAGER_COMMAND = {
   toggle_filename_status_line: true,
   instant_search: true
 }
-# @cycles = { truncate_from: :center,
-            # show_hidden: nil }
-# @enums = {
-  # truncate_from: %i[left right center],
-  # show_hidden: [nil, 'D']
-# }
 # var is name of variable to be set
 @options = {
   truncate_from: { current: :center, values: %i[left right center], var: :truncate_from },
-  group_directories: { current: :first, values: %i[first none last] },
+  group_directories: { current: :first, values: %i[first none last], var: :group_directories },
   show_hidden: { current: nil, values: [nil, 'D'], var: :hidden }
 }
 
@@ -458,19 +454,12 @@ CURSOR_COLOR = REVERSE
 def read_directory
   rescan_required false
 
-  # http://zsh.sourceforge.net/Doc/Release/Shell-Builtin-Commands.html
-  # zsh print -rl
-  # -l Print the arguments separated by newlines instead of spaces.
-  # -r Ignore the escape conventions of echo.
-  # zshglob M = MARK_DIRS
-
   @filterstr ||= 'M' # XXX can we remove from here
-  # @files = `zsh -c 'print -rl -- *(#{@sorto}#{@hidden}#{@filterstr})'`.split("\n")
-  # @files = list_files
   list_files
-  # @files = group_directories_first(@files) if @toggles[:group_directories]
+
   group_directories_first
-  return unless cget(:enhanced_mode)
+  # return unless cget(:enhanced_mode)
+  return unless @enhanced_mode
 
   enhance_file_list
   @files = @files.uniq
@@ -478,6 +467,7 @@ end
 
 # return a list of directory contents sorted as per sort order
 # NOTE: FNM_CASEFOLD does not work with Dir.glob
+# XXX _filter unused.
 def list_files dir='*', sorto=@sorto, hidden=@hidden, _filter=@filterstr
   dir += '/*' if File.directory?(dir)
   dir = dir.gsub('//', '/')
@@ -520,7 +510,7 @@ def list_files dir='*', sorto=@sorto, hidden=@hidden, _filter=@filterstr
     end
   end
 
-  sorted_files.sort! { |w1, w2| w1.casecmp(w2) } if func == :path && cget(:ignore_case)
+  sorted_files.sort! { |w1, w2| w1.casecmp(w2) } if func == :path && @ignore_case
 
   # zsh gives mtime sort with latest first, ruby gives latest last
   sorted_files.reverse! if sorto[0] == 'O'
@@ -545,7 +535,8 @@ end
 # ------------------- create_viewport ------------------ #
 def create_viewport
   @view = if @patt
-            if cget(:ignore_case)
+            # if cget(:ignore_case)
+            if @ignore_case
               @files.grep(/#{@patt}/i)
             else
               @files.grep(/#{@patt}/)
@@ -584,7 +575,8 @@ def print_title
   fl = @view.size
 
   # fix count of entries so separator and enhanced entries don't show up
-  if cget(:enhanced_mode)
+  # if cget(:enhanced_mode)
+  if @enhanced_mode
     ix = @viewport.index SEPARATOR
     fin = @sta + ix if ix
 
@@ -610,15 +602,15 @@ def status_line
   # prompt
   v_mm = @mode ? "[#{@mode}] " : ''
   cf = current_file
-  @message = ' | No matches. Press ESCAPE' if @patt && !cf
+  @message = " | No matches. Press ESCAPE " if @patt && !cf
 
   clear_last_line
 
   # Print the filename at the right side of the status line
   # sometimes due to search, there is no file
   if cf
-    if cget(:debug_flag)
-      # XXX this will not work on file basis FIXME
+    # if cget(:debug_flag)
+    if @debug_flag
       print_debug_info cf
     else
       # print_on_right "#{Dir.pwd}"
@@ -629,7 +621,8 @@ def status_line
   # patt and message are together, no gap, why not ? 2019-04-08 -
   if @patt && @patt != ''
     patt = "[/#{@patt}" + ']' # to get unfrozen string
-    patt[-1] = '/i]' if cget(:ignore_case)
+    # patt[-1] = '/i]' if cget(:ignore_case)
+    patt[-1] = '/i]' if @ignore_case
   end
   # bring cursor to start of line
   # add background color
@@ -758,30 +751,27 @@ def tput_cup row, col
   print "\e[#{row + 3};#{col + 1}H"
 end
 
-# FIXME flag is unused ???? XXX
 def redraw_required flag=true
   @redraw_required = flag
 end
 
+# return value determines if screen is redrawn or not.
 def resolve_key key
-  ret = true
   clear_message
 
-  return true if search_as_you_type(key)
+  # hint mode, pick file based on shortcut
+  return select_hint(@viewport, key) if key.match?(/^[a-pr-zZ]$/)
 
-  if key.match?(/^[a-pr-zZ]$/)
-    # hint mode
-    ret = select_hint @viewport, key
+  if '0123456789'.include?(key)
+    resolve_numeric_key(key)
   elsif key == 'BACKSPACE'
     @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
     resolve_binding key
   end
-  ret
+  true
 end
 
 def resolve_binding key
@@ -816,68 +806,39 @@ 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
+# v2 if search_as_you_type which takes keyboard control
+# This is fairly straightforward and took only a few minutes to get done.
+# return value is not used.
+def search_as_you_type
 
-  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
+  @patt = '' + '' # rubocop suggestion to get unfrozen string
+  @title = 'Search Results (ENTER to return, ESC to cancel)'
+  clear_last_line
+  print "\r/"
+  loop do
+    key = get_char
+    if key == 'ENTER'
+      @title = 'Search Results (ESCAPE to return)'
+      return true
+    elsif key == 'ESCAPE'
+      @mode = @title = @patt = nil
+      status_line
+      return false
+    elsif key == 'BACKSPACE'
+      @patt = @patt[0..-2]
+      @message = nil # remove pesky ESCAPE message
+    elsif key.match?(/^[a-zA-Z0-9\. _]$/)
+      @patt += key if @patt
+    else
+      resolve_key key
+      @mode = @title = nil
+      # if directory changes, then patt is nilled causing error above
+      return true
+    end
+    # XXX is rescan required ?
+    draw_directory
+    place_cursor
   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
@@ -1416,7 +1377,6 @@ def escape
   @viewctr = 0
   @title = nil
   @filterstr = 'M'
-  @searching = false
   @message = nil
   @mode = nil
   visual_block_clear
@@ -1433,13 +1393,14 @@ end
 
 # put directories first, then files
 def group_directories_first
-  return if cget(:group_directories) == :none
+  # return if cget(:group_directories) == :none
+  return if @group_directories == :none
 
   files = @files
   dirs = files.select { |f| File.directory?(f) }
   # earlier I had File? which removed links, esp dead ones
   fi   = files.reject { |f| File.directory?(f) }
-  @files = if cget(:group_directories) == :first
+  @files = if @group_directories == :first
              dirs + fi
            else
              fi + dirs
@@ -1549,20 +1510,13 @@ end
 
 ## take regex from user, to run on files on screen, user can filter file names
 def ask_regex
-  unless cget(:instant_search)
-    @log.info "Inside ask_regex readline."
+  @title = 'Search Results: (Press Escape to cancel)'
+  @mode = 'SEARCH'
+  if cget(:instant_search)
+    search_as_you_type
+  else
     @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.
@@ -1600,11 +1554,12 @@ def print_help
     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 'To open a file or dir, press a-z A-Z (shortcut on left of file)'
+    file.puts 'Ctrl-s to select file under cursor. * for multiple select.'
+    file.puts 'Ctrl-Space: Enter and exit Visual Selection mode'
+    file.puts 'Ctrl-x: file actions for selected files, or file under cursor'
+    file.puts '1-9: bookmark a dir, and go to it.'
+
     file.puts 'Use left and right arrows to move through directories'
     file.puts
     ary = []
@@ -1630,6 +1585,25 @@ def page_stat_for_file
   end
 end
 
+# display values of flag and options in pager
+def page_flags
+  # XXX once this is changed to an array, then remove 'keys'
+  page_with_tempfile do |file|
+    file.puts 'Values of toggles/flags'
+    file.puts '-----------------------'
+    @toggles.keys.each do |flag|
+      value = instance_variable_get "@#{flag}"
+      file.puts "#{flag} : #{value}"
+    end
+    file.puts '-----------------------'
+    @options.each_pair do |flag, struc|
+      var = struc[:var]
+      value = instance_variable_get "@#{var}"
+      file.puts "#{flag} : #{value}"
+    end
+  end
+end
+
 def page_with_tempfile
   require 'tempfile'
   file = Tempfile.new('cetus')
@@ -2006,12 +1980,13 @@ end
 def extras
   h = { '1' => :one_column,
         '2' => :multi_column,
-        :c => :columns,
+        c: :columns,
         s: :scripts,
         g: :generators,
-        :B => :bindkey_ext_command,
-        :r => :config_read,
-        :w => :config_write }
+        B: :bindkey_ext_command,
+        f: :page_flags,
+        r: :config_read,
+        w: :config_write }
   key, menu_text = menu 'Extras Menu', h
   case menu_text
   when :one_column
@@ -3513,7 +3488,8 @@ end
 # latest source, but in some cases even this can be misleading since running a program accesses
 # include files.
 def enhance_file_list
-  return unless cget(:enhanced_mode)
+  # return unless cget(:enhanced_mode)
+  return unless @enhanced_mode
 
   begin
     actr = @files.size
@@ -3522,11 +3498,6 @@ def enhance_file_list
     # 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
@@ -3813,7 +3784,7 @@ def only_cursor_moved?
   end
 
   # we may want to print debug info if flag is on
-  if cget(:debug_flag)
+  if @debug_flag
     clear_last_line
     print_debug_info
   else

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.39'
+  spec.version       = '0.1.41'
   spec.authors       = ['Rahul Kumar']
   spec.email         = ['oneness.univ@gmail.com']
   spec.description   = %q{lightning fast file navigator}

data/scripts/back

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+# ----------------------------------------------------------------------------- #
+#         File: back.sh
+#  Description: copies given file into dropbox dir with timestamp appended
+#       Author: j kepler  http://github.com/mare-imbrium/canis/
+#         Date: 2019-01-18 - 12:23
+#      License: MIT
+#  Last update: 2019-02-23 10:13
+# ----------------------------------------------------------------------------- #
+#  YFF Copyright (C) 2012-2018 j kepler
+errecho(){ >&2 echo $@; }
+
+if [  $# -eq 0 ]; then
+   errecho "Give a file name to copy into dropbox dir"
+   exit 1
+fi
+TODAY=$(date +"%Y%m%d%H%M")
+#if [[ ! -d back ]]; then
+    #mkdir back 
+#fi
+BASE=~/Dropbox/backups
+YEAR=$(date +"%Y")
+TARGET=${BASE}/${YEAR}
+if [[ ! -d $TARGET ]]; then
+    mkdir -p $TARGET
+fi
+
+
+cp -p "$1" ${TARGET}/${1}.${TODAY}
+ls -l ${TARGET}/$1.${TODAY}

data/scripts/remove_brackets

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# Remove brackets and quotes from filenames
+# replaces space with underscore
+IFILE=~/tmp/selected_files
+if [[ -f $IFILE ]]; then
+  wc -l $IFILE
+else
+  echo "No files selected."
+  exit 1
+fi
+
+while IFS= read -r file
+do
+  NEWNAME=$( echo "$file" | tr ' ' '_' | tr -d "[]()\"'")
+  [ -f "$file" ] && mv "$file" "$NEWNAME"
+done < "$IFILE"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cetus
 version: !ruby/object:Gem::Version
-  version: 0.1.39
+  version: 0.1.41
 platform: ruby
 authors:
 - Rahul Kumar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-21 00:00:00.000000000 Z
+date: 2019-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -55,8 +55,10 @@ files:
 - cetus.gemspec
 - generators/viminfo
 - generators/z
+- scripts/back
 - scripts/create_dir_with_selection
 - scripts/encrypt.sh
+- scripts/remove_brackets
 - scripts/zip
 homepage: http://github.com/rkumar/cetus
 licenses: