rtfm-filemanager 1.3.7 → 1.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f8f91e8bdcc9ef4971615a32ce6eaafcb76f49bf5025765071b41671fa04dbd
-  data.tar.gz: c94681c000bd0ab6a0ef378a6188bbcdbeaa3e8f2bac98bc83924b8535826a50
+  metadata.gz: 6a4491169a82080e604a5d903e107f3f544ac70355ccac0e70090779704136df
+  data.tar.gz: b7ae5ca815031c325eaf566e85bbd0ab53436b70e33390cad640f7ad15892304
 SHA512:
-  metadata.gz: 7230ecb3e03c0cabedc467dd26d9b641236418fac7b11a847342f2d46931859bdfe198ab03c8f03766499ac2820886cbf4f9477c829fcee10fe6229047b46968
-  data.tar.gz: 8e0da5f055e969a98cdd959ab32bba5ec2d13b021dbe797a196494d9d5e64e8db9b0bd7255bfea9ca9b4db475ba73b375cb91c513dc390149558ac1dbf38af97
+  metadata.gz: 9c8170aeeda9b5464f9bbd7a325dc988ec7997020302de8ceab15845cc39b2336f6768b007d8a53517021e2e51c853c06f155174bc079173de94acf3b370f59d
+  data.tar.gz: b5d7c09506eba404783cf6e5fe1ddb0015d0650f330023d1aa24905c945eff09e7049bf4d6846689ae9c3d68044fdd0b638092c56dd6d871f55fc5412e0df580

data/bin/rtfm

@@ -560,30 +560,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  "
-    cpu     += "\n\n"
-    text    += [[154, 0, cpu]]
-    disk     = `df -H`
-    text    += [[123, 0, disk]]
-    dmesg    = "\nDMESG:\n"
-    dmesg   += `dmesg | tail -10`
-    text    += [[213, 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
@@ -1051,7 +1053,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
@@ -1061,7 +1062,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.7
+  version: 1.3.11
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-29 00:00:00.000000000 Z
+date: 2021-11-03 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.7: Fixed minor bug in syntax highlighting (via batcat)'
+  other features. New in 1.3.11: Rescued error when system commands fail (via the
+  ''S'' key)'
 email: g@isene.com
 executables:
 - rtfm