rtfm-filemanager 1.3.3 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b542c242216ef7d3d496e7250d907a34f63579dc916a25b51421e7d2c88b691
-  data.tar.gz: d6b9f31b5dcd57fb6bb134511b8312576e1cfc7e2d2957966d2bc36ed6e157b8
+  metadata.gz: 8f8f91e8bdcc9ef4971615a32ce6eaafcb76f49bf5025765071b41671fa04dbd
+  data.tar.gz: c94681c000bd0ab6a0ef378a6188bbcdbeaa3e8f2bac98bc83924b8535826a50
 SHA512:
-  metadata.gz: dbe11dbc46f5b022d019f1351d8249a05ffd98f7b324d044cab28aa65c2e694ea39be93380e77ee819d8af3db3c746368c35acbe9af38726d5d499f498a5f385
-  data.tar.gz: 2fa548bb0711d7593708c376ab498d1e7eb406b0d93ef19b0127f4beae55042fc1bfa697b9d361d28629908bbcf7c04dbb79409b580cc2a8588fdb14ef51815a
+  metadata.gz: 7230ecb3e03c0cabedc467dd26d9b641236418fac7b11a847342f2d46931859bdfe198ab03c8f03766499ac2820886cbf4f9477c829fcee10fe6229047b46968
+  data.tar.gz: 8e0da5f055e969a98cdd959ab32bba5ec2d13b021dbe797a196494d9d5e64e8db9b0bd7255bfea9ca9b4db475ba73b375cb91c513dc390149558ac1dbf38af97

data/bin/rtfm

@@ -72,6 +72,7 @@ DIRECTORY VIEWS
  G      = Show git status for current directory
  H      = Do a cryptographic hash of the current directory with subdirs
           If a previous hash was made, compare and report if there has been any change
+ S      = Show comprehensive system info (system, CPU, filesystem, latest dmesg messages)
 
 RIGHT PANE
  ENTER  = Refresh the right pane
@@ -123,6 +124,7 @@ begin # BASIC SETUP
   require 'fileutils'
   require 'io/console'
   require 'date'
+  require 'timeout'
   require 'curses'
   include  Curses
 
@@ -186,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)
@@ -226,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
@@ -274,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 
@@ -365,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
@@ -438,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
@@ -522,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
@@ -530,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
@@ -552,6 +559,31 @@ def main_getkey # GET KEY FROM USER
     end
     @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
   # RIGHT PANE
   when 'ENTER' # Refresh right pane
     @w_r.clr # First clear the window, then clear any previously showing image
@@ -670,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 + "/"
@@ -930,7 +972,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"
@@ -941,19 +983,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
@@ -1007,10 +1051,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
@@ -1177,17 +1228,19 @@ def w_b_exec(cmd) # EXECUTE COMMAND FROM @W_B
     return
   end
   begin
-    begin
-      @w_r.pager_cmd = "#{cmd} | batcat -n --color=always 2>/dev/null"
-      @w_r.text = `#{@w_r.pager_cmd} 2>/dev/null`
-    rescue
-      @w_r.text = `#{cmd} 2>/dev/null`
-    end
-    unless @w_r.text == "" or @w_r.text == nil
-      pager_start
-      pager_show
-      @w_r.update = false
-    end
+    status = Timeout::timeout(5) {
+      begin
+        @w_r.pager_cmd = "#{cmd} | batcat -n --color=always 2>/dev/null"
+        @w_r.text = `#{@w_r.pager_cmd} 2>/dev/null`
+      rescue
+        @w_r.text = `#{cmd} 2>/dev/null`
+      end
+      unless @w_r.text == "" or @w_r.text == nil
+        pager_start
+        pager_show
+        @w_r.update = false
+      end
+    }
   rescue
     w_b_info(" Failed to execute command (#{cmd})")
   end
@@ -1271,7 +1324,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.3
+  version: 1.3.7
 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.3: Fixed rtfm crashing when the current directory is
-  externally removed'
+  other features. New in 1.3.7: Fixed minor bug in syntax highlighting (via batcat)'
 email: g@isene.com
 executables:
 - rtfm