rtfm-filemanager 1.5.1 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58e367b107dab960575d391b4daa4995f4e53d8b838b38888ce1aadfe1687ce7
-  data.tar.gz: a224584539c2160613a7886f836cbf71619c5aaef5aae36b77685467446402ac
+  metadata.gz: 2a28a340b9bef89f913d1133a7e9f3ba301e1b3f1662f5bd4f2ff07bb3a61c53
+  data.tar.gz: 36b80a48dcd9ffc61941809bd71fcc2b6202bdb9c25fbdac015f471b95c36fbf
 SHA512:
-  metadata.gz: f9bb4987880cc5fef8d3fb12595e94cdb7ce215d4aa73b7dcf17290ace55da85317a8049a71db6099fbbc3b1e2e0b699a79b15a8aa676339e8de7699d0f783dd
-  data.tar.gz: 31447f99d73dc8f039d6ea40231b1478045409d868adcbde6bc1149815c783fc51ed19b092c75bdbbb1997148f7f62751479ca694f0c218d630628ba964cc4c5
+  metadata.gz: a8d6bf8e99726cc2926bdc921094744c409f2adc790f0d346f8fba0c6cf3148461ec7a5a6d47f775369290f90a9bb9a5ff6cce1088bb6bc0cd6d0ffca412963f
+  data.tar.gz: febf4da32dabc8542ae0c48b2e61f28c79edd0e26e133dfa90a1f157761dd2656f0f71063c1cdaae1cd36b5f0efec2e7eb6781c3fa72c943bf7155b3adec49d2

data/bin/rtfm

@@ -624,21 +624,29 @@ def main_getkey # GET KEY FROM USER
     @searched = w_b_getstr("/ ", "")
     l = `ls #{@lsbase} #{@lsall} #{@lsorder} #{@lsinvert} #{@lsuser}`.split
     m = l.each_index.select{|n| l[n] =~ /#{@searched}/}
+    @index = 0 unless m == []
     i = m.find { |n| n > @index }
     @index = i if i > @index unless i == nil
-    @index = 0 if @searched == ""
     @w_r.update = true
   when 'n'
     l = `ls #{@lsbase} #{@lsall} #{@lsorder} #{@lsinvert} #{@lsuser}`.split
     m = l.each_index.select{|n| l[n] =~ /#{@searched}/}
     i = m.find { |n| n > @index }
-    @index = i unless i == nil
+    if i == nil
+      @index = m.first
+    else
+      @index = i
+    end
     @w_r.update = true
   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 }
-    @index = i unless i == nil
+    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
@@ -664,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
@@ -985,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"
@@ -1250,6 +1268,7 @@ def w_b_exec(cmd) # EXECUTE COMMAND FROM @W_B
   end
   begin
     status = Timeout::timeout(5) {
+      @w_r.clr
       begin
         @w_r.pager_cmd = "#{cmd} | batcat -n --color=always 2>/dev/null"
         @w_r.text = `#{@w_r.pager_cmd} 2>/dev/null`
@@ -1354,8 +1373,8 @@ loop do # OUTER LOOP - CATCHING REFRESHES VIA 'r'
       @tag = false       # Clear tag pattern
       lsall_old = @lsall
       main_getkey        # Get key from user 
-      break if @break    # Break to outer loop, redrawing windows, if user hit 'r'
       break if Curses.cols != maxx or Curses.lines != maxy # break on terminal resize 
+      break if @break    # Break to outer loop, redrawing windows, if user hit 'r'
     end
   ensure # On exit: close curses, clear terminal 
     @write_conf_all = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rtfm-filemanager
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.5
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-14 00:00:00.000000000 Z
+date: 2021-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -34,8 +34,9 @@ description: 'A full featured terminal browser with syntax highlighted files, im
   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.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.1: Added
-  ''N'' to jump to the previous matched item by ''/'''
+  to jump to the next matched item (''j'' and ''J'' are now gone). New in 1.5.4: Fixed
+  command output error - now shown in right pane. New in 1.5.5: Fixed minor jump issue
+  when searching via ''/'''
 email: g@isene.com
 executables:
 - rtfm