rtfm-filemanager 1.3.6 → 1.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5c18ed2d6400377fdf9e2acf29f0ca8e4cee53fdc96fc5db49f5e9be6ed5a43
-  data.tar.gz: 6596098c323336814fd4fd0cdb147441ff70479580cbc6f6a441fa4f551be485
+  metadata.gz: '08d890de53f5852401d5df75f8a65583081b712c1fc96f3d5d0195ffa3cbf59b'
+  data.tar.gz: 6bc34a174aa4b9a238059650b373181020821c22e83c6c135e415e7ba4f2536f
 SHA512:
-  metadata.gz: 90b2cc8d115449ca2d66a92e053c33c956dad083067dcef5f750476c8a8ae8c0a6c36592da11ad29aacd831af1fc59b39a09bda2913a836354763da7f75eaba8
-  data.tar.gz: e1dead5ecb7189b0dedc7a48eeeab77b29b810f699bbe39f21d011115c70f63f1841b81133cb3c70b6e4d2187bc583d1e9338f150485b8ae511c6d95c79350ec
+  metadata.gz: e4835a7476f47ba53cff5137eda8f42a867fb81846c0c3019db8aae9bc58f373fefa12872e468182f10c148f5ef78cdd414af925bc0d60d0fb1c741f9d2670b3
+  data.tar.gz: 6af0f47caaa58cdd9dd3ac02a88dbe8d8ce0de712ed8988f697e9bcc06b19b4c942f00a0e6b933eeef5474a7e3e6571deeacd3fce109adfd262bd23031ab993f

data/bin/rtfm

@@ -228,7 +228,7 @@ def get_ls_color(type) # GET THE COLOR FOR THE FILETYPE FROM IMPORTED LS_COLORS
   return color.to_i, bold
 end
 def color_parse(input) # PARSE ANSI COLOR SEQUENCES
-  #input.gsub!( /\e\[\d;38;5;(\d+)m/, '¤¤\1¤¤')
+  input.gsub!( /\e\[\d;38;5;(\d+);*(\d*)m/, '¤¤\1¤¤\2¤¤')
   input.gsub!( /\e\[38;5;(\d+);*(\d*)m/, '¤¤\1¤¤\2¤¤')
   input.gsub!( /\e\[0m/, "\t")
   color_array = input.split("¤¤")
@@ -566,24 +566,22 @@ def main_getkey # GET KEY FROM USER
     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"
+    cpu     += "Min: " + cpuinfo[/^.*CPU min MHz:\s*(.*)/, 1][/(.*),.*/, 1] + "MHz\n\n"
     text    += [[154, 0, cpu]]
-    disk     = `df -H`
-    text    += [[123, 0, disk]]
+    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 -10`
-    text    += [[213, 0, dmesg]]
-    @w_r.text= ansifix(text)
-    pager_start
-    pager_show
-    @w_r.update = false
+    dmesg   += `dmesg | tail -6`
+    text    += [[219, 0, dmesg]]
+    w_r_info(ansifix(text))
   # RIGHT PANE
   when 'ENTER' # Refresh right pane
     @w_r.clr # First clear the window, then clear any previously showing image
@@ -1051,7 +1049,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 +1058,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.6
+  version: 1.3.10
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-28 00:00:00.000000000 Z
+date: 2021-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -33,8 +33,7 @@ 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.6: Created a better ANSI color code parser and prettified
-  system info (via key ''S'')'
+  other features. New in 1.3.10: Code cleanup.'
 email: g@isene.com
 executables:
 - rtfm