rtfm-filemanager 1.3.8 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc3e48bb0ada386807c65a545d611fce279e6bf3fb59930321966f2930771e6c
-  data.tar.gz: 5291689c682b4a1330b22e8f29795d1a306fe5a2b37472b6dfab0900da48da0f
+  metadata.gz: 4cb8c1afd7b4f2cf1ab8175432956159e52dc715f25568cc7882c7ee0f5358d0
+  data.tar.gz: efd18775dfbfe3e7a8780b4e971b116b73d278cc63f7dd8a17dfdedadaa97120
 SHA512:
-  metadata.gz: 252cd0070e118855a332d27c6e4fbb46dc528b337de47f7578a039c237be897991b0d154fdf9a12f45f26c5e6d48043f2a4f4501d9651a1f1766bce302eda0ad
-  data.tar.gz: 5fdc7a20442d6517f644bfb68aa8a9b5f6275afca1e620fe409ba0cc3f0ad39885c64f9ee4ddd426bcedf39d91b23fb4a82ac563cfe2e7d1f39828c6661cafc6
+  metadata.gz: 9975653d0d5b99418cf0f710bcfa8f314489cd5b9f4369f47f69a41ee2979be0645a1570e83f8eaba322f29d6a0560ba97d40a7607f3608a44007819ebed8dd9
+  data.tar.gz: 78cbd09e08d1c8754ad75fc5b1cd8ad7e8e8b79df56259822234778abe0152042fddd33a82425876ba6704a9ee8533cd5176d97100db86725fbce92503adb23a

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'])
+ 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
  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
@@ -170,6 +172,7 @@ 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
@@ -560,31 +563,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]]
-    mem      = `free -h`  + "\n"
-    text    += [[229, 0, mem]]
-    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]]
-    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.text= ansifix(text)
-    pager_start
-    pager_show
-    @w_r.update = false
+    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
@@ -616,7 +620,21 @@ 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 'j' # Get the jump-to-file in the current dir from input
+    @w_b.nohistory = true
+    @jump = w_b_getstr("Jump to: ", @jump)
+    l = `ls #{@lsbase} #{@lsall} #{@lsorder} #{@lsinvert} #{@lsuser}`.split
+    m = l.each_index.select{|n| l[n] =~ /#{@jump}/}
+    i = m.find { |n| n > @index }
+    @index = i if i > @index unless i == nil
+    @w_r.update = true
+  when 'J'
+    l = `ls #{@lsbase} #{@lsall} #{@lsorder} #{@lsinvert} #{@lsuser}`.split
+    m = l.each_index.select{|n| l[n] =~ /#{@jump}/}
+    i = m.find { |n| n > @index }
+    @index = i if i > @index unless i == nil
+    @w_r.update = true
+  when '/' # Get search string to mark items that match the input 
     @w_b.nohistory = true
     @searched = w_b_getstr("/ ", "")
     @w_r.update = true
@@ -1052,7 +1070,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
@@ -1062,7 +1079,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.8
+  version: 1.4.0
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-29 00:00:00.000000000 Z
+date: 2021-11-13 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.8: Better system info (via the key ''S'')'
+  other features. New in 1.4.0: Added jumping to an item in the current dir via the
+  ''j'' and ''J'' keys.'
 email: g@isene.com
 executables:
 - rtfm