rtfm-filemanager 1.3.9 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da9c8e1fd1f0c686be71e26551d824ec5a7163c63a312b52f0858947c53d9884
-  data.tar.gz: 697e2567e81bece7afba8b466d4d6f803fb631cf410d0c2f2e44112ea88ba813
+  metadata.gz: 8981f5f29cc24ff888f70b1792a5abf8cfb8f50ed13af3c2f7982b72c4f9cef8
+  data.tar.gz: 4284525dc3e44a0e8fbb9d25f7e63089d229c33610845c9d58cc2b28f80c1cc5
 SHA512:
-  metadata.gz: 4879b5abfa28e6f3023a48e105d20e8009f64ddbcfee3e5e6cb47a84c3fce93f645bd4cee6c6540460ef2539af9b47b21792c8cebd32a7e7dc9960b7cad497fd
-  data.tar.gz: d52ced54337ef56d9e7e666f5139f8f8cc0a4685a2496526572aa76492e984e684d06db37e35598419e537f79d0b70ab0356bab18ef9c51cba14c9adeb473b50
+  metadata.gz: 4b30796732dfbfafdf7ac17900b67f98cb596f0ac9cb2724eb45fdf26a6b3040d1c05e741d3e93a2e02f756566cb197474a82d856db34e6d10f37a022a34b84b
+  data.tar.gz: 4d1780ff6d665a0ca585a6c248e65734fd716116f41df886b961fa01796362075a79dea786d4807fd385ea8913d081a4fafc735e2e60c6b24a7cc835aa9f8dbe

data/bin/rtfm

@@ -46,6 +46,8 @@ 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'])
+ /      = Enter search string in bottom window to highlight matching items and jump to the first match
+ n      = Jump to the next 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
@@ -82,7 +84,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
@@ -560,28 +561,32 @@ def main_getkey # GET KEY FROM USER
     @w_r.update = true
     @w_b.update = false
   when 'S' # Show comprehensive system info
-    @w_r.pager_cmd = ""
-    uname    = `uname -o`.chop + "  "
-    uname   += `uname -r`.chop + "  "
-    uname   += `uname -v`.chop + "  "
-    uname   += `uname -p` + "\n"
-    text     = [[253, 1, uname]]
-    cpu      = "CPUs = " + `nproc`.chop + "  "
-    cpuinfo  = `lscpu`
-    cpu     += cpuinfo[/^.*Model name:\s*(.*)/, 1] + "  "
-    cpu     += "Max: " + cpuinfo[/^.*CPU max MHz:\s*(.*)/, 1][/(.*),.*/, 1] + "MHz  "
-    cpu     += "Min: " + cpuinfo[/^.*CPU min MHz:\s*(.*)/, 1][/(.*),.*/, 1] + "MHz\n\n"
-    text    += [[154, 0, cpu]]
-    mem      = `free -h`  + "\n"
-    text    += [[229, 0, mem]]
-    ps       = `ps -eo comm,pid,user,pcpu,pmem,stat --sort -pcpu,-pmem | head` + "\n"
-    text    += [[195, 0, ps]]
-    disk     = `df -H | head -8`
-    text    += [[172, 0, disk]]
-    dmesg    = "\nDMESG:\n"
-    dmesg   += `dmesg | tail -6`
-    text    += [[219, 0, dmesg]]
-    w_r_info(ansifix(text))
+    begin
+      @w_r.pager_cmd = ""
+      uname    = `uname -o`.chop + "  "
+      uname   += `uname -r`.chop + "  "
+      uname   += `uname -v`.chop + "  "
+      uname   += `uname -p` + "\n"
+      text     = [[253, 1, uname]]
+      cpu      = "CPUs = " + `nproc`.chop + "  "
+      cpuinfo  = `lscpu`
+      cpu     += cpuinfo[/^.*Model name:\s*(.*)/, 1] + "  "
+      cpu     += "Max: " + cpuinfo[/^.*CPU max MHz:\s*(.*)/, 1][/(.*),.*/, 1] + "MHz  "
+      cpu     += "Min: " + cpuinfo[/^.*CPU min MHz:\s*(.*)/, 1][/(.*),.*/, 1] + "MHz\n\n"
+      text    += [[154, 0, cpu]]
+      mem      = `free -h`  + "\n"
+      text    += [[229, 0, mem]]
+      ps       = `ps -eo comm,pid,user,pcpu,pmem,stat --sort -pcpu,-pmem | head` + "\n"
+      text    += [[195, 0, ps]]
+      disk     = `df -H | head -8`
+      text    += [[172, 0, disk]]
+      dmesg    = "\nDMESG:\n"
+      dmesg   += `dmesg | tail -6`
+      text    += [[219, 0, dmesg]]
+      w_r_info(ansifix(text))
+    rescue
+      w_r_info("Unable to show system info")
+    end
   # RIGHT PANE
   when 'ENTER' # Refresh right pane
     @w_r.clr # First clear the window, then clear any previously showing image
@@ -613,9 +618,20 @@ def main_getkey # GET KEY FROM USER
     @break = true
     @w_b.update = true
   # ADDITIONAL COMMANDS
-  when '/' # Get search string to mark items that match # 
+  when '/' # Get search string to mark items that match the input 
     @w_b.nohistory = true
     @searched = w_b_getstr("/ ", "")
+    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
+    @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 if i > @index unless i == nil
     @w_r.update = true
   when ':' # Enter "command mode" in the bottom window - tries to execute the given command 
     @w_r.nohistory = false
@@ -1049,7 +1065,6 @@ def pager_show # SHOW THE CURRENT PAGE CONTENT
   end_l = beg_l + @w_r.maxy - 2
   input = @w_r.text.lines[beg_l..end_l].join() + "\n"
   input.lines.count > @w_r.maxy - 2 ? @w_r.pager_more = true : @w_r.pager_more = false
-  #if @w_r.pager_cmd.match(/batcat/)
   if @w_r.text.match(/^\e\[/)
     syntax_highlight(input)
   else
@@ -1059,7 +1074,8 @@ def pager_show # SHOW THE CURRENT PAGE CONTENT
     else 
       init_pair(@w_r.fg, @w_r.fg, 0)
     end
-    @w_r.attron(color_pair(@w_r.fg)) { @w_r << input }
+    @w_r.attr = 0 if @w_r.attr == nil
+    @w_r.attron(color_pair(@w_r.fg) | @w_r.attr) { @w_r << input }
   end
   (@w_r.maxy - @w_r.cury).times {@w_r.deleteln()} # Clear to bottom of window
   pager_add_markers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rtfm-filemanager
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.5.0
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-29 00:00:00.000000000 Z
+date: 2021-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -33,7 +33,8 @@ 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.3.9: Code cleanup and a minor bug fix'
+  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).'
 email: g@isene.com
 executables:
 - rtfm