rtfm-filemanager 1.3.4 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37417f8c791cc8efd9e6d9173f0408ebc6c4704bc5571efdbbda7f253835d79b
-  data.tar.gz: 9304a814ca2b6cd77ddc1cf19f172c8d3538bfee101a6fae19929226f78f9fb1
+  metadata.gz: cc3e48bb0ada386807c65a545d611fce279e6bf3fb59930321966f2930771e6c
+  data.tar.gz: 5291689c682b4a1330b22e8f29795d1a306fe5a2b37472b6dfab0900da48da0f
 SHA512:
-  metadata.gz: ebc13ae2087a0a412a0f933f62e87b68d4bc5df325902d0870176689882298d2e672e121e389ccab6dc6080ee56390729c951139512a0f03c6cd02fa7775d101
-  data.tar.gz: fe964dc5032cd8fff3fcf2f5b2ca6407fc305be811a988022510e61c1b6173408ee8333edc429dcaee45a551c89479d209bdbddbfacdee604497744ff5dafda3
+  metadata.gz: 252cd0070e118855a332d27c6e4fbb46dc528b337de47f7578a039c237be897991b0d154fdf9a12f45f26c5e6d48043f2a4f4501d9651a1f1766bce302eda0ad
+  data.tar.gz: 5fdc7a20442d6517f644bfb68aa8a9b5f6275afca1e620fe409ba0cc3f0ad39885c64f9ee4ddd426bcedf39d91b23fb4a82ac563cfe2e7d1f39828c6661cafc6

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+);*(\d*)m/, '¤¤\1¤¤\2¤¤')
+  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
@@ -276,6 +276,7 @@ def main_getkey # GET KEY FROM USER
   case chr
   # BASIC KEYS
   when '?' # Show helptext in right window 
+    @w_r.fg = 249
     w_r_info(@help)
     @w_b.update = true
   when 'r' # Refresh all windows 
@@ -367,6 +368,7 @@ def main_getkey # GET KEY FROM USER
     @w_b.update = true
   when 'M' # Show marks 
     @marks = @marks.sort.to_h
+    @w_r.fg = 147
     marks_info
     @w_r.update = false
     @w_b.update = true
@@ -440,6 +442,7 @@ def main_getkey # GET KEY FROM USER
     @w_r.update = true
     @w_b.update = true
   when 'T' # Show tagged list 
+    @w_r.fg = 196
     tagged_info
     @w_r.update = false
     @w_b.update = true
@@ -524,6 +527,7 @@ def main_getkey # GET KEY FROM USER
   when 'O' # Show the Ordering in the bottom window (the full ls command)
     w_b_info(" Full 'ls' command: ls <@s> #{@lsbase} #{@lsall} #{@lsorder} #{@lsinvert} #{@lsuser}")
   when 'G' # Git status for selected item or current dir
+    @w_r.fg = 214
     if File.exist?(".git")
       w_r_info(`git status 2>/dev/null`)
     else
@@ -532,6 +536,7 @@ def main_getkey # GET KEY FROM USER
     @w_r.update = false
     @w_b.update = true
   when 'H' # Compare with previous hash status or write hash status if no existing hash
+    @w_r.fg = 213
     hashcmd = "\(find #{Dir.pwd} -type f -print0  | sort -z | xargs -0 sha1sum; find #{Dir.pwd}"\
               " \\( -type f -o -type d \\) -print0 | sort -z | xargs -0 stat -c '%n %a'\) | sha1sum | cut -c -40"
     begin
@@ -556,20 +561,27 @@ def main_getkey # GET KEY FROM USER
     @w_b.update = false
   when 'S' # Show comprehensive system info
     @w_r.pager_cmd = ""
-    @w_r.text  = `uname -o`.chop + "  "
-    @w_r.text += `uname -r`.chop + "  "
-    @w_r.text += `uname -v`.chop + "  "
-    @w_r.text += `uname -p` + "\n"
-    @w_r.text += `free -h`  + "\n"
-    @w_r.text += "CPUs = " + `nproc`.chop + "  "
-    cpuinfo    = `lscpu`
-    @w_r.text += cpuinfo[/^.*Model name:\s*(.*)/, 1] + "  "
-    @w_r.text += "Max: " + cpuinfo[/^.*CPU max MHz:\s*(.*)/, 1][/(.*),.*/, 1] + "MHz  "
-    @w_r.text += "Min: " + cpuinfo[/^.*CPU min MHz:\s*(.*)/, 1][/(.*),.*/, 1] + "MHz  "
-    @w_r.text += "\n\n"
-    @w_r.text += `df -H`
-    @w_r.text += "\nDMESG:\n"
-    @w_r.text += `dmesg | tail -10`
+    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
@@ -691,6 +703,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 + "/"
@@ -951,7 +973,7 @@ def w_r_info(info) # SHOW INFO IN THE RIGHT WINDOW
   image_show("clear") if @image; @image = false
 end
 def marks_info # SHOW MARKS IN RIGHT WINDOW
-  info = "Marks:\n"
+  info = "MARKS:\n"
   unless @marks.empty?
     @marks.each do |mark, dir|
       info += "#{mark} = #{dir}\n"
@@ -962,19 +984,21 @@ def marks_info # SHOW MARKS IN RIGHT WINDOW
   w_r_info(info)
 end
 def tagged_info # SHOW THE LIST OF TAGGED ITEMS IN @w_r
-  info = "Tagged:\n"
+  info = "TAGGED:\n"
   @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
@@ -1028,10 +1052,17 @@ 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
-    @w_r << input
+    if @w_r.fg == nil
+      init_pair(255, 255, 0)
+      @w_r.fg = 255
+    else 
+      init_pair(@w_r.fg, @w_r.fg, 0)
+    end
+    @w_r.attron(color_pair(@w_r.fg)) { @w_r << input }
   end
   (@w_r.maxy - @w_r.cury).times {@w_r.deleteln()} # Clear to bottom of window
   pager_add_markers
@@ -1294,7 +1325,10 @@ loop do # OUTER LOOP - CATCHING REFRESHES VIA 'r'
       @w_l.setpos(0,0)
       list_dir(true)
       @w_l.refresh
-      w_r_show if @w_r.update and @preview
+      if @w_r.update and @preview
+        w_r_show
+        @w_r.fg = 255
+      end
       Curses.curs_set(1) # Clear residual cursor
       Curses.curs_set(0) # ...from editing files 
       @tag = false       # Clear tag pattern

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rtfm-filemanager
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.8
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-24 00:00:00.000000000 Z
+date: 2021-10-29 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.4: Added key ''S'' to show comprehensive system info
-  (system, CPU, filesystem, latest dmesg messages)'
+  other features. New in 1.3.8: Better system info (via the key ''S'')'
 email: g@isene.com
 executables:
 - rtfm