rtfm-filemanager 1.5.0 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8981f5f29cc24ff888f70b1792a5abf8cfb8f50ed13af3c2f7982b72c4f9cef8
-  data.tar.gz: 4284525dc3e44a0e8fbb9d25f7e63089d229c33610845c9d58cc2b28f80c1cc5
+  metadata.gz: b429fe89ffca3ad31171312be68f9db1a1c43f821d8a8faa7624e805eab8a06d
+  data.tar.gz: dba591810bea3426ee863f062cea05c7ed43c07fa83b7c5087d265b3f123aba3
 SHA512:
-  metadata.gz: 4b30796732dfbfafdf7ac17900b67f98cb596f0ac9cb2724eb45fdf26a6b3040d1c05e741d3e93a2e02f756566cb197474a82d856db34e6d10f37a022a34b84b
-  data.tar.gz: 4d1780ff6d665a0ca585a6c248e65734fd716116f41df886b961fa01796362075a79dea786d4807fd385ea8913d081a4fafc735e2e60c6b24a7cc835aa9f8dbe
+  metadata.gz: 03d0872a3dd61f96f20f777ce8337b06ebef31d5d4fb99fd83bc51f38dec9689a862d7eadb66deefd931b5e348b26f5f0d335bd567965ce9922467be72e4a5ab
+  data.tar.gz: 79fd8c6618c222c9365caf005a84a5363c635c8370634efa789efaa89a526603d55b8816e55a9eec80cc4fc172d669a0d8c3f84dc9537b2759570c5c88f2e5aa

data/bin/rtfm

@@ -48,6 +48,7 @@ JUMPING AND MARKS
  '      = Jump to mark (next letter is the name of the mark [a-zA-Z'])
  /      = 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
@@ -631,7 +632,21 @@ def main_getkey # GET KEY FROM USER
     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 if i > @index 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 }
+    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
@@ -657,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
@@ -978,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"
@@ -1243,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`
@@ -1347,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rtfm-filemanager
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.4
 platform: ruby
 authors:
 - Geir Isene
@@ -34,7 +34,8 @@ 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).'
+  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 raght pane.'
 email: g@isene.com
 executables:
 - rtfm