rtfm-filemanager 1.4.0 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cb8c1afd7b4f2cf1ab8175432956159e52dc715f25568cc7882c7ee0f5358d0
-  data.tar.gz: efd18775dfbfe3e7a8780b4e971b116b73d278cc63f7dd8a17dfdedadaa97120
+  metadata.gz: b6f194c1fffc6901d52041ffe687b4880cbd948a150a6917dc2c181c65aaf674
+  data.tar.gz: fe7bc722683be3375c84897c3128e09149f839859a3ae3246dcac8611c6f5643
 SHA512:
-  metadata.gz: 9975653d0d5b99418cf0f710bcfa8f314489cd5b9f4369f47f69a41ee2979be0645a1570e83f8eaba322f29d6a0560ba97d40a7607f3608a44007819ebed8dd9
-  data.tar.gz: 78cbd09e08d1c8754ad75fc5b1cd8ad7e8e8b79df56259822234778abe0152042fddd33a82425876ba6704a9ee8533cd5176d97100db86725fbce92503adb23a
+  metadata.gz: d5a6d8051cb8d64e426db0b35a7b88aeba64b493e1b99a0ba6659d214cd2510d79dc5b62786eb1b57d8d8c6980465e8f150441d8e265f1ed71a5ea9c59d04e32
+  data.tar.gz: 56f1089b663786fe0d5aaefc73db51a446500c5f2807ba76baadc014f143c6b6a88bd3e3a6610326c171ee1f84abd945d684935804e950d8786070e6acbfc4fd

data/bin/rtfm

@@ -46,8 +46,9 @@ JUMPING AND MARKS
           Press '-' and a letter to delete that mark
  M      = Show marked items in right pane
  '      = Jump to mark (next letter is the name of the mark [a-zA-Z'])
- j      = Jump to the item in the left pane that matches the entry
- J      = Jump to the next matched item (as entered via 'j') if any
+ /      = Enter search string in bottom window to highlight matching items and jump to the first match
+ n      = Jump to the next item matched by '/'
+ N      = Jump to the previous item matched by '/'
  h      = Jump to Home directory
  f      = Follow symlink to the directory where the target resides
  L      = Start 'locate' search for files, then use '#' to jump to desired line/directory
@@ -84,7 +85,6 @@ RIGHT PANE
  -      = Toggle preview in right pane (turn it off for faster traversing of directories)
 
 ADDITINAL COMMANDS
- /      = Enter search string in bottom window to highlight matching items
  g      = Run 'grep' to show files that contains the MATCH in current directory
  :      = Enter "command mode" in bottom window (press ENTER to execute, press Ctrl-G to escape)
  ;      = Show command history in right pane
@@ -172,7 +172,6 @@ begin # BASIC SETUP
   ## These should not be set by user in .rtfm.conf
   @directory  = {}    # Initialize the directory hash for remembering directories visited
   @searched   = ""    # Initialize the active searched for items
-  @jump       = ""    # Initialize the "jump-to-file"
   @index      = 0     # Set chosen item to first on startup
   @marks["'"] = Dir.pwd
   ## File type recognizers
@@ -620,23 +619,34 @@ def main_getkey # GET KEY FROM USER
     @break = true
     @w_b.update = true
   # ADDITIONAL COMMANDS
-  when 'j' # Get the jump-to-file in the current dir from input
+  when '/' # Get search string to mark items that match the input 
     @w_b.nohistory = true
-    @jump = w_b_getstr("Jump to: ", @jump)
+    @searched = w_b_getstr("/ ", "")
     l = `ls #{@lsbase} #{@lsall} #{@lsorder} #{@lsinvert} #{@lsuser}`.split
-    m = l.each_index.select{|n| l[n] =~ /#{@jump}/}
+    m = l.each_index.select{|n| l[n] =~ /#{@searched}/}
     i = m.find { |n| n > @index }
     @index = i if i > @index unless i == nil
+    @index = 0 if @searched == ""
     @w_r.update = true
-  when 'J'
+  when 'n'
     l = `ls #{@lsbase} #{@lsall} #{@lsorder} #{@lsinvert} #{@lsuser}`.split
-    m = l.each_index.select{|n| l[n] =~ /#{@jump}/}
+    m = l.each_index.select{|n| l[n] =~ /#{@searched}/}
     i = m.find { |n| n > @index }
-    @index = i if i > @index unless i == nil
+    if i == nil
+      @index = m.first
+    else
+      @index = i
+    end
     @w_r.update = true
-  when '/' # Get search string to mark items that match the input 
-    @w_b.nohistory = true
-    @searched = w_b_getstr("/ ", "")
+  when 'N'
+    l = `ls #{@lsbase} #{@lsall} #{@lsorder} #{@lsinvert} #{@lsuser}`.split
+    m = l.each_index.select{|n| l[n] =~ /#{@searched}/}.reverse
+    i = m.find { |n| n < @index }
+    if i == nil
+      @index = m.first
+    else
+      @index = i
+    end
     @w_r.update = true
   when ':' # Enter "command mode" in the bottom window - tries to execute the given command 
     @w_r.nohistory = false
@@ -662,14 +672,17 @@ def main_getkey # GET KEY FROM USER
   when '@' # Enter "Ruby debug"
     @w_b.nohistory = true
     cmd = w_b_getstr("◆ ", "")
+    @w_b.clr
+    @w_b.refresh
+    @w_b.update = true
     @w_r.clr
-    @w_r << "Command: #{cmd}\n\n"
-    @w_r.refresh
+    info = "Command: #{cmd}\n\n"
     begin
-      eval(cmd)
+      info += eval(cmd).to_s
     rescue StandardError => e
-      w_r_info("Error: #{e.inspect}")
+      info += "Error: #{e.inspect}"
     end
+    w_r_info(info)
     @w_r.update = false
   end
   if @w_r.update == true
@@ -983,12 +996,19 @@ def w_r_doc # GET FULL CONTENT TO PAGE
   @w_r << @w_r.text
 end
 def w_r_info(info) # SHOW INFO IN THE RIGHT WINDOW
+  image_show("clear") if @image; @image = false
+  @w_r.clr
+  @w_r. refresh
+  w_r_width = Curses.cols - (Curses.cols/@width) - 1
+  info = info.split("\n")
+  l = []
+  info.each{ |e| l << e.scan(/.{,#{w_r_width}}/)[0..-2] }
+  info = l.join("\n")
   @w_r.text      = info
   @w_r.pager_cmd = ""
   pager_start
   pager_show
   @w_r.update = false
-  image_show("clear") if @image; @image = false
 end
 def marks_info # SHOW MARKS IN RIGHT WINDOW
   info = "MARKS:\n"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rtfm-filemanager
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.3
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-13 00:00:00.000000000 Z
+date: 2021-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -33,8 +33,9 @@ dependencies:
 description: 'A full featured terminal browser with syntax highlighted files, images
   shown in the terminal, videos thumbnailed, etc. You can bookmark and jump around
   easily, delete, rename, copy, symlink and move files. RTFM has a a wide range of
-  other features. New in 1.4.0: Added jumping to an item in the current dir via the
-  ''j'' and ''J'' keys.'
+  other features. New in 1.5.0: Expanded ''/'' to jump to the first match and ''n''
+  to jump to the next matched item (''j'' and ''J'' are now gone). New in 1.5.3: Fixed
+  output of Ruby commands (via the ''@'' key)'
 email: g@isene.com
 executables:
 - rtfm