rtfm-filemanager 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fdfba59295e424a39605d0501e0df29a7a37d9ad36429adb412d8d13c54c752
-  data.tar.gz: 2a5523150436439dbbcabf66a7e9c8505c7ad30c82fd827e2b198ab5f73361e9
+  metadata.gz: b5c18ed2d6400377fdf9e2acf29f0ca8e4cee53fdc96fc5db49f5e9be6ed5a43
+  data.tar.gz: 6596098c323336814fd4fd0cdb147441ff70479580cbc6f6a441fa4f551be485
 SHA512:
-  metadata.gz: 5e1cf39a6d5e205a7ea226bc8c70d885037077d1ed918450634a8fc9feb179dee05a03f58bcc174609c7419231b2d4df3b1f1b3bd7cb4cc89bd4a01d658124c6
-  data.tar.gz: 5a152abd6d7c54de6c116f6ecac690e939cd2d07b28a1e7b9d4261337f72e6b23a833162567ccd6fb6674d5e92882551d9f27e3d7167ac4d61c00d6eb894b492
+  metadata.gz: 90b2cc8d115449ca2d66a92e053c33c956dad083067dcef5f750476c8a8ae8c0a6c36592da11ad29aacd831af1fc59b39a09bda2913a836354763da7f75eaba8
+  data.tar.gz: e1dead5ecb7189b0dedc7a48eeeab77b29b810f699bbe39f21d011115c70f63f1841b81133cb3c70b6e4d2187bc583d1e9338f150485b8ae511c6d95c79350ec

data/bin/rtfm

@@ -188,7 +188,7 @@ begin # BASIC SETUP
   end
 end
 class Curses::Window # CLASS EXTENSION 
-  attr_accessor :fg, :bg, :attr, :text, :update, :pager, :pager_more, :pager_cmd, :locate, :nohistory 
+  attr_accessor :fg, :bg, :attr, :text, :update, :pager, :pager_more, :pager_cmd, :locate, :nohistory
   # General extensions (see https://github.com/isene/Ruby-Curses-Class-Extension)
   def clr
     self.setpos(0, 0)
@@ -228,12 +228,12 @@ 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\[38;5;(\d+)m/, '%-%\1%-%')
+  #input.gsub!( /\e\[\d;38;5;(\d+)m/, '¤¤\1¤¤')
+  input.gsub!( /\e\[38;5;(\d+);*(\d*)m/, '¤¤\1¤¤\2¤¤')
   input.gsub!( /\e\[0m/, "\t")
-  color_array = input.split("%-%")
+  color_array = input.split("¤¤")
   color_array = color_array.drop(1)
-  output = color_array.each_slice(2).to_a
+  output = color_array.each_slice(3).to_a
   return output
 end
 def getchr # PROCESS KEY PRESSES
@@ -561,22 +561,28 @@ def main_getkey # GET KEY FROM USER
     @w_b.update = false
   when 'S' # Show comprehensive system info
     @w_r.pager_cmd = ""
-    systext  = `uname -o`.chop + "  "
-    systext += `uname -r`.chop + "  "
-    systext += `uname -v`.chop + "  "
-    systext += `uname -p` + "\n"
-    systext += `free -h`  + "\n"
-    systext += "CPUs = " + `nproc`.chop + "  "
-    cpuinfo    = `lscpu`
-    systext += cpuinfo[/^.*Model name:\s*(.*)/, 1] + "  "
-    systext += "Max: " + cpuinfo[/^.*CPU max MHz:\s*(.*)/, 1][/(.*),.*/, 1] + "MHz  "
-    systext += "Min: " + cpuinfo[/^.*CPU min MHz:\s*(.*)/, 1][/(.*),.*/, 1] + "MHz  "
-    systext += "\n\n"
-    systext += `df -H`
-    systext += "\nDMESG:\n"
-    systext += `dmesg | tail -10`
-    @w_r.fg    = 155
-    w_r_info(systext)
+    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
   # RIGHT PANE
   when 'ENTER' # Refresh right pane
@@ -696,6 +702,16 @@ def conf_write
   end
   File.write(Dir.home+'/.rtfm.conf', conf)
 end
+def ansifix(text) # Format [[fg, attr, text]]
+  output = ""
+  text.each do |e|
+    ansi    = "\e[38;5;#{e[0]}"
+    ansi   += ";1" if e[1] == 1
+    ansi   += "m"
+    output += ansi + e[2].gsub(/\n/, "\n#{ansi}")
+  end
+  return output
+end
 # TOP WINDOW FUNCTIONS 
 def w_t_info # SHOW INFO IN @w_t
   text  = " " + ENV['USER'].to_s + "@" + `hostname 2>/dev/null`.to_s.chop + ": " + Dir.pwd + "/"
@@ -971,15 +987,17 @@ def tagged_info # SHOW THE LIST OF TAGGED ITEMS IN @w_r
   @tagged.empty? ? info += "(None)" : info += @tagged.join("\n")
   w_r_info(info)
 end
-def syntax_highlight(input) # BATCAT SYNTAX HIGHLIGHTING
+def syntax_highlight(input) # SYNTAX HIGHLIGHTING FROM ANSI COLOR CODES
   color_ary  = color_parse(input)
   color_ary.each do | pair |
     begin
       fg   = pair[0].to_i
-      text = pair[1]
+      atr  = pair[1].to_i
+      atr == 1 ? atr = Curses::A_BOLD : atr = 0
+      text = pair[2]
       text.gsub!(/\t/, '')
       init_pair(fg, fg, 0)
-      @w_r.attron(color_pair(fg)) { @w_r << text }
+      @w_r.attron(color_pair(fg) | atr) { @w_r << text }
     rescue
     end
   end
@@ -1033,7 +1051,8 @@ 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.pager_cmd.match(/batcat/)
+  if @w_r.text.match(/^\e\[/)
     syntax_highlight(input)
   else
     if @w_r.fg == nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rtfm-filemanager
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-25 00:00:00.000000000 Z
+date: 2021-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -33,8 +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.5: Sexify by color some of the info shown in right pane
-  (like Help, Tagged, Marks and System Info)'
+  other features. New in 1.3.6: Created a better ANSI color code parser and prettified
+  system info (via key ''S'')'
 email: g@isene.com
 executables:
 - rtfm