rtfm-filemanager 3.3 → 3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f93c42211b4b1f57fdec42841b7cfddf9d08797cc999f32da9816899016043b9
-  data.tar.gz: cf1c10a981bea7b7f384cdbe5bba59f3138f58467d39644e65d8ccaad1386e43
+  metadata.gz: fe11017b37608ece785d04b740e858ee400a3518f7ec6e2e90d318c36069d431
+  data.tar.gz: c1f526b4b1a347c106915e6c4e03486e1adf1464c8050e153b625f1510fa6aa7
 SHA512:
-  metadata.gz: 85564f159ec0be34424eb45715474ba75fd001711a93f9830f5d4c33b319ef509a216afac9ac809ba8a8ec39f15a6d61f1f9055250d9d3264b46cffa231fbcc3
-  data.tar.gz: bd1fab6993c5f5bd735274f275d1195439b33d83cadad26a98541d266e3fe6dbc243d2a513f1aaac8697c5645ae567a13e6f8425fa0f1f5467345359b911b15b
+  metadata.gz: 8cb52b1a6b0d7bd0db5f76486cde99416a1a3fcb9ceee3d1e5e0cc912c6c79c567e104982e9fa32f6a8f53a7cbbe34481f72d30980e24c9a2ffc31ac544db96e
+  data.tar.gz: 8376fb44256d84321f755842daa76009c5e116a86024977bd1af5bc01c24915198b51c0c082f2e609cd6181ee5dfef36484a6394a376da8f08f1816ad76c5567

data/README.md

@@ -1,5 +1,5 @@
 # RTFM - Ruby Terminal File Manager
- 
+
 ![Ruby](https://img.shields.io/badge/language-Ruby-red) [![Gem Version](https://badge.fury.io/rb/rtfm-filemanager.svg)](https://badge.fury.io/rb/rtfm-filemanager) ![Unlicense](https://img.shields.io/badge/license-Unlicense-green) ![Stay Amazing](https://img.shields.io/badge/Stay-Amazing-important)
 
 What other features can I cram into this file manager?
@@ -64,9 +64,6 @@ of the selected item (directory or file) is shown in the right pane. The right
 pane is also used to show information such as the currently tagged items, your
 (book)marks, output from commands, etc. 
 
-When you start RTFM, you can supply a directory path as an argument to let
-RTFM start up in that directory.
-
 You can run any command in the bottom "command bar" and have the output
 presented in the right pane. Use LEFT and RIGHT keys to go back and forth on
 the command line, HOME to beginning of line, END to end of line, Backspace or
@@ -263,9 +260,8 @@ B      | Toggle border
 y      | Copy path of selected item to primary selection (for pasting with middle mouse button)
 Y      | Copy path of selected item to clipboard
 Ctrl-y | Copy content of right pane to clipboard
-Ctrl-d | Create a new directory (a shortcut for ":mkdir ")
-Ctrl-n | Invoke navi (see https://github.com/denisidoro/navi) with any output in right pane
 S      | Show comprehensive system info (system, CPU, filesystem, latest dmesg messages)
+Ctrl-n | Invoke navi (see https://github.com/denisidoro/navi) with any output in right pane
 
 ## Keyboard cheat sheet
 ![RTFM keyboard cheat sheet](img/rtfm-kb.png)

data/bin/rtfm

@@ -14,7 +14,7 @@
 #             for any damages resulting from its use. Further, I am under no
 #             obligation to maintain or extend this software. It is provided 
 #             on an 'as is' basis without any expressed or implied warranty.
-@version    = "3.3"
+@version    = "3.5"
 
 # PRELIMINARIES
 @help = <<HELPTEXT
@@ -111,11 +111,10 @@ ADDITIONAL COMMANDS
  y       = Copy path of selected item to primary selection (for pasting with middle mouse button)
  Y       = Copy path of selected item to clipboard
  Ctrl-y  = Copy content of right pane to clipboard
- Ctrl-d  = Create a new directory (a shortcut for ":mkdir ")
- Ctrl-n  = Invoke navi (see https://github.com/denisidoro/navi) with any output in right window
  S       = Show comprehensive System info (system, CPU, filesystem, latest dmesg messages)
+ Ctrl-n  = Invoke navi (see https://github.com/denisidoro/navi) with any output in right window
 
-COPYRIGHT: Geir Isene, 2020-4. No rights reserved. See http://isene.com for more.
+COPYRIGHT: Geir Isene, 2020-3. No rights reserved. See http://isene.com for more.
 HELPTEXT
 def firstrun
   @firstrun = <<~FIRSTRUN
@@ -143,38 +142,9 @@ def firstrun
 
 FIRSTRUN
   
-  @shell = File.basename(`echo "$SHELL"`.chomp)
-  if @shell == "fish"
-    if not File.exist?(Dir.home+'/.config/fish/config.fish')
-      @rtfmlaunch = <<RTFMFISHLAUNCH
-# This is the RTFM launcher (https://github.com/isene/RTFM) for fish
-function r { 
-	f=$(mktemp)
-  (
-  set +e
-	rtfm "$f"
-  code=$?
-  if [ "$code" != 0 ]; then
-    rm -f "$f"
-    exit "$code"
-  fi
-  )
-  code=$?
-  if [ "$code" != 0 ]; then
-    return "$code"
-  fi
-  d=$(<"$f")
-  rm -f "$f"
-  cd "$d"
-}
-RTFMFISHLAUNCH
-      File.write(Dir.home+'/.config/fish/config.fish', @rtfmlaunch)
-      `echo "source ~/.config/fish/config.fish" >> .#{@shell}rc`
-    end
-  else
-    if not File.exist?(Dir.home+'/.rtfm.launch')
-      @rtfmlaunch = <<RTFMLAUNCH
-# This is the RTFM launcher (https://github.com/isene/RTFM) for bash/zsh
+  if not File.exist?(Dir.home+'/.rtfm.launch')
+    @rtfmlaunch = <<RTFMLAUNCH
+# This is the RTFM launcher (https://github.com/isene/RTFM)
 function r { 
 	f=$(mktemp)
   (
@@ -195,19 +165,18 @@ function r {
   cd "$d"
 }
 RTFMLAUNCH
-      File.write(Dir.home+'/.rtfm.launch', @rtfmlaunch)
-      `echo "source ~/.rtfm.launch" >> .#{@shell}rc`
-    end
+    File.write(Dir.home+'/.rtfm.launch', @rtfmlaunch)
+    @shell = File.basename(`echo "$SHELL"`.chomp)
+    `echo "source ~/.rtfm.launch" >> .#{@shell}rc`
   end
 
   puts @firstrun
   puts "\n... hit ENTER to start RTFM. Hit ? inside RTFM to show the help text. Enjoy :-)"
-  $stdin.gets
+  STDIN.gets
 end
 begin # BASIC SETUP
   require 'fileutils'
   require 'io/console'
-  require 'io/wait'
   require 'date'
   require 'timeout'
   require 'curses'
@@ -229,7 +198,8 @@ begin # BASIC SETUP
   
   cmd?('bat') ? @bat = "bat" : @bat = "batcat"
 
-  $stdin.set_encoding(Encoding::UTF_8) # Set encoding for $stdin 
+  STDIN.set_encoding(Encoding::UTF_8) # Set encoding for STDIN 
+  LScolors = `echo $LS_COLORS` # Import LS_COLORS 
 
   ## Curses setup 
   Curses.init_screen
@@ -241,52 +211,48 @@ begin # BASIC SETUP
 
   # INITIALIZE VARIABLES 
   ## These can be set by user in .rtfm.conf
-  @lsbase      = "--group-directories-first" # Basic ls setup
-  @lslong      = false # Set short form ls (toggled by pressing "l")
-  @lsall       = ""    # Set "ls -a" to false (toggled by pressing "a" - sets it to "-a")
-  @lsorder     = ""    # Change the order/sorting by pressing 'o' (circular toggle)
-  @lsinvert    = ""    # Set to "-r" to reverse/invert sorting order
-  @lsuser      = ""    # Set this variable in .rtfm.conf to any 'ls' switch you want to customize directory listings
-  @width       = 4     # Set width of the left pane to the default ⅓ of the terminal width
-  @history     = []    # Initialize the command line history array
-  @rubyhistory = []    # Initialize the command line history array for ruby commands
-  @border      = false
-  @preview     = true
-  @runmailcap  = false # Set to 'true' in .rtfm.conf if you want to use run-mailcap instead of xdg-open
-  @batuse      = true  # Use batcat for syntax highlighting
-  @aimodel     = "gpt-3.5-turbo-instruct" # The default OpenAI model, set another in .rtfm.conf if you like
+  @lsbase     = "--group-directories-first" # Basic ls setup
+  @lslong     = false # Set short form ls (toggled by pressing "l")
+  @lsall      = ""    # Set "ls -a" to false (toggled by pressing "a" - sets it to "-a")
+  @lsorder    = ""    # Change the order/sorting by pressing 'o' (circular toggle)
+  @lsinvert   = ""    # Set to "-r" to reverse/invert sorting order
+  @lsuser     = ""    # Set this variable in .rtfm.conf to any 'ls' switch you want to customize directory listings
+  @width      = 4     # Set width of the left pane to the default ⅓ of the terminal width
+  @history    = []    # Initialize the command line history array
+  @border     = false
+  @preview    = true
+  @runmailcap = false # Set to 'true' in .rtfm.conf if you want to use run-mailcap instead of xdg-open
+  @batuse     = true  # Use batcat for syntax highlighting
   ## These are automatically written on exit
-  @marks       = {}    # Initialize (book)marks hash
-  @hash        = {}    # Initialize the sha directory hashing
-  @tagged      = []    # Initialize the tagged array - for collecting all tagged items
+  @marks      = {}    # Initialize (book)marks hash
+  @hash       = {}    # Initialize the sha directory hashing
+  @tagged     = []    # Initialize the tagged array - for collecting all tagged items
   ## These should not be set by user in .rtfm.conf
-  @directory   = {}    # Initialize the directory hash for remembering directories visited
-  @searched    = ""    # Initialize the active searched for items
-  @lsfiles     = ""    # File types to show (initially set to all file types) - not saved on exit
-  @lsmatch     = ""    # Files to match (initially set to matching all files) - not saved on exit
-  @index       = 0     # Set chosen item to first on startup
-  @cont        = ""
-  @tagsize     = 0
-  @navi        = ""
-  @marks["'"]  = Dir.pwd
+  @directory  = {}    # Initialize the directory hash for remembering directories visited
+  @searched   = ""    # Initialize the active searched for items
+  @lsfiles    = ""    # File types to show (initially set to all file types) - not saved on exit
+  @lsmatch    = ""    # Files to match (initially set to matching all files) - not saved on exit
+  @index      = 0     # Set chosen item to first on startup
+  @cont       = ""
+  @tagsize    = 0
+  @navi       = ""
+  @marks["'"] = Dir.pwd
   ## File type recognizers
-  @imagefile   = /\.jpg$|\.JPG$|\.jpeg$|\.png$|\.bmp$|\.gif$|\.tif$|\.tiff$/
-  @pptfile     = /\.ppt$/
-  @xlsfile     = /\.xls$/
-  @docfile     = /\.doc$/
-  @docxfile    = /\.docx$/
-  @xlsxfile    = /\.xlsx$/
-  @pptxfile    = /\.pptx$/
-  @oolofile    = /\.odt$|\.odc$|\.odp$|\.odg$/
-  @pdffile     = /\.pdf$|\.ps$/
+  @imagefile  = /\.jpg$|\.JPG$|\.jpeg$|\.png$|\.bmp$|\.gif$|\.tif$|\.tiff$/
+  @pptfile    = /\.ppt$/
+  @xlsfile    = /\.xls$/
+  @docfile    = /\.doc$/
+  @docxfile   = /\.docx$/
+  @xlsxfile   = /\.xlsx$/
+  @pptxfile   = /\.pptx$/
+  @oolofile   = /\.odt$|\.odc$|\.odp$|\.odg$/
+  @pdffile    = /\.pdf$|\.ps$/
   ## Get variables from config file (written back to .rtf.conf upon exit via 'q')
   if File.exist?(Dir.home+'/.rtfm.conf')
     load(Dir.home+'/.rtfm.conf')
   end
-  Dir.chdir(ARGV[0]) if ARGV[0] and Dir.exist?(ARGV[0]) and ARGV[0] !~ /\/tmp/
 end
-# CLASS EXTENSIONS
-class Curses::Window 
+class Curses::Window # CLASS EXTENSION 
   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
@@ -316,6 +282,16 @@ class Curses::Window
   # RTFM specific extensions
 end
 # GENERIC FUNCTIONS 
+def get_ls_color(type) # GET THE COLOR FOR THE FILETYPE FROM IMPORTED LS_COLORS
+  bold    = 0
+  begin
+    color = LScolors.match(/#{type}=\d*;\d*;(\d*)/)[1]
+    bold  = 1 if LScolors.match(/#{type}=\d*;\d*;\d*;1/)
+  rescue
+    color = 7 # Default color
+  end
+  return color.to_i, bold
+end
 def syntax_highlight(input) # SYNTAX HIGHLIGHTING FROM ANSI COLOR CODES
   color_ary  = color_parse(input)
   color_ary.each do | pair |
@@ -332,15 +308,13 @@ def syntax_highlight(input) # SYNTAX HIGHLIGHTING FROM ANSI COLOR CODES
   end
 end
 def color_parse(input) # PARSE ANSI COLOR SEQUENCES
-  input.gsub!(/\e\[\d;38;5;(\d+);*(\d*)m/, '¤¤\1¤¤\2¤¤')
-  input.gsub!(/\e\[38;5;(\d+);*(\d*)m/, '¤¤\1¤¤\2¤¤')
-  input.gsub!(/\e\[\d;38;2;(\d+);*(\d*);\d*m/, '¤¤\1¤¤\2¤¤')
-  input.gsub!(/\e\[38;2;(\d+);*(\d*);\d*m/, '¤¤\1¤¤\2¤¤')
-  input.gsub!(/\e\[\d+;(\d+);*(\d*)m/, '¤¤\1¤¤\2¤¤')
-  input.gsub!(/\e\[0m/, "")
+  input.gsub!( /\e\[\d;38;5;(\d+);*(\d*)m/, '¤¤\1¤¤\2¤¤')
+  input.gsub!( /\e\[38;5;(\d+);*(\d*)m/, '¤¤\1¤¤\2¤¤')
+  input.gsub!( /\e\[\d;38;2;(\d+);*(\d*);\d*m/, '¤¤\1¤¤\2¤¤')
+  input.gsub!( /\e\[38;2;(\d+);*(\d*);\d*m/, '¤¤\1¤¤\2¤¤')
+  input.gsub!( /\e\[0m/, "\t")
   color_array = input.split("¤¤")
   color_array = color_array.drop(1)
-  #color_array.map! { |x| x || 0 }
   output = color_array.each_slice(3).to_a
   return output
 end
@@ -348,10 +322,9 @@ def getchr # PROCESS KEY PRESSES
   # Note: Curses.getch blanks out @w_t
   # @w_l.getch makes Curses::KEY_DOWN etc not work
   # Therefore resorting to the generic method
-  c = $stdin.getch(min: 0, time: 3)
+  c = STDIN.getch(min: 0, time: 3)
   case c
   when "\e"    # ANSI escape sequences
-    return "ESC" if $stdin.ready? == nil
     case $stdin.getc
     when '['   # CSI
       case $stdin.getc
@@ -360,13 +333,12 @@ def getchr # PROCESS KEY PRESSES
       when 'C' then chr = "RIGHT"
       when 'D' then chr = "LEFT"
       when 'Z' then chr = "S-TAB"
-      when '2' then chr = "INS"    ; chr = "C-INS"    if $stdin.getc == "^"
-      when '3' then chr = "DEL"    ; chr = "C-DEL"    if $stdin.getc == "^"
-      when '5' then chr = "PgUP"   ; chr = "C-PgUP"   if $stdin.getc == "^"
-      when '6' then chr = "PgDOWN" ; chr = "C-PgDOWN" if $stdin.getc == "^"
-      when '7' then chr = "HOME"   ; chr = "C-HOME"   if $stdin.getc == "^"
-      when '8' then chr = "END"    ; chr = "C-END"    if $stdin.getc == "^"
-      else chr = ""
+      when '2' then chr = "INS"    ; chr = "C-INS"    if STDIN.getc == "^"
+      when '3' then chr = "DEL"    ; chr = "C-DEL"    if STDIN.getc == "^"
+      when '5' then chr = "PgUP"   ; chr = "C-PgUP"   if STDIN.getc == "^"
+      when '6' then chr = "PgDOWN" ; chr = "C-PgDOWN" if STDIN.getc == "^"
+      when '7' then chr = "HOME"   ; chr = "C-HOME"   if STDIN.getc == "^"
+      when '8' then chr = "END"    ; chr = "C-END"    if STDIN.getc == "^"
       end
     when 'O'   # Set Ctrl+ArrowKey equal to ArrowKey; May be used for other purposes in the future
       case $stdin.getc
@@ -374,29 +346,22 @@ def getchr # PROCESS KEY PRESSES
       when 'b' then chr = "C-DOWN"
       when 'c' then chr = "C-RIGHT"
       when 'd' then chr = "C-LEFT"
-      else chr = ""
       end
     end
   when "", "" then chr = "BACK"
-  when "" then chr = "C-C"
-  when "" then chr = "C-D"
-  when "" then chr = "C-E"
+  when "" then chr = "WBACK"
+  when "" then chr = "LDEL"
   when "" then chr = "C-G"
-  when "" then chr = "C-K"
   when "" then chr = "C-L"
   when "" then chr = "C-N"
   when "" then chr = "C-O"
   when "" then chr = "C-P"
   when "" then chr = "C-T"
   when "" then chr = "C-Y"
-  when "" then chr = "WBACK"
-  when "" then chr = "LDEL"
   when "\r" then chr = "ENTER"
   when "\t" then chr = "TAB"
-  when /[[:print:]]/  then chr = c
-  else chr = ""
+  when /./  then chr = c
   end
-  #stdin_clear
   return chr
 end
 def main_getkey # GET KEY FROM USER
@@ -489,11 +454,11 @@ def main_getkey # GET KEY FROM USER
   # JUMPING AND MARKS
   when 'm' # Set mark 
     marks_info
-    m = $stdin.getc
+    m = STDIN.getc
     if m.match(/[\w']/)
       @marks[m] = Dir.pwd
     elsif m == "-"
-      r = $stdin.getc
+      r = STDIN.getc
       @marks.delete(r)
     end
     marks_info
@@ -648,7 +613,7 @@ def main_getkey # GET KEY FROM USER
       @tagged.push("\"#{Dir.pwd}/#{@selected}\"")
       @tagged.uniq!
       deletes = @tagged.join(" ")
-      if $stdin.getc == 'y'
+      if STDIN.getc == 'y'
         `rm -rf #{deletes} 2>/dev/null` 
         items_number = @tagged.length
         @tagged = []
@@ -907,9 +872,6 @@ def main_getkey # GET KEY FROM USER
     system("echo -n '#{@cont}' | #{clip}")
   when 'S' # Show comprehensive system info
     sysinfo
-  when 'C-D' # Create new directory (shortcut for ":mkdir ")
-    cmd = w_b_getstr(": ", "mkdir ")
-    w_b_exec(cmd + " -p")
   when 'C-N' # navi integration (https://github.com/denisidoro/navi)
     begin
       @navi = `navi`
@@ -919,7 +881,7 @@ def main_getkey # GET KEY FROM USER
     @break = true
   when '@' # Enter "Ruby debug"
     @w_b.nohistory = false
-    cmd = w_b_getstr("◆ ", "", true)
+    cmd = w_b_getstr("◆ ", "")
     @w_b.clr
     @w_b.refresh
     @w_b.update = true
@@ -927,8 +889,8 @@ def main_getkey # GET KEY FROM USER
     info = "Command: #{cmd}\n\n"
     begin
       info += eval(cmd).to_s
-    rescue Exception => err
-      info += "Error: #{err.inspect}"
+    rescue StandardError => e
+      info += "Error: #{e.inspect}"
     end
     w_r_info(info)
     @w_r.update = false
@@ -943,12 +905,6 @@ def main_getkey # GET KEY FROM USER
   rescue
   end
 end
-def stdin_clear
-  begin
-    $stdin.getc while $stdin.ready?
-  rescue
-  end
-end
 def conf_write
   if File.exist?(Dir.home+'/.rtfm.conf')
     conf = File.read(Dir.home+'/.rtfm.conf')
@@ -961,10 +917,6 @@ def conf_write
   conf += "@hash = #{@hash}\n"
   conf.sub!(/^@tagged.*\[.*\]\n/, "")
   conf += "@tagged = #{@tagged}\n"
-  conf.sub!(/^@history.*\[.*\]\n/, "")
-  conf += "@history = #{@history}\n"
-  conf.sub!(/^@rubyhistory.*\[.*\]\n/, "")
-  conf += "@rubyhistory = #{@rubyhistory}\n"
   if @write_conf_all
     conf.sub!(/^@lslong.*\n/, "") 
     conf += "@lslong = #{@lslong}\n"
@@ -1008,8 +960,7 @@ end
 def get_files(win) # The core of the directory listings
   ls_cmd  = "ls 2>/dev/null #{@lsbase} #{@lsall} #{@lsorder} #{@lsinvert} #{@lsuser}" # Get files in current directory 
   ls_cmd += @selected_safe if win == "right"
-  @cfiles = `#{ls_cmd} --color`.split("\n")
-  @files  = @cfiles.map {|f| f.sub(/^.*\d+m(.+)\e\[0m/, '\1')}
+  @files  = `#{ls_cmd}`.split("\n")
   ls_cmd += " -H " if win == "right"
   ls_cmd += %q[ -lh --time-style="long-iso" | awk '{printf "%s%s%s%11s%6s%6s", $1, " " $3, ":" $4,$6,$7,$5"\n"}']
   @fspes  = `#{ls_cmd}`.split("\n").drop(1)
@@ -1076,8 +1027,7 @@ def list_dir(active) # LIST CONTENT OF A DIRECTORY (BOTH active AND RIGHT WINDOW
     @cont = ""
   end
   while ix < @files.size and t < win.maxy do
-    str  = @files[ix]
-    cstr = @cfiles[ix]
+    str = @files[ix]
     active ? str_path = str : str_path = "#{@selected}/#{str}" 
     begin # Add items matching @tag to @tagged
       if str.match(/#{@tag}/) and @tag != false
@@ -1086,9 +1036,25 @@ def list_dir(active) # LIST CONTENT OF A DIRECTORY (BOTH active AND RIGHT WINDOW
       end
     rescue
     end
+    # Determine the filetype of the item 
+    ftype = ""
+    ftype = str.match(/\.([^.]*$)/)[1] if str.match?(/\.([^.]*$)/)
+    # Set special filetypes (sequence matters)
+    ftype = "bd" if File.blockdev?(str_path)
+    ftype = "cd" if File.chardev?(str_path)
+    ftype = "pi" if File.pipe?(str_path)
+    ftype = "st" if File.sticky?(str_path)
+    ftype = "so" if File.socket?(str_path)
+    ftype = "ex" if File.executable?(str_path)
+    ftype = "di" if File.directory?(str_path)
+    ftype = "ln" if File.symlink?(str_path) 
+    begin
+      File.stat(str_path) # Checking if not an orphaned link
+    rescue
+      ftype = "or"        # Set to orphant if no link target
+    end
     fg = 7; bold = 0; bg = 0 # Set default color
-    fl = color_parse(cstr)
-    fg, bold = fl[0][0].to_i, fl[0][1].to_i unless fl[0] == nil
+    fg, bold = get_ls_color(ftype) unless ftype == "" # Color from LS_COLORS
     init_pair(fg, fg, bg)
     file_marker = color_pair(fg)
     file_marker = file_marker | Curses::A_BOLD if bold == 1
@@ -1110,8 +1076,6 @@ def list_dir(active) # LIST CONTENT OF A DIRECTORY (BOTH active AND RIGHT WINDOW
       ext_name    = File.extname(str)
       ext_length  = ext_name.length
       nbl = win.maxx - 5 - ext_length # nbl: new_base_length
-      nbl -= 1 if dir  != ""          # Account for one extra character
-      nbl -= 1 if link != ""          # Account for one extra character
       str = base_name[0..nbl] + "…" + ext_name
     end
     if !active and ix == win.maxy - 1 # Add indicator of more at bottom @w_r list 
@@ -1123,7 +1087,7 @@ def list_dir(active) # LIST CONTENT OF A DIRECTORY (BOTH active AND RIGHT WINDOW
     win.attron(file_marker) { win << str } # Implement color/bold to the item
     win.clrtoeol
     win << "\n"
-    ix += 1; t += 1
+    ix += 1; t  += 1
   end
   (win.maxy - win.cury).times {win.deleteln()} # Clear to bottom of window
   if active
@@ -1150,14 +1114,12 @@ def open_selected(html = nil) # OPEN SELECTED ITEM (when pressing RIGHT)
       if File.read(@selected).force_encoding("UTF-8").valid_encoding? and not html
         system("exec $EDITOR #{@selected_safe}")
       else
-        if @runmailcap
-          #Thread.new { system("run-mailcap #{@selected_safe} 2>/dev/null") }
-          system("run-mailcap #{@selected_safe} 2>/dev/null")
-        else
-          #Thread.new { system("xdg-open #{@selected_safe} 2>/dev/null") }
-          system("xdg-open #{@selected_safe} 2>/dev/null")
+          if @runmailcap
+            Thread.new { system("run-mailcap #{@selected_safe} 2>/dev/null") }
+          else
+            Thread.new { system("xdg-open #{@selected_safe} 2>/dev/null") }
+          end
         end
-      end
       @break = true
     rescue
     end
@@ -1185,7 +1147,7 @@ def copy_move_link(type) # COPY OR MOVE TAGGED ITEMS (COPY IF "keep == true")
         FileUtils.ln_s(item, dest)
         w_b_info(" Item(s) symlinked here.")
       end
-    rescue Exception => err
+    rescue StandardError => err
       w_b_info(err.to_s)
     end
   end
@@ -1279,19 +1241,16 @@ def w_r_doc # GET FULL CONTENT TO PAGE
   @w_r << @w_r.text
 end
 def w_r_info(info) # SHOW INFO IN THE RIGHT WINDOW
-  begin
-    image_show("clear") if @image; @image = false
-    @w_r.clr
-    @w_r.refresh
-    w_r_width = Curses.cols - (Curses.cols * @width / 10) - 2
-    info.gsub!(/(.{1,#{w_r_width}})( +|$\n?)|(.{1,#{w_r_width}})/, "\\1\\3\n")
-    @w_r.text      = info
-    @w_r.pager_cmd = ""
-    pager_start
-    pager_show
-    @w_r.update = false
-  rescue
-  end
+  image_show("clear") if @image; @image = false
+  @w_r.clr
+  @w_r.refresh
+  w_r_width = Curses.cols - (Curses.cols * @width / 10) - 2
+  info.gsub!(/(.{1,#{w_r_width}})( +|$\n?)|(.{1,#{w_r_width}})/, "\\1\\3\n")
+  @w_r.text      = info
+  @w_r.pager_cmd = ""
+  pager_start
+  pager_show
+  @w_r.update = false
 end
 def marks_info # SHOW MARKS IN RIGHT WINDOW
   @w_r.fg = 183
@@ -1415,13 +1374,11 @@ def openai # INTERFACE TO OPENAI
   p += "#{f}? "
   p += "Give a brief summary of its content: " + c unless File.directory?(@selected) and c == ""
 
-  begin
-    response = client.completions( parameters: { model: @aimodel, prompt: p, max_tokens: 200 })
+  response = client.completions( parameters: { model: "text-davinci-003", prompt: p, max_tokens: 200 })
+  if response["error"]["message"] == ""
     text = "OpenAI description:\n" + response["choices"][0]["text"]
-  rescue
-    text  = "Error retrieving OpenAI request.\n\n"
-    text += "Check your connection and @ai secret key (in .rtfm.conf).\n\n"
-    text += response.to_s
+  else
+    text = response["error"]["message"]
   end
 
   @w_r.fg = 229
@@ -1450,8 +1407,8 @@ def sysinfo
     cpu      = "CPUs = " + `nproc`.chop + "  "
     cpuinfo  = `lscpu`
     cpu     += cpuinfo[/^.*Model name:\s*(.*)/, 1] + "  "
-    cpu     += "Max: " + cpuinfo[/^.*CPU max MHz:\s*(.*)/, 1].to_i.to_s + "MHz  "
-    cpu     += "Min: " + cpuinfo[/^.*CPU min MHz:\s*(.*)/, 1].to_i.to_s + "MHz\n\n"
+    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]]
@@ -1460,8 +1417,7 @@ def sysinfo
     disk     = `df -H | head -8`
     text    += [[172, 0, disk]]
     dmesg    = "\nDMESG (latest first):\n"
-    dcmd     = `dmesg 2>/dev/null | tail -6`.split("\n").sort.reverse.join("\n")
-    dcmd != "" ? dmesg += dcmd : dmesg   += "dmesg requires root, run 'sudo sysctl kernel.dmesg_restrict=0' if you need permission\n"
+    dmesg   += `dmesg | tail -6`.split("\n").sort.reverse.join("\n")
     text    += [[219, 0, dmesg]]
     w_r_info(ansifix(text))
   rescue
@@ -1489,29 +1445,23 @@ def w_b_info(info) # SHOW INFO IN @W_B
   @w_b.write
   @w_b.update = false
 end
-def w_b_getstr(pretext, text, ruby=false) # A SIMPLE READLINE-LIKE ROUTINE
+def w_b_getstr(pretext, text) # A SIMPLE READLINE-LIKE ROUTINE
   Curses.curs_set(1)
   Curses.echo
   stk = 0
+  @history.insert(stk, text)
+  pos = @history[stk].length
   chr = ""
-  if ruby
-    @rubyhistory.insert(stk, text)
-    @history_copy = @rubyhistory.map(&:clone)
-  else
-    @history.insert(stk, text)
-    @history_copy = @history.map(&:clone)
-  end
-  pos = @history_copy[stk].length
   while chr != "ENTER"
     @w_b.setpos(0,0)
     init_pair(250, 250, 238)
-    text = pretext + @history_copy[stk]
+    text = pretext + @history[stk]
     text += " " * (@w_b.maxx - text.length) if text.length < @w_b.maxx
     @w_b.attron(color_pair(250)) { @w_b << text }
     @w_b.setpos(0,pretext.length + pos)
     @w_b.refresh
     chr = getchr
-    if chr == 'C-G' or chr == 'C-C'
+    if chr == "C-G"
       Curses.curs_set(0)
       Curses.noecho
       @w_b.update = true
@@ -1520,50 +1470,50 @@ def w_b_getstr(pretext, text, ruby=false) # A SIMPLE READLINE-LIKE ROUTINE
     case chr
     when 'UP'
       unless @w_b.nohistory
-        unless stk == @history_copy.length - 1
+        unless stk == @history.length - 1
           stk += 1 
-          pos = @history_copy[stk].length
+          pos = @history[stk].length
         end
       end
     when 'DOWN'
       unless @w_b.nohistory
         unless stk == 0
           stk -= 1 
-          pos = @history_copy[stk].length
+          pos = @history[stk].length
         end
       end
     when 'RIGHT'
-      pos += 1 unless pos > @history_copy[stk].length
+      pos += 1 unless pos > @history[stk].length
     when 'LEFT'
       pos -= 1 unless pos == 0
     when 'HOME'
       pos = 0
     when 'END'
-      pos = @history_copy[stk].length
+      pos = @history[stk].length
     when 'DEL'
-      @history_copy[stk][pos] = ""
+      @history[stk][pos] = ""
     when 'BACK'
       unless pos == 0
         pos -= 1
-        @history_copy[stk][pos] = ""
+        @history[stk][pos] = ""
       end
     when 'WBACK'
       unless pos == 0
-        until @history_copy[stk][pos - 1] == " " or pos == 0
+        until @history[stk][pos - 1] == " " or pos == 0
           pos -= 1
-          @history_copy[stk][pos] = ""
+          @history[stk][pos] = ""
         end
-        if @history_copy[stk][pos - 1] == " "
+        if @history[stk][pos - 1] == " "
           pos -= 1
-          @history_copy[stk][pos] = ""
+          @history[stk][pos] = ""
         end
       end
     when 'LDEL'
-      @history_copy[stk] = ""
+      @history[stk] = ""
       pos = 0
     when 'TAB' # Tab completion of dirs and files
       p1 = pos - 1
-      c  = @history_copy[stk][0..(p1)].sub(/^.* /, '')
+      c  = @history[stk][0..(p1)].sub(/^.* /, '')
       p0 = p1 - c.length
       compl = File.expand_path(c)
       compl += "/" if Dir.exist?(compl)
@@ -1598,28 +1548,19 @@ def w_b_getstr(pretext, text, ruby=false) # A SIMPLE READLINE-LIKE ROUTINE
           Curses.echo
         end
       end
-      @history_copy[stk].sub!(c,compl)
+      @history[stk].sub!(c,compl)
       pos = pos - c.length + compl.length
     when /^.$/
-      @history_copy[stk].insert(pos,chr)
-      pos += 1
-    end
-    while $stdin.ready?
-      chr = $stdin.getc
-      @history_copy[stk].insert(pos,chr)
+      @history[stk].insert(pos,chr)
       pos += 1
     end
   end
-  curstr = @history_copy[stk]
-  @history_copy.shift if @w_b.nohistory
-  ruby ? @rubyhistory.insert(0, @history_copy[stk]) : @history.insert(0, @history_copy[stk])
+  curstr = @history[stk]
+  @history.shift if @w_b.nohistory
   unless @w_b.nohistory
     @history.uniq!
     @history.compact!
     @history.delete("")
-    @rubyhistory.uniq!
-    @rubyhistory.compact!
-    @rubyhistory.delete("")
   end
   Curses.curs_set(0)
   Curses.noecho
@@ -1642,11 +1583,11 @@ def w_b_exec(cmd) # EXECUTE COMMAND FROM @W_B
     status = Timeout::timeout(15) {
       @w_r.clr
       begin
-        @w_r.pager_cmd = "#{cmd} 2>&1 | #{@bat} -n --color=always"
-        @w_r.text = %x(#{@w_r.pager_cmd})
+        @w_r.pager_cmd = "#{cmd} | #{@bat} -n --color=always 2>/dev/null"
+        @w_r.text = `#{@w_r.pager_cmd}`
       rescue
-        @w_r.pager_cmd = "#{cmd} 2>&1"
-        @w_r.text = %x(#{@w_r.pager_cmd})
+        @w_r.pager_cmd = "#{cmd} 2>/dev/null"
+        @w_r.text = `#{@w_r.pager_cmd}`
       end
       unless @w_r.text == "" or @w_r.text == nil
         pager_start
@@ -1678,8 +1619,8 @@ loop do # OUTER LOOP - CATCHING REFRESHES VIA 'r'
     maxx = Curses.cols
     maxy = Curses.lines
     # Curses::Window.new(h,w,y,x)
-    @w_t = Curses::Window.new(1, maxx, 0, 0)
-    @w_b = Curses::Window.new(1, maxx, maxy - 1, 0)
+    @w_t = Curses::Window.new(1, 0, 0, 0)
+    @w_b = Curses::Window.new(1, 0, maxy - 1, 0)
     @w_l = Curses::Window.new(maxy - 3, (maxx * @width / 10) - 1, 2, 0)
     @w_r = Curses::Window.new(maxy - 4, maxx - (maxx * @width / 10), 2, maxx * @width / 10)
     @w_p = Curses::Window.new(1, maxx - (maxx * @width / 10), maxy - 2, maxx * @width / 10)
@@ -1698,6 +1639,8 @@ loop do # OUTER LOOP - CATCHING REFRESHES VIA 'r'
       tagged_info
       @w_r.update = false
     end
+    @change     = true
+    @change_tag = true # For future need to force @change
     loop do # INNER, CORE LOOP 
       begin # Jump to home dir if current dir is externally removed
         Dir.pwd
@@ -1729,8 +1672,13 @@ loop do # OUTER LOOP - CATCHING REFRESHES VIA 'r'
       @selected       = @files[@index]                     # Get text of selected item
       sel_old         = @selected_safe
       @selected_safe  = "\"#{@selected}\""                 # Make it safe for commands
-      system("printf \"\033]0;RTFM: #{Dir.pwd}\007\"")     # Set Window title to path 
-      w_t_info                                             # Top window (info line) 
+      @selected_safe == sel_old ? @change = false : @change = true
+      @change         = true if @change_tag; @change_tag = false
+      if @change
+        system("printf \"\033]0;RTFM: #{Dir.pwd}\007\"")   # Set Window title to path 
+        # Top window (info line) 
+        w_t_info
+      end
       @w_l.setpos(0,0)
       list_dir(true)
       @w_l.refresh
@@ -1753,9 +1701,6 @@ loop do # OUTER LOOP - CATCHING REFRESHES VIA 'r'
       break if Curses.cols != maxx or Curses.lines != maxy # break on terminal resize 
       break if @break    # Break to outer loop, redrawing windows, if user hit 'r'
     end
-  rescue StandardError => err # Throw error nicely
-    w_r_info(err)
-    @w_r.update = false
   ensure # On exit: close curses, clear terminal 
     @write_conf_all = false
     conf_write if @write_conf # Write marks to config file
@@ -1763,7 +1708,7 @@ loop do # OUTER LOOP - CATCHING REFRESHES VIA 'r'
     close_screen
     # If launched via the script "r", return current dir and "r" will cd to that
     begin
-      File.write(ARGV[0], Dir.pwd) if ARGV[0] and ARGV[0].match(/\/tmp/)
+      File.write(ARGV[0], Dir.pwd) if ARGV[0] and ARGV[0].match(/\/tmp\/tmp/)
     rescue
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rtfm-filemanager
 version: !ruby/object:Gem::Version
-  version: '3.3'
+  version: '3.5'
 platform: ruby
 authors:
 - Geir Isene
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-27 00:00:00.000000000 Z
+date: 2023-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -47,8 +47,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 3.3: Updated default OpenAI model and adding the option to
-  add own by setting @aimodel in .rtfm.conf.'
+  other features. New in 3.5: Simplified install :-)'
 email: g@isene.com
 executables:
 - rtfm
@@ -63,7 +62,7 @@ licenses:
 - Unlicense
 metadata:
   source_code_uri: https://github.com/isene/RTFM
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -78,8 +77,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
-signing_key:
+rubygems_version: 3.3.5
+signing_key: 
 specification_version: 4
 summary: RTFM - Ruby Terminal File Manager
 test_files: []